Initial RTL update work. Consolidated shared rtl-related css selector…

…s in gallery.common. Applied g-right and g-left to a few banner items, including login menu and the logo.
gallery · Oct 28, 2009 · fbc5517 · fbc5517
1 parent 27571a1
commit fbc5517
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 76 deletions.
diff --git a/lib/gallery.common.css b/lib/gallery.common.css
@@ -347,13 +347,11 @@ form .g-error {
 .g-left {
   clear: none;
   float: left;
-  margin: 1em 1em 1em 0;
 }
 
 .g-right {
   clear: none;
   float: right;
-  margin: 1em 0 1em 1em;
 }
 
 .g-first {
@@ -566,14 +564,45 @@ div#g-action-status {
   margin-left: 0;
 }
 
-/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
+/** *******************************************************************
+ * 7) Right to left styles
+ **********************************************************************/
+
+.rtl {
+  direction: rtl;
+}
+
+.rtl caption,
+.rtl th,
+.rtl #g-dialog,
+.g-message {
+  text-align: right;
+}
 
-.rtl .g-short-form li {
+.rtl .g-txt-right {
+  text-align: left;
+}
+
+.rtl .g-left,
+.rtl .g-inline li,
+.rtl form ul ul li,
+.rtl input[type="submit"],
+.rtl input[type="reset"],
+.rtl #g-content #g-album-grid .g-item,
+.rtl .sf-menu li,
+.rtl .g-breadcrumbs li,
+.rtl .g-pager li,
+.rtl .g-buttonset li,
+.rtl .ui-icon-left .ui-icon {
   float: right;
 }
 
+.rtl .g-right,
+.rtl .ui-icon-right .ui-icon {
+  float: left;
+}
+
 .rtl .g-inline li {
-  float: right;
   margin-right: 1em;
 }
 

diff --git a/modules/gallery/views/login.html.php b/modules/gallery/views/login.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul id="g-login-menu" class="g-inline">
+<ul id="g-login-menu" class="g-inline g-right">
   <? if ($user->guest): ?>
   <li class="g-first">
     <a href="<?= url::site("login/ajax") ?>"

diff --git a/modules/search/views/search_link.html.php b/modules/search/views/search_link.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<form action="<?= url::site("search") ?>" id="g-quick-search-form" class="g-short-form">
+<form action="<?= url::site("search") ?>" id="g-quick-search-form" class="g-short-form g-right">
   <ul>
     <li>
       <label for="g-search"><?= t("Search the gallery") ?></label>

diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
@@ -457,46 +457,19 @@ th {
  * 7) Right to left styles
  *********************************************************************/
 
-.rtl {
-  direction: rtl;
+.rtl #g-admin-menu {
+  left: auto;
+  right: 150px;
 }
 
-.rtl caption,
-.rtl th,
-.rtl #g-dialog {
-  text-align: right;
-}
-
-.rtl #g-header #g-login-menu,
-.rtl .g-txt-right {
-  text-align: left;
-}
-
-.rtl .g-right,
-.rtl #g-header #g-quick-search-form,
-.rtl #g-header #g-login-menu,
-.rtl .ui-icon-right .ui-icon {
-  clear: left;
-  float: left;
-}
-
-.rtl .g-left,
-.rtl form ul ul li,
-.rtl input[type="submit"],
-.rtl input[type="reset"],
 .rtl #g-content #g-album-grid .g-item,
-.rtl #g-site-admin-menu,
-.rtl .g-pager li,
-.rtl .g-buttonset li,
-.rtl .ui-icon-left .ui-icon,
 .rtl #g-site-theme,
 .rtl #g-admin-theme,
 .rtl .g-selected img,
 .rtl .g-available .g-block img,
 .rtl #g-content #g-photo-stream .g-item,
 .rtl li.g-group,
-.rtl #g-server-add-admin,
-.rtl .ui-icon-left .ui-icon {
+.rtl #g-server-add-admin {
   float: right;
 }
 

diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
@@ -195,10 +195,6 @@ td {
 
 /* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#g-banner #g-logo img {
-  margin: 0;
-}
-
 #g-banner #g-quick-search-form {
   clear: right;
   float: right;
@@ -311,7 +307,6 @@ td {
 
 #g-banner #g-login-menu {
   color: #999;
-  float: right;
 }
 
 #g-banner #g-login-menu li {
@@ -417,37 +412,10 @@ td {
 }
 
 /** *******************************************************************
- * 6) Right to left styles
+ * 7) Right to left styles
  *********************************************************************/
 
-.rtl {
-  direction: rtl;
-}
-
-.rtl caption,
-.rtl th,
-.rtl #g-dialog {
-  text-align: right;
-}
-
-.rtl .g-right,
-.rtl #g-header #g-quick-search-form,
-.rtl #g-header #g-login-menu,
-.rtl .ui-icon-right .ui-icon {
-  clear: left;
-  float: left;
-}
-
-.rtl .g-left,
-.rtl form ul ul li,
-.rtl input[type="submit"],
-.rtl input[type="reset"],
-.rtl #g-header #g-logo img,
-.rtl #g-content #g-album-grid .g-item,
-.rtl #g-site-menu,
-.rtl .g-breadcrumbs li,
-.rtl .g-pager li,
-.rtl .g-buttonset li,
-.rtl .ui-icon-left .ui-icon {
-  float: right;
+.rtl #g-site-menu {
+  left: auto;
+  right: 150px;
 }
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
@@ -77,14 +77,14 @@
       <?= $theme->site_status() ?>
       <div id="g-header" class="ui-helper-clearfix">
         <div id="g-banner">
-          <?= $theme->header_top() ?>
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
           <?= $header_text ?>
           <? else: ?>
-          <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
+          <a id="g-logo" class="g-left" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
             <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("lib/images/logo.png") ?>" />
           </a>
           <? endif ?>
+          <?= $theme->header_top() ?>
           <div id="g-site-menu">
           <?= $theme->site_menu() ?>
           </div>