From f0ca27ab924c06cc72a44d66498b86aeda672b33 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 8 Jun 2009 21:31:50 -0700
Subject: Fix the admin/themes url.

---
 modules/gallery/views/admin_block_welcome.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/admin_block_welcome.html.php b/modules/gallery/views/admin_block_welcome.html.php
index 488fa908..a453b006 100644
--- a/modules/gallery/views/admin_block_welcome.html.php
+++ b/modules/gallery/views/admin_block_welcome.html.php
@@ -10,7 +10,7 @@
   </li>
   <li>
     <?= t("Appearance - <a href=\"%theme_url\">choose a theme</a>, or <a href=\"%theme_details_url\">customize the way it looks</a>.",
-        array("theme_url" => url::site("admin/theme"),
+        array("theme_url" => url::site("admin/themes"),
               "theme_details_url" => url::site("admin/theme_details"))) ?>
   </li>
   <li>
-- 
cgit v1.2.3


From e6768a4e9771f5f751d74001ce3a0d33f6775216 Mon Sep 17 00:00:00 2001
From: unostar <unostar@danalan.info>
Date: Mon, 8 Jun 2009 17:51:56 +0800
Subject: Add string to localizer

Signed-off-by: Bharat Mediratta <bharat@menalto.com>
---
 modules/gallery/views/simple_uploader.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 79919d50..f10d764c 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -93,7 +93,7 @@
     button_width: "202",
     button_height: "45",
     button_placeholder_id: "gChooseFilesButtonPlaceholder",
-    button_text: '<span class="swfUploadFont">Select photos...</span>',
+    button_text: '<span class="swfUploadFont"><?= t("Select photos...") ?></span>',
     button_text_style: ".swfUploadFont { color: #2E6E9E; font-size: 16px; font-family: Lucida Grande,Lucida Sans,Arial,sans-serif; font-weight: bold; }",
     button_text_left_padding: 30,
     button_text_top_padding: 10,
-- 
cgit v1.2.3


From 79d526f1faccb2f929f00c296cb22941d74b8eb2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 18:58:40 -0700
Subject: Put in a placeholder link to click on if there's no value for a
 setting.

---
 modules/gallery/views/admin_advanced_settings.html.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 77aff050..34abadea 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -25,7 +25,11 @@
         <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . p::clean($var->name)) ?>"
           class="gDialogLink"
           title="<?= t("Edit %var (%module_name)", array("var" => p::clean($var->name), "module_name" => $var->module_name)) ?>">
+          <? if ($var->value): ?>
           <?= p::clean($var->value) ?>
+          <? else: ?>
+          <i> <?= t("empty") ?> </i>
+          <? endif ?>
       </a>
       </td>
     </tr>
-- 
cgit v1.2.3


From 7e4fcb97cb4a575811c1e84ced07fbaf4d7ed7ba Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Tue, 9 Jun 2009 20:10:34 -0700
Subject: Fix HTML bug in l10n message

---
 modules/gallery/views/admin_advanced_settings.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 34abadea..b4dedaef 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -6,7 +6,7 @@
   </p>
   <ul id="gMessage">
     <li class="gWarning">
-      <b><?= t("Change these values at your own risk!</b>") ?>
+      <b><?= t("Change these values at your own risk!") ?>
     </li>
   </ul>
 
-- 
cgit v1.2.3


From a20246b7382ea828157e358dd5ed62ed05db5193 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 20:33:06 -0700
Subject: Say hello to the new upgrader UI.

