Merge branch 'master' of git@github.com:gallery/gallery3

10 files changed, 103 insertions, 128 deletions

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index c5adc3ee..414bae73 100644
--- 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 {
@@ -467,10 +465,6 @@ ul.sf-menu li li li.sfHover ul {
 
 /* Status and validation messages ~~~~ */
 
-.g-message {
-  font-size: .8em;
-}
-
 .g-message-block {
   border: 1px solid #ccc;
   width: 100%;
@@ -500,17 +494,19 @@ div#g-action-status {
 /* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-breadcrumbs {
+  clear: both;
   padding: 0 20px;
 }
 
 .g-breadcrumbs li {
   background: transparent url('images/ico-separator.gif') no-repeat scroll left center;
   float: left;
-  padding: 10px 6px 10px 16px !important;
+  padding: 1em .6em 1em 1.4em;
 }
 
-.g-breadcrumbs li.root {
-  background: transparent;
+.g-breadcrumbs .g-first {
+  background: none;
+  padding-left: 0;
 }
 
 .g-breadcrumbs li a,
@@ -518,21 +514,11 @@ div#g-action-status {
   display: block;
 }
 
-.g-breadcrumbs li.active,
-.g-breadcrumbs li.active span {
-  font-weight: bold;
-}
-
 #g-dialog ul.g-breadcrumbs {
-  clear: both;
   margin-left: 0;
   padding-left: 0;
 }
 
-#g-dialog .g-breadcrumbs li {
-  font-size: .9em;
-}
-
 /* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-pager {
@@ -570,21 +556,53 @@ div#g-action-status {
 
 .g-inline li {
   float: left;
-  margin-left: 1em;
+  margin-left: 1.8em;
+  padding-left: 0 !important;
 }
 
 .g-inline li.g-first {
   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-txt-right {
+  text-align: left;
+}
 
-.rtl .g-short-form li {
+.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
index 0e0d9039..971d18b8 100644
--- 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/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index e432f56b..0b27336e 100644
--- a/modules/gallery/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -6,8 +6,8 @@
       url: form_url.replace("__ITEM__", id),
       success: function(data) {
           $("#g-edit-permissions-form").html(data);
-          $(".active").removeClass("active");
-          $("#item-" + id).addClass("active");
+          $(".g-active").removeClass("g-active");
+          $("#item-" + id).addClass("g-active");
       }
     });
   }
@@ -38,18 +38,18 @@
   <p><?= t("Edit permissions for album:") ?></p>
 
   <ul class="g-breadcrumbs">
+    <? $i = 0 ?>
     <? foreach ($parents as $parent): ?>
-    <li id="item-<?= $parent->id ?>">
+    <li id="item-<?= $parent->id ?>"<? if ($i == 0) print " class=\"g-first\"" ?>>
       <? if (access::can("edit", $parent)): ?>
-      <a href="javascript:show(<?= $parent->id ?>)">
-        <?= html::purify($parent->title) ?>
-      </a>
+      <a href="javascript:show(<?= $parent->id ?>)"> <?= html::purify($parent->title) ?> </a>
       <? else: ?>
       <?= html::purify($parent->title) ?>
       <? endif ?>
     </li>
+    <? $i++ ?>
     <? endforeach ?>
-    <li class="active" id="item-<?= $item->id ?>">
+    <li class="g-active" id="item-<?= $item->id ?>">
       <a href="javascript:show(<?= $item->id ?>)">
         <?= html::purify($item->title) ?>
       </a>
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index ff73dd6f..9285fffe 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -25,10 +25,12 @@
     <?= t("Photos will be uploaded to album: ") ?>
   </p>
   <ul class="g-breadcrumbs">
+    <? $i = 0 ?>
     <? foreach ($item->parents() as $parent): ?>
-    <li> <?= html::clean($parent->title) ?> </li>
+    <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::clean($parent->title) ?> </li>
+    <? $i++ ?>
     <? endforeach ?>
-    <li class="active"> <?= html::purify($item->title) ?> </li>
+    <li class="g-active"> <?= html::purify($item->title) ?> </li>
   </ul>
 
   <div id="g-uploadqueue-infobar">
diff --git a/modules/search/views/search_link.html.php b/modules/search/views/search_link.html.php
index 481d0c82..9d1ce83b 100644
--- 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/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index cd3b09cc..824a86a6 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -9,14 +9,12 @@
 
   <p id="g-description"><?= t("Photos will be added to album:") ?></p>
   <ul class="g-breadcrumbs">
+    <? $i = 0 ?>
     <? foreach ($item->parents() as $parent): ?>
-    <li>
-      <?= html::purify($parent->title) ?>
-    </li>
+    <li<? if ($i == 0) print " class=\"g-first\"" ?>> <?= html::purify($parent->title) ?> </li>
+    <? $i++ ?>
     <? endforeach ?>
-    <li class="active">
-      <?= html::purify($item->title) ?>
-    </li>
+    <li class="g-active"> <?= html::purify($item->title) ?> </li>
   </ul>
 
   <ul id="g-server-add-tree" class="g-checkbox-tree">
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 4ae0c218..fbcdf4ae 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -246,7 +246,7 @@ th {
   background: transparent url('../../../lib/images/logo.png') no-repeat 0 .5em;
   color: #A5A5A5 !important;
   display: block;
-  height: 55px;
+  height: 65px;
   padding-top: 5px;
   width: 105px;
 }
@@ -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/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index d88cabf6..ef1aa1d2 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -44,7 +44,17 @@
       <div id="g-header">
         <?= $theme->admin_header_top() ?>
         <ul id="g-login-menu" class="g-inline g-right">
-          <li class="g-first"><?= html::anchor(item::root()->abs_url(), "&larr; ".t("Back to the Gallery")) ?></li>
+          <li class="g-first">
+            <? if (identity::is_writable()): ?>
+            <?= t('Logged in as %name', array('name' => html::mark_clean(
+              '<a href="' . url::site("form/edit/users/{$user->id}") .
+              '" title="' . t("Edit Your Profile")->for_html_attr() .
+              '" id="g-user-profile-link" class="g-dialog-link">' .
+              html::clean($user->display_name()) . '</a>'))) ?>
+            <? else: ?>
+            <?= t('Logged in as %name', array('name' => html::clean($user->display_name()))) ?>
+            <? endif ?>
+          </li>
           <li id="g-logout-link"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
         </ul>
         <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 15ce4173..b73c21f0 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -4,7 +4,7 @@
  * @requires YUI reset, font, grids CSS
  *
  * Sheet organization:
- *  1)  Basic HTML elements
+ *  1)  Font sizes, base HTML elements
  *  2)  Reusable content blocks
  *  3)  Page layout containers
  *  4)  Content blocks in specific layout containers
@@ -16,7 +16,7 @@
  */
 
 /** *******************************************************************
- * 1) Basic HTML elements
+ * 1) Font sizes, base HTML elements
  **********************************************************************/
 
 body, html {
@@ -56,10 +56,27 @@ h2 {
   margin-bottom: .6em;
 }
 
+#g-content,
+#g-site-menu,
 h3 {
   font-size: 1.2em;
 }
 
+#g-sidebar,
+.g-breadcrumbs {
+  font-size: .9em;
+}
+
+#g-banner,
+#g-footer,
+.g-message {
+  font-size: .8em;
+}
+
+#g-content #g-album-grid .g-item {
+  font-size: .7em;
+}
+
 /* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 a,
@@ -149,21 +166,18 @@ td {
 #g-banner {
   background-color: #e8e8e8;
   border-bottom: 1px solid #ccc;
-  font-size: .8em;
   min-height: 5em;
   padding: 1em 20px;
   position: relative;
 }
 
 #g-content {
-  font-size: 1.2em;
   padding-left: 20px;
   position: relative;
   width: 696px;
 }
 
 #g-sidebar {
-  font-size: .9em;
   padding: 0 20px;
   width: 220px;
 }
@@ -171,7 +185,6 @@ td {
 #g-footer {
   background-color: #e8e8e8;
   border-top: 1px solid #ccc;
-  font-size: .8em;
   margin-top: 20px;
   padding: 10px 20px;
 }
@@ -182,10 +195,6 @@ td {
 
 /* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#g-banner #g-logo img {
-  margin: 0;
-}
-
 #g-banner #g-quick-search-form {
   clear: right;
   float: right;
@@ -217,7 +226,6 @@ td {
   background-color: #fff;
   border: 1px solid #fff;
   float: left;
-  font-size: .7em;
   padding: .6em 8px;
   position: relative;
   text-align: center;
@@ -295,15 +303,10 @@ td {
  * 5) Navigation and menus
  *********************************************************************/
 
-#g-site-menu {
-  font-size: 1.2em;
-}
-
 /* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-banner #g-login-menu {
   color: #999;
-  float: right;
 }
 
 #g-banner #g-login-menu li {
@@ -337,10 +340,6 @@ td {
   width: 100%;
 }
 
-#g-item .g-context-menu {
-  font-size: .7em;
-}
-
 #g-item .g-context-menu ul {
   display: none;
 }
@@ -413,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
index a14a3278..a2b2fdd7 100644
--- 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>
@@ -93,8 +93,9 @@
 
         <? if (!empty($parents)): ?>
         <ul class="g-breadcrumbs">
+          <? $i = 0 ?>
           <? foreach ($parents as $parent): ?>
-          <li>
+          <li<? if ($i == 0) print " class=\"g-first\"" ?>>
             <!-- Adding ?show=<id> causes Gallery3 to display the page
                  containing that photo.  For now, we just do it for
                  the immediate parent so that when you go back up a
@@ -104,8 +105,9 @@
               <?= html::purify($parent->title) ?>
             </a>
           </li>
+          <? $i++ ?>
           <? endforeach ?>
-          <li class="active"><?= html::purify($theme->item()->title) ?></li>
+          <li class="g-active"><?= html::purify($theme->item()->title) ?></li>
         </ul>
         <? endif ?>
       </div>