From f191adfe7897adb350f68f422a651785acb25e21 Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <nkinkade@nkinka.de>
Date: Thu, 19 Aug 2010 23:26:27 +0000
Subject: Copied default Gallery3 Wind theme to a new one so that I could make
 mods, such as hiding image titles.

---
 themes/wind_npk/views/album.html.php      |  4 ++--
 themes/wind_npk/views/dynamic.html.php    |  2 +-
 themes/wind_npk/views/movie.html.php      |  5 +++--
 themes/wind_npk/views/no_sidebar.html.php |  6 +++---
 themes/wind_npk/views/page.html.php       | 20 +++++++++++---------
 themes/wind_npk/views/photo.html.php      |  5 ++---
 6 files changed, 22 insertions(+), 20 deletions(-)

(limited to 'themes/wind_npk/views')

diff --git a/themes/wind_npk/views/album.html.php b/themes/wind_npk/views/album.html.php
index eabe07c3..43565b45 100644
--- a/themes/wind_npk/views/album.html.php
+++ b/themes/wind_npk/views/album.html.php
@@ -21,7 +21,7 @@
     <?= $theme->thumb_bottom($child) ?>
     <?= $theme->context_menu($child, "#g-item-id-{$child->id} .g-thumbnail") ?>
     <h2><span class="<?= $item_class ?>"></span>
-      <a href="<?= $child->url() ?>"><?= html::purify($child->title) ?></a></h2>
+      <a href="<?= $child->url() ?>"><!--<?= html::purify($child->title) ?>--></a></h2>
     <ul class="g-metadata">
       <?= $theme->thumb_info($child) ?>
     </ul>
@@ -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("uploader/index/$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_npk/views/dynamic.html.php b/themes/wind_npk/views/dynamic.html.php
index a4ab11e7..a8a4d362 100644
--- a/themes/wind_npk/views/dynamic.html.php
+++ b/themes/wind_npk/views/dynamic.html.php
@@ -16,7 +16,7 @@
            width="<?= $child->thumb_width ?>"
            height="<?= $child->thumb_height ?>" />
     </a>
-    <h2><?//= html::purify($child->title) ?></h2>
+    <h2><?= html::purify($child->title) ?></h2>
     <?= $theme->thumb_bottom($child) ?>
     <ul class="g-metadata">
       <?= $theme->thumb_info($child) ?>
diff --git a/themes/wind_npk/views/movie.html.php b/themes/wind_npk/views/movie.html.php
index 27c293ce..158857db 100644
--- a/themes/wind_npk/views/movie.html.php
+++ b/themes/wind_npk/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_npk/views/no_sidebar.html.php b/themes/wind_npk/views/no_sidebar.html.php
index 378bd971..a9eb0e3e 100644
--- a/themes/wind_npk/views/no_sidebar.html.php
+++ b/themes/wind_npk/views/no_sidebar.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul class="g-message-block">
-  <li class="g-warning"><?= t("No active sidebar blocks.<br/>
-      <a href=\"%url\">Add blocks</a>",
-          array("url" => html::mark_clean(url::site("admin/sidebar")))) ?></li>
+  <li class="g-warning"><?= t("No active sidebar blocks.") ?>
+    <br/><a href="<?= url::site("admin/sidebar") ?>"><?= t("Add blocks") ?></a>
+  </li>
 </ul>
diff --git a/themes/wind_npk/views/page.html.php b/themes/wind_npk/views/page.html.php
index 2dcc5d70..9f94b04f 100644
--- a/themes/wind_npk/views/page.html.php
+++ b/themes/wind_npk/views/page.html.php
@@ -29,16 +29,16 @@
     <?= $theme->css("themeroller/ui.base.css") ?>
     <?= $theme->css("gallery.common.css") ?>
     <?= $theme->css("screen.css") ?>
-    <!--[if lt IE 8]>
+    <!--[if lte IE 8]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
           media="screen,print,projection" />
     <![endif]-->
     <? if ($theme->page_type == "collection"): ?>
       <? if ($thumb_proportion != 1): ?>
-        <? $new_width = $thumb_proportion * 213 ?>
-        <? $new_height = $thumb_proportion * 240 ?>
+        <? $new_width = round($thumb_proportion * 213) ?>
+        <? $new_height = round($thumb_proportion * 240) ?>
     <style type="text/css">
-    #g-content #g-album-grid .g-item {
+    .g-view #g-content #g-album-grid .g-item {
       width: <?= $new_width ?>px;
       height: <?= $new_height ?>px;
       /* <?= $thumb_proportion ?> */
@@ -87,11 +87,11 @@
           <?= $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> $(document).ready(function() { $("#g-site-menu").css("visibility", "visible"); }) </script>
+          <script type="text/javascript"> $(document).ready(function() { $("#g-site-menu").css("visibility", "visible"); }) </script>
 
           <?= $theme->header_bottom() ?>
         </div>
@@ -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) ?>
+              <?= html::purify(text::limit_chars($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" ?>">
+            <?= html::purify(text::limit_chars($theme->item()->title, 15)) ?>
+          </li>
         </ul>
         <? endif ?>
       </div>
diff --git a/themes/wind_npk/views/photo.html.php b/themes/wind_npk/views/photo.html.php
index e0fae3f1..c17d6b90 100644
--- a/themes/wind_npk/views/photo.html.php
+++ b/themes/wind_npk/views/photo.html.php
@@ -22,16 +22,15 @@
     <? 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">
-    <h1><?= html::purify($item->title) ?></h1>
+    <!-- <h1><?= html::purify($item->title) ?></h1> -->
     <div><?= nl2br(html::purify($item->description)) ?></div>
   </div>
 
-- 
cgit v1.2.3