From 1f014aae6c16bbda62d8f5937180f11ccb0eb1b1 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 27 Jul 2009 12:39:12 -0700
Subject: Allow a theme to override the page refresh mechanism.  Create a new
 javascript lib (gallery.reload.js) which defines the functions
 gallery_reload() and gallery_location(new_location).  They just do a
 window.location.reload() and window.location = new_location.

This change breaks the assumption that all themes will handle page reloads
the same and allows the theme to customize the page refresh.
---
 modules/gallery/js/quick.js                        |  4 +-
 modules/gallery/tests/xss_data.txt                 | 68 +++++++++++-----------
 .../views/admin_maintenance_show_log.html.php      |  2 +-
 .../gallery/views/admin_maintenance_task.html.php  |  2 +-
 4 files changed, 39 insertions(+), 37 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/js/quick.js b/modules/gallery/js/quick.js
index fda6470f..4753808e 100644
--- a/modules/gallery/js/quick.js
+++ b/modules/gallery/js/quick.js
@@ -67,9 +67,9 @@ var quick_do = function(cont, pane, img) {
             img.css("margin-top", 0);
           }
         } else if (data.location) {
-          window.location = data.location;
+          $.gallery_location(data.location);
         } else if (data.reload) {
-          window.location.reload();
+          $.gallery_reload();
         }
       }
     });
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 45f7c7ec..b1cb295b 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -498,24 +498,25 @@ themes/admin_default/views/admin.html.php                    20  DIRTY $theme->s
 themes/admin_default/views/admin.html.php                    21  DIRTY $theme->script("jquery.form.js")
 themes/admin_default/views/admin.html.php                    22  DIRTY $theme->script("jquery-ui.js")
 themes/admin_default/views/admin.html.php                    23  DIRTY $theme->script("gallery.common.js")
-themes/admin_default/views/admin.html.php                    28  DIRTY $theme->script("gallery.dialog.js")
-themes/admin_default/views/admin.html.php                    29  DIRTY $theme->script("superfish/js/superfish.js")
-themes/admin_default/views/admin.html.php                    30  DIRTY $theme->script("jquery.dropshadow.js")
-themes/admin_default/views/admin.html.php                    31  DIRTY $theme->script("ui.init.js")
-themes/admin_default/views/admin.html.php                    33  DIRTY $theme->admin_head()
-themes/admin_default/views/admin.html.php                    36  DIRTY $theme->body_attributes()
-themes/admin_default/views/admin.html.php                    37  DIRTY $theme->admin_page_top()
-themes/admin_default/views/admin.html.php                    43  DIRTY $theme->site_status()
-themes/admin_default/views/admin.html.php                    45  DIRTY $theme->admin_header_top()
-themes/admin_default/views/admin.html.php                    48  DIRTY $csrf
-themes/admin_default/views/admin.html.php                    54  DIRTY $theme->admin_menu()
-themes/admin_default/views/admin.html.php                    56  DIRTY $theme->admin_header_bottom()
-themes/admin_default/views/admin.html.php                    62  DIRTY $theme->messages()
-themes/admin_default/views/admin.html.php                    63  DIRTY $content
-themes/admin_default/views/admin.html.php                    69  DIRTY $sidebar
-themes/admin_default/views/admin.html.php                    74  DIRTY $theme->admin_footer()
-themes/admin_default/views/admin.html.php                    76  DIRTY $theme->admin_credits()
-themes/admin_default/views/admin.html.php                    80  DIRTY $theme->admin_page_bottom()
+themes/admin_default/views/admin.html.php                    25  DIRTY $theme->script("gallery.reload.js")
+themes/admin_default/views/admin.html.php                    30  DIRTY $theme->script("gallery.dialog.js")
+themes/admin_default/views/admin.html.php                    31  DIRTY $theme->script("superfish/js/superfish.js")
+themes/admin_default/views/admin.html.php                    32  DIRTY $theme->script("jquery.dropshadow.js")
+themes/admin_default/views/admin.html.php                    33  DIRTY $theme->script("ui.init.js")
+themes/admin_default/views/admin.html.php                    35  DIRTY $theme->admin_head()
+themes/admin_default/views/admin.html.php                    38  DIRTY $theme->body_attributes()
+themes/admin_default/views/admin.html.php                    39  DIRTY $theme->admin_page_top()
+themes/admin_default/views/admin.html.php                    45  DIRTY $theme->site_status()
+themes/admin_default/views/admin.html.php                    47  DIRTY $theme->admin_header_top()
+themes/admin_default/views/admin.html.php                    50  DIRTY $csrf
+themes/admin_default/views/admin.html.php                    56  DIRTY $theme->admin_menu()
+themes/admin_default/views/admin.html.php                    58  DIRTY $theme->admin_header_bottom()
+themes/admin_default/views/admin.html.php                    64  DIRTY $theme->messages()
+themes/admin_default/views/admin.html.php                    65  DIRTY $content
+themes/admin_default/views/admin.html.php                    71  DIRTY $sidebar
+themes/admin_default/views/admin.html.php                    76  DIRTY $theme->admin_footer()
+themes/admin_default/views/admin.html.php                    78  DIRTY $theme->admin_credits()
+themes/admin_default/views/admin.html.php                    82  DIRTY $theme->admin_page_bottom()
 themes/admin_default/views/block.html.php                    2   DIRTY $id
 themes/admin_default/views/block.html.php                    2   DIRTY $css_id
 themes/admin_default/views/block.html.php                    5   DIRTY $id
@@ -603,21 +604,22 @@ themes/default/views/page.html.php                           48  DIRTY $theme->s
 themes/default/views/page.html.php                           49  DIRTY $theme->script("jquery.form.js")
 themes/default/views/page.html.php                           50  DIRTY $theme->script("jquery-ui.js")
 themes/default/views/page.html.php                           51  DIRTY $theme->script("gallery.common.js")
