From 1e79ca2dcbad102aab876169f706e7c5eef587f3 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 30 Aug 2009 23:22:54 -0600
Subject: Move header and footer into page.html.php since they're not included
 in any other view template.

---
 themes/default/views/footer.html.php | 11 ----------
 themes/default/views/header.html.php | 28 --------------------------
 themes/default/views/page.html.php   | 39 ++++++++++++++++++++++++++++++++++--
 3 files changed, 37 insertions(+), 41 deletions(-)
 delete mode 100644 themes/default/views/footer.html.php
 delete mode 100644 themes/default/views/header.html.php

(limited to 'themes/default')

diff --git a/themes/default/views/footer.html.php b/themes/default/views/footer.html.php
deleted file mode 100644
index 040a4062..00000000
--- a/themes/default/views/footer.html.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= $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 ?>
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
deleted file mode 100644
index dcfa6fd8..00000000
--- a/themes/default/views/header.html.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="gBanner">
-  <?= $theme->header_top() ?>
-  <? if ($header_text = module::get_var("gallery", "header_text")): ?>
-  <?= $header_text ?>
-  <? else: ?>
-  <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
-    <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("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>
-    <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
-      <?= html::purify($parent->title) ?>
-    </a>
-  </li>
-  <? endforeach ?>
-  <li class="active"><?= html::purify($item->title) ?></li>
-</ul>
-<? endif ?>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 2696442b..636b2f99 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -76,7 +76,33 @@
     <div id="doc4" class="yui-t5 gView">
       <?= $theme->site_status() ?>
       <div id="gHeader">
-        <?= new View("header.html") ?>
+        <div id="gBanner">
+          <?= $theme->header_top() ?>
+          <? if ($header_text = module::get_var("gallery", "header_text")): ?>
+          <?= $header_text ?>
+          <? else: ?>
+          <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
+            <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("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>
+            <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
+              <?= html::purify($parent->title) ?>
+            </a>
+          </li>
+          <? endforeach ?>
+          <li class="active"><?= html::purify($item->title) ?></li>
+        </ul>
+        <? endif ?>
       </div>
       <div id="bd">
         <div id="yui-main">
@@ -94,7 +120,16 @@
         </div>
       </div>
       <div id="gFooter">
-        <?= new View("footer.html") ?>
+        <?= $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() ?>
-- 
cgit v1.2.3


From e6c2fe60c42efee8ce898e208befe63565d98ffc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 17:17:14 -0700
Subject: Use $theme->item() instead of $item.

---
 themes/default/views/page.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 636b2f99..ebe6b0cf 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -95,12 +95,12 @@
         <ul class="gBreadcrumbs">
           <? foreach ($parents as $parent): ?>
           <li>
-            <a href="<?= url::site("albums/{$parent->id}?show=$item->id") ?>">
+            <a href="<?= url::site("albums/{$parent->id}?show=$theme->item()->id") ?>">
               <?= html::purify($parent->title) ?>
             </a>
           </li>
           <? endforeach ?>
-          <li class="active"><?= html::purify($item->title) ?></li>
+          <li class="active"><?= html::purify($theme->item()->title) ?></li>
         </ul>
         <? endif ?>
       </div>
-- 
cgit v1.2.3


From 74a124b261dabfae2613449addbcabc4310994ac Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 30 Aug 2009 17:41:34 -0700
Subject: Oops, fix up the show argument that I "fixed" in the last change.

---
 themes/default/views/page.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/default')

diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index ebe6b0cf..7d181ea0 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -95,7 +95,7 @@
         <ul class="gBreadcrumbs">
           <? foreach ($parents as $parent): ?>
           <li>
-            <a href="<?= url::site("albums/{$parent->id}?show=$theme->item()->id") ?>">
+            <a href="<?= url::site("albums/{$parent->id}?show={$theme->item()->id}") ?>">
               <?= html::purify($parent->title) ?>
             </a>
           </li>
-- 
cgit v1.2.3


From 80ae2fe4bf8d5872d0aeb18559fa8b099d07282f Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 30 Aug 2009 23:51:31 -0600
Subject: Finish this pass at the Admin Maintenance view. Re-introduce status
 icons, put Cancel All, Delete All buttons in the action heading cell.

---
 modules/gallery/views/admin_maintenance.html.php | 20 +++++++++-----------
 themes/admin_default/css/screen.css              |  7 +------
 themes/default/css/screen.css                    |  1 -
 3 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'themes/default')

diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 05bc0923..4bca8653 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -22,7 +22,7 @@
       <? $i = 0; ?>
       <? foreach ($task_definitions as $task): ?>
       <tr class="<?= log::severity_class($task->severity) ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
-        <td>
+        <td class="<?= log::severity_class($task->severity) ?>">
           <?= $task->name ?>
         </td>
         <td>
@@ -42,10 +42,6 @@
 
   <? if ($running_tasks->count()): ?>
   <div id="gRunningTasks">
-    <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
-       class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
-      <?= t("cancel all") ?></a>
-
     <h2> <?= t("Running Tasks") ?> </h2>
     <table>
       <tr>
@@ -66,12 +62,15 @@
         </th>
         <th>
           <?= t("Action") ?>
+          <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
+             class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+            <?= t("cancel all") ?></a>
         </th>
       </tr>
       <? $i = 0; ?>
       <? foreach ($running_tasks as $task): ?>
       <tr class="<?= $task->state == "stalled" ? "gWarning" : "" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
-        <td>
+        <td class="<?= $task->state == "stalled" ? "gWarning" : "" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
         <td>
@@ -116,10 +115,6 @@
 
   <? if ($finished_tasks->count()): ?>
   <div id="gFinishedTasks">
-    <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
-         class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
-       <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
-
     <h2> <?= t("Finished Tasks") ?> </h2>
     <table>
       <tr>
@@ -140,12 +135,15 @@
         </th>
         <th>
           <?= t("Action") ?>
+          <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
+               class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+             <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
         </th>
       </tr>
       <? $i = 0; ?>
       <? foreach ($finished_tasks as $task): ?>
       <tr class="<?= $task->state == "success" ? "gSuccess" : "gError" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
-        <td>
+        <td class="<?= $task->state == "success" ? "gSuccess" : "gError" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
         <td>
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index c275eb10..21b2b31c 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -312,7 +312,6 @@ li.gError select {
 
 .gError {
   background-color: #f6cbca;
-  color: red;
   background-image: url('../images/ico-error.png');
 }
 
@@ -346,11 +345,7 @@ table .gSuccess {
   background-color: transparent !important;
 }
 
-.gPager .gInfo,
-table .gError,
-table .gInfo,
-table .gSuccess,
-table .gWarning {
+.gPager .gInfo {
   background-image: none !important;
 }
 
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 5eb30bde..7cf4cfbe 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -308,7 +308,6 @@ li.gError select {
 
 .gError {
   background-color: #f6cbca;
-  color: #f00;
   background-image: url('../images/ico-error.png');
 }
 
-- 
cgit v1.2.3