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/js/ui.init.js        | 3 +++
 themes/wind/views/movie.html.php | 3 +--
 themes/wind/views/page.html.php  | 2 +-
 themes/wind/views/photo.html.php | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'themes')

diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index 6edf6be4..53b58516 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -108,6 +108,9 @@ $(document).ready(function() {
       duration: 1000,
       hash: true
     });
+
+    $(this).find(".g-dialog-link").gallery_dialog();
+    $(this).find(".g-ajax-link").gallery_ajax();
   }
 
   // Initialize button hover effect
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
index 27c293ce..8481c7ce 100644
--- a/themes/wind/views/movie.html.php
+++ b/themes/wind/views/movie.html.php
@@ -5,8 +5,7 @@
   <?= $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}") ?>
+    <?= $item->movie_img(array("class" => "g-movie", "id" => "g-item-id-{$item->id}")) ?>
   </div>
 
   <div id="g-info">
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>
 
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index 07952c94..f8b5511c 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -22,7 +22,7 @@
     <? 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 ?>
-- 
cgit v1.2.3