From 04f02b49c5d524345bc916aad6e247c714177662 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 5 Jul 2009 17:38:49 -0700
Subject: Add task logging functionality. When a task runs, it creates a log
 that is stored in the persistant cache for 30 days.  On the admin_maintenance
 page there is a new link for completed tasks "browse log".  Clicking this
 will open a dialog box that has the the contents of the log displayed.

The user can then view the log and close the dialog, or press the save button
to download the log to their local machine.
---
 modules/gallery/views/admin_maintenance.html.php      |  5 +++++
 .../gallery/views/admin_maintenance_show_log.html.php | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 modules/gallery/views/admin_maintenance_show_log.html.php

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index c47f77f8..f50c95dd 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -164,6 +164,11 @@
           <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>">
             <?= t("remove") ?>
           </a>
+          <? if ($task->get_task_log()): ?>
+          <a class="gDialogLink" href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>">
+            <?= t("browse log") ?>
+          </a>
+          <? endif ?>
           <? else: ?>
           <a class="gDialogLink" href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
             <?= t("resume") ?>
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
new file mode 100644
index 00000000..afd988bb
--- /dev/null
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -0,0 +1,19 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<script type="text/javascript">
+  dismiss = function() {
+    window.location.reload();
+  }
+  download = function(){
+    // send request
+    $('<form action="<?= url::site("admin/maintenance/save_log/$task->id?csrf=$csrf") ?>" method="post"></form>').
+appendTo('body').submit().remove();
+  };
+</script>
+<div id="gTaskLogDialog">
+  <h1> <?= $task->name ?> </h1>
+  <div class="gTaskLog">
+    <pre><?= p::purify($task->get_task_log()) ?></pre>
+  </div>
+  <button id="gCloseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
+  <button id="gSaveButton" class="ui-state-default ui-corner-all" onclick="download()"><?= t("Save") ?></button>
+</div>
-- 
cgit v1.2.3


From 30aa065013507c18ed64cc189e60e0959b7c4d7d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 6 Jul 2009 12:41:54 -0700
Subject: Don't use jQuery in the error page, it interferes with the jquery lib
 in the outer page when we load it in a dialog context.

---
 modules/gallery/views/kohana_error_page.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php
index 6bf48549..9361514d 100644
--- a/modules/gallery/views/kohana_error_page.php
+++ b/modules/gallery/views/kohana_error_page.php
@@ -53,7 +53,6 @@
         margin: 0px;
       }
     </style>
-    <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title><?= t("Something went wrong!") ?></title>
   </head>
@@ -78,8 +77,13 @@
       <h2>
         <?= t("Hey wait, you're an admin!  We can tell you stuff.") ?>
       </h2>
-      <a id="toggle" href=""
-         onclick="javascript:$('#stuff').slideDown('slow'); $('#toggle').slideUp(); return false">
+      <script type="text/javascript">
+        var show_details = function() {
+          document.getElementById("stuff").style.display = "block";
+          document.getElementById("toggle").style.display = "none";
+        }
+      </script>
+      <a id="toggle" href="#" onclick="javascript:show_details(); return false;">
         <b><?= t("Ok.. tell me stuff!") ?></b>
       </a>
       <div id="stuff" style="display: none">
-- 
cgit v1.2.3


From b59e94e7dccc2ce1710ae98bda97ef537fd0c9b7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 7 Jul 2009 07:32:36 -0700
Subject: Change references to Gallery 2 and Gallery 3 to consistently refer to
 Gallery n as opposed any variants of this.

---
 .htaccess                                  |  2 +-
 installer/cli.php                          |  2 +-
 installer/views/already_installed.html.php |  2 +-
 installer/views/install.html.php           |  2 +-
 installer/views/success.html.php           |  2 +-
 modules/comment/views/comment.mrss.php     |  2 +-
 modules/g2_import/helpers/g2_import.php    | 18 +++++++++---------
 modules/gallery/helpers/gallery_block.php  |  2 +-
 modules/gallery/views/upgrader.html.php    |  2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'modules/gallery/views')