-themes/default/views/page.html.php                           56  DIRTY $theme->script("gallery.dialog.js")
-themes/default/views/page.html.php                           57  DIRTY $theme->script("gallery.form.js")
-themes/default/views/page.html.php                           58  DIRTY $theme->script("superfish/js/superfish.js")
-themes/default/views/page.html.php                           59  DIRTY $theme->script("jquery.localscroll.js")
-themes/default/views/page.html.php                           60  DIRTY $theme->script("ui.init.js")
-themes/default/views/page.html.php                           64  DIRTY $theme->script("jquery.scrollTo.js")
-themes/default/views/page.html.php                           65  DIRTY $theme->script("gallery.show_full_size.js")
-themes/default/views/page.html.php                           67  DIRTY $theme->script("flowplayer.js")
-themes/default/views/page.html.php                           70  DIRTY $theme->head()
-themes/default/views/page.html.php                           73  DIRTY $theme->body_attributes()
-themes/default/views/page.html.php                           74  DIRTY $theme->page_top()
-themes/default/views/page.html.php                           76  DIRTY $theme->site_status()
-themes/default/views/page.html.php                           84  DIRTY $theme->messages()
-themes/default/views/page.html.php                           85  DIRTY $content
-themes/default/views/page.html.php                           99  DIRTY $theme->page_bottom()
+themes/default/views/page.html.php                           53  DIRTY $theme->script("gallery.reload.js")
+themes/default/views/page.html.php                           58  DIRTY $theme->script("gallery.dialog.js")
+themes/default/views/page.html.php                           59  DIRTY $theme->script("gallery.form.js")
+themes/default/views/page.html.php                           60  DIRTY $theme->script("superfish/js/superfish.js")
+themes/default/views/page.html.php                           61  DIRTY $theme->script("jquery.localscroll.js")
+themes/default/views/page.html.php                           62  DIRTY $theme->script("ui.init.js")
+themes/default/views/page.html.php                           66  DIRTY $theme->script("jquery.scrollTo.js")
+themes/default/views/page.html.php                           67  DIRTY $theme->script("gallery.show_full_size.js")
+themes/default/views/page.html.php                           69  DIRTY $theme->script("flowplayer.js")
+themes/default/views/page.html.php                           72  DIRTY $theme->head()
+themes/default/views/page.html.php                           75  DIRTY $theme->body_attributes()
+themes/default/views/page.html.php                           76  DIRTY $theme->page_top()
+themes/default/views/page.html.php                           78  DIRTY $theme->site_status()
+themes/default/views/page.html.php                           86  DIRTY $theme->messages()
+themes/default/views/page.html.php                           87  DIRTY $content
+themes/default/views/page.html.php                           101 DIRTY $theme->page_bottom()
 themes/default/views/pager.html.php                          13  DIRTY $url
 themes/default/views/pager.html.php                          20  DIRTY $previous_page
 themes/default/views/pager.html.php                          20  DIRTY $url
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index 9d850986..ac593de7 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   dismiss = function() {
-    window.location.reload();
+    $.gallery_reload();
   }
   download = function(){
     // send request
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index c81fe571..b0d99425 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -40,7 +40,7 @@
   $(".gProgressBar").progressbar({value: 0});
   update();
   dismiss = function() {
-    window.location.reload();
+    $.gallery_reload();
   }
 </script>
 <div id="gProgress">
-- 
cgit v1.2.3


From 4550969101f04dda6573afc59c57897710a3f149 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 27 Jul 2009 20:59:58 -0700
Subject: Create A Forge Script element. Form_Script allows the specification
 of either a url to a script file or in line text which will be included in a
 script block.

---
 modules/gallery/libraries/Form_Script.php | 66 +++++++++++++++++++++++++++++++
 modules/gallery/tests/DrawForm_Test.php   | 39 ++++++++++++++++++
 modules/gallery/tests/xss_data.txt        |  4 +-
 modules/gallery/views/form.html.php       |  2 +
 4 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 modules/gallery/libraries/Form_Script.php

(limited to 'modules/gallery')

diff --git a/modules/gallery/libraries/Form_Script.php b/modules/gallery/libraries/Form_Script.php
new file mode 100644
index 00000000..e841408d
--- /dev/null
+++ b/modules/gallery/libraries/Form_Script.php
@@ -0,0 +1,66 @@
+<?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 Form_Script_Core extends Forge {
+  protected $data = array(
+    "name" => false,
+    "type"  => "script",
+    "url" => "",
+    "text" => "");
+
+  public function __construct($name) {
+    // Set dummy data so we don"t get errors
+    $this->attr["action"] = "";
+    $this->attr["method"] = "post";
+    $this->data["name"] = $name;
+  }
+
+  public function __get($key) {
+    return isset($this->data[$key]) ? $this->data[$key] : null;
+  }
+
+  /**
+   * Sets url attribute
+   */
+  public function url($url) {
+    $this->data["url"] = $url;
+
+    return $this;
+  }
+
+  public function text($script_text) {
+    $this->data["text"] = $script_text;
+
+    return $this;
+  }
+
+  public function render() {
+    $script = array();
+    if (!empty($this->data["url"])) {
+      $script[] = html::script($this->data["url"]);
+    }
+
+    if (!empty($this->data["text"])) {
+      $script[] = "<script type=\"text/javascript\">\n{$this->data['text']}\n</script>\n";
+    }
+
+    return implode("\n", $script);
+  }
+
+} // End Form Script
\ No newline at end of file
diff --git a/modules/gallery/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php
index 2c5aaba4..dde54257 100644
--- a/modules/gallery/tests/DrawForm_Test.php
+++ b/modules/gallery/tests/DrawForm_Test.php
@@ -80,5 +80,44 @@ class DrawForm_Test extends Unit_Test_Case {
     $this->assert_same($expected, $rendered);
   }
 
+  function form_script_test() {
+    $form = new Forge("test/controller", "", "post", array("id" => "gTestGroupForm"));
+    $group = $form->group("test_group")->label(t("Test Group"));
+    $group->input("title")->label(t("Title"));
+    $group->textarea("description")->label(t("Text Area"));
+    $form->script("")
+      ->url(url::file("test.js"))
+      ->text("alert('Test Javascript');");
+    $group->submit("")->value(t("Submit"));
+    $rendered = $form->__toString();
+
+    $expected = "<form action=\"http://./index.php/test/controller\" method=\"post\" " .
+                      "id=\"gTestGroupForm\">\n" .
+                "<input type=\"hidden\" name=\"csrf\" value=\"" . access::csrf_token() . "\"  />\n" .
+                "  <fieldset>\n" .
+                "    <legend>Test Group</legend>\n" .
+                "    <ul>\n" .
+                "      <li>\n" .
+                "        <label for=\"title\" >Title</label>\n" .
+                "        <input type=\"text\" id=\"title\" name=\"title\" value=\"\" " .
+                            "class=\"textbox\"  />\n" .
+                "      </li>\n" .
+                "      <li>\n" .
+                "        <label for=\"description\" >Text Area</label>\n" .
+                "        <textarea id=\"description\" name=\"description\" " .
+                              "class=\"textarea\" ></textarea>\n" .
+                "      </li>\n" .
+                "      <li>\n" .
+                "        <input type=\"submit\" value=\"Submit\" class=\"submit\"  />\n" .
+                "      </li>\n" .
+                "    </ul>\n" .
+                "  </fieldset>\n" .
+                "<script type=\"text/javascript\" src=\"http://./test.js\"></script>\n\n" .
+                "<script type=\"text/javascript\">\n" .
+                "alert('Test Javascript');\n" .
+                "</script>\n" .
+                "</form>\n";
+    $this->assert_same($expected, $rendered);
+  }
 }
 
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index b1cb295b..f3d50e71 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -444,8 +444,8 @@ modules/tag/views/admin_tags.html.php                        50  DIRTY $tag->id
 modules/tag/views/admin_tags.html.php                        50        $tag->name
 modules/tag/views/admin_tags.html.php                        51  DIRTY $tag->count
 modules/tag/views/admin_tags.html.php                        52  DIRTY $tag->id
-modules/tag/views/tag_block.html.php                         13  DIRTY $cloud
-modules/tag/views/tag_block.html.php                         15  DIRTY $form
+modules/tag/views/tag_block.html.php                         15  DIRTY $cloud
+modules/tag/views/tag_block.html.php                         17  DIRTY $form
 modules/tag/views/tag_cloud.html.php                         4   DIRTY $tag->count
 modules/tag/views/tag_cloud.html.php                         4   DIRTY $max_count
 modules/tag/views/tag_cloud.html.php                         5   DIRTY $tag->count
diff --git a/modules/gallery/views/form.html.php b/modules/gallery/views/form.html.php
index ec2a56a9..730d77cb 100644
--- a/modules/gallery/views/form.html.php
+++ b/modules/gallery/views/form.html.php
@@ -40,6 +40,8 @@ if (!function_exists("DrawForm")) {
           print "$prefix  {$hidden->render()}\n";
         }
         print "$prefix</fieldset>\n";
