4 files changed, 11 insertions, 9 deletions
diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php
index eabe07c3..b9072e2b 100644
--- a/themes/wind/views/album.html.php
+++ b/themes/wind/views/album.html.php
@@ -29,7 +29,7 @@
   <? endforeach ?>
 <? else: ?>
   <? if ($user->admin || access::can("add", $item)): ?>
-  <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?>
+  <? $addurl = url::site("flash_uploader/app/$item->id") ?>
   <li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.",
             array("attrs" => html::mark_clean("href=\"$addurl\" class=\"g-dialog-link\""))) ?></li>
   <? else: ?>
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
index 27c293ce..158857db 100644
--- a/themes/wind/views/movie.html.php
+++ b/themes/wind/views/movie.html.php
@@ -5,8 +5,9 @@
   <?= $theme->paginator() ?>
 
   <div id="g-movie" class="ui-helper-clearfix">
-    <?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?>
-    <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?>
+    <?= $theme->resize_top($item) ?>
+    <?= $item->movie_img(array("class" => "g-movie", "id" => "g-item-id-{$item->id}")) ?>
+    <?= $theme->resize_bottom($item) ?>
   </div>
 
   <div id="g-info">
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index ebfbf700..16e43c63 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -87,9 +87,9 @@
           <?= $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->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>
 
@@ -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>
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index e0fae3f1..f8b5511c 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -22,12 +22,11 @@
     <? if (access::can("view_full", $item)): ?>
     <a href="<?= $item->file_url() ?>" class="g-fullsize-link" title="<?= t("View full size")->for_html_attr() ?>">
       <? endif ?>
-      <?= $item->resize_img(array("id" => "g-photo-id-{$item->id}", "class" => "g-resize")) ?>
+      <?= $item->resize_img(array("id" => "g-item-id-{$item->id}", "class" => "g-resize")) ?>
       <? if (access::can("view_full", $item)): ?>
     </a>
     <? endif ?>
     <?= $theme->resize_bottom($item) ?>
-    <?= $theme->context_menu($item, "#g-photo-id-{$item->id}") ?>
   </div>
 
   <div id="g-info">