---
 modules/gallery/controllers/upgrader.php |  25 ++++++
 modules/gallery/views/upgrader.html.php  | 135 +++++++++++++++++++++++++++++++
 2 files changed, 160 insertions(+)
 create mode 100644 modules/gallery/controllers/upgrader.php
 create mode 100644 modules/gallery/views/upgrader.html.php

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
new file mode 100644
index 00000000..e8798de5
--- /dev/null
+++ b/modules/gallery/controllers/upgrader.php
@@ -0,0 +1,25 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Upgrader_Controller extends Controller {
+  public function index() {
+    $view = new View("upgrader.html");
+    print $view;
+  }
+}
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
new file mode 100644
index 00000000..ecf2e265
--- /dev/null
+++ b/modules/gallery/views/upgrader.html.php
@@ -0,0 +1,135 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<html>
+  <head>
+    <title><?= t("Gallery3 Upgrader") ?></title>
+  </head>
+  <style>
+    body {
+      background: #eee;
+      font-family: Trebuchet MS;
+      font-size: 1.1em;
+    }
+    div#outer {
+      width: 650px;
+      background: white;
+      border: 1px solid #999;
+      margin: 0 auto;
+        padding: -10px;
+    }
+    div#inner {
+      padding: 0 1em 0 1em;
+      margin: 0px;
+    }
+    div#footer {
+      border-top: 1px solid #ccc;
+      margin: 1em;
+    }
+    td.name {
+      text-align: left;
+      padding-left: 30px;
+    }
+    td {
+      text-align: center;
+      border-bottom: 1px solid #eee;
+    }
+    tr.current td {
+      color: #999;
+      font-style: italic;
+    }
+    tr.upgradeable td {
+      font-weight: bold;
+    }
+    table {
+      width: 600px;
+      margin-bottom: 10px;
+    }
+    p {
+      font-size: .9em;
+    }
+    ul {
+      font-size: .9em;
+      list-style: none;
+    }
+    li {
+      display: inline;
+    }
+    li:before {
+      content: "\00BB \0020";
+    }
+    div.button {
+      margin: 0 auto;
+      width: 120px;
+      text-align: center;
+      border: 1px solid #999;
+      background: #eee;
+    }
+    div.button:hover {
+      background: #ccc;
+    }
+  </style>
+  <body>
+    <div id="outer">
+      <img src="<?= url::file("modules/gallery/images/gallery.png") ?>" />
+      <div id="inner">
+        <p>
+          <?= t("Welcome to the Gallery upgrader.  One click and you're done!") ?>
+        </p>
+        <table>
+          <tr>
+            <th> <?= t("Module name") ?> </th>
+            <th> <?= t("Installed version") ?> </th>
+            <th> <?= t("Available version") ?> </th>
+          </tr>
+
+          <? foreach (module::available() as $module): ?>
+          <? if ($module->active): ?>
+          <tr class="<?= $module->version == $module->code_version ? "current" : "upgradeable" ?>" >
+            <td class="name">
+              <?= $module->name ?>
+            </td>
+            <td>
+              <?= $module->version ?>
+            </td>
+            <td>
+              <?= $module->code_version ?>
+            </td>
+          </tr>
+          <? else: ?>
+          <? @$inactive++ ?>
+          <? endif ?>
+          <? endforeach ?>
+        </table>
+
+        <div class="button">
+          <a href="<?= url::site("upgrader/upgrade") ?>">
+            <?= t("Upgrade all") ?>
+          </a>
+        </div>
+
+        <? if (@$inactive): ?>
+        <p>
+          <?= t("The following modules are inactive and don't require an upgrade.") ?>
+        </p>
+        <ul>
+          <? foreach (module::available() as $module): ?>
+          <? if (!$module->active): ?>
+          <li>
+            <?= $module->name ?>
+          </li>
+          <? endif ?>
+          <? endforeach ?>
+        </p>
+        <? endif ?>
+      </div>
+      <div id="footer">
+        <p>
+          <i>
+            <?= t("Did something go wrong? Try the <a href=\"%faq_url\">FAQ</a> or ask in the <a href=\"%forums_url\">Gallery forums</a>.</i>",
+                array("faq_url" => "http://codex.gallery2.org/Gallery3:FAQ",
+                      "forums_url" => "http://gallery.menalto.com/forum")) ?>
+          </i>
+        </p>
+      </div>
+    </div>
+  </body>
+</html>
-- 
cgit v1.2.3


From f1c91ab9779542f1605476bc52c57d5f14294e97 Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Tue, 9 Jun 2009 23:54:02 -0400
Subject: fixed that you couldn't copy and paste text from the admin dashboard

* made only the block headers draggable, so that the rest of the block could be normal
* this should fix bug #292
---
 modules/gallery/views/admin_dashboard.html.php | 8 ++++----
 themes/admin_default/css/screen.css            | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/admin_dashboard.html.php b/modules/gallery/views/admin_dashboard.html.php
