Commit 1cc9b1da authored by jamiewalch@google.com's avatar jamiewalch@google.com

Web-app visual and string tweaks.

* Implemented waiting class using a background image like error-state.
* Make waiting text line up with Cancel buttons.
* Make tool-bar spacing i18n- and hostname-safe.
* Updated strings after reviewer feedback.
* Fixed vertical position of host setup transitional text.

BUG=None
TEST=Manual

Review URL: https://chromiumcodereview.appspot.com/10103034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132601 0039d316-1c4b-4281-b951-d872f2087c98
parent 5331d05c
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
"description": "Description of the 'access' or 'client' functionality, displayed next to a button that instigates an access operation." "description": "Description of the 'access' or 'client' functionality, displayed next to a button that instigates an access operation."
}, },
"HOME_DAEMON_ACTIVE_MESSAGE": { "HOME_DAEMON_ACTIVE_MESSAGE": {
"message": "You may securely access this computer from anywhere you sign in to Chromoting.", "message": "You may securely access this computer using Chromoting.",
"description": "Message displayed when the current computer is accepting remote connections." "description": "Message displayed when the current computer is accepting remote connections."
}, },
"HOME_DAEMON_CHANGE_PIN_LINK": { "HOME_DAEMON_CHANGE_PIN_LINK": {
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
"description": "Button displayed when the current computer is not accepting remote connections. Clicking this button causes it to start accepting remote connections." "description": "Button displayed when the current computer is not accepting remote connections. Clicking this button causes it to start accepting remote connections."
}, },
"HOME_DAEMON_START_MESSAGE": { "HOME_DAEMON_START_MESSAGE": {
"message": "To securely access this computer from anywhere you sign in to Chromoting, you must first enable remote connections.", "message": "You must enable remote connections if you want to use Chromoting to access this computer.",
"description": "Message displayed when the current computer is not accepting remote connections, instructing the user how to enable them." "description": "Message displayed when the current computer is not accepting remote connections, instructing the user how to enable them."
}, },
"HOST_SETUP_DIALOG_DESCRIPTION": { "HOST_SETUP_DIALOG_DESCRIPTION": {
......
...@@ -422,20 +422,19 @@ button { ...@@ -422,20 +422,19 @@ button {
color: #AAA; color: #AAA;
} }
.waiting:before {
content: url('spinner.gif');
position: absolute;
left: 0px;
top: -3px;
}
.waiting { .waiting {
background-image: url('spinner.gif');
background-repeat: no-repeat;
background-position: top __MSG_@@bidi_start_edge__;
padding-__MSG_@@bidi_start_edge__: 30px;
padding-top: 2px;
padding-bottom: 4px;
color: rgb(180, 180, 180); color: rgb(180, 180, 180);
margin-left: 30px; line-height: 27px; /* Same as line-height for buttons */
} }
.waiting-container { .waiting-container {
position: relative; display: -webkit-box;
} }
.space-before { .space-before {
...@@ -470,11 +469,6 @@ button { ...@@ -470,11 +469,6 @@ button {
margin-bottom: 8px; margin-bottom: 8px;
} }
#cancel-connect-button, #cancel-share-button {
float: __MSG_@@bidi_end_edge__;
}
#current-email { #current-email {
color: rgba(0, 0, 0, 0.5); color: rgba(0, 0, 0, 0.5);
} }
......
...@@ -229,9 +229,10 @@ found in the LICENSE file. ...@@ -229,9 +229,10 @@ found in the LICENSE file.
</button> </button>
</div> </div>
</form> </form>
<div data-ui-mode="home.host-setup.processing" hidden> <div data-ui-mode="home.host-setup.processing"
<img src="spinner.gif"> class="waiting-container"
<span id="host-setup-processing-message"></span> hidden>
<span class="waiting" id="host-setup-processing-message"></span>
</div> </div>
<div data-ui-mode="home.host-setup.done" hidden> <div data-ui-mode="home.host-setup.done" hidden>
<div id="host-setup-done-message" class="message"></div> <div id="host-setup-done-message" class="message"></div>
...@@ -337,11 +338,9 @@ found in the LICENSE file. ...@@ -337,11 +338,9 @@ found in the LICENSE file.
<div data-ui-mode="home.host.waiting-for-connection home.host.waiting-for-code" <div data-ui-mode="home.host.waiting-for-connection home.host.waiting-for-code"
class="waiting-container space-before"> class="waiting-container space-before">
<span class="waiting" <span class="waiting" i18n-content="FOOTER_WAITING"></span>
i18n-content="FOOTER_WAITING"></span> <div class="box-spacer"></div>
<button id="cancel-share-button" <button id="cancel-share-button" i18n-content="CANCEL"></button>
i18n-content="CANCEL">
</button>
</div> </div>
<div id="host-plugin-container"></div> <div id="host-plugin-container"></div>
...@@ -375,9 +374,8 @@ found in the LICENSE file. ...@@ -375,9 +374,8 @@ found in the LICENSE file.
<div data-ui-mode="home.client.connecting" class="waiting-container"> <div data-ui-mode="home.client.connecting" class="waiting-container">
<span class="waiting" i18n-content="FOOTER_WAITING"></span> <span class="waiting" i18n-content="FOOTER_WAITING"></span>
<button id="cancel-connect-button" <div class="box-spacer"></div>
i18n-content="CANCEL"> <button id="cancel-connect-button" i18n-content="CANCEL"></button>
</button>
</div> <!-- client.connecting --> </div> <!-- client.connecting -->
<div data-ui-mode="home.client.pin-prompt" class="centered"> <div data-ui-mode="home.client.pin-prompt" class="centered">
...@@ -507,14 +505,13 @@ found in the LICENSE file. ...@@ -507,14 +505,13 @@ found in the LICENSE file.
class="toolbar-container" class="toolbar-container"
hidden> hidden>
<div class="toolbar-border"> <div class="toolbar-border">
<span id="session-status-message" <div id="session-status-message"
i18n-content="LABEL_CONNECTED"></span> i18n-content="LABEL_CONNECTED"></div>
<strong id="connected-to"></strong> <div id="connected-to" class="box-spacer"></div>
<button id="toolbar-disconnect" <button id="toolbar-disconnect"
type="button" type="button"
i18n-content="DISCONNECT_MYSELF_BUTTON"> i18n-content="DISCONNECT_MYSELF_BUTTON">
</button> </button>
<div class="box-spacer"></div>
<span class="menu-button" id="send-keys-menu"> <span class="menu-button" id="send-keys-menu">
<button> <button>
<span i18n-content="SEND_KEYS"></span> <span i18n-content="SEND_KEYS"></span>
......
...@@ -47,9 +47,12 @@ ...@@ -47,9 +47,12 @@
display: -webkit-box; display: -webkit-box;
} }
.toolbar-border > div {
margin: 4px;
}
/* Ensure that the 'connected to' string doesn't make the tool-bar overflow */ /* Ensure that the 'connected to' string doesn't make the tool-bar overflow */
#connected-to { #connected-to {
display: inline-block;
max-width: 280px; max-width: 280px;
overflow: hidden; overflow: hidden;
margin-__MSG_@@bidi_end_edge__: 8px; margin-__MSG_@@bidi_end_edge__: 8px;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment