6 files changed, 27 insertions, 20 deletions
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index cb51f349..fcebeea8 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -20,7 +20,7 @@ input.submit {
   float: none !important;
 }
 
-.g-pager .g-txt-right {
+.g-pager .g-text-right {
   width: 29%;
 }
 
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 74771e07..e46ba8e6 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -11,8 +11,6 @@
  *  5)  Navigation and menus
  *  6)  jQuery and jQuery UI
  *  7)  Right-to-left language styles
- *
- *  @todo Review g-buttonset and it's usage here and admin_wind
  */
 
 /** *******************************************************************
@@ -73,7 +71,9 @@ h3 {
   font-size: .8em;
 }
 
-#g-content #g-album-grid .g-item {
+#g-album-grid .g-item,
+#g-item #g-photo,
+#g-item #g-movie {
   font-size: .7em;
 }
 
@@ -129,6 +129,9 @@ td {
   border: none;
   border-bottom: 1px solid #ccc;
   padding: .5em;
+}
+
+td {
   vertical-align: top;
 }
 
@@ -274,18 +277,21 @@ td {
 
 /* Individual photo content ~~~~~~~~~~~~~~ */
 
-#g-content #g-item {
+#g-item {
   position: relative;
   width: 100%;
 }
 
-#g-content #g-photo {
+#g-item #g-photo,
+#g-item #g-movie {
+  padding: 2.2em 0;
   position: relative;
 }
 
-#g-content #g-item .g-fullsize-link img {
+#g-item img.g-resize,
+#g-item a.g-movie object {
   display: block;
-  margin: 1em auto;
+  margin: 0 auto;
 }
 
 /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index 0126c36b..be03b6a8 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -87,12 +87,12 @@ $(document).ready(function() {
   }
 
   // Photo/Item item view
-  if ($("#g-item").length) {
+  if ($("#g-photo").length) {
     // Ensure the resized image fits within its container
-    $("#g-item").gallery_fit_photo();
+    $("#g-photo").gallery_fit_photo();
 
     // Initialize context menus
-    var resize = $("#g-item").gallery_get_photo();
+    var resize = $("#g-photo").gallery_get_photo();
     $(resize).hover(function(){
       $(this).gallery_context_menu();
     });
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
index 9254c7fe..d91ffbc5 100644
--- a/themes/wind/views/movie.html.php
+++ b/themes/wind/views/movie.html.php
@@ -2,7 +2,7 @@
 <div id="g-item">
   <?= $theme->photo_top() ?>
 
-  <ul class="g-pager">
+  <ul class="g-pager ui-helper-clearfix">
     <li>
       <? if ($previous_item): ?>
       <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
@@ -13,7 +13,7 @@
       <? endif; ?>
     </li>
     <li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <li class="g-txt-right">
+    <li class="g-text-right">
       <? if ($next_item): ?>
       <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("Next") ?></a>
@@ -24,14 +24,15 @@
     </li>
   </ul>
 
-
-  <?= $item->movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?>
-
+  <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}") ?>
+  </div>
+  
   <div id="g-info">
     <h1><?= html::purify($item->title) ?></h1>
-       <div><?= nl2br(html::purify($item->description)) ?></div>
+    <div><?= nl2br(html::purify($item->description)) ?></div>
   </div>
 
   <?= $theme->photo_bottom() ?>
-  <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?>
 </div>
diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php
index 36b2c13f..1dfe7eac 100644
--- a/themes/wind/views/pager.html.php
+++ b/themes/wind/views/pager.html.php
@@ -25,7 +25,7 @@
   <? endif ?>
   </li>
   <li class="g-info"><?= $from_to_msg ?></li>
-  <li class="g-txt-right">
+  <li class="g-text-right">
   <? if ($next_page): ?>
     <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-seek-next"></span><?= t("Next") ?></a>
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index cee44134..e17dcdb3 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -26,7 +26,7 @@
       <? endif; ?>
     </li>
     <li class="g-info"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <li class="g-txt-right">
+    <li class="g-text-right">
       <? if ($next_item): ?>
       <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>