index c266d7e1..5b8cae2e 100644
--- a/modules/gallery/views/admin_dashboard.html.php
+++ b/modules/gallery/views/admin_dashboard.html.php
@@ -10,23 +10,23 @@
   };
 
   $(document).ready(function(){
-    $("#gAdminDashboard .gBlock *:first").addClass("gDraggable");
+    $("#gAdminDashboard .gBlock .ui-widget-header").addClass("gDraggable");
     $("#gAdminDashboard").sortable({
       connectWith: ["#gAdminDashboardSidebar"],
       containment: "document",
       cursor: "move",
-      handle: $("div:first"),
+      handle: $(".ui-widget-header"),
       opacity: 0.6,
       placeholder: "gDropTarget",
       stop: update_blocks
     });
 
-    $("#gAdminDashboardSidebar .gBlock *:first").addClass("gDraggable");
+    $("#gAdminDashboardSidebar .gBlock .ui-widget-header").addClass("gDraggable");
     $("#gAdminDashboardSidebar").sortable({
       connectWith: ["#gAdminDashboard"],
       containment: "document",
       cursor: "move",
-      handle: $("div:first"),
+      handle: $(".ui-widget-header"),
       opacity: 0.6,
       placeholder: "gDropTarget",
       stop: update_blocks
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 1ad64fa1..82f85f21 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -327,8 +327,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   border: none;
 }
 
-.ui-draggable,
-.ui-sortable {
+.ui-draggable {
   cursor: move;
 }
 
-- 
cgit v1.2.3


From 2fd322deeaf6b6b3f880fe21bf78664870d630a3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 21:26:37 -0700
Subject: ACtually implement the upgrader, and add a confirmation box when the
 upgrade is complete.

---
 modules/gallery/controllers/upgrader.php | 21 +++++++++++++
 modules/gallery/views/upgrader.html.php  | 54 +++++++++++++++++++++++++++-----
 2 files changed, 67 insertions(+), 8 deletions(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index e8798de5..b8769b27 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -20,6 +20,27 @@
 class Upgrader_Controller extends Controller {
   public function index() {
     $view = new View("upgrader.html");
+    $view->available = module::available();
+    $view->done = Input::instance()->get("done");
     print $view;
   }
+
+  public function upgrade() {
+    // Upgrade gallery and user first
+    module::install("gallery");
+    module::install("user");
+
+    // Then upgrade the rest
+    foreach (module::available() as $id => $module) {
+      if ($id == "gallery") {
+        continue;
+      }
+
+      if ($module->active && $module->code_version != $module->version) {
+        module::install($id);
+      }
+    }
+
+    url::redirect("upgrader?done=1");
+  }
 }
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index ecf2e265..6b9a0110 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -36,9 +36,15 @@
       color: #999;
       font-style: italic;
     }
+    tr.current td.gallery {
+      color: #00d;
+    }
     tr.upgradeable td {
       font-weight: bold;
     }
+    tr.upgradeable td.gallery {
+      color: #00d;
+    }
     table {
       width: 600px;
       margin-bottom: 10px;
@@ -63,28 +69,60 @@
       border: 1px solid #999;
       background: #eee;
     }
+    div.button a {
+      text-decoration: none;
+    }
     div.button:hover {
       background: #ccc;
     }
+    div#confirmation {
+      position: fixed;
+      top: 400px;
+      left: 325px;
+      background: blue;
+      z-index: 1000;
+      margin: 10px;
+      text-align: center;
+    }
+    div#confirmation div {
+      margin: 2px;
+      padding: 20px;
+      border: 2px solid #999;
+      background: white;
+    }
+    .gray_on_done {
+      opacity: <?= $done ? "0.5" : "1" ?>;
+    }
   </style>
   <body>
     <div id="outer">
       <img src="<?= url::file("modules/gallery/images/gallery.png") ?>" />
       <div id="inner">
-        <p>
+        <? if ($done): ?>
+        <div id="confirmation">
+          <div>
+            <h1> <?= t("That's it!") ?> </h1>
+            <p>
+              <?= t("Your <a href=\"%url\">Gallery</a> is up to date.",
+                    array("url" => url::site("albums/1"))) ?>
+            </p>
+          </div>
+        </div>
+        <? endif ?>
+        <p class="gray_on_done">
           <?= t("Welcome to the Gallery upgrader.  One click and you're done!") ?>
         </p>
         <table>
-          <tr>
+          <tr class="gray_on_done">
             <th> <?= t("Module name") ?> </th>
             <th> <?= t("Installed version") ?> </th>
             <th> <?= t("Available version") ?> </th>
           </tr>
 
-          <? foreach (module::available() as $module): ?>
+          <? foreach ($available as $id => $module): ?>
           <? if ($module->active): ?>
           <tr class="<?= $module->version == $module->code_version ? "current" : "upgradeable" ?>" >
-            <td class="name">
+            <td class="name <?= $id ?>">
               <?= $module->name ?>
             </td>
             <td>
@@ -100,18 +138,18 @@
           <? endforeach ?>
         </table>
 
-        <div class="button">
+        <div class="button gray_on_done">
           <a href="<?= url::site("upgrader/upgrade") ?>">
             <?= t("Upgrade all") ?>
           </a>
         </div>
 
         <? if (@$inactive): ?>
-        <p>
+        <p class="gray_on_done">
           <?= t("The following modules are inactive and don't require an upgrade.") ?>
         </p>
-        <ul>
-          <? foreach (module::available() as $module): ?>
+        <ul class="gray_on_done">
+          <? foreach ($available as $module): ?>
           <? if (!$module->active): ?>
           <li>
             <?= $module->name ?>
-- 
cgit v1.2.3