Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2010)

Unified Diff: chrome/browser/resources/local_discovery/local_discovery.html

Issue 23903011: Modify devices page to match the latest mocks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browser test Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/local_discovery/local_discovery.html
diff --git a/chrome/browser/resources/local_discovery/local_discovery.html b/chrome/browser/resources/local_discovery/local_discovery.html
index a1418ebf20da292ae7fe90ee13e66db07e919f8c..2cd98508c7a2c944f9b5ae4d3c85eb5ebc340f28 100644
--- a/chrome/browser/resources/local_discovery/local_discovery.html
+++ b/chrome/browser/resources/local_discovery/local_discovery.html
@@ -6,6 +6,7 @@
<title i18n-content="devicesTitle"></title>
<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
<link rel="stylesheet" href="chrome://resources/css/overlay.css">
+ <link rel="stylesheet" href="chrome://resources/css/spinner.css">
<link rel="stylesheet" href="local_discovery.css">
<link rel="stylesheet" href="../uber/uber_shared.css">
@@ -25,17 +26,16 @@
<div id="register-page-choose" class="register-page">
<h1 i18n-content="confirmRegistration"></h1>
- <div id="register-message">
-
+ <div id="register-message"
+ i18n-content="noPrintersOnNetworkExplanation">
</div>
- <div id="register-picker">
- <label i18n-content="registerUser" for="register-user-list"></label>
- <select id="register-user-list"></select>
+ <div id="register-device-picker">
+ <div class="devices" id="register-device-list">
+ </div>
</div>
+
<div class="button-list">
- <button class="register-cancel">Cancel</button>
- <button class="register-continue"
- id="register-confirmation-continue">Continue</button>
+ <button class="register-cancel" i18n-content="cancel"></button>
</div>
</div>
@@ -43,15 +43,16 @@
<h1 i18n-content="addingPrinter"></h1>
<div i18n-content="addingMessage1"></div>
<div class="button-list">
- <button class="register-cancel">Cancel</button>
+ <button class="register-cancel" i18n-content="cancel"></button>
</div>
</div>
<div id="register-page-adding2" class="register-page">
<h1 i18n-content="addingPrinter"></h1>
- <div i18n-content="addingMessage2"></div>
+ <div class="inline-spinner"> </div>
+ <span i18n-content="addingMessage2"></span>
<div class="button-list">
- <button class="register-cancel">Cancel</button>
+ <button class="register-cancel" i18n-content="cancel"></button>
</div>
</div>
@@ -59,7 +60,7 @@
<h1 i18n-content="addingError"></h1>
<div i18n-content="addingErrorMessage"></div>
<div class="button-list">
- <button id="register-error-exit">OK</button>
+ <button id="register-error-exit" i18n-content="ok"></button>
</div>
</div>
</div>
@@ -69,13 +70,20 @@
<h1 i18n-content="devicesTitle"></h1>
</header>
- <h2 i18n-content="registeredDevicesTitle"></h2>
- <div id="registered-devices" class="device-list">
+ <div class="controls">
+ <button id="add-printers-button" i18n-content="addPrinters"></button>
+ <span id="printer-num" class="subline"
+ i18n-content="printersOnNetworkZero">
+ </span>
</div>
- <h2 i18n-content="unregisteredDevicesTitle"></h2>
- <div id="unregistered-devices" class="device-list">
+ <div id="cloud-devices-loading">
+ <div class="inline-spinner"> </div> <span i18n-content="loading"></span>
</div>
+ <div id="cloud-devices">
+
+ </div>
+
</div>
<script src="chrome://resources/js/i18n_template2.js"></script>

Powered by Google App Engine
This is Rietveld 408576698