From ce04395182671afec833762655eabdfa2514a02a Mon Sep 17 00:00:00 2001
From: "jamiewalch@google.com"
 <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 10 Aug 2011 23:25:43 +0000
Subject: Made web-app bidi-compatible.

BUG=None
TEST=Manual

Review URL: http://codereview.chromium.org/7610001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96245 0039d316-1c4b-4281-b951-d872f2087c98
---
 remoting/webapp/me2mom/choice.css  | 23 ++++++++++++-----------
 remoting/webapp/me2mom/choice.html | 10 +++++-----
 remoting/webapp/me2mom/toolbar.css |  6 +++---
 3 files changed, 20 insertions(+), 19 deletions(-)

(limited to 'remoting')

diff --git a/remoting/webapp/me2mom/choice.css b/remoting/webapp/me2mom/choice.css
index eeb360d..87608a0 100644
--- a/remoting/webapp/me2mom/choice.css
+++ b/remoting/webapp/me2mom/choice.css
@@ -16,6 +16,7 @@ body {
   font-family: 'Droid sans', Arial, sans-serif;
   margin:0;
   padding:0;
+  direction: __MSG_@@bidi_dir__;
 }
 
 button, input {
@@ -54,7 +55,7 @@ button[disabled], .button[disabled]:hover {
 h1 {
   font-size: 24px;
   font-weight: normal;
-  margin-left: 10px;
+  margin-__MSG_@@bidi_start_edge__: 10px;
 }
 
 label {
@@ -92,7 +93,7 @@ label {
 .choice-header {
   font-size: 24px;
   font-weight: normal;
-  margin-left: 10px;
+  margin-__MSG_@@bidi_start_edge__: 10px;
 }
 
 .choice-footer {
@@ -111,8 +112,8 @@ label {
 .error-state {
   background-image: url('icon_warning.png');
   background-repeat: no-repeat;
-  background-position: top left;
-  padding-left: 30px;
+  background-position: top __MSG_@@bidi_start_edge__;
+  padding-__MSG_@@bidi_start_edge__: 30px;
   padding-top: 3px;
   margin-bottom: 10px;
   color: #900;
@@ -138,18 +139,18 @@ label {
   margin-bottom: 10px;
 }
 
-.top-left {
+.top-primary {
   font-size: 14px;
   position: absolute;
   top: 0.5em;
-  left: 0.5em;
+  __MSG_@@bidi_start_edge__: 0.5em;
 }
 
-.top-right {
+.top-secondary {
   font-size: 14px;
   position: absolute;
   top: 0.5em;
-  right: 0.5em;
+  __MSG_@@bidi_end_edge__: 0.5em;
 }
 
 .waiting {
@@ -175,7 +176,7 @@ label {
   font-size: 18px;
   height: 25px;
   margin: 0 10px;
-  padding-left: 5px;
+  padding-__MSG_@@bidi_start_edge__: 5px;
   width: 12em;
 }
 
@@ -184,7 +185,7 @@ label {
 }
 
 #cancel-button {
-  float: right;
+  float: __MSG_@@bidi_end_edge__;
 }
 
 #client-footer-text, #host-footer-text {
@@ -204,7 +205,7 @@ label {
 }
 
 #email-status {
-  margin-right: 0.5ex;
+  margin-__MSG_@@bidi_end_edge__: 0.5ex;
 }
 
 #icon {
diff --git a/remoting/webapp/me2mom/choice.html b/remoting/webapp/me2mom/choice.html
index 1f322b4..9b3c1f1 100644
--- a/remoting/webapp/me2mom/choice.html
+++ b/remoting/webapp/me2mom/choice.html
@@ -38,7 +38,7 @@ found in the LICENSE file.
       <em>Loading&hellip;</em>
     </section> <!-- loading-mode -->
 
-    <div class="top-left"
+    <div class="top-primary"
          data-ui-mode="client.unconnected host.unshared"
          hidden>
       <span id="email-status">
@@ -48,7 +48,7 @@ found in the LICENSE file.
       </span>
     </div>
 
-    <div class="top-right" data-ui-mode="auth client host">
+    <div class="top-secondary" data-ui-mode="auth client host">
       <a href="#" onclick="remoting.toggleDebugLog();"
          i18n-content="debugButton"></a>
     </div>
@@ -62,7 +62,7 @@ found in the LICENSE file.
         <strong id="connected-to"></strong>
         <button type="button" onclick="remoting.disconnect();"
                 i18n-content="disconnectButton"></button>
-        <span class="right-align">
+        <span class="end-align">
           <button type="button" onclick="remoting.toggleDebugLog();"
                   i18n-content="debugButton"></button>
           <button type="button" onclick="remoting.toggleScaleToFit();"
@@ -116,7 +116,7 @@ found in the LICENSE file.
 
         <div data-ui-mode="host.waiting-for-connection">
           <div class="description" i18n-content="instructionsShareAbove"></div>
-          <div id="access-code-display"></div>
+          <div id="access-code-display" dir="ltr"></div>
           <div id="access-code-countdown-container">
             <div id="access-code-countdown" class="expiring" hidden>
               <span i18n-content="accessCodeTimer"></span>
@@ -231,7 +231,7 @@ found in the LICENSE file.
     <div id="session-mode" data-ui-mode="in-session client" hidden>
     </div> <!-- session-mode -->
 
-    <section id="debug-log" hidden>
+    <section id="debug-log" dir="ltr" hidden>
       <div id="statistics">
       </div>
       <div id="debug-messages">
diff --git a/remoting/webapp/me2mom/toolbar.css b/remoting/webapp/me2mom/toolbar.css
index 41f9380..9f3d3d2 100644
--- a/remoting/webapp/me2mom/toolbar.css
+++ b/remoting/webapp/me2mom/toolbar.css
@@ -46,10 +46,10 @@
   display: inline-block;
   max-width: 280px;
   overflow: hidden;
-  margin-right: 8px;
+  margin-__MSG_@@bidi_end_edge__: 8px;
   white-space: nowrap;
 }
 
-.right-align {
-  float: right;
+.end-align {
+  float: __MSG_@@bidi_end_edge__;
 }
-- 
cgit v1.1