4 files changed, 26 insertions, 16 deletions
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index ffb4b913..8c690f5f 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -19,7 +19,7 @@
       <?= $child->thumb_img(array("class" => "gThumbnail")) ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
-    <?= $theme->thumb_menu($child) ?>
+    <?= $theme->context_menu($child, "#gItemId-{$child->id} .gThumbnail") ?>
     <h2><span></span><a href="<?= $child->url() ?>"><?= SafeString::of($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index 75d51eff..237743b7 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -2,16 +2,29 @@
 <div id="gItem">
   <?= $theme->photo_top() ?>
 
-  <ul id="gPager">
-    <li><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <? if ($previous_item): ?>
-    <li><span class="ui-icon ui-icon-seek-prev"></span><a href="<?= $previous_item->url() ?>"><?= t("previous") ?></a></li>
-    <? endif ?>
-    <? if ($next_item): ?>
-    <li><a href="<?= $next_item->url() ?>"><?= t("next") ?></a><span class="ui-icon ui-icon-seek-next"></span></li>
-    <? endif ?>
+  <ul class="gPager">
+    <li>
+      <? if ($previous_item): ?>
+      <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
+      <? else: ?>
+      <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
+      <? endif; ?>
+    </li>
+    <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
+    <li class="txtright">
+      <? if ($next_item): ?>
+      <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
+      <? else: ?>
+      <a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
+      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
+      <? endif ?>
+    </li>
   </ul>
 
+
   <?= $item->movie_img(array("class" => "gMovie", "id" => "gMovieId-{$item->id}")) ?>
 
   <div id="gInfo">
@@ -19,8 +32,6 @@
        <div><?= nl2br(SafeString::purify($item->description)) ?></div>
   </div>
 
-  <script type="text/javascript">
-    var ADD_A_COMMENT = "<?= t("Add a comment")->for_js() ?>";
-  </script>
   <?= $theme->photo_bottom() ?>
+  <?= $theme->context_menu($item, "#gMovieId-{$item->id}") ?>
 </div>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 8d9f0caa..844ef295 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -53,6 +53,7 @@
     <script type="text/javascript">
     var MSG_CANCEL = "<?= t('Cancel')->for_js() ?>";
     </script>
+    <?= $theme->script("gallery.ajax.js") ?>
     <?= $theme->script("gallery.dialog.js") ?>
     <?= $theme->script("gallery.form.js") ?>
     <?= $theme->script("superfish/js/superfish.js") ?>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index fcf597cf..5b5cb12b 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -5,7 +5,7 @@
 <script>
   $(document).ready(function() {
     $(".gFullSizeLink").click(function() {
-      show_full_size("<?= $theme->item()->file_url()->for_js() ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
+      $.gallery_show_full_size("<?= $theme->item()->file_url()->for_js() ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
       return false;
     });
   });
@@ -47,6 +47,7 @@
     </a>
     <? endif ?>
     <?= $theme->resize_bottom($item) ?>
+    <?= $theme->context_menu($item, "#gPhotoId-{$item->id}") ?>
   </div>
 
   <div id="gInfo">
@@ -54,8 +55,5 @@
     <div><?= nl2br(SafeString::purify($item->description)) ?></div>
   </div>
 
-  <script type="text/javascript">
-    var ADD_A_COMMENT = "<?= t("Add a comment")->for_js() ?>";
-  </script>
   <?= $theme->photo_bottom() ?>
 </div>