From d73de4f0a20001963fa2274a2d758d6931c6ee1f Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 8 Nov 2009 09:00:49 -0700
Subject: No need to abbreviate text in CSS class names. Thx bharat!

---
 themes/wind/views/movie.html.php | 2 +-
 themes/wind/views/pager.html.php | 2 +-
 themes/wind/views/photo.html.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'themes/wind/views')

diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
index 9254c7fe..a791f2d8 100644
--- a/themes/wind/views/movie.html.php
+++ b/themes/wind/views/movie.html.php
@@ -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>
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>
-- 
cgit v1.2.3


From ecadec6b84127db5749cc664b9b8878aca9d61ed Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 8 Nov 2009 13:07:12 -0700
Subject: Wrap movies in #g-movie, apply ui-helper-clearfix to the pager and
 g-moive to fix clear issues reported in ticket #873.

---
 themes/wind/css/screen.css       | 18 ++++++++++++++----
 themes/wind/views/movie.html.php | 11 ++++++-----
 2 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'themes/wind/views')

diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 74771e07..1a7fc110 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -129,6 +129,9 @@ td {
   border: none;
   border-bottom: 1px solid #ccc;
   padding: .5em;
+}
+
+td {
   vertical-align: top;
 }
 
@@ -274,18 +277,25 @@ 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: 1em 0;
+}
+
+#g-item #g-photo,
+#g-item #g-movie {
   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/views/movie.html.php b/themes/wind/views/movie.html.php
index a791f2d8..116fd95e 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">
@@ -24,12 +24,13 @@
     </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}")) ?>
+  </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() ?>
-- 
cgit v1.2.3


From 46fda847ad625c085b020f719da1c37660ab93b9 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 8 Nov 2009 18:13:26 -0700
Subject: Moved movie context-menu up to just under the movie. Fixed contextual
 menu font size on resize and movie pages.

---
 themes/wind/css/screen.css       | 10 ++++------
 themes/wind/views/movie.html.php |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'themes/wind/views')

diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 1a7fc110..bd17e0e4 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -73,7 +73,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;
 }
 
@@ -284,11 +286,7 @@ td {
 
 #g-item #g-photo,
 #g-item #g-movie {
-  padding: 1em 0;
-}
-
-#g-item #g-photo,
-#g-item #g-movie {
+  padding: 2.2em 0;
   position: relative;
 }
 
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
index 116fd95e..d91ffbc5 100644
--- a/themes/wind/views/movie.html.php
+++ b/themes/wind/views/movie.html.php
@@ -26,6 +26,7 @@
 
   <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">
@@ -34,5 +35,4 @@
   </div>
 
   <?= $theme->photo_bottom() ?>
-  <?= $theme->context_menu($item, "#g-movie-id-{$item->id}") ?>
 </div>
-- 
cgit v1.2.3