From b5f2dbc2c4fa974f486bc92c75054940424ed323 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 6 Nov 2009 14:08:46 -0800
Subject: Create a user_menu for the top of the page.  Change the login, edit
 profile and logout portions of the banner to be rendered by the
 Theme_View::user_menu callback.  This fires the user_menu event. Fixes Ticket
 #871.

---
 themes/night_wind/views/page.html.php | 11 +++++++----
 themes/wind/views/page.html.php       |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'themes')

diff --git a/themes/night_wind/views/page.html.php b/themes/night_wind/views/page.html.php
index a14a3278..f41dcd27 100644
--- a/themes/night_wind/views/page.html.php
+++ b/themes/night_wind/views/page.html.php
@@ -77,14 +77,15 @@
       <?= $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->user_menu() ?>
+          <?= $theme->header_top() ?>
           <div id="g-site-menu">
           <?= $theme->site_menu() ?>
           </div>
@@ -93,8 +94,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 +106,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>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index a2b2fdd7..f41dcd27 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -84,6 +84,7 @@
             <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->user_menu() ?>
           <?= $theme->header_top() ?>
           <div id="g-site-menu">
           <?= $theme->site_menu() ?>
-- 
cgit v1.2.3


From 3e0a81a39490f58840e3144b88d9c963e69f8f79 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 6 Nov 2009 21:35:32 -0700
Subject: Move log viewing and translation CSS from admin_wind to gallery.css.
 Explicitly set widths on all admin forms to 270px, all work better at a
 narrower width than the 500px default set by gallery.dialog.js.

---
 modules/gallery/css/gallery.css  | 46 ++++++++++++++++++++++++++++++++++++++++
 themes/admin_wind/css/screen.css | 39 ++++++----------------------------
 2 files changed, 52 insertions(+), 33 deletions(-)

(limited to 'themes')

diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css
index 724c50d3..18d9a522 100644
--- a/modules/gallery/css/gallery.css
+++ b/modules/gallery/css/gallery.css
@@ -1,3 +1,15 @@
+/**
+ * Gallery 3 core module styles
+ *
+ * Sheet organization:
+ *  1)  End-user
+ *  2)  Admin
+ */
+
+/** *******************************************************************
+ * 1) End-user
+ **********************************************************************/
+
 /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-edit-permissions-form {
@@ -103,3 +115,37 @@
   background-color: #cfc;
   border: 1px solid #beb;
 }
+
+/** *******************************************************************
+ * 2) Admin
+ **********************************************************************/
+
+.g-task-log {
+  border: 1px solid #000;
+  height: 400px;
+  margin: .6em 0;
+  overflow: auto;
+  padding: .4em
+}
+
+#g-languages-form table {
+	width: 40%;
+	margin: 0 3em 1em 0;
+}
+
+#g-languages-form input {
+	clear: both;
+}
+
+#g-translations ol {
+	margin: 0 0 1em 2em;
+}
+#g-translations ol li {
+  list-style-type: decimal;
+	line-height: 150%;
+}
+
+#g-translations .g-button {
+	padding: .5em;
+	margin-bottom: 1em;
+}
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index cd83b110..8d49a389 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -86,6 +86,12 @@ a:hover,
   text-decoration: none;
 }
 
+/* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-dialog form {
+  width: 270px;
+}
+
 /* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 table {
@@ -435,39 +441,6 @@ th {
   padding: .2em .4em;
 }
 
-/*************** STUFF THAT NEEDS A HOME ****************/
-
-.g-task-log {
-  border: 1pt solid;
-  font-size: .9em;
-  height: 400px;
-  margin: .5em 0;
-  overflow: auto;
-  padding: .5em
-}
-
-#g-languages-form table {
-	width: 40%;
-	margin: 0 3em 1em 0;
-}
-
-#g-languages-form input {
-	clear: both;
-}
-
-#g-translations ol {
-	margin: 0 0 1em 2em;
-}
-#g-translations ol li {
-  list-style-type: decimal;
-	line-height: 150%;
-}
-
-#g-translations .g-button {
-	padding: .5em;
-	margin-bottom: 1em;
-}
-
 /** *******************************************************************
  * 7) Right to left styles
  *********************************************************************/
-- 
cgit v1.2.3