+      } else if ($input->type == 'script') {
+        print $input->render();
       } else {
         if ($input->error_messages()) {
           print "$prefix<li class=\"gError\">\n";
-- 
cgit v1.2.3


From 2e8f73d4e96e4e114493f703a5c2c0207fad5cf5 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 28 Jul 2009 05:40:28 -0700
Subject: Revert commit 078c77a62b623322956457bfd7bfbdaf56203b00 and change the
 tag_event:item_edit_form to use the new Form_Script library to inject script
 into a form.

---
 modules/gallery/controllers/albums.php   |  5 ++---
 modules/gallery/controllers/movies.php   |  5 ++---
 modules/gallery/controllers/photos.php   |  5 ++---
 modules/gallery/helpers/album.php        | 14 ++++++--------
 modules/gallery/helpers/photo.php        | 14 ++++++--------
 modules/gallery/tests/xss_data.txt       |  2 --
 modules/gallery/views/item_edit.html.php |  9 ---------
 modules/tag/helpers/tag_event.php        | 18 +++++++-----------
 modules/tag/js/tag.js                    |  1 +
 9 files changed, 26 insertions(+), 47 deletions(-)
 delete mode 100644 modules/gallery/views/item_edit.html.php

(limited to 'modules/gallery')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 4fefd3a1..56b74cb1 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -166,8 +166,7 @@ class Albums_Controller extends Items_Controller {
     access::required("view", $album);
     access::required("edit", $album);
 
-    $view = album::get_edit_form($album);
-    $form = $view->form;
+    $form = album::get_edit_form($album);
     if ($valid = $form->validate()) {
       // Make sure that there's not a conflict
       if ($album->id != 1 &&
@@ -203,7 +202,7 @@ class Albums_Controller extends Items_Controller {
     } else {
       print json_encode(
         array("result" => "error",
-              "form" => $view->__toString()));
+              "form" => $form->__toString()));
     }
   }
 
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 1391c4b4..c8227d74 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -70,8 +70,7 @@ class Movies_Controller extends Items_Controller {
     access::required("view", $photo);
     access::required("edit", $photo);
 
-    $view = photo::get_edit_form($photo);
-    $form = $view->form;
+    $form = photo::get_edit_form($photo);
     if ($valid = $form->validate()) {
       // Make sure that there's not a conflict
       if (Database::instance()
@@ -102,7 +101,7 @@ class Movies_Controller extends Items_Controller {
     } else {
       print json_encode(
         array("result" => "error",
-              "form" => $view->__toString()));
+              "form" => $form->__toString()));
     }
   }
 
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 9d9b25a1..8ee24da8 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -61,8 +61,7 @@ class Photos_Controller extends Items_Controller {
     access::required("view", $photo);
     access::required("edit", $photo);
 
-    $view = photo::get_edit_form($photo);
-    $form = $view->form;
+    $form = photo::get_edit_form($photo);
     if ($valid = $form->validate()) {
       if ($form->edit_item->filename->value != $photo->name) {
         // Make sure that there's not a conflict
@@ -95,7 +94,7 @@ class Photos_Controller extends Items_Controller {
     } else {
       print json_encode(
         array("result" => "error",
-              "form" => $view->__toString()));
+              "form" => $form->__toString()));
     }
   }
 
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index f146bfb3..6065f580 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -94,11 +94,9 @@ class album_Core {
   }
 
   static function get_edit_form($parent) {
-    $view = new View("item_edit.html");
-    $view->script = array();
-    $view->form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm"));
-    $view->form->hidden("_method")->value("put");
-    $group = $view->form->group("edit_item")->label(t("Edit Album"));
+    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm"));
+    $form->hidden("_method")->value("put");
+    $group = $form->group("edit_item")->label(t("Edit Album"));
 
     $group->input("title")->label(t("Title"))->value($parent->title);
     $group->textarea("description")->label(t("Description"))->value($parent->description);
@@ -130,11 +128,11 @@ class album_Core {
                       "DESC" => t("Descending")))
       ->selected($parent->sort_order);
 
-    module::event("item_edit_form", $parent, $view);
+    module::event("item_edit_form", $parent, $form);
 
     $group->hidden("type")->value("album");
     $group->submit("")->value(t("Modify"));
-    $view->form->add_rules_from(ORM::factory("item"));
-    return $view;
+    $form->add_rules_from(ORM::factory("item"));
+    return $form;
   }
 }
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 299195e9..5cf37de1 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -135,11 +135,9 @@ class photo_Core {
   }
 
   static function get_edit_form($photo) {
-    $view = new View("item_edit.html");
-    $view->script = array();
-    $view->form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm"));
-    $view->form->hidden("_method")->value("put");
-    $group = $view->form->group("edit_item")->label(t("Edit Photo"));
+    $form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm"));
+    $form->hidden("_method")->value("put");
+    $group = $form->group("edit_item")->label(t("Edit Photo"));
     $group->input("title")->label(t("Title"))->value($photo->title);
     $group->textarea("description")->label(t("Description"))->value($photo->description);
     $group->input("filename")->label(t("Filename"))->value($photo->name)
@@ -149,11 +147,11 @@ class photo_Core {
       ->callback("item::validate_no_trailing_period")
       ->error_messages("no_trailing_period", t("The photo name can't end in \".\""));
 
-    module::event("item_edit_form", $photo, $view);
+    module::event("item_edit_form", $photo, $form);
 
     $group->submit("")->value(t("Modify"));
-    $view->form->add_rules_from(ORM::factory("item"));
-    return $view;
+    $form->add_rules_from(ORM::factory("item"));
+    return $form;
   }
 
   /**
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index f3d50e71..5335a812 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -207,8 +207,6 @@ modules/gallery/views/admin_themes_preview.html.php          4   DIRTY $info->na
 modules/gallery/views/admin_themes_preview.html.php          7   DIRTY $url
 modules/gallery/views/after_install.html.php                 11        $user->name
 modules/gallery/views/after_install.html.php                 15  DIRTY $user->id
-modules/gallery/views/item_edit.html.php                     4   DIRTY $script
-modules/gallery/views/item_edit.html.php                     8   DIRTY $form
 modules/gallery/views/kohana_error_page.php                  102 DIRTY $message
 modules/gallery/views/kohana_error_page.php                  104 DIRTY $file
 modules/gallery/views/kohana_error_page.php                  104 DIRTY $line
diff --git a/modules/gallery/views/item_edit.html.php b/modules/gallery/views/item_edit.html.php
deleted file mode 100644
index 9aa2fb64..00000000
--- a/modules/gallery/views/item_edit.html.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<? if (!empty($script)): ?>
-<script>
-  <?= implode("\n", $script) ?>
-</script>
-<? endif ?>
-<div id="gEditFormContainer">
-  <?= $form ?>
-</div>
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index 0cb49ffa..0fe8a393 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -64,19 +64,15 @@ class tag_event_Core {
     tag::compact();
   }
 
-  static function item_edit_form($item, $view) {
+  static function item_edit_form($item, $form) {
     $url = url::site("tags/autocomplete");
-    $view->script[] = "$('#gEditFormContainer form').ready(function() {
-                         $('#gEditFormContainer form input[id=tags]').autocomplete(
-                           '$url',
-                           {max: 30,
-                            multiple: true,
-                            multipleSeparator: ',',
-                            cacheLength: 1}
-                         );
-                      });";
+    $form->script("")
+      ->text("$('form input[id=tags]').ready(function() {
+                $('form input[id=tags]').autocomplete(
+                  '$url', {max: 30, multiple: true, multipleSeparator: ',', cacheLength: 1});
+              });");
     $tag_value = implode(", ", tag::item_tags($item));
-    $view->form->edit_item->input("tags")->label(t("Tags (comma separated)"))
+    $form->edit_item->input("tags")->label(t("Tags (comma separated)"))
       ->value($tag_value);
   }
 
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index 5a435ecf..564de393 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -66,3 +66,4 @@ function editInPlace(element) {
   };
   ajaxify_editInPlaceForm();
 }
+
-- 
cgit v1.2.3


From dfaf8703101be049def4cfabbd4c44194a2bd3f7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 28 Jul 2009 06:33:25 -0700
Subject: Convert the album add dialog to use the new Form_Script library

---
 modules/gallery/controllers/albums.php | 5 ++---
 modules/gallery/helpers/album.php      | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 56b74cb1..cdfa823d 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -122,7 +122,7 @@ class Albums_Controller extends Items_Controller {
       print json_encode(
         array(
           "result" => "error",
-          "form" => $form->__toString() . html::script("modules/gallery/js/albums_form_add.js")));
+          "form" => $form->__toString()));
     }
   }
 
@@ -216,8 +216,7 @@ class Albums_Controller extends Items_Controller {
 
     switch ($this->input->get("type")) {
     case "album":
-      print album::get_add_form($album) .
-        html::script("modules/gallery/js/albums_form_add.js");
+      print album::get_add_form($album);
       break;
 
     case "photo":
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 6065f580..8a7c9951 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -90,6 +90,8 @@ class album_Core {
     $group->hidden("type")->value("album");
     $group->submit("")->value(t("Create"));
     $form->add_rules_from(ORM::factory("item"));
+    $form->script("")
+      ->url(url::abs_file("modules/gallery/js/albums_form_add.js"));
     return $form;
   }
 
-- 
cgit v1.2.3


From 653c291d94f02e3e292541fe39d9fc95bf3d22ba Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 29 Jul 2009 10:55:56 -0700
Subject: Fix for ticket #576 Add a weight index to the item table and changed
 the retrieval of the maximum weight to select weight from items order by
 weight desc limit 1.

Upgrades the gallery module to version 10
---
 modules/gallery/helpers/gallery_installer.php | 21 +++++++++++++++++++--
 modules/gallery/models/item.php               | 16 ++++++++++++++--
 modules/gallery/module.info                   |  2 +-
 3 files changed, 34 insertions(+), 5 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 760bec31..2322110e 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -98,9 +98,20 @@ class gallery_installer {
                  PRIMARY KEY (`id`),
                  KEY `parent_id` (`parent_id`),
                  KEY `type` (`type`),
-                 KEY `random` (`rand_key`))
+                 KEY `random` (`rand_key`),
+                 KEY `weight` (`weight` DESC))
                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
+    $db->query("DELIMITER |
+               CREATE TRIGGER setweight BEFORE INSERT ON {items}
+                 FOR EACH ROW BEGIN
+                   DECLARE new_weight int(9);
+                   SELECT weight+1 FROM {items}
+                    ORDER BY weight LIMIT 1 INTO new_weight;
+                   SET NEW.weight = new_weight;
+                 END;|
+               DELIMITER ;");
+
     $db->query("CREATE TABLE {logs} (
                  `id` int(9) NOT NULL auto_increment,
                  `category` varchar(64) default NULL,
@@ -329,7 +340,13 @@ class gallery_installer {
       $db->query("ALTER TABLE {items} CHANGE COLUMN `right` `right_ptr` INT(9) NOT NULL;");
       module::set_version("gallery", $version = 9);
     }
-  }
+
+    if ($version == 9) {
+      $db->query("ALTER TABLE {items} ADD KEY `weight` (`weight` DESC);");
+
+      module::set_version("gallery", $version = 10);
+    }
+}
 
   static function uninstall() {
     $db = Database::instance();
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index dcbee991..481b22bc 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -350,9 +350,21 @@ class Item_Model extends ORM_MPTT {
     if (!empty($this->changed) && $this->changed != array("view_count" => "view_count")) {
       $this->updated = time();
       if (!$this->loaded) {
+        try {
         $this->created = $this->updated;
-        $r = ORM::factory("item")->select("MAX(weight) as max_weight")->find();
-        $this->weight = $r->max_weight + 1;
+        Kohana::log("error", "get Weight");
+        $weight = ORM::factory("item")
+          ->select("weight")
+          ->orderby("weight", "DESC")
+          ->limit(1)
+          ->find_all()
+          ->current()->weight;
+          Kohana::log("error", "Weight: $weight");
+        $this->weight = $weight + 1;
+        } catch (Exception $e) {
+          Kohana::log("error", $e->__toString());
+          throw $e;
+        }
       } else {
         $send_event = 1;
       }
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index c5a9d25d..dfb1a7a2 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 9
+version = 10
-- 
cgit v1.2.3


From fc7ef17e0fb08459a84ba9ba0654664e519e6a0f Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 30 Jul 2009 05:27:19 -0700
Subject: Remove try statement w/o catch

---
 modules/gallery/models/item.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 1ce4d340..a0598ea4 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -350,7 +350,6 @@ class Item_Model extends ORM_MPTT {
     if (!empty($this->changed) && $this->changed != array("view_count" => "view_count")) {
       $this->updated = time();
       if (!$this->loaded) {
-        try {
         $this->created = $this->updated;
         $weight = Database::instance()
           ->select("weight")->from("items")
-- 
cgit v1.2.3


From 187d4b209d6bd3fce2fa81a88e31f587d9eb4624 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 5 Aug 2009 07:38:35 -0700
Subject: Change the children methods on Item_Core and ORM_MPTT in order to
 specify a type parameter, so tht we can filter the children based on type
 (i.e. album, photo, etc). In addition, expose the sort order, so that we can
 specify the order we want to return the children.

---
 modules/gallery/libraries/ORM_MPTT.php | 16 +++++++++++-----
 modules/gallery/models/item.php        |  9 +++++++--
 2 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 1917d738..cde049cd 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -146,11 +146,15 @@ class ORM_MPTT_Core extends ORM {
    * @chainable
    * @param   integer  SQL limit
    * @param   integer  SQL offset
+   * @param   string   type to return
    * @param   array    orderby
    * @return array ORM
    */
-  function children($limit=null, $offset=0, $orderby=null) {
+  function children($limit=null, $offset=0, $type=null, $orderby=null) {
     $this->where("parent_id", $this->id);
+    if ($type) {
+      $this->where("type", $type);
+    }
     if (empty($orderby)) {
       $this->orderby("id", "ASC");
     } else {
@@ -163,16 +167,18 @@ class ORM_MPTT_Core extends ORM {
    * Return all of the children of this node, ordered by id.
    *
    * @chainable
-   * @param   integer  SQL limit
-   * @param   integer  SQL offset
+   * @param   string  type to return
    * @return array ORM
    */
-  function children_count() {
+  function children_count($type=null) {
+    if ($type) {
+      $this->where("type", $type);
+    }
     return $this->where("parent_id", $this->id)->count_all();
   }
 
   /**
-   * Return all of the children of the specified type, ordered by id.
+   * Return all of the decendents of the specified type, ordered by id.
    *
    * @param   integer  SQL limit
    * @param   integer  SQL offset
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index f3e6b8f3..3498e0db 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -526,10 +526,15 @@ class Item_Model extends ORM_MPTT {
    * @chainable
    * @param   integer  SQL limit
    * @param   integer  SQL offset
+   * @param   string   type to return
+   * @param   array    orderby
    * @return array ORM
    */
-  function children($limit=null, $offset=0) {
-    return parent::children($limit, $offset, array($this->sort_column => $this->sort_order));
+  function children($limit=null, $offset=0, $type=null,  $orderby=null) {
+    if (empty($orderby)) {
+      $orderby = array($this->sort_column => $this->sort_order);
+    }
+    return parent::children($limit, $offset, $type, $orderby);
   }
 
   /**
-- 
cgit v1.2.3


From 81d39a9bb15577b0c8a59b2b14fd27fb1b7d26d9 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 5 Aug 2009 07:47:17 -0700
Subject: Remove the trigger definition code

---
 modules/gallery/helpers/gallery_installer.php | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index fd2cd7f9..d12dad70 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -102,16 +102,6 @@ class gallery_installer {
                  KEY `weight` (`weight` DESC))
                ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
-    $db->query("DELIMITER |
-               CREATE TRIGGER setweight BEFORE INSERT ON {items}
-                 FOR EACH ROW BEGIN
-                   DECLARE new_weight int(9);
-                   SELECT weight+1 FROM {items}
-                    ORDER BY weight LIMIT 1 INTO new_weight;
-                   SET NEW.weight = new_weight;
-                 END;|
-               DELIMITER ;");
-
     $db->query("CREATE TABLE {logs} (
                  `id` int(9) NOT NULL auto_increment,
                  `category` varchar(64) default NULL,
-- 
cgit v1.2.3


From 9f396178cedc96abb282e72ff0e843e255c8225a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 5 Aug 2009 09:24:27 -0700
Subject: Revert "Allow a theme to override the page refresh mechanism.  Create
 a new"

This reverts commit 1f014aae6c16bbda62d8f5937180f11ccb0eb1b1.
---
 lib/gallery.dialog.js                              |  4 +-
 lib/gallery.panel.js                               |  4 +-
 lib/gallery.reload.js                              | 16 -----
 modules/gallery/js/quick.js                        |  4 +-
 modules/gallery/tests/xss_data.txt                 | 68 +++++++++++-----------
 .../views/admin_maintenance_show_log.html.php      |  2 +-
 .../gallery/views/admin_maintenance_task.html.php  |  2 +-
 modules/organize/js/organize.js                    |  2 +-
 .../views/server_add_tree_dialog.html.php          |  2 +-
 modules/tag/js/tag.js                              |  2 +-
 themes/admin_default/views/admin.html.php          |  2 -
 themes/default/views/page.html.php                 |  2 -
 12 files changed, 44 insertions(+), 66 deletions(-)
 delete mode 100644 lib/gallery.reload.js

(limited to 'modules/gallery')

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 0efcf120..74c2f20e 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -25,9 +25,9 @@ function ajaxify_dialog() {
       }
       if (data.result == "success") {
 	if (data.location) {
-          $.gallery_location(data.location);
+          window.location = data.location;
         } else {
-          $.gallery_reload();
+          window.location.reload();
         }
       }
     }
diff --git a/lib/gallery.panel.js b/lib/gallery.panel.js
index 26be11ad..022e4878 100644
--- a/lib/gallery.panel.js
+++ b/lib/gallery.panel.js
@@ -40,9 +40,9 @@ function togglePanel(element, on_success) {
               if (on_success) {
                 on_success();
               } else if (data.location) {
-                $.gallery_location(data.location);
+                window.location = data.location;
               } else {
-                $.gallery_reload();
+                window.location.reload();
               }
             }
           }
diff --git a/lib/gallery.reload.js b/lib/gallery.reload.js
deleted file mode 100644
index 2c8752a0..00000000
--- a/lib/gallery.reload.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-(function ($) {
-  $.gallery_reload = function() {
-    window.location.reload();
-  };
-})(jQuery);
-
-// Vertically align a block element's content
-(function ($) {
-  $.gallery_location = function(location) {
-    window.location = location;
-  };
-})(jQuery);
diff --git a/modules/gallery/js/quick.js b/modules/gallery/js/quick.js
index 4753808e..fda6470f 100644
--- a/modules/gallery/js/quick.js
+++ b/modules/gallery/js/quick.js
@@ -67,9 +67,9 @@ var quick_do = function(cont, pane, img) {
             img.css("margin-top", 0);
           }
         } else if (data.location) {
-          $.gallery_location(data.location);
+          window.location = data.location;
         } else if (data.reload) {
-          $.gallery_reload();
+          window.location.reload();
         }
       }
     });
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 29d223b7..0e118ce7 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -496,25 +496,24 @@ themes/admin_default/views/admin.html.php                    20  DIRTY $theme->s
 themes/admin_default/views/admin.html.php                    21  DIRTY $theme->script("jquery.form.js")
 themes/admin_default/views/admin.html.php                    22  DIRTY $theme->script("jquery-ui.js")
 themes/admin_default/views/admin.html.php                    23  DIRTY $theme->script("gallery.common.js")
-themes/admin_default/views/admin.html.php                    25  DIRTY $theme->script("gallery.reload.js")
-themes/admin_default/views/admin.html.php                    30  DIRTY $theme->script("gallery.dialog.js")
-themes/admin_default/views/admin.html.php                    31  DIRTY $theme->script("superfish/js/superfish.js")
-themes/admin_default/views/admin.html.php                    32  DIRTY $theme->script("jquery.dropshadow.js")
-themes/admin_default/views/admin.html.php                    33  DIRTY $theme->script("ui.init.js")
-themes/admin_default/views/admin.html.php                    35  DIRTY $theme->admin_head()
-themes/admin_default/views/admin.html.php                    38  DIRTY $theme->body_attributes()
-themes/admin_default/views/admin.html.php                    39  DIRTY $theme->admin_page_top()
-themes/admin_default/views/admin.html.php                    45  DIRTY $theme->site_status()
-themes/admin_default/views/admin.html.php                    47  DIRTY $theme->admin_header_top()
-themes/admin_default/views/admin.html.php                    50  DIRTY $csrf
-themes/admin_default/views/admin.html.php                    56  DIRTY $theme->admin_menu()
-themes/admin_default/views/admin.html.php                    58  DIRTY $theme->admin_header_bottom()
-themes/admin_default/views/admin.html.php                    64  DIRTY $theme->messages()
-themes/admin_default/views/admin.html.php                    65  DIRTY $content
-themes/admin_default/views/admin.html.php                    71  DIRTY $sidebar
-themes/admin_default/views/admin.html.php                    76  DIRTY $theme->admin_footer()
-themes/admin_default/views/admin.html.php                    78  DIRTY $theme->admin_credits()
-themes/admin_default/views/admin.html.php                    82  DIRTY $theme->admin_page_bottom()
+themes/admin_default/views/admin.html.php                    28  DIRTY $theme->script("gallery.dialog.js")
+themes/admin_default/views/admin.html.php                    29  DIRTY $theme->script("superfish/js/superfish.js")
+themes/admin_default/views/admin.html.php                    30  DIRTY $theme->script("jquery.dropshadow.js")
+themes/admin_default/views/admin.html.php                    31  DIRTY $theme->script("ui.init.js")
+themes/admin_default/views/admin.html.php                    33  DIRTY $theme->admin_head()
+themes/admin_default/views/admin.html.php                    36  DIRTY $theme->body_attributes()
+themes/admin_default/views/admin.html.php                    37  DIRTY $theme->admin_page_top()
+themes/admin_default/views/admin.html.php                    43  DIRTY $theme->site_status()
+themes/admin_default/views/admin.html.php                    45  DIRTY $theme->admin_header_top()
+themes/admin_default/views/admin.html.php                    48  DIRTY $csrf
+themes/admin_default/views/admin.html.php                    54  DIRTY $theme->admin_menu()
+themes/admin_default/views/admin.html.php                    56  DIRTY $theme->admin_header_bottom()
+themes/admin_default/views/admin.html.php                    62  DIRTY $theme->messages()
+themes/admin_default/views/admin.html.php                    63  DIRTY $content
+themes/admin_default/views/admin.html.php                    69  DIRTY $sidebar
+themes/admin_default/views/admin.html.php                    74  DIRTY $theme->admin_footer()
+themes/admin_default/views/admin.html.php                    76  DIRTY $theme->admin_credits()
+themes/admin_default/views/admin.html.php                    80  DIRTY $theme->admin_page_bottom()
 themes/admin_default/views/block.html.php                    2   DIRTY $id
 themes/admin_default/views/block.html.php                    2   DIRTY $css_id
 themes/admin_default/views/block.html.php                    5   DIRTY $id
@@ -602,22 +601,21 @@ themes/default/views/page.html.php                           48  DIRTY $theme->s
 themes/default/views/page.html.php                           49  DIRTY $theme->script("jquery.form.js")
 themes/default/views/page.html.php                           50  DIRTY $theme->script("jquery-ui.js")
 themes/default/views/page.html.php                           51  DIRTY $theme->script("gallery.common.js")
-themes/default/views/page.html.php                           53  DIRTY $theme->script("gallery.reload.js")
-themes/default/views/page.html.php                           58  DIRTY $theme->script("gallery.dialog.js")
-themes/default/views/page.html.php                           59  DIRTY $theme->script("gallery.form.js")
-themes/default/views/page.html.php                           60  DIRTY $theme->script("superfish/js/superfish.js")
-themes/default/views/page.html.php                           61  DIRTY $theme->script("jquery.localscroll.js")
-themes/default/views/page.html.php                           62  DIRTY $theme->script("ui.init.js")
-themes/default/views/page.html.php                           66  DIRTY $theme->script("jquery.scrollTo.js")
-themes/default/views/page.html.php                           67  DIRTY $theme->script("gallery.show_full_size.js")
-themes/default/views/page.html.php                           69  DIRTY $theme->script("flowplayer.js")
-themes/default/views/page.html.php                           72  DIRTY $theme->head()
-themes/default/views/page.html.php                           75  DIRTY $theme->body_attributes()
-themes/default/views/page.html.php                           76  DIRTY $theme->page_top()
-themes/default/views/page.html.php                           78  DIRTY $theme->site_status()
-themes/default/views/page.html.php                           86  DIRTY $theme->messages()
-themes/default/views/page.html.php                           87  DIRTY $content
-themes/default/views/page.html.php                           101 DIRTY $theme->page_bottom()
+themes/default/views/page.html.php                           56  DIRTY $theme->script("gallery.dialog.js")
+themes/default/views/page.html.php                           57  DIRTY $theme->script("gallery.form.js")
+themes/default/views/page.html.php                           58  DIRTY $theme->script("superfish/js/superfish.js")
+themes/default/views/page.html.php                           59  DIRTY $theme->script("jquery.localscroll.js")
+themes/default/views/page.html.php                           60  DIRTY $theme->script("ui.init.js")
+themes/default/views/page.html.php                           64  DIRTY $theme->script("jquery.scrollTo.js")
+themes/default/views/page.html.php                           65  DIRTY $theme->script("gallery.show_full_size.js")
+themes/default/views/page.html.php                           67  DIRTY $theme->script("flowplayer.js")
+themes/default/views/page.html.php                           70  DIRTY $theme->head()
+themes/default/views/page.html.php                           73  DIRTY $theme->body_attributes()
+themes/default/views/page.html.php                           74  DIRTY $theme->page_top()
+themes/default/views/page.html.php                           76  DIRTY $theme->site_status()
+themes/default/views/page.html.php                           84  DIRTY $theme->messages()
+themes/default/views/page.html.php                           85  DIRTY $content
+themes/default/views/page.html.php                           99  DIRTY $theme->page_bottom()
 themes/default/views/pager.html.php                          13  DIRTY $url
 themes/default/views/pager.html.php                          20  DIRTY $previous_page
 themes/default/views/pager.html.php                          20  DIRTY $url
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index ac593de7..9d850986 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   dismiss = function() {
-    $.gallery_reload();
+    window.location.reload();
   }
   download = function(){
     // send request
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index 6ab87e3f..0eb0b38c 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -47,7 +47,7 @@
   $(".gProgressBar").progressbar({value: 0});
   update();
   dismiss = function() {
-    $.gallery_reload();
+    window.location.reload();
   }
 </script>
 <div id="gProgress">
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index 12d8a5b5..f10cbcc9 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -374,7 +374,7 @@ function organize_dialog_init() {
   }
 
   $("#gDialog").bind("organize_close", function(target) {
-    $.gallery_reload();
+    document.location.reload();
   });
 
   heightMicroThumbPanel -= 2 * parseFloat($("#gDialog").css("padding-top"));
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 8dfd2c38..21952849 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -34,7 +34,7 @@
       <?= t("Add") ?>
     </button>
 
-    <button class="ui-state-default ui-corner-all" onclick="closeDialog(); $.gallery_reload();">
+    <button class="ui-state-default ui-corner-all" onclick="closeDialog(); window.location.reload();">
       <?= t("Close") ?>
     </button>
   </span>
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index 564de393..765c2a35 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -59,7 +59,7 @@ function editInPlace(element) {
           closeEditInPlaceForms(); // close form
           $("#gTag-" + data.tag_id).text(data.new_tagname); // update tagname
           console.log(data);
-          $.gallery_reload();
+          window.location.reload();
         }
       }
     });
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 63fc45b5..d27f9260 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -21,8 +21,6 @@
    <?= $theme->script("jquery.form.js") ?>
    <?= $theme->script("jquery-ui.js") ?>
    <?= $theme->script("gallery.common.js") ?>
-   <? /* Themes can override this to provide custom refresh handling */ ?>
-   <?= $theme->script("gallery.reload.js") ?>
    <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
    <script type="text/javascript">
    var MSG_CANCEL = "<?= t('Cancel') ?>";
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 5865e4cc..66282bae 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -49,8 +49,6 @@
     <?= $theme->script("jquery.form.js") ?>
     <?= $theme->script("jquery-ui.js") ?>
     <?= $theme->script("gallery.common.js") ?>
-    <? /* Themes can override this to provide custom refresh handling */ ?>
-    <?= $theme->script("gallery.reload.js") ?>
     <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
     <script type="text/javascript">
     var MSG_CANCEL = "<?= t('Cancel') ?>";
-- 
cgit v1.2.3


From e8c57290a2e98e3cbb7cf47875e6e5dae2e41fa2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 5 Aug 2009 10:38:53 -0700
Subject: Change the children and descendants APIs to be more consistent and to
 remove Gallery3 concepts from ORM_MPTT.

The following API methods:
  ORM_MPTT::children
  ORM_MPTT::children_count
  ORM_MPTT::descendants
  ORM_MPTT::descendants_count

All now take a $where clause that allow you to pass through additional
field parameters.

old API:
  $album->children(10, 0, "photos")
  $album->children_count("photos")

new API:
  $album->children(10, 0, array("type" => "photos"))
  $album->children_count(array("type" => "photos"))

This gives us a more flexible API and simplifies the code.  While I
was in there, I changed the way we deal with default orderby values so
that we just assign the default value in the function definition,
which allows us to get rid of all conditionals in the implementation
which results in simpler code.
---
 modules/gallery/helpers/gallery_rss.php |  5 ++-
 modules/gallery/libraries/ORM_MPTT.php  | 69 +++++++++++++--------------------
 modules/gallery/models/item.php         | 25 +++++++-----
 modules/gallery/tests/ORM_MPTT_Test.php |  8 ++--
 4 files changed, 51 insertions(+), 56 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index 7daf6170..8e887368 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -50,8 +50,9 @@ class gallery_rss_Core {
 
       $feed->children = $item
         ->viewable()
-        ->descendants($limit, $offset, "photo");
-      $feed->max_pages = ceil($item->viewable()->descendants_count("photo") / $limit);
+        ->descendants($limit, $offset, array("type" => "photo"));
+      $feed->max_pages = ceil(
+        $item->viewable()->descendants_count(array("type" => "photo")) / $limit);
       $feed->title = p::purify($item->title);
       $feed->link = url::abs_site("albums/{$item->id}");
       $feed->description = nl2br(p::purify($item->description));
diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index cde049cd..9d716d8b 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -146,35 +146,30 @@ class ORM_MPTT_Core extends ORM {
    * @chainable
    * @param   integer  SQL limit
    * @param   integer  SQL offset
-   * @param   string   type to return
+   * @param   array    additional where clauses
    * @param   array    orderby
    * @return array ORM
    */
-  function children($limit=null, $offset=0, $type=null, $orderby=null) {
-    $this->where("parent_id", $this->id);
-    if ($type) {
-      $this->where("type", $type);
-    }
-    if (empty($orderby)) {
-      $this->orderby("id", "ASC");
-    } else {
-      $this->orderby($orderby);
-    }
-    return $this->find_all($limit, $offset);
+  function children($limit=null, $offset=0, $where=array(), $orderby=array("id", "ASC")) {
+    return $this
+      ->where("parent_id", $this->id)
+      ->where($where)
+      ->orderby($orderby)
+      ->find_all($limit, $offset);
   }
 
   /**
    * Return all of the children of this node, ordered by id.
    *
    * @chainable
-   * @param   string  type to return
+   * @param   array    additional where clauses
    * @return array ORM
    */
-  function children_count($type=null) {
-    if ($type) {
-      $this->where("type", $type);
-    }
-    return $this->where("parent_id", $this->id)->count_all();
+  function children_count($where=array()) {
+    return $this
+      ->where($where)
+      ->where("parent_id", $this->id)
+      ->count_all();
   }
 
   /**
@@ -182,39 +177,31 @@ class ORM_MPTT_Core extends ORM {
    *
    * @param   integer  SQL limit
    * @param   integer  SQL offset
-   * @param   string   type to return
+   * @param   array    additional where clauses
    * @param   array    orderby
    * @return object ORM_Iterator
    */
-  function descendants($limit=null, $offset=0, $type=null, $orderby=null) {
-    $this->where("left_ptr >", $this->left_ptr)
-      ->where("right_ptr <=", $this->right_ptr);
-    if ($type) {
-      $this->where("type", $type);
-    }
-
-    if (empty($orderby)) {
-      $this->orderby("id", "ASC");
-    } else {
-      $this->orderby($orderby);
-    }
-
-    return $this->find_all($limit, $offset);
+  function descendants($limit=null, $offset=0, $where=array(), $orderby=array("id", "ASC")) {
+    return $this
+      ->where("left_ptr >", $this->left_ptr)
+      ->where("right_ptr <=", $this->right_ptr)
+      ->where($where)
+      ->orderby($orderby)
+      ->find_all($limit, $offset);
   }
 
   /**
    * Return the count of all the children of the specified type.
    *
-   * @param   string   type to count
+   * @param    array    additional where clauses
    * @return   integer  child count
    */
-  function descendants_count($type=null) {
-    $this->where("left_ptr >", $this->left_ptr)
-      ->where("right_ptr <=", $this->right_ptr);
-    if ($type) {
-      $this->where("type", $type);
-    }
-    return $this->count_all();
+  function descendants_count($where=array()) {
+    return $this
+      ->where("left_ptr >", $this->left_ptr)
+      ->where("right_ptr <=", $this->right_ptr)
+      ->where($where)
+      ->count_all();
   }
 
   /**
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 3498e0db..c4b9826f 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -521,31 +521,38 @@ class Item_Model extends ORM_MPTT {
   }
 
   /**
-   * Return all of the children of this node, ordered by the defined sort order.
+   * Return all of the children of this album.  Unless you specify a specific sort order, the
+   * results will be ordered by this album's sort order.
    *
    * @chainable
    * @param   integer  SQL limit
    * @param   integer  SQL offset
-   * @param   string   type to return
+   * @param   array    additional where clauses
    * @param   array    orderby
    * @return array ORM
    */
-  function children($limit=null, $offset=0, $type=null,  $orderby=null) {
+  function children($limit=null, $offset=0, $where=array(), $orderby=null) {
     if (empty($orderby)) {
       $orderby = array($this->sort_column => $this->sort_order);
     }
-    return parent::children($limit, $offset, $type, $orderby);
+    return parent::children($limit, $offset, $where, $orderby);
   }
 
   /**
-   * Return all of the children of the specified type, ordered by the defined sort order.
+   * Return the children of this album, and all of it's sub-albums.  Unless you specify a specific
+   * sort order, the results will be ordered by this album's sort order.  Note that this
+   * album's sort order is imposed on all sub-albums, regardless of their sort order.
+   *
+   * @chainable
    * @param   integer  SQL limit
    * @param   integer  SQL offset
-   * @param   string   type to return
+   * @param   array    additional where clauses
    * @return object ORM_Iterator
    */
-  function descendants($limit=null, $offset=0, $type=null) {
-    return parent::descendants($limit, $offset, $type,
-                               array($this->sort_column => $this->sort_order));
+  function descendants($limit=null, $offset=0, $where=array(), $orderby=null) {
+    if (empty($orderby)) {
+      $orderby = array($this->sort_column => $this->sort_order);
+    }
+    return parent::descendants($limit, $offset, $where, $orderby);
   }
 }
diff --git a/modules/gallery/tests/ORM_MPTT_Test.php b/modules/gallery/tests/ORM_MPTT_Test.php
index 943810c3..f77f1f34 100644
--- a/modules/gallery/tests/ORM_MPTT_Test.php
+++ b/modules/gallery/tests/ORM_MPTT_Test.php
@@ -177,8 +177,8 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $parent->reload();
 
     $this->assert_equal(3, $parent->descendants()->count());
-    $this->assert_equal(2, $parent->descendants(null, 0, "photo")->count());
-    $this->assert_equal(1, $parent->descendants(null, 0, "album")->count());
+    $this->assert_equal(2, $parent->descendants(null, 0, array("type" => "photo"))->count());
+    $this->assert_equal(1, $parent->descendants(null, 0, array("type" => "album"))->count());
   }
 
   public function descendant_limit_test() {
@@ -215,7 +215,7 @@ class ORM_MPTT_Test extends Unit_Test_Case {
     $parent->reload();
 
     $this->assert_equal(3, $parent->descendants_count());
-    $this->assert_equal(2, $parent->descendants_count("photo"));
-    $this->assert_equal(1, $parent->descendants_count("album"));
+    $this->assert_equal(2, $parent->descendants_count(array("type" => "photo")));
+    $this->assert_equal(1, $parent->descendants_count(array("type" => "album")));
   }
 }
-- 
cgit v1.2.3


From b394b0b2c67d680fad61880a01885e8b2c750ce5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 5 Aug 2009 11:01:48 -0700
Subject: Fix the default $orderby to be an associative array in descendants()
 and children(), thanks Tim!

---
 modules/gallery/libraries/ORM_MPTT.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 9d716d8b..a7defba9 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -150,7 +150,7 @@ class ORM_MPTT_Core extends ORM {
    * @param   array    orderby
    * @return array ORM
    */
-  function children($limit=null, $offset=0, $where=array(), $orderby=array("id", "ASC")) {
+  function children($limit=null, $offset=0, $where=array(), $orderby=array("id" => "ASC")) {
     return $this
       ->where("parent_id", $this->id)
       ->where($where)
@@ -181,7 +181,7 @@ class ORM_MPTT_Core extends ORM {
    * @param   array    orderby
    * @return object ORM_Iterator
    */
-  function descendants($limit=null, $offset=0, $where=array(), $orderby=array("id", "ASC")) {
+  function descendants($limit=null, $offset=0, $where=array(), $orderby=array("id" => "ASC")) {
     return $this
       ->where("left_ptr >", $this->left_ptr)
       ->where("right_ptr <=", $this->right_ptr)
-- 
cgit v1.2.3


From b826182b7a7b2d630b478d3e2bcf0628989a92d9 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 6 Aug 2009 22:22:24 +0800
Subject: Cleanup the javascript for enabling dialog or panel links. 1) We
 don't need to loop over the elements to bind the event handler. 2) Just
 include gallery.panel.js for all the admin pages.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/helpers/gallery_theme.php |  1 +
 modules/user/helpers/user_theme.php       |  6 ------
 themes/admin_default/js/ui.init.js        | 12 +++---------
 themes/default/js/ui.init.js              |  5 +----
 4 files changed, 5 insertions(+), 19 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index d3751b80..903827cc 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -78,6 +78,7 @@ class gallery_theme_Core {
   }
 
   static function admin_head($theme) {
+    $theme->script("gallery.panel.js");
     $session = Session::instance();
     if ($session->get("debug")) {
       $theme->css("debug.css");
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index c5351f8e..69042aed 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -23,10 +23,4 @@ class user_theme_Core {
     $view->user = user::active();
     return $view->render();
   }
-
-  static function admin_head($theme) {
-    if (strpos(Router::$current_uri, "admin/users") !== false) {
-      $theme->script("gallery.panel.js");
-    }
-  }
 }
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index 3f062a27..06cc1cd5 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -1,5 +1,5 @@
 $(document).ready(function(){
-  
+
   // Initialize Superfish menus
   $("#gSiteAdminMenu ul.gMenu").addClass("sf-menu");
   $("ul.gMenu").addClass("sf-menu");
@@ -18,16 +18,10 @@ $(document).ready(function(){
   $("#gMessage li").showMessage();
 
   // Initialize modal dialogs
-  var dialogLinks = $(".gDialogLink");
-  for (var i=0; i < dialogLinks.length; i++) {
-    $(dialogLinks[i]).bind("click", handleDialogEvent);
-  }
+  $(".gDialogLink").bind("click", handleDialogEvent);
 
   // Initialize panels
-  var panelLinks = $(".gPanelLink");
-  for (i=0; i<panelLinks.length; i++) {
-    $(panelLinks[i]).bind("click", handlePanelEvent);
-  }
+  $(".gPanelLink").bind("click", handlePanelEvent);
 
   if ($("#gPhotoStream").length) {
     // Vertically align thumbs in photostream
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 11cd06ed..ff76c79c 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -34,10 +34,7 @@ $(document).ready(function() {
   // Initialize dialogs
   $(".gMenuLink").addClass("gDialogLink");
   $("#gLoginLink").addClass("gDialogLink");
-  var dialogLinks = $(".gDialogLink");
-  for (var i=0; i < dialogLinks.length; i++) {
-    $(dialogLinks[i]).bind("click", handleDialogEvent);
-  }
+  $(".gDialogLink").bind("click", handleDialogEvent);
 
   // Initialize view menu
   if ($("#gViewMenu").length) {
-- 
cgit v1.2.3


From a302a9c3fa7ec8d11373dc5eeb9c94400a255b1a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 7 Aug 2009 23:58:57 +0800
Subject: Refactor the gallery dialog into a jQuery widget

Signed-off-by: Bharat Mediratta <bharat@menalto.com>
---
 lib/gallery.common.js                              |  27 ++-
 lib/gallery.dialog.js                              | 252 ++++++++++-----------
 modules/gallery/views/after_install.html.php       |   2 +-
 .../views/server_add_tree_dialog.html.php          |   5 +-
 modules/tag/js/tag.js                              |   2 +-
 modules/user/views/admin_users.html.php            |   2 +-
 themes/admin_default/js/ui.init.js                 |   2 +-
 themes/default/js/ui.init.js                       |   2 +-
 8 files changed, 155 insertions(+), 139 deletions(-)

(limited to 'modules/gallery')

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 1eaa6db2..e063462e 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -2,17 +2,15 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-(function () {
+(function ($) {
   $.fn.showMessage = function(message) {
     return this.each(function(i){
       $(this).effect("highlight", {"color": "white"}, 3000);
       $(this).animate({opacity: 1.0}, 6000);
     });
   };
-})(jQuery);
 
 // Vertically align a block element's content
-(function () {
   $.fn.vAlign = function(container) {
     return this.each(function(i){
       if (container == null) {
@@ -26,10 +24,8 @@
       $(el).css('margin-top', nh);
     });
   };
-})(jQuery);
 
 // Get the viewport size
-(function () {
   $.getViewportSize = function() {
     return {
       width : function() {
@@ -40,4 +36,25 @@
       }
     };
   };
+
+  /**
+   * Toggle the processing indicator, both large and small
+   * @param elementID Target ID, including #, to apply .gLoadingSize
+   */
+  $.fn.showLoading = function() {
+    return this.each(function(i){
+      var size;
+      switch ($(this).attr("id")) {
+      case "#gDialog":
+        case "#gPanel":
+          size = "Large";
+        break;
+      default:
+        size = "Small";
+        break;
+      }
+      $(this).toggleClass("gLoading" + size);
+    });
+  };
+
 })(jQuery);
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 74c2f20e..7e0ba1b4 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -1,140 +1,136 @@
-/**
- * Fire openDialog() and prevent links from opening
- * @see openDialog()
- */
-function handleDialogEvent(event) {
-  var target = event.currentTarget;
-  if (!target) {
-    target = event.srcElement;
-  }
-  openDialog(target);
-  event.preventDefault();
-}
+(function($) {
+   $.widget("ui.galleryDialog",  {
+     _init: function() {
+       var self = this;
+       this.element.click(function(event){
+         event.preventDefault();
+         var element = event.currentTarget;
+         var sHref = $(element).attr("href");
+         var sTitle = $(element).attr("title");
+         var eDialog = '<div id="gDialog"></div>';
 
-function ajaxify_dialog() {
-  $("#gDialog form").ajaxForm({
-    dataType: "json",
-    success: function(data) {
-      if (data.form) {
-        $("#gDialog form").replaceWith(data.form);
-        ajaxify_dialog();
-        on_form_loaded();
-        if (typeof data.reset == 'function') {
-          eval(data.reset + '()');
-        }
-      }
-      if (data.result == "success") {
-	if (data.location) {
-          window.location = data.location;
-        } else {
-          window.location.reload();
-        }
-      }
-    }
-  });
-};
+         $("body").append(eDialog);
+
+         if (!self.options.close) {
+           self.options.close = self.closeDialog;
+         }
+         $("#gDialog").dialog(self.options);
 
-/**
- * Display modal dialogs, populate dialog with trigger link's href
- * @requires ui.core
- * @requires ui.draggable
- * @requires ui.resizable
- * @requires ui.dialog
- * @see handleDialogEvent()
- * @see showLoading()
- */
-function openDialog(element) {
-  var sHref = $(element).attr("href");
-  var sTitle = $(element).attr("title");
-  var eDialog = '<div id="gDialog"></div>';
-  var dialogWidth;
+         $("#gDialog").showLoading();
 
-  $("body").append(eDialog);
+         $.get(sHref, function(data) {
+           $("#gDialog").html(data).showLoading();
 
-  $("#gDialog").dialog({
-    autoOpen: false,
-    autoResize: true,
-    modal: true,
-    resizable: false,
-    close: closeDialog
-  });
+           if ($("#gDialog form").length) {
+             self._trigger("form_loaded", null, $("#gDialog form"));
+           }
+           self._layout();
 
-  showLoading("#gDialog");
+           $("#gDialog").dialog("open");
+           // Remove titlebar for progress dialogs or set title
+           if ($("#gDialog #gProgress").length) {
+             $(".ui-dialog-titlebar").remove();
+           } else if ($("#gDialog h1").length) {
+             $("#gDialog").dialog('option', 'title', $("#gDialog h1:eq(0)").html());
+           } else if ($("#gDialog fieldset legend").length) {
+             $("#gDialog").dialog('option', 'title', $("#gDialog fieldset legend:eq(0)").html());
+           }
 
-  $.get(sHref, function(data) {
-    showLoading("#gDialog");
-    $("#gDialog").html(data);
-    var dialogHeight = $("#gDialog").height();
-    var cssWidth = new String($("#gDialog form").css("width"));
-    var childWidth = cssWidth.replace(/[^0-9]/g,"");
-    if ($("#gDialog iframe").length) {
-      dialogWidth = $(window).width() - 100;
-      // Set the iframe width and height
-      $("#gDialog iframe").width("100%");
-      $("#gDialog iframe").height($(window).height() - 100);
-    } else if (childWidth == "" || childWidth > 300) {
-      dialogWidth = 500;
-    }
-    $("#gDialog").dialog('option', 'width', dialogWidth);
+           if ($("#gDialog form").length) {
+             self._ajaxify_dialog();
+           }
+         });
+         $("#gDialog").dialog("option", "self", self);
+         return false;
+       });
+     },
 
-    on_form_loaded();
+     destroy: function() {
+       if ($("#gDialog form").length) {
+         this._trigger("form_closing", null, $("#gDialog form"));
+       }
+       this._trigger("dialog_closing", null, $("#gDialog"));
 
-    $("#gDialog").dialog("open");
-    // Remove titlebar for progress dialogs or set title
-    if ($("#gDialog #gProgress").length) {
-      $(".ui-dialog-titlebar").remove();
-    } else if ($("#gDialog h1").length) {
-      $("#gDialog").dialog('option', 'title', $("#gDialog h1:eq(0)").html());
-    } else if ($("#gDialog fieldset legend").length) {
-      $("#gDialog").dialog('option', 'title', $("#gDialog fieldset legend:eq(0)").html());
-    }
+       $("#gDialog").dialog("destroy").remove();
+     },
+
+     _layout: function() {
+       var dialogWidth;
+       var dialogHeight = $("#gDialog").height();
+       var cssWidth = new String($("#gDialog form").css("width"));
+       var childWidth = cssWidth.replace(/[^0-9]/g,"");
+       if ($("#gDialog iframe").length) {
+         dialogWidth = $(window).width() - 100;
+         // Set the iframe width and height
+         $("#gDialog iframe").width("100%").height($(window).height() - 100);
+       } else if (childWidth == "" || childWidth > 300) {
+         dialogWidth = 500;
+       }
+       $("#gDialog").dialog('option', 'width', dialogWidth);
+     },
+
+     form_loaded: function event(event, ui) {
+       // Should be defined (and localized) in the theme
+       MSG_CANCEL = MSG_CANCEL || 'Cancel';
+       var eCancel = '<a href="#" class="gCancel">' + MSG_CANCEL + '</a>';
+       if ($("#gDialog .submit").length) {
+         $("#gDialog .submit").addClass("ui-state-default ui-corner-all");
+         $("#gDialog .submit").parent().append(eCancel);
+         $("#gDialog .gCancel").click(function(event) {
+           $("gDialog").dialog("close");
+           event.preventDefault();
+         });
+        }
+       $("#gDialog .ui-state-default").hover(
+         function() {
+           $(this).addClass("ui-state-hover");
+         },
+         function() {
+           $(this).removeClass("ui-state-hover");
+         }
+       );
+     },
 
-    ajaxify_dialog();
-  });
-  return false;
-}
+     closeDialog: function (event, ui) {
+       var self = $("#gDialog").dialog("option", "self");
+       self.destroy();
+     },
 
-function on_form_loaded() {
-  // Should be defined (and localized) in the theme
-  MSG_CANCEL = MSG_CANCEL || 'Cancel';
-  var eCancel = '<a href="javascript: closeDialog()" class="gCancel">' + MSG_CANCEL + '</a>';
-  if ($("#gDialog .submit").length) {
-    $("#gDialog .submit").addClass("ui-state-default ui-corner-all");
-    $("#gDialog .submit").parent().append(eCancel);
-  }
-  $("#gDialog").dialog("option", "form", $("#gDialog form"));
-  $("#gDialog .ui-state-default").hover(
-    function() {
-      $(this).addClass("ui-state-hover");
-    },
-    function() {
-      $(this).removeClass("ui-state-hover");
-    }
-  );
-}
+     _ajaxify_dialog: function() {
+       var self = this;
+       $("#gDialog form").ajaxForm({
+         dataType: "json",
+         success: function(data) {
+           if (data.form) {
+             $("#gDialog form").replaceWith(data.form);
+             self._ajaxify_dialog();
+             self._trigger("form_loaded", null, $("#gDialog form"));
+             if (typeof data.reset == 'function') {
+               eval(data.reset + '()');
+             }
+           }
+           if (data.result == "success") {
+	     if (data.location) {
+               window.location = data.location;
+             } else {
+               window.location.reload();
+             }
+           }
+         }
+       });
+     },
 
-function closeDialog() {
-  var form = $("#gDialog").dialog("option", "form");
-  if (form != null) {
-    $("#gDialog").dialog("option", "form").trigger("form_closing");
-  }
-  $("#gDialog").dialog("destroy").remove();
-}
+     form_closing: function(event, ui) {},
+     dialog_closing: function(event, ui) {}
+   });
 
-/**
- * Toggle the processing indicator, both large and small
- * @param elementID Target ID, including #, to apply .gLoadingSize
- */
-function showLoading(elementID) {
-  var size;
-  switch (elementID) {
-    case "#gDialog":
-    case "#gPanel":
-      size = "Large";
-      break;
-    default:
-      size = "Small";
-      break;
-  }
-  $(elementID).toggleClass("gLoading" + size);
-}
+   $.extend($.ui.galleryDialog,  {
+     defaults: {
+       autoOpen: false,
+       autoResize: true,
+       modal: true,
+       resizable: false,
+       position: "center"
+     }
+   });
+})(jQuery);
diff --git a/modules/gallery/views/after_install.html.php b/modules/gallery/views/after_install.html.php
index e4842163..feb2d281 100644
--- a/modules/gallery/views/after_install.html.php
+++ b/modules/gallery/views/after_install.html.php
@@ -16,7 +16,7 @@
     title="<?= t("Edit Your Profile") ?>"
     id="gAfterInstallChangePasswordLink" class="gButtonLink ui-state-default ui-corners-all"><?= t("Change Password Now") ?></a>
   <script>
-    $("#gAfterInstallChangePasswordLink").bind("click", handleDialogEvent);
+    $("#gAfterInstallChangePasswordLink").galleryDialog();
   </script>
 </p>
 
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 21952849..5c5dfd0f 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -34,7 +34,7 @@
       <?= t("Add") ?>
     </button>
 
-    <button class="ui-state-default ui-corner-all" onclick="closeDialog(); window.location.reload();">
+    <button id="gServerCloseButton" class="ui-state-default ui-corner-all">
       <?= t("Close") ?>
     </button>
   </span>
@@ -48,6 +48,9 @@
            progressbar("value", 0);
          $("#gProgress").slideDown("fast", function() { start_add() });
       });
+      $("#gServerCloseButton").click(function(event) {
+        $("#gDialog").dialog("close");
+      });
     });
   </script>
 
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index 765c2a35..535582c5 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -23,7 +23,7 @@ function closeEditInPlaceForms() {
     $("#gRenameTagForm").parent().html($("#gRenameTagForm").parent().data("revert"));
     li.height("");
     $(".gEditable", li).bind("click", editInPlace);
-    $(".gDialogLink", li).bind("click", handleDialogEvent);
+    $(".gDialogLink", li).galleryDialog();
   }
 }
 
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 542b8b8b..a487d565 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -28,7 +28,7 @@
           {},
           function(data) {
             $("#group-" + group_id).html(data);
-            $("#group-" + group_id + " .gDialogLink").bind("click", handleDialogEvent);
+            $("#group-" + group_id + " .gDialogLink").galleryDialog());
           });
   }
 
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index 63b74300..eea3cab2 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -17,7 +17,7 @@ $(document).ready(function(){
   $("#gMessage li").showMessage();
 
   // Initialize modal dialogs
-  $(".gDialogLink").bind("click", handleDialogEvent);
+  $(".gDialogLink").galleryDialog();
 
   // Initialize panels
   $(".gPanelLink").galleryPanel();
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index ff76c79c..33d04328 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -34,7 +34,7 @@ $(document).ready(function() {
   // Initialize dialogs
   $(".gMenuLink").addClass("gDialogLink");
   $("#gLoginLink").addClass("gDialogLink");
-  $(".gDialogLink").bind("click", handleDialogEvent);
+  $(".gDialogLink").galleryDialog();
 
   // Initialize view menu
   if ($("#gViewMenu").length) {
-- 
cgit v1.2.3


From 445a8fb1b6b6f410d1ea432da6d704bf2f59a14d Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 8 Aug 2009 01:47:56 +0800
Subject: Change galleryPanel and galleryDialog widgets to gallery_panel and
 gallery_dialog respectively

Signed-off-by: Bharat Mediratta <bharat@menalto.com>
---
 lib/gallery.dialog.js                        | 8 ++++----
 lib/gallery.panel.js                         | 2 +-
 modules/gallery/views/after_install.html.php | 2 +-
 modules/tag/js/tag.js                        | 2 +-
 modules/user/views/admin_users.html.php      | 2 +-
 themes/admin_default/js/ui.init.js           | 4 ++--
 themes/default/js/ui.init.js                 | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'modules/gallery')

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 7e0ba1b4..04ab44de 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -1,5 +1,5 @@
 (function($) {
-   $.widget("ui.galleryDialog",  {
+   $.widget("ui.gallery_dialog",  {
      _init: function() {
        var self = this;
        this.element.click(function(event){
@@ -12,7 +12,7 @@
          $("body").append(eDialog);
 
          if (!self.options.close) {
-           self.options.close = self.closeDialog;
+           self.options.close = self.close_dialog;
          }
          $("#gDialog").dialog(self.options);
 
@@ -91,7 +91,7 @@
        );
      },
 
-     closeDialog: function (event, ui) {
+     close_dialog: function (event, ui) {
        var self = $("#gDialog").dialog("option", "self");
        self.destroy();
      },
@@ -124,7 +124,7 @@
      dialog_closing: function(event, ui) {}
    });
 
-   $.extend($.ui.galleryDialog,  {
+   $.extend($.ui.gallery_dialog,  {
      defaults: {
        autoOpen: false,
        autoResize: true,
diff --git a/lib/gallery.panel.js b/lib/gallery.panel.js
index 98d78d2a..e0bf4259 100644
--- a/lib/gallery.panel.js
+++ b/lib/gallery.panel.js
@@ -1,5 +1,5 @@
 (function($) {
-   $.widget("ui.galleryPanel", {
+   $.widget("ui.gallery_panel", {
      _init: function() {
        var self = this;
        this.element.click(function(event) {
diff --git a/modules/gallery/views/after_install.html.php b/modules/gallery/views/after_install.html.php
index feb2d281..bfce46f0 100644
--- a/modules/gallery/views/after_install.html.php
+++ b/modules/gallery/views/after_install.html.php
@@ -16,7 +16,7 @@
     title="<?= t("Edit Your Profile") ?>"
     id="gAfterInstallChangePasswordLink" class="gButtonLink ui-state-default ui-corners-all"><?= t("Change Password Now") ?></a>
   <script>
-    $("#gAfterInstallChangePasswordLink").galleryDialog();
+    $("#gAfterInstallChangePasswordLink").gallery_dialog();
   </script>
 </p>
 
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index 535582c5..61ac73f4 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -23,7 +23,7 @@ function closeEditInPlaceForms() {
     $("#gRenameTagForm").parent().html($("#gRenameTagForm").parent().data("revert"));
     li.height("");
     $(".gEditable", li).bind("click", editInPlace);
-    $(".gDialogLink", li).galleryDialog();
+    $(".gDialogLink", li).gallery_dialog();
   }
 }
 
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index a487d565..9bd4c068 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -28,7 +28,7 @@
           {},
           function(data) {
             $("#group-" + group_id).html(data);
-            $("#group-" + group_id + " .gDialogLink").galleryDialog());
+            $("#group-" + group_id + " .gDialogLink").gallery_dialog();
           });
   }
 
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index eea3cab2..89dd5b47 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -17,10 +17,10 @@ $(document).ready(function(){
   $("#gMessage li").showMessage();
 
   // Initialize modal dialogs
-  $(".gDialogLink").galleryDialog();
+  $(".gDialogLink").gallery_dialog();
 
   // Initialize panels
-  $(".gPanelLink").galleryPanel();
+  $(".gPanelLink").gallery_panel();
 
   if ($("#gPhotoStream").length) {
     // Vertically align thumbs in photostream
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 33d04328..4b876c66 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -34,7 +34,7 @@ $(document).ready(function() {
   // Initialize dialogs
   $(".gMenuLink").addClass("gDialogLink");
   $("#gLoginLink").addClass("gDialogLink");
-  $(".gDialogLink").galleryDialog();
+  $(".gDialogLink").gallery_dialog();
 
   // Initialize view menu
   if ($("#gViewMenu").length) {
-- 
cgit v1.2.3