From 1240878df0f4a2b0ad0cdb32814717038ff2773f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 14 May 2010 16:55:15 -0700
Subject: Fix-ups for d98b85f7d3142676e6b4f407a18ed81564823f88

- Pass the CSS selector of the active image in as an arg to site_menu
  so that quick operations know what they're operating on.
- Change the ids from g-{photo,movie}-id to the generic g-item-id
- Initialize ajax handlers for site menu on the photo and movie page
- Drop the movie context menu, it's now in the site menu
---
 themes/wind/views/page.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/wind/views/page.html.php')

diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index ebfbf700..4cc949ce 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -89,7 +89,7 @@
 
           <!-- hide the menu and make it visible after the page has loaded, to minimize menu flicker -->
           <div id="g-site-menu" style="visibility: hidden">
-          <?= $theme->site_menu() ?>
+            <?= $theme->site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?>
           </div>
           <script type="text/javascript"> $(document).ready(function() { $("#g-site-menu").css("visibility", "visible"); }) </script>
 
-- 
cgit v1.2.3


From 6b01022a97e5fbd30d8f9a14b785e3e25ec7c2d4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 13 Jun 2010 20:44:13 -0700
Subject: Hide the admin menu and show it after it's loaded to minimize
 flicker. Normalize the comment text about this interaction between admin_wind
 and wind.

---
 themes/admin_wind/views/admin.html.php | 4 +++-
 themes/wind/views/page.html.php        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'themes/wind/views/page.html.php')

diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index ff7b930f..f9ef18c7 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -53,9 +53,11 @@
           &larr; <?= t("back to the ...") ?>
         </a>
         <?= $theme->user_menu() ?>
-        <div id="g-site-admin-menu" class="ui-helper-clearfix">
+        <!-- hide the menu until after the page has loaded, to minimize menu flicker -->
+        <div id="g-site-admin-menu" class="ui-helper-clearfix" style="visibility: hidden">
           <?= $theme->admin_menu() ?>
         </div>
+        <script type="text/javascript"> $(document).ready(function() { $("#g-site-admin-menu").css("visibility", "visible"); }) </script>
         <?= $theme->admin_header_bottom() ?>
       </div>
       <div id="bd">
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 4cc949ce..6ce2a559 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -87,7 +87,7 @@
           <?= $theme->user_menu() ?>
           <?= $theme->header_top() ?>
 
-          <!-- hide the menu and make it visible after the page has loaded, to minimize menu flicker -->
+          <!-- hide the menu until after the page has loaded, to minimize menu flicker -->
           <div id="g-site-menu" style="visibility: hidden">
             <?= $theme->site_menu($theme->item() ? "#g-item-id-{$theme->item()->id}" : "") ?>
           </div>
-- 
cgit v1.2.3


From 66bea24482be05ccfbea76bda2c9b70c93c34408 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 20 Jun 2010 11:59:46 -0700
Subject: Use text::limit_chars() to keep individual elements in breadcrumbs
 from going over 15 chars.  Fixes ticket #1108.

---
 themes/wind/views/page.html.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'themes/wind/views/page.html.php')

diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 6ce2a559..16e43c63 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -107,12 +107,14 @@
                  level you're on the right page. -->
             <a href="<?= $parent->url($parent == $theme->item()->parent() ?
                      "show={$theme->item()->id}" : null) ?>">
-              <?= html::purify($parent->title) ?>
+              <?= text::limit_chars(html::purify($parent->title), 15) ?>
             </a>
           </li>
           <? $i++ ?>
           <? endforeach ?>
-          <li class="g-active<? if ($i == 0) print " g-first" ?>"><?= html::purify($theme->item()->title) ?></li>
+          <li class="g-active<? if ($i == 0) print " g-first" ?>">
+            <?= text::limit_chars(html::purify($theme->item()->title), 15) ?>
+          </li>
         </ul>
         <? endif ?>
       </div>
-- 
cgit v1.2.3