diff --git a/.htaccess b/.htaccess
index f1996eed..08b9c5bb 100644
--- a/.htaccess
+++ b/.htaccess
@@ -36,7 +36,7 @@
 # block below.  You just need to change RewriteBase line to match your
 # Gallery 3 URL.  Here are some examples:
 #
-#   Gallery3 URL                        RewriteBase line
+#   Gallery 3 URL                       RewriteBase line
 #   =============                       ====================
 #   http://example.com/gallery3         RewriteBase /gallery3
 #   http://example.com/~bob/photos      RewriteBase /~bob/photos
diff --git a/installer/cli.php b/installer/cli.php
index e2fdffce..50845ea4 100644
--- a/installer/cli.php
+++ b/installer/cli.php
@@ -69,7 +69,7 @@ function oops($message) {
   print "==> " . $message;
   print "\n";
   print "For help you can try:\n";
-  print "  * The Gallery3 FAQ   - http://codex.gallery2.org/Gallery3:FAQ\n";
+  print "  * The Gallery 3 FAQ   - http://codex.gallery2.org/Gallery3:FAQ\n";
   print "  * The Gallery Forums - http://gallery.menalto.com/forum\n";
   print "\n\n** INSTALLATION FAILED **\n";
   exit(1);
diff --git a/installer/views/already_installed.html.php b/installer/views/already_installed.html.php
index 0d7fc193..f6ac1bff 100644
--- a/installer/views/already_installed.html.php
+++ b/installer/views/already_installed.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <p class="success">
-  Your Gallery3 install is complete.
+  Your Gallery 3 install is complete.
 </p>
 
diff --git a/installer/views/install.html.php b/installer/views/install.html.php
index 18060219..a0eddaf3 100644
--- a/installer/views/install.html.php
+++ b/installer/views/install.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title>Gallery3 Installer</title>
+    <title>Gallery 3 Installer</title>
     <link rel="stylesheet" type="text/css" href="install.css"/>
   </head>
   <body>
diff --git a/installer/views/success.html.php b/installer/views/success.html.php
index 4bca2fb1..e9ee9818 100644
--- a/installer/views/success.html.php
+++ b/installer/views/success.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <h1> Success! </h1>
 <p class="success">
-  Your Gallery3 install is complete!
+  Your Gallery 3 install is complete!
 </p>
 
 <?php if (!empty($user)): ?>
diff --git a/modules/comment/views/comment.mrss.php b/modules/comment/views/comment.mrss.php
index e27bc44f..2b5b13c1 100644
--- a/modules/comment/views/comment.mrss.php
+++ b/modules/comment/views/comment.mrss.php
@@ -5,7 +5,7 @@
    xmlns:content="http://purl.org/rss/1.0/modules/content/"
    xmlns:fh="http://purl.org/syndication/history/1.0">
   <channel>
-    <generator>gallery3</generator>
+    <generator>Gallery 3</generator>
     <title><?= p::clean($feed->title) ?></title>
     <link><?= $feed->uri ?></link>
     <description><?= p::clean($feed->description) ?></description>
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index e86558b7..0d72c139 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -54,14 +54,14 @@ class g2_import_Core {
   }
 
   /**
-   * Initialize the embedded Gallery2 instance.  Call this before any other Gallery2 calls.
+   * Initialize the embedded Gallery 2 instance.  Call this before any other Gallery 2 calls.
    */
   static function init_embed($embed_path) {
     if (!is_file($embed_path)) {
       return false;
     }
 
-    // Gallery2 defines a class called Gallery.  So does Gallery 3.  They don't get along.  So do
+    // Gallery 2 defines a class called Gallery.  So does Gallery 3.  They don't get along.  So do
     // a total hack here and copy over a few critical files (embed.php, main.php, bootstrap.inc
     // and Gallery.class) and munge them so that we can rename the Gallery class to be
     // G2_Gallery.   Is this retarded?  Why yes it is.
@@ -244,7 +244,7 @@ class g2_import_Core {
       break;
 
     case GROUP_SITE_ADMINS:
-      $message = t("Group 'Admin' does not exist in gallery3, skipping");
+      $message = t("Group 'Admin' does not exist in Gallery 3, skipping");
       break;  // This is not a group in G3
 
     case GROUP_EVERYBODY:
@@ -343,7 +343,7 @@ class g2_import_Core {
     }
 
     if ($g2_album->getParentId() == null) {
-      return t("Skipping Gallery2 root album");
+      return t("Skipping Gallery 2 root album");
     }
     $parent_album = ORM::factory("item", self::map($g2_album->getParentId()));
 
@@ -446,7 +446,7 @@ class g2_import_Core {
     $g2_type = $g2_item->getEntityType();
     $corrupt = 0;
     if (!file_exists($g2_path)) {
-      // If the Gallery2 source image isn't available, this operation is going to fail.  That can
+      // If the Gallery 2 source image isn't available, this operation is going to fail.  That can
       // happen in cases where there's corruption in the source Gallery 2.  In that case, fall
       // back on using a broken image.  It's important that we import *something* otherwise
       // anything that refers to this item in Gallery 2 will have a dangling pointer in Gallery 3
@@ -665,8 +665,8 @@ class g2_import_Core {
   }
 
   /**
-   * If the thumbnails and resizes created for the Gallery2 photo match the dimensions of the
-   * ones we expect to create for Gallery3, then copy the files over instead of recreating them.
+   * If the thumbnails and resizes created for the Gallery 2 photo match the dimensions of the
+   * ones we expect to create for Gallery 3, then copy the files over instead of recreating them.
    */
   static function copy_matching_thumbnails_and_resizes($item) {
     // We only operate on items that are being imported
@@ -674,7 +674,7 @@ class g2_import_Core {
       return;
     }
 
-    // Precaution: if the Gallery2 item was watermarked, or we have the Gallery3 watermark module
+    // Precaution: if the Gallery 2 item was watermarked, or we have the Gallery 3 watermark module
     // active then we'd have to do something a lot more sophisticated here.  For now, just skip
     // this step in those cases.
     // @todo we should probably use an API here, eventually.
@@ -927,7 +927,7 @@ function g2() {
   $args = func_get_arg(0);
   $ret = array_shift($args);
   if ($ret) {
-    Kohana::log("error", "Gallery2 call failed with: " . $ret->getAsText());
+    Kohana::log("error", "Gallery 2 call failed with: " . $ret->getAsText());
     throw new Exception("@todo G2_FUNCTION_FAILED");
   }
   if (count($args) == 1) {
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index a10f2bbf..b7816954 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -33,7 +33,7 @@ class gallery_block_Core {
     switch($block_id) {
     case "welcome":
       $block->css_id = "gWelcome";
-      $block->title = t("Welcome to Gallery3");
+      $block->title = t("Welcome to Gallery 3");
       $block->content = new View("admin_block_welcome.html");
       break;
 
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index f9e242a8..37578855 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <html>
   <head>
-    <title><?= t("Gallery3 Upgrader") ?></title>
+    <title><?= t("Gallery 3 Upgrader") ?></title>
     <link rel="stylesheet" type="text/css" href="<?= url::file("modules/gallery/css/upgrader.css") ?>"
           media="screen,print,projection" />
     <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
-- 
cgit v1.2.3


From 5d9e334fe6d7c7c1cf6d39a12684e215e797b4b3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 7 Jul 2009 12:49:21 -0700
Subject: Added a wee bit of phpDoc. Changed the name of the method
 get_task_log to get_log Changed the default name of the file when the log is
 downloaded to gallery3_task_log.txt

---
 modules/gallery/controllers/admin_maintenance.php         |  4 ++--
 modules/gallery/models/task.php                           | 14 +++++++++++++-
 modules/gallery/views/admin_maintenance.html.php          |  2 +-
 modules/gallery/views/admin_maintenance_show_log.html.php |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index 37cc5222..543961a1 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -119,8 +119,8 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     }
 
     header("Content-Type: application/text");
-    header("Content-Disposition: filename=g2_import.txt");
-    print $task->get_task_log();
+    header("Content-Disposition: filename=gallery3_task_log.txt");
+    print $task->get_log();
   }
 
   /**
diff --git a/modules/gallery/models/task.php b/modules/gallery/models/task.php
index 55bb8e21..b7e255a2 100644
--- a/modules/gallery/models/task.php
+++ b/modules/gallery/models/task.php
@@ -49,6 +49,10 @@ class Task_Model extends ORM {
     return user::lookup($this->owner_id);
   }
 
+  /**
+   * Log a message to the task log.
+   * @params $msg mixed a string or array of strings
+   */
   public function log($msg) {
     $key = $this->_cache_key();
     $log = Cache::instance()->get($key);
@@ -63,11 +67,19 @@ class Task_Model extends ORM {
                            array("task", "log", "import"), 2592000);
   }
 
-  public function get_task_log() {
+  /**
+   * Retrieve the cached log information for this task.
+   * @returns the log data or null if there is no log data
+   */
+  public function get_log() {
     $log_data = Cache::instance()->get($this->_cache_key());
     return  $log_data !== null ? $log_data : false;
   }
 
+  /**
+   * Build the task cache key
+   * @returns the key to use in access the cache
+   */
   private function _cache_key() {
     return md5("$this->id; $this->name; $this->callback");
   }
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index f50c95dd..eecc045c 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -164,7 +164,7 @@
           <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>">
             <?= t("remove") ?>
           </a>
-          <? if ($task->get_task_log()): ?>
+          <? if ($task->get_log()): ?>
           <a class="gDialogLink" href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>">
             <?= t("browse log") ?>
           </a>
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index afd988bb..9d850986 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -12,7 +12,7 @@ appendTo('body').submit().remove();
 <div id="gTaskLogDialog">
   <h1> <?= $task->name ?> </h1>
   <div class="gTaskLog">
-    <pre><?= p::purify($task->get_task_log()) ?></pre>
+    <pre><?= p::purify($task->get_log()) ?></pre>
   </div>
   <button id="gCloseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
   <button id="gSaveButton" class="ui-state-default ui-corner-all" onclick="download()"><?= t("Save") ?></button>
-- 
cgit v1.2.3


From 2852161ca31f1a5b90bfd16a14615dd1812bd78a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 7 Jul 2009 21:49:54 -0700
Subject: Provide some clarity on the action links by formating them as buttons
 on the Maintenance Tasks admin page.

---
 modules/gallery/views/admin_maintenance.html.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index eecc045c..501daa0b 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -161,22 +161,23 @@
         </td>
         <td>
           <? if ($task->done): ?>
-          <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>">
+          <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>" class="gButtonLink ui-state-default ui-corner-all">
             <?= t("remove") ?>
           </a>
           <? if ($task->get_log()): ?>
-          <a class="gDialogLink" href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>">
+          <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="gDialogLink gButtonLink ui-state-default ui-corner-all">
             <?= t("browse log") ?>
           </a>
           <? endif ?>
           <? else: ?>
-          <a class="gDialogLink" href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
+          <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="gDialogLink gButtonLink" ui-state-default ui-corner-all>
             <?= t("resume") ?>
           </a>
-          <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>">
+          <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="gButtonLink ui-state-default ui-corner-all">
             <?= t("cancel") ?>
           </a>
           <? endif ?>
+          </ul>
         </td>
       </tr>
       <? endforeach ?>
-- 
cgit v1.2.3


From 9f00e734ed28f9c359fa52cfc4694ead5e4cf84e Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 8 Jul 2009 08:26:14 -0700
Subject: Added the button formatting to the other links on the Admin
 Maintenance page.

---
 modules/gallery/views/admin_maintenance.html.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 501daa0b..cd1cc02e 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -29,7 +29,7 @@
         </td>
         <td>
           <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>"
-            class="gDialogLink">
+            class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all">
             <?= t("run") ?>
           </a>
         </td>
@@ -94,11 +94,13 @@
         </td>
         <td>
           <? if ($task->state == "stalled"): ?>
-          <a class="gDialogLink" href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
+          <a class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"
+             href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
             <?= t("resume") ?>
           </a>
           <? endif ?>
-          <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>">
+          <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"
+             class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
             <?= t("cancel") ?>
           </a>
         </td>
-- 
cgit v1.2.3