From 65051a4bf77321518a0cf80bc328a7ed609dfc90 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 23 Sep 2009 15:06:17 -0700
Subject: Rename the default themes to wind and admin_wind.  Change
 xss_data.txt file to reflect this move.  Not completely moved yet, but the
 git st is rather large so lets commit this now as a base for the cleanup.

---
 themes/default/views/album.html.php   |  41 ----------
 themes/default/views/block.html.php   |  10 ---
 themes/default/views/dynamic.html.php |  29 -------
 themes/default/views/movie.html.php   |  37 ---------
 themes/default/views/page.html.php    | 142 ----------------------------------
 themes/default/views/pager.html.php   |  44 -----------
 themes/default/views/photo.html.php   |  59 --------------
 themes/default/views/sidebar.html.php |  18 -----
 8 files changed, 380 deletions(-)
 delete mode 100644 themes/default/views/album.html.php
 delete mode 100644 themes/default/views/block.html.php
 delete mode 100644 themes/default/views/dynamic.html.php
 delete mode 100644 themes/default/views/movie.html.php
 delete mode 100644 themes/default/views/page.html.php
 delete mode 100644 themes/default/views/pager.html.php
 delete mode 100644 themes/default/views/photo.html.php
 delete mode 100644 themes/default/views/sidebar.html.php

(limited to 'themes/default/views')

diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
deleted file mode 100644
index 01f7be50..00000000
--- a/themes/default/views/album.html.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<? // @todo Set hover on AlbumGrid list items for guest users ?>
-<div id="gInfo">
-  <?= $theme->album_top() ?>
-  <h1><?= html::purify($item->title) ?></h1>
-  <div class="gDescription"><?= nl2br(html::purify($item->description)) ?></div>
-</div>
-
-<ul id="gAlbumGrid">
-<? if (count($children)): ?>
-  <? foreach ($children as $i => $child): ?>
-    <? $item_class = "gPhoto"; ?>
-    <? if ($child->is_album()): ?>
-      <? $item_class = "gAlbum"; ?>
-    <? endif ?>
-  <li id="gItemId-<?= $child->id ?>" class="gItem <?= $item_class ?>">
-    <?= $theme->thumb_top($child) ?>
-    <a href="<?= $child->url() ?>">
-      <?= $child->thumb_img(array("class" => "gThumbnail")) ?>
-    </a>
-    <?= $theme->thumb_bottom($child) ?>
-    <?= $theme->context_menu($child, "#gItemId-{$child->id} .gThumbnail") ?>
-    <h2><span></span><a href="<?= $child->url() ?>"><?= html::purify($child->title) ?></a></h2>
-    <ul class="gMetadata">
-      <?= $theme->thumb_info($child) ?>
-    </ul>
-  </li>
-  <? endforeach ?>
-<? else: ?>
-  <? if ($user->admin || access::can("add", $item)): ?>
-  <? $addurl = url::file("index.php/simple_uploader/app/$item->id") ?>
-  <li><?= t("There aren't any photos here yet! <a %attrs>Add some</a>.",
-            array("attrs" => html::mark_clean("href=\"$addurl\" class=\"gDialogLink\""))) ?></li>
-  <? else: ?>
-  <li><?= t("There aren't any photos here yet!") ?></li>
-  <? endif; ?>
-<? endif; ?>
-</ul>
-<?= $theme->album_bottom() ?>
-
-<?= $theme->pager() ?>
diff --git a/themes/default/views/block.html.php b/themes/default/views/block.html.php
deleted file mode 100644
index e8cff833..00000000
--- a/themes/default/views/block.html.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<? if ($anchor): ?>
-<a name="<?= $anchor ?>"></a>
-<? endif ?>
-<div id="<?= $css_id ?>" class="gBlock">
-  <h2><?= $title ?></h2>
-  <div class="gBlockContent">
-    <?= $content ?>
-  </div>
-</div>
diff --git a/themes/default/views/dynamic.html.php b/themes/default/views/dynamic.html.php
deleted file mode 100644
index 9ed9d69b..00000000
--- a/themes/default/views/dynamic.html.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gAlbumHeader">
-  <div id="gAlbumHeaderButtons">
-    <?= $theme->dynamic_top() ?>
-  </div>
-  <h1><?= html::clean($title) ?></h1>
-</div>
-
-<ul id="gAlbumGrid">
-  <? foreach ($children as $i => $child): ?>
-  <li class="gItem <?= $child->is_album() ? "gAlbum" : "" ?>">
-    <?= $theme->thumb_top($child) ?>
-    <a href="<?= $child->url() ?>">
-      <img id="gPhotoId-<?= $child->id ?>" class="gThumbnail"
-           alt="photo" src="<?= $child->thumb_url() ?>"
-           width="<?= $child->thumb_width ?>"
-           height="<?= $child->thumb_height ?>" />
-    </a>
-    <h2><?= html::purify($child->title) ?></h2>
-    <?= $theme->thumb_bottom($child) ?>
-    <ul class="gMetadata">
-      <?= $theme->thumb_info($child) ?>
-    </ul>
-  </li>
-  <? endforeach ?>
-</ul>
-<?= $theme->dynamic_bottom() ?>
-
-<?= $theme->pager() ?>
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
deleted file mode 100644
index 910814dd..00000000
--- a/themes/default/views/movie.html.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gItem">
-  <?= $theme->photo_top() ?>
-
-  <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">
-    <h1><?= html::purify($item->title) ?></h1>
-       <div><?= nl2br(html::purify($item->description)) ?></div>
-  </div>
-
-  <?= $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
deleted file mode 100644
index 19d8cc00..00000000
--- a/themes/default/views/page.html.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <title>
-      <? if ($page_title): ?>
-        <?= $page_title ?>
-      <? else: ?>
-        <? if ($theme->item()): ?>
-          <? if ($theme->item()->is_album()): ?>
-          <?= t("Browse Album :: %album_title", array("album_title" => $theme->item()->title)) ?>
-          <? elseif ($theme->item()->is_photo()): ?>
-          <?= t("Photo :: %photo_title", array("photo_title" => $theme->item()->title)) ?>
-          <? else: ?>
-          <?= t("Movie :: %movie_title", array("movie_title" => $theme->item()->title)) ?>
-          <? endif ?>
-        <? elseif ($theme->tag()): ?>
-          <?= t("Browse Tag :: %tag_title", array("tag_title" => $theme->tag()->name)) ?>
-        <? else: /* Not an item, not a tag, no page_title specified.  Help! */ ?>
-          <?= t("Gallery") ?>
-        <? endif ?>
-      <? endif ?>
-    </title>
-    <link rel="shortcut icon" href="<?= url::file("lib/images/favicon.ico") ?>" type="image/x-icon" />
-    <?= $theme->css("yui/reset-fonts-grids.css") ?>
-    <?= $theme->css("superfish/css/superfish.css") ?>
-    <?= $theme->css("themeroller/ui.base.css") ?>
-    <?= $theme->css("screen.css") ?>
-    <!--[if lt IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
-          media="screen,print,projection" />
-    <![endif]-->
-    <? if ($theme->page_type == 'album'): ?>
-      <? if ($thumb_proportion != 1): ?>
-        <? $new_width = $thumb_proportion * 213 ?>
-        <? $new_height = $thumb_proportion * 240 ?>
-    <style type="text/css">
-    #gContent #gAlbumGrid .gItem {
-      width: <?= $new_width ?>px;
-      height: <?= $new_height ?>px;
-      /* <?= $thumb_proportion ?> */
-    }
-    </style>
-      <? endif ?>
-    <? endif ?>
-    <?= $theme->script("jquery.js") ?>
-    <?= $theme->script("jquery.form.js") ?>
-    <?= $theme->script("jquery-ui.js") ?>
-    <?= $theme->script("gallery.common.js") ?>
-    <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
-    <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") ?>
-    <?= $theme->script("jquery.localscroll.js") ?>
-    <?= $theme->script("ui.init.js") ?>
-
-    <? /* These are page specific, but if we put them before $theme->head() they get combined */ ?>
-    <? if ($theme->page_type == "photo"): ?>
-    <?= $theme->script("jquery.scrollTo.js") ?>
-    <?= $theme->script("gallery.show_full_size.js") ?>
-    <? elseif ($theme->page_type == "movie"): ?>
-    <?= $theme->script("flowplayer.js") ?>
-    <? endif ?>
-
-    <?= $theme->head() ?>
-  </head>
-
-  <body <?= $theme->body_attributes() ?>>
-    <?= $theme->page_top() ?>
-    <div id="doc4" class="yui-t5 gView">
-      <?= $theme->site_status() ?>
-      <div id="gHeader">
-        <div id="gBanner">
-          <?= $theme->header_top() ?>
-          <? if ($header_text = module::get_var("gallery", "header_text")): ?>
-          <?= $header_text ?>
-          <? else: ?>
-          <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
-            <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("lib/images/logo.png") ?>" />
-          </a>
-          <? endif ?>
-          <div id="gSiteMenu">
-          <?= $theme->site_menu() ?>
-          </div>
-          <?= $theme->header_bottom() ?>
-        </div>
-
-        <? if (!empty($parents)): ?>
-        <ul class="gBreadcrumbs">
-          <? foreach ($parents as $parent): ?>
-          <li>
-            <!-- Adding ?show=<id> causes Gallery3 to display the page
-                 containing that photo.  For now, we just do it for
-                 the immediate parent so that when you go back up a
-                 level you're on the right page. -->
-            <a href="<?= $parent->url($parent == $theme->item()->parent() ?
-                     "show={$theme->item()->id}" : null) ?>">
-              <?= html::purify($parent->title) ?>
-            </a>
-          </li>
-          <? endforeach ?>
-          <li class="active"><?= html::purify($theme->item()->title) ?></li>
-        </ul>
-        <? endif ?>
-      </div>
-      <div id="bd">
-        <div id="yui-main">
-          <div class="yui-b">
-            <div id="gContent" class="yui-g">
-              <?= $theme->messages() ?>
-              <?= $content ?>
-            </div>
-          </div>
-        </div>
-        <div id="gSidebar" class="yui-b">
-          <? if ($theme->page_type != "login"): ?>
-          <?= new View("sidebar.html") ?>
-          <? endif ?>
-        </div>
-      </div>
-      <div id="gFooter">
-        <?= $theme->footer() ?>
-        <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
-        <?= $footer_text ?>
-        <? endif ?>
-
-        <? if (module::get_var("gallery", "show_credits")): ?>
-        <ul id="gCredits">
-          <?= $theme->credits() ?>
-        </ul>
-        <? endif ?>
-      </div>
-    </div>
-    <?= $theme->page_bottom() ?>
-  </body>
-</html>
diff --git a/themes/default/views/pager.html.php b/themes/default/views/pager.html.php
deleted file mode 100644
index 7cdc9bb0..00000000
--- a/themes/default/views/pager.html.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<? // See http://docs.kohanaphp.com/libraries/pagination ?>
-<ul class="gPager">
-  <? /* @todo This message isn't easily localizable */
-     $from_to_msg = t2("Photo %from_number of %count",
-                       "Photos %from_number - %to_number of %count",
-                       $total_items,
-                       array("from_number" => $current_first_item,
-                             "to_number" => $current_last_item,
-                             "count" => $total_items)) ?>
-  <li>
-  <? if ($first_page): ?>
-    <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
-  <? else: ?>
-    <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
-  <? endif ?>
-  <? if ($previous_page): ?>
-    <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
-  <? else: ?>
-    <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
-      <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
-  <? endif ?>
-  </li>
-  <li class="gInfo"><?= $from_to_msg ?></li>
-  <li class="txtright">
-  <? if ($next_page): ?>
-    <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
-  <? else: ?>
-    <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
-  <? endif ?>
-  <? if ($last_page): ?>
-    <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
-  <? else: ?>
-    <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
-      <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
-  <? endif ?>
-  </li>
-</ul>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
deleted file mode 100644
index b0096043..00000000
--- a/themes/default/views/photo.html.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-
-<? if (access::can("view_full", $theme->item())): ?>
-<!-- Use javascript to show the full size as an overlay on the current page -->
-<script>
-  $(document).ready(function() {
-    $(".gFullSizeLink").click(function() {
-      $.gallery_show_full_size(<?= html::js_string($theme->item()->file_url()) ?>, "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
-      return false;
-    });
-  });
-</script>
-<? endif ?>
-
-<div id="gItem">
-  <?= $theme->photo_top() ?>
-
-  <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>
-
-  <div id="gPhoto">
-    <?= $theme->resize_top($item) ?>
-    <? if (access::can("view_full", $item)): ?>
-    <a href="<?= $item->file_url() ?>" class="gFullSizeLink" title="<?= t("View full size")->for_html_attr() ?>">
-      <? endif ?>
-      <?= $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?>
-      <? if (access::can("view_full", $item)): ?>
-    </a>
-    <? endif ?>
-    <?= $theme->resize_bottom($item) ?>
-    <?= $theme->context_menu($item, "#gPhotoId-{$item->id}") ?>
-  </div>
-
-  <div id="gInfo">
-    <h1><?= html::purify($item->title) ?></h1>
-    <div><?= nl2br(html::purify($item->description)) ?></div>
-  </div>
-
-  <?= $theme->photo_bottom() ?>
-</div>
diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php
deleted file mode 100644
index 04379eb6..00000000
--- a/themes/default/views/sidebar.html.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= $theme->sidebar_top() ?>
-<div class="gToolbar">
-  <div id="gViewMenu" class="gButtonSet">
-    <? if ($page_type == "album"):?>
-      <?= $theme->album_menu() ?>
-    <? elseif ($page_type == "photo") : ?>
-      <?= $theme->photo_menu() ?>
-    <? elseif ($page_type == "movie") : ?>
-      <?= $theme->movie_menu() ?>
-    <? elseif ($page_type == "tag") : ?>
-      <?= $theme->tag_menu() ?>
-    <? endif ?>
-  </div>
-</div>
-
-<?= $theme->sidebar_blocks() ?>
-<?= $theme->sidebar_bottom() ?>
-- 
cgit v1.2.3