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.
---
 themes/default/views/page.html.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'themes/default')

diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 66282bae..5865e4cc 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -49,6 +49,8 @@
     <?= $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 52147cf6f857c4c54a2f3d753e72b27b5141d028 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 3 Aug 2009 21:45:54 -0700
Subject: Combine the quick menu and the thumb menu into a single menu called
 the "context" menu.

This new context menu is generated using the typical event processing
system, like our other menus.  The specialized quick CSS and JS is now
gone, replaced by our generic menu handling code.  It's all rolled
together currently using the thumb_menu UI for easy packaging.  All
the CSS and JS is updated.

NOTE: the non-dialog links (rotate, album_cover) have a broken UI
because they return JSON which the quick.js code handled specially,
but we don't handle properly now.  I need to fix this.
---
 modules/digibug/helpers/digibug_event.php |   4 +-
 modules/gallery/controllers/quick.php     |  14 ---
 modules/gallery/css/quick.css             |  52 ----------
 modules/gallery/helpers/gallery.php       | 102 ++++++++++++++++++++
 modules/gallery/helpers/gallery_quick.php | 152 ------------------------------
 modules/gallery/helpers/gallery_theme.php |  31 ------
 modules/gallery/helpers/module.php        |   8 +-
 modules/gallery/js/quick.js               |  78 ---------------
 modules/gallery/libraries/Menu.php        |   4 +-
 modules/gallery/libraries/Theme_View.php  |  10 +-
 modules/gallery/views/quick_pane.html.php |  26 -----
 themes/default/css/fix-ie.css             |   4 -
 themes/default/css/screen.css             |   9 +-
 themes/default/js/ui.init.js              |  31 ++----
 themes/default/views/album.html.php       |   2 +-
 15 files changed, 131 insertions(+), 396 deletions(-)
 delete mode 100644 modules/gallery/css/quick.css
 delete mode 100644 modules/gallery/helpers/gallery_quick.php
 delete mode 100644 modules/gallery/js/quick.js
 delete mode 100644 modules/gallery/views/quick_pane.html.php

(limited to 'themes/default')

diff --git a/modules/digibug/helpers/digibug_event.php b/modules/digibug/helpers/digibug_event.php
index c4f9e560..efe66a0f 100644
--- a/modules/digibug/helpers/digibug_event.php
+++ b/modules/digibug/helpers/digibug_event.php
@@ -36,9 +36,9 @@ class digibug_event_Core {
       ->css_id("gDigibugLink"));
   }
 
-  static function thumb_menu($menu, $theme, $item) {
+  static function context_menu($menu, $theme, $item) {
     if ($item->type == "photo") {
-      $menu->get("options_menu")
+      $menu
         ->append(
           Menu::factory("link")
           ->id("digibug")
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index de027c1b..82176e02 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -18,20 +18,6 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Quick_Controller extends Controller {
-  public function pane($id) {
-    $item = model_cache::get("item", $id);
-    if (!access::can("view", $item) || !access::can("edit", $item)) {
-      return "";
-    }
-
-    $view = new View("quick_pane.html");
-    $page_type = Input::instance()->get("page_type");
-    $view->button_list = gallery_quick::get_quick_buttons($item, $page_type);
-    $view->item = $item;
-    $view->page_type = $page_type;
-    print $view;
-  }
-
   public function rotate($id, $dir) {
     access::verify_csrf();
     $item = model_cache::get("item", $id);
diff --git a/modules/gallery/css/quick.css b/modules/gallery/css/quick.css
deleted file mode 100644
index f153d475..00000000
--- a/modules/gallery/css/quick.css
+++ /dev/null
@@ -1,52 +0,0 @@
-.gQuickPane {
-  position: absolute;
-  top: 0;
-  left: 0;
-  text-align: center;
-  width: 100%;
-  height: auto;
-}
-
-.gItem:hover {
-  background-color: #cfdeff;
-}
-
-.gQuick {
-  border: none !important;
-  margin: 0 !important;
-  padding: 0 !important;
-}
-
-.gQuickPane {
-  background: #000;
-  border-bottom: 1px solid #ccc;
-  opacity: 0.9;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-.gQuickPane a {
-  cursor: pointer;
-  float: left;
-  margin: 4px;
-}
-
-.gQuickPaneOptions {
-  background: #000;
-  float: left;
-  width: 100%;
-}
-
-.gQuickPaneOptions li a {
-  display: block;
-  float: none;
-  width: auto;
-  margin: 0;
-  padding: .5em .5em .5em .8em;
-  text-align: left;
-}
-
-.gQuickPaneOptions li a:hover {
-  background-color: #4d4d4d;
-}
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 476e9cbe..085965a2 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -196,4 +196,106 @@ class gallery_Core {
                ->url(url::site("admin/maintenance")));
     return $menu;
   }
+
+  static function context_menu($menu, $theme, $item, $page_type) {
+    switch ($item->type) {
+    case "movie":
+      $edit_title = t("Edit this movie");
+      $move_title = t("Move this movie to another album");
+      $cover_title = t("Choose this movie as the album cover");
+      $delete_title = t("Delete this movie");
+      break;
+
+    case "album":
+      $edit_title = t("Edit this album");
+      $move_title = t("Move this album to another album");
+      $cover_title = t("Choose this album as the album cover");
+      $delete_title = t("Delete this album");
+      break;
+
+    default:
+      $edit_title = t("Edit this photo");
+      $move_title = t("Move this photo to another album");
+      $cover_title = t("Choose this photo as the album cover");
+      $delete_title = t("Delete this photo");
+      break;
+    }
+
+    $csrf = access::csrf_token();
+    $menu->append(Menu::factory("dialog")
+                  ->id("edit")
+                  ->label($edit_title)
+                  ->css_clasS("ui-icon-pencil")
+                  ->url(url::site("quick/form_edit/$item->id?page_type=$page_type")));
+
+
+    if ($item->is_photo() && graphics::can("rotate")) {
+      $menu
+        ->append(Menu::factory("link")
+                  ->id("rotate_ccw")
+                 ->label(t("Rotate 90 degrees counter clockwise"))
+                 ->css_class("ui-icon-rotate-ccw")
+                 ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&page_type=$page_type")))
+        ->append(Menu::factory("link")
+                  ->id("rotate_cw")
+                 ->label(t("Rotate 90 degrees clockwise"))
+                 ->css_class("ui-icon-rotate-cw")
+                 ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type")));
+    }
+
+    // Don't move photos from the photo page; we don't yet have a good way of redirecting after move
+    if ($page_type == "album") {
+      $menu
+        ->append(Menu::factory("dialog")
+                 ->id("move")
+                 ->label($move_title)
+                 ->css_class("ui-icon-folder-open")
+                 ->url(url::site("move/browse/$item->id")));
+    }
+
+    $parent = $item->parent();
+    if (access::can("edit", $parent)) {
+      // We can't make this item the highlight if it's an album with no album cover, or if it's
+      // already the album cover.
+      if (($item->type == "album" && empty($item->album_cover_item_id)) ||
+          ($item->type == "album" && $parent->album_cover_item_id == $item->album_cover_item_id) ||
+          $parent->album_cover_item_id == $item->id) {
+        $disabledState = " ui-state-disabled";
+      } else {
+        $disabledState = " ";
+      }
+      $menu
+        ->append(Menu::factory("link")
+                 ->id("make_album_cover")
+                 ->label($cover_title)
+                 ->css_class($disabledState)
+                 ->url(
+                   url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type")))
+        ->append(Menu::factory("dialog")
+                 ->id("delete")
+                 ->label($delete_title)
+                 ->css_class("ui-icon-trash")
+                 ->css_id("gQuickDelete")
+                 ->url(url::site("quick/form_delete/$item->id?csrf=$csrf&page_type=$page_type")));
+    }
+
+    if ($item->is_album()) {
+      $menu
+        ->append(Menu::factory("dialog")
+                 ->id("add_item")
+                 ->label(t("Add a photo"))
+                 ->css_class("add_item")
+                 ->url(url::site("simple_uploader/app/$item->id")))
+        ->append(Menu::factory("dialog")
+                 ->id("add_album")
+                 ->label(t("Add an album"))
+                 ->css_class("add_album")
+                 ->url(url::site("form/add/albums/$item->id?type=album")))
+        ->append(Menu::factory("dialog")
+                 ->id("edit_permissions")
+                 ->label(t("Edit permissions"))
+                 ->css_class("permissions")
+                 ->url(url::site("permissions/browse/$item->id")));
+    }
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery_quick.php b/modules/gallery/helpers/gallery_quick.php
deleted file mode 100644
index 8a92890b..00000000
--- a/modules/gallery/helpers/gallery_quick.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?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 gallery_quick_Core {
-  static function get_quick_buttons($item, $page_type) {
-    $buttons = self::buttons($item, $page_type);
-    foreach (module::active() as $module) {
-      if ($module->name == "gallery") {
-        continue;
-      }
-      $class_name = "{$module->name}_quick";
-      if (method_exists($class_name, "buttons")) {
-        $module_buttons = call_user_func(array($class_name, "buttons"), $item, $page_type);
-        foreach (array("left", "center", "right", "additional") as $position) {
-          if (!empty($module_buttons[$position])) {
-            $buttons[$position] = array_merge($buttons[$position], $module_buttons[$position]);
-          }
-        }
-      }
-    }
-
-    $sorted_buttons->main = array();
-    foreach (array("left", "center", "right") as $position) {
-      $sorted_buttons->main = array_merge($sorted_buttons->main, $buttons[$position]);
-    }
-
-    $sorted_buttons->additional = $buttons["additional"];
-    $max_display = empty($sorted_buttons->additional) ? 6 : 5;
-    if (count($sorted_buttons->main) >= $max_display) {
-      $to_move = array_slice($sorted_buttons->main, 5);
-      $sorted_buttons->additional = array_merge($to_move, $sorted_buttons->additional);
-      for ($i = count($sorted_buttons->main); $i >= 5; $i--) {
-        unset($sorted_buttons->main[$i]);
-      }
-    }
-
-    return $sorted_buttons;
-  }
-
-  static function buttons($item, $page_type) {
-    $elements = array("left" => array(), "center" => array(), "right" => array(),
-                      "additional"  => array());
-    switch ($item->type) {
-    case "movie":
-      $edit_title = t("Edit this movie");
-      $move_title = t("Move this movie to another album");
-      $cover_title = t("Choose this movie as the album cover");
-      $delete_title = t("Delete this movie");
-      break;
-    case "album":
-      $edit_title = t("Edit this album");
-      $move_title = t("Move this album to another album");
-      $cover_title = t("Choose this album as the album cover");
-      $delete_title = t("Delete this album");
-      break;
-    default:
-      $edit_title = t("Edit this photo");
-      $move_title = t("Move this photo to another album");
-      $cover_title = t("Choose this photo as the album cover");
-      $delete_title = t("Delete this photo");
-      break;
-    }
-
-    $csrf = access::csrf_token();
-    $elements["left"][] = (object)array(
-      "title" => $edit_title,
-      "class" => "gDialogLink gButtonLink",
-      "icon" => "ui-icon-pencil",
-      "href" => url::site("quick/form_edit/$item->id?page_type=$page_type"));
-
-    if ($item->is_photo() && graphics::can("rotate")) {
-      $elements["left"][] =
-        (object)array(
-          "title" => t("Rotate 90 degrees counter clockwise"),
-          "class" => "gButtonLink",
-          "icon" => "ui-icon-rotate-ccw",
-          "href" => url::site("quick/rotate/$item->id/ccw?csrf=$csrf&page_type=$page_type"));
-      $elements["left"][] =
-        (object)array(
-          "title" => t("Rotate 90 degrees clockwise"),
-          "class" => "gButtonLink",
-          "icon" => "ui-icon-rotate-cw",
-          "href" => url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type"));
-    }
-
-    // Don't move photos from the photo page; we don't yet have a good way of redirecting after move
-    if ($page_type == "album") {
-      $elements["left"][] = (object)array(
-        "title" => $move_title,
-        "class" => "gDialogLink gButtonLink",
-        "icon" => "ui-icon-folder-open",
-        "href" => url::site("move/browse/$item->id"));
-    }
-
-    $parent = $item->parent();
-    if (access::can("edit", $parent)) {
-      // We can't make this item the highlight if it's an album with no album cover, or if it's
-      // already the album cover.
-      if (($item->type == "album" && empty($item->album_cover_item_id)) ||
-          ($item->type == "album" && $parent->album_cover_item_id == $item->album_cover_item_id) ||
-          $parent->album_cover_item_id == $item->id) {
-        $disabledState = " ui-state-disabled";
-      } else {
-        $disabledState = " ";
-      }
-      $elements["right"][] = (object)array(
-        "title" => $cover_title,
-        "class" => "gButtonLink$disabledState",
-        "icon" => "ui-icon-star",
-        "href" => url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type"));
-
-      $elements["right"][] = (object)array(
-        "title" => $delete_title,
-        "class" => "gDialogLink gButtonLink",
-        "icon" => "ui-icon-trash",
-        "id" => "gQuickDelete",
-        "href" => url::site("quick/form_delete/$item->id?csrf=$csrf&page_type=$page_type"));
-    }
-
-    if ($item->is_album()) {
-      $elements["additional"][] = (object)array(
-        "title" => t("Add a photo"),
-        "class" => "add_item gDialogLink",
-        "href" => url::site("simple_uploader/app/$item->id"));
-      $elements["additional"][] = (object)array(
-        "title" => t("Add an album"),
-        "class" => "add_album gDialogLink",
-        "href" => url::site("form/add/albums/$item->id?type=album"));
-      $elements["additional"][] = (object)array(
-        "title" => t("Edit permissions"),
-        "class" => "permissions gDialogLink",
-        "href" => url::site("permissions/browse/$item->id"));
-    }
-    return $elements;
-  }
-}
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index d3751b80..8fe1c768 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -24,11 +24,6 @@ class gallery_theme_Core {
     if ($session->get("debug")) {
       $theme->css("debug.css");
     }
-    if (($theme->page_type == "album" || $theme->page_type == "photo")
-        && access::can("edit", $theme->item())) {
-      $theme->css("quick.css");
-      $theme->script("quick.js");
-    }
 
     if (module::is_active("rss")) {
       if ($item = $theme->item()) {
@@ -51,32 +46,6 @@ class gallery_theme_Core {
     return $buf;
   }
 
-  static function resize_top($theme, $item) {
-    if (access::can("edit", $item)) {
-      $edit_link = url::site("quick/pane/$item->id?page_type=photo");
-      return "<div class=\"gQuick\" href=\"$edit_link\">";
-    }
-  }
-
-  static function resize_bottom($theme, $item) {
-    if (access::can("edit", $item)) {
-      return "</div>";
-    }
-  }
-
-  static function thumb_top($theme, $child) {
-    if (access::can("edit", $child)) {
-      $edit_link = url::site("quick/pane/$child->id?page_type=album");
-      return "<div class=\"gQuick\" href=\"$edit_link\">";
-    }
-  }
-
-  static function thumb_bottom($theme, $child) {
-    if (access::can("edit", $child)) {
-      return "</div>";
-    }
-  }
-
   static function admin_head($theme) {
     $session = Session::instance();
     if ($session->get("debug")) {
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 0d483206..03d538a9 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -274,11 +274,9 @@ class module_Core {
     array_shift($args);
     $function = str_replace(".", "_", $name);
 
-    foreach (self::$modules as $module) {
-      if (!$module->active) {
-        continue;
-      }
-
+    // @todo: consider calling gallery_event first, since for things menus we need it to do some
+    // setup
+    foreach (self::$active as $module) {
       $class = "{$module->name}_event";
       if (method_exists($class, $function)) {
         call_user_func_array(array($class, $function), $args);
diff --git a/modules/gallery/js/quick.js b/modules/gallery/js/quick.js
deleted file mode 100644
index fda6470f..00000000
--- a/modules/gallery/js/quick.js
+++ /dev/null
@@ -1,78 +0,0 @@
-$(document).ready(function() {
-  if ($("#gAlbumGrid").length) {
-    // @todo Add quick edit pane for album (meta, move, permissions, delete)
-    $(".gItem").hover(show_quick, function() {});
-  }
-  if ($("#gPhoto").length) {
-    $("#gPhoto").hover(show_quick, function() {});
-  }
-});
-
-var show_quick = function() {
-  var cont = $(this);
-  var quick = $(this).find(".gQuick");
-  var img = cont.find(".gThumbnail,.gResize");
-  cont.find(".gQuickPane").remove();
-  cont.append("<div class=\"gQuickPane\"></div>");
-  cont.find(".gQuickPane").hide();
-  cont.hover(function() {}, function() { cont.find(".gQuickPane").remove(); });
-  $.get(
-    quick.attr("href"),
-    {},
-    function(data, textStatus) {
-      cont.find(".gQuickPane").html(data).slideDown("fast");
-      $(".ui-state-default").hover(
-        function() {
-          $(this).addClass("ui-state-hover");
-        },
-        function() {
-          $(this).removeClass("ui-state-hover");
-        }
-      );
-      cont.find(".gQuickPane a:not(.options)").click(function(e) {
-        e.preventDefault();
-        quick_do(cont, $(this), img);
-      });
-      cont.find(".gQuickPane a.options").click(function(e) {
-        e.preventDefault();
-        cont.find(".gQuickPaneOptions").slideToggle("fast");
-      });
-    }
-  );
-};
-
-var quick_do = function(cont, pane, img) {
-  if (pane.hasClass("ui-state-disabled")) {
-    return false;
-  }
-  if (pane.hasClass("gDialogLink")) {
-    openDialog(pane);
-  } else {
-    img.css("opacity", "0.1");
-    cont.addClass("gLoadingLarge");
-    $.ajax({
-      type: "GET",
-      url: pane.attr("href"),
-      dataType: "json",
-      success: function(data) {
-        img.css("opacity", "1");
-        cont.removeClass("gLoadingLarge");
-        if (data.src) {
-          img.attr("width", data.width);
-          img.attr("height", data.height);
-          img.attr("src", data.src);
-          if (data.height > data.width) {
-            img.css("margin-top", -32);
-          } else {
-            img.css("margin-top", 0);
-          }
-        } else if (data.location) {
-          window.location = data.location;
-        } else if (data.reload) {
-          window.location.reload();
-        }
-      }
-    });
-  }
-  return false;
-};
diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index a39b59a5..263dc38d 100644
--- a/modules/gallery/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
@@ -91,7 +91,7 @@ class Menu_Element_Link extends Menu_Element {
     } else {
       $css_class = "";
     }
-    return "<li><a$css_id class=\"gMenuElement$css_class\" href=\"$this->url\" " .
+    return "<li><a$css_id class=\"gMenuLink $css_class\" href=\"$this->url\" " .
       "title=\"$this->label\">$this->label</a></li>";
   }
 }
@@ -111,7 +111,7 @@ class Menu_Element_Dialog extends Menu_Element {
     } else {
       $css_class = "";
     }
-    return "<li><a$css_id class=\"gMenuLink$css_class\" href=\"$this->url\" " .
+    return "<li><a$css_id class=\"gDialogLink $css_class\" href=\"$this->url\" " .
            "title=\"$this->label\">$this->label</a></li>";
   }
 }
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 360e5e46..24dea729 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -111,14 +111,16 @@ class Theme_View_Core extends Gallery_View {
     return $menu->compact();
   }
 
-  public function thumb_menu($item) {
+  public function context_menu($item) {
     $menu = Menu::factory("root")
       ->append(Menu::factory("submenu")
-               ->id("options_menu")
+               ->id("context_menu")
                ->label(t("Options")))
-      ->css_class("gThumbMenu");
+      ->css_class("gContextMenu");
 
-    module::event("thumb_menu", $menu, $this, $item);
+    $page_type = Input::instance()->get("page_type");
+    gallery::context_menu($menu, $this, $item, $page_type);
+    module::event("context_menu", $menu, $this, $item, $page_type);
     return $menu->compact();
   }
 
diff --git a/modules/gallery/views/quick_pane.html.php b/modules/gallery/views/quick_pane.html.php
deleted file mode 100644
index e5469696..00000000
--- a/modules/gallery/views/quick_pane.html.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<? foreach ($button_list->main as $button): ?>
-<a class="<?= $button->class ?> ui-corner-all ui-state-default" href="<?= $button->href ?>"
-  title="<?= $button->title ?>">
-  <span class="ui-icon <?= $button->icon ?>">
-    <?= $button->title ?>
-  </span>
-</a>
-<? endforeach ?>
-
-<? if (!empty($button_list->additional)): ?>
-<a class="gButtonLink ui-corner-all ui-state-default options" href="#" title="<?= t("additional options") ?>">
-  <span class="ui-icon ui-icon-triangle-1-s">
-    <?= t("Additional options") ?>
-  </span>
-</a>
-
-<ul class="gQuickPaneOptions" style="display: none">
-  <? foreach ($button_list->additional as $button): ?>
-  <li><a class="<?= $button->class ?>" href="<?= $button->href ?>"
-    title="<?= $button->title ?>">
-    <?=  $button->title ?>
-  </a></li>
-  <? endforeach ?>
-</ul>
-<? endif ?>
diff --git a/themes/default/css/fix-ie.css b/themes/default/css/fix-ie.css
index c7c1ebad..eee88c15 100644
--- a/themes/default/css/fix-ie.css
+++ b/themes/default/css/fix-ie.css
@@ -35,7 +35,3 @@ input.submit {
 .gPager .ui-icon-right {
   width: 60px;
 }
-
-.gQuickPane {
-  height: 32px !important;
-}
\ No newline at end of file
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index c5a9956d..eb092b83 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -588,24 +588,25 @@ form .gError,
 
 /* Thumb Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gContent .gThumbMenu {
+#gContent .gContextMenu {
   bottom: 0;
   left: 0;
   position: absolute;
   width: 100%;
+  display: none;
 }
 
-#gContent .gThumbMenu li {
+#gContent .gContextMenu li {
   border-left: none;
   border-right: none;
   border-bottom: none;
 }
 
-#gContent .gThumbMenu li li {
+#gContent .gContextMenu li li {
   padding: .3em;
 }
 
-#gContent .gThumbMenu a:hover {
+#gContent .gContextMenu a:hover {
   text-decoration: none;
 }
 
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 11cd06ed..d796cb67 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -32,7 +32,6 @@ $(document).ready(function() {
   $("#gMessage li").showMessage();
 
   // Initialize dialogs
-  $(".gMenuLink").addClass("gDialogLink");
   $("#gLoginLink").addClass("gDialogLink");
   var dialogLinks = $(".gDialogLink");
   for (var i=0; i < dialogLinks.length; i++) {
@@ -57,9 +56,6 @@ $(document).ready(function() {
   if ($("#gAlbumGrid").length) {
     // Vertical align thumbnails/metadata in album grid
     $(".gItem").vAlign();
-    $(".gQuick").ajaxStop(function(){
-      $(".gItem").vAlign();
-    });
   }
 
   // Photo/Item item view only
@@ -97,26 +93,19 @@ $(document).ready(function() {
     }
   );
 
-  // Initialize thumbnail menus
-  // @todo Toggle between north and south caret's on hover
-  if ($("#gContent .gThumbMenu").length) {
-    $("#gContent .gThumbMenu li").addClass("ui-state-default");
-    $("#gContent .gThumbMenu li a")
-      .not('[class]')
-      .addClass("gButtonLink ui-icon ui-icon-caret-l-n")
-      .css({
-        height: "10px",
-        margin: "0",
-        padding: "0 0 3px 0"
-      });
-
-    $(".gThumbMenu ul").hide();
-    $(".gThumbMenu").hover(
+  // Initialize context menus
+  if ($("#gContent .gContextMenu").length) {
+    $("#gContent .gContextMenu li").addClass("ui-state-default");
+    $(".gContextMenu").parent().hover(
       function() {
-        $(this).find("ul").slideDown("fast");
+        $(this).find(".gContextMenu").slideDown("fast");
+	var dialogLinks = $(this).find(".gDialogLink");
+	for (var i = 0; i < dialogLinks.length; i++) {
+	  $(dialogLinks[i]).bind("click", handleDialogEvent);
+	}
       },
       function() {
-	      $(this).find("ul").slideUp("slow");
+	$(this).find(".gContextMenu").slideUp("slow");
       }
     );
   }
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 65ea3381..ce57458e 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -19,7 +19,7 @@
       <?= $child->thumb_img(array("class" => "gThumbnail")) ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
-    <?= $theme->thumb_menu($child) ?>
+    <?= $theme->context_menu($child) ?>
     <h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
-- 
cgit v1.2.3


From ad19e29c469295189a2d13772706e39e3bd3dfc7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 3 Aug 2009 21:50:01 -0700
Subject: Add the context menu to the photo/movie pages also.

---
 themes/default/views/movie.html.php | 1 +
 themes/default/views/photo.html.php | 1 +
 2 files changed, 2 insertions(+)

(limited to 'themes/default')

diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index 66c80ded..b9e1bc21 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -23,4 +23,5 @@
     var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
   </script>
   <?= $theme->photo_bottom() ?>
+  <?= $theme->context_menu($item) ?>
 </div>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index bf4d9da3..cf8bebdd 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -47,6 +47,7 @@
     </a>
     <? endif ?>
     <?= $theme->resize_bottom($item) ?>
+    <?= $theme->context_menu($item) ?>
   </div>
 
   <div id="gInfo">
-- 
cgit v1.2.3


From 3a8837726a6618139813ea88b007909d32da752b Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Tue, 4 Aug 2009 23:52:36 -0600
Subject: White space fixes.

---
 themes/default/js/ui.init.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index d796cb67..6414cbcc 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -66,7 +66,9 @@ $(document).ready(function() {
 
     // Collapse comments form, insert button to expand
     if ($("#gAddCommentForm").length) {
-      var showCommentForm = '<a href="#add_comment_form" class="showCommentForm gButtonLink ui-corner-all ui-icon-left ui-state-default right"><span class="ui-icon ui-icon-comment"></span>' + ADD_A_COMMENT + '</a>';
+      var showCommentForm = '<a href="#add_comment_form"'
+        + ' class="showCommentForm gButtonLink ui-corner-all ui-icon-left ui-state-default right">'
+        + '<span class="ui-icon ui-icon-comment"></span>' + ADD_A_COMMENT + '</a>';
       $("#gAddCommentForm").hide();
       $("#gComments").prepend(showCommentForm);
       $(".showCommentForm").click(function(){
@@ -99,13 +101,13 @@ $(document).ready(function() {
     $(".gContextMenu").parent().hover(
       function() {
         $(this).find(".gContextMenu").slideDown("fast");
-	var dialogLinks = $(this).find(".gDialogLink");
-	for (var i = 0; i < dialogLinks.length; i++) {
-	  $(dialogLinks[i]).bind("click", handleDialogEvent);
-	}
+        var dialogLinks = $(this).find(".gDialogLink");
+        for (var i = 0; i < dialogLinks.length; i++) {
+          $(dialogLinks[i]).bind("click", handleDialogEvent);
+        }
       },
       function() {
-	$(this).find(".gContextMenu").slideUp("slow");
+        $(this).find(".gContextMenu").slideUp("slow");
       }
     );
   }
-- 
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 'themes/default')

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 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 'themes/default')

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 'themes/default')

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 'themes/default')

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


From e4eec71efa5f7b1902155a34f8655cebe523c358 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 7 Aug 2009 11:53:40 -0700
Subject: Rename gallery.common.js functions to conform to our naming standards
 and have some basic namespacing:   showMessage --> gallery_show_message  
 vAlign      --> gallery_valign   showLoading --> gallery_show_loading

Convert gallery.show_full_size.js to be a jQuery function and give it a namespace:
  show_full_size --> gallery_show_full_size
---
 lib/gallery.common.js                |   9 +--
 lib/gallery.dialog.js                |   4 +-
 lib/gallery.show_full_size.js        | 140 ++++++++++++++++++-----------------
 modules/organize/js/organize.js      |   2 +-
 modules/organize/js/organize_init.js |   2 +-
 themes/admin_default/js/ui.init.js   |   4 +-
 themes/default/js/ui.init.js         |   6 +-
 themes/default/views/photo.html.php  |   2 +-
 8 files changed, 85 insertions(+), 84 deletions(-)

(limited to 'themes/default')

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 7fced304..7e6acad9 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -1,5 +1,5 @@
 (function ($) {
-  $.fn.showMessage = function(message) {
+  $.fn.gallery_show_message = function(message) {
     return this.each(function(i){
       $(this).effect("highlight", {"color": "white"}, 3000);
       $(this).animate({opacity: 1.0}, 6000);
@@ -7,7 +7,7 @@
   };
 
   // Vertically align a block element's content
-  $.fn.vAlign = function(container) {
+  $.fn.gallery_valign = function(container) {
     return this.each(function(i){
       if (container == null) {
         container = 'div';
@@ -22,7 +22,7 @@
   };
 
   // Get the viewport size
-  $.getViewportSize = function() {
+  $.gallery_get_viewport_size = function() {
     return {
       width : function() {
         return $(window).width();
@@ -37,7 +37,7 @@
    * Toggle the processing indicator, both large and small
    * @param elementID Target ID, including #, to apply .gLoadingSize
    */
-  $.fn.showLoading = function() {
+  $.fn.gallery_show_loading = function() {
     return this.each(function(i){
       var size;
       switch ($(this).attr("id")) {
@@ -52,5 +52,4 @@
       $(this).toggleClass("gLoading" + size);
     });
   };
-
 })(jQuery);
diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 04ab44de..51ebb21a 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -16,10 +16,10 @@
          }
          $("#gDialog").dialog(self.options);
 
-         $("#gDialog").showLoading();
+         $("#gDialog").gallery_show_loading();
 
          $.get(sHref, function(data) {
-           $("#gDialog").html(data).showLoading();
+           $("#gDialog").html(data).gallery_show_loading();
 
            if ($("#gDialog form").length) {
              self._trigger("form_loaded", null, $("#gDialog form"));
diff --git a/lib/gallery.show_full_size.js b/lib/gallery.show_full_size.js
index 8b271db9..c32195f6 100644
--- a/lib/gallery.show_full_size.js
+++ b/lib/gallery.show_full_size.js
@@ -1,76 +1,78 @@
-/**
- * @todo Move inline CSS out to external style sheet (theme style sheet)
- */
-var show_full_size = function(image_url, image_width, image_height) {
-  /*
-   * Calculate the size of the image panel based on the size of the image and the size of the
-   * window.  Scale the image so the entire panel fits in the view port.
-   */
-  function _auto_fit(imageWidth, imageHeight) {
-    // ui-dialog gives a padding of 2 pixels
-    var windowWidth = $(window).width() - 10;
-    var windowHeight = $(window).height() - 10;
+(function($) {
+   /**
+    * @todo Move inline CSS out to external style sheet (theme style sheet)
+    */
+   $.gallery_show_full_size = function(image_url, image_width, image_height) {
+     /*
+      * Calculate the size of the image panel based on the size of the image and the size of the
+      * window.  Scale the image so the entire panel fits in the view port.
+      */
+     function _auto_fit(imageWidth, imageHeight) {
+       // ui-dialog gives a padding of 2 pixels
+       var windowWidth = $(window).width() - 10;
+       var windowHeight = $(window).height() - 10;
 
-    /* If the width is greater then scale the image width first */
-    if (imageWidth > windowWidth) {
-      var ratio = windowWidth / imageWidth;
-      imageWidth *= ratio;
-      imageHeight *= ratio;
-    }
-    /* after scaling the width, check that the height fits */
-    if (imageHeight > windowHeight) {
-      var ratio = windowHeight / imageHeight;
-      imageWidth *= ratio;
-      imageHeight *= ratio;
-    }
+       /* If the width is greater then scale the image width first */
+       if (imageWidth > windowWidth) {
+	 var ratio = windowWidth / imageWidth;
+	 imageWidth *= ratio;
+	 imageHeight *= ratio;
+       }
+       /* after scaling the width, check that the height fits */
+       if (imageHeight > windowHeight) {
+	 var ratio = windowHeight / imageHeight;
+	 imageWidth *= ratio;
+	 imageHeight *= ratio;
+       }
 
-    // handle the case where the calculation is almost zero (2.14e-14)
-    return {
-      top: Number((windowHeight - imageHeight) / 2),
-      left: Number((windowWidth - imageWidth) / 2),
-      width: Number(imageWidth),
-      height: Number(imageHeight)
-    };
-  }
+       // handle the case where the calculation is almost zero (2.14e-14)
+       return {
+	 top: Number((windowHeight - imageHeight) / 2),
+	 left: Number((windowWidth - imageWidth) / 2),
+	 width: Number(imageWidth),
+	 height: Number(imageHeight)
+       };
+     }
 
-  var width = $(document).width();
-  var height = $(document).height();
+     var width = $(document).width();
+     var height = $(document).height();
 
-  $("body").append('<div id="gFullsizeOverlay" class="ui-dialog-overlay" ' +
-		   'style="border: none; margin: 0; padding: 0; background-color: #000; ' +
-		   'position: absolute; top: 0px; left: 0px; ' +
-		   'width: ' + width + 'px; height: ' + height + 'px; opacity: 0.7; filter: alpha(opacity=70);' +
-		   '-moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; ' +
-		   '-moz-background-inline-policy: -moz-initial; z-index: 1001;"> </div>');
+     $("body").append('<div id="gFullsizeOverlay" class="ui-dialog-overlay" ' +
+		      'style="border: none; margin: 0; padding: 0; background-color: #000; ' +
+		      'position: absolute; top: 0px; left: 0px; ' +
+		      'width: ' + width + 'px; height: ' + height + 'px; opacity: 0.7; filter: alpha(opacity=70);' +
+		      '-moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; ' +
+		      '-moz-background-inline-policy: -moz-initial; z-index: 1001;"> </div>');
 
-  var image_size = _auto_fit(image_width, image_height);
+     var image_size = _auto_fit(image_width, image_height);
 
-  $("body").append('<div id="gFullsize" class="ui-dialog ui-widget" ' +
-		   'style="overflow: hidden; display: block; ' +
-		   'position: absolute; z-index: 1002; outline-color: -moz-use-text-color; ' +
-		   'outline-style: none; outline-width: 0px; ' +
-		   'height: ' + image_size.height + 'px; ' +
-		   'width: ' + image_size.width + 'px; ' +
-		   'top: ' + image_size.top + 'px; left: ' + image_size.left + 'px;">' +
-		   '<img id="gFullSizeImage" src="' + image_url + '"' +
-		   'height="' + image_size.height + '" width="' + image_size.width + '"/></div>');
+     $("body").append('<div id="gFullsize" class="ui-dialog ui-widget" ' +
+		      'style="overflow: hidden; display: block; ' +
+		      'position: absolute; z-index: 1002; outline-color: -moz-use-text-color; ' +
+		      'outline-style: none; outline-width: 0px; ' +
+		      'height: ' + image_size.height + 'px; ' +
+		      'width: ' + image_size.width + 'px; ' +
+		      'top: ' + image_size.top + 'px; left: ' + image_size.left + 'px;">' +
+		      '<img id="gFullSizeImage" src="' + image_url + '"' +
+		      'height="' + image_size.height + '" width="' + image_size.width + '"/></div>');
 
-  $("#gFullsize").append('<span id="gFullsizeClose" class="fg-button ui-icon ui-state-default ' +
-			 'ui-icon-closethick ui-corner-all" style="z-index: 1003; position: absolute; ' +
-			 'right: 1em; top: 1em;"></span>');
-  $("#gFullsizeClose").click(function() {
-			       $("#gFullsizeOverlay*").remove();
-			       $("#gFullsize").remove();
-			     });
-  $(window).resize(function() {
-		     $("#gFullsizeOverlay").width($(document).width());
-		     $("#gFullsizeOverlay").height($(document).height());
-		     image_size = _auto_fit(image_width, image_height);
-		     $("#gFullsize").height(image_size.height);
-		     $("#gFullsize").width(image_size.width);
-		     $("#gFullsize").css("top", image_size.top);
-		     $("#gFullsize").css("left", image_size.left);
-		     $("#gFullSizeImage").height(image_size.height);
-		     $("#gFullSizeImage").width(image_size.width);
-		   });
-};
+     $("#gFullsize").append('<span id="gFullsizeClose" class="fg-button ui-icon ui-state-default ' +
+			    'ui-icon-closethick ui-corner-all" style="z-index: 1003; position: absolute; ' +
+			    'right: 1em; top: 1em;"></span>');
+     $("#gFullsizeClose").click(function() {
+				  $("#gFullsizeOverlay*").remove();
+				  $("#gFullsize").remove();
+				});
+     $(window).resize(function() {
+			$("#gFullsizeOverlay").width($(document).width())
+			  .height($(document).height());
+			image_size = _auto_fit(image_width, image_height);
+			$("#gFullsize").height(image_size.height)
+			  .width(image_size.width)
+			  .css("top", image_size.top)
+			  .css("left", image_size.left);
+			$("#gFullSizeImage").height(image_size.height)
+			  .width(image_size.width);
+		      });
+   };
+})(jQuery);
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index f10cbcc9..31657d3a 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -391,7 +391,7 @@ function organize_dialog_init() {
   $(".gBranchText").droppable(treeDroppable);
   $(".gBranchText").click(organizeOpenFolder);
   retrieveMicroThumbs(item_id);
-  //showLoading("#gDialog");
+  //$.gallery_show_loading("#gDialog");
 
   $("#gMicroThumbPanel").droppable(thumbDroppable);
   $("#gMicroThumbPanel").selectable(selectable);
diff --git a/modules/organize/js/organize_init.js b/modules/organize/js/organize_init.js
index ed036fdb..30bc78dd 100644
--- a/modules/organize/js/organize_init.js
+++ b/modules/organize/js/organize_init.js
@@ -17,7 +17,7 @@ $("document").ready(function() {
       zIndex: 75
     });
 
-    //showLoading("#gDialog");
+    //$.gallery_show_loading("#gDialog");
 
     $.get(href, function(data) {
       $("#gDialog").html(data);
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index 89dd5b47..e52f0c4c 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -14,7 +14,7 @@ $(document).ready(function(){
   $("#gSiteAdminMenu").css("display", "block");
 
   // Initialize status message effects
-  $("#gMessage li").showMessage();
+  $("#gMessage li").gallery_show_message();
 
   // Initialize modal dialogs
   $(".gDialogLink").gallery_dialog();
@@ -24,7 +24,7 @@ $(document).ready(function(){
 
   if ($("#gPhotoStream").length) {
     // Vertically align thumbs in photostream
-    $(".gItem").vAlign();
+    $(".gItem").gallery_valign();
   }
 
   // Apply jQuery UI button css to submit inputs
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 4b876c66..b8ad68db 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -29,7 +29,7 @@ $(document).ready(function() {
   $("#gSiteMenu").css("display", "block");
 
   // Initialize status message effects
-  $("#gMessage li").showMessage();
+  $("#gMessage li").gallery_show_message();
 
   // Initialize dialogs
   $(".gMenuLink").addClass("gDialogLink");
@@ -53,9 +53,9 @@ $(document).ready(function() {
   // Album view only
   if ($("#gAlbumGrid").length) {
     // Vertical align thumbnails/metadata in album grid
-    $(".gItem").vAlign();
+    $(".gItem").gallery_valign();
     $(".gQuick").ajaxStop(function(){
-      $(".gItem").vAlign();
+      $(".gItem").gallery_valign();
     });
   }
 
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index bf4d9da3..48472170 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -5,7 +5,7 @@
 <script>
   $(document).ready(function() {
     $(".gFullSizeLink").click(function() {
-      show_full_size("<?= $theme->item()->file_url() ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
+      $.gallery_show_full_size("<?= $theme->item()->file_url() ?>", "<?= $theme->item()->width ?>", "<?= $theme->item()->height ?>");
       return false;
     });
   });
-- 
cgit v1.2.3


From 828f6add509c26ee183b44b4ad4f927f34d04509 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 7 Aug 2009 13:17:56 -0700
Subject: Remove stray js-breaking "#" symbol that I accidentally added in
 63ddac5d

---
 themes/default/js/ui.init.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'themes/default')

diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index f86c8df4..6a1b2b19 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -1,4 +1,3 @@
-#
 /**
  * Initialize jQuery UI and Plugin elements
  *
-- 
cgit v1.2.3


From 6357f3332b9bc33b10c11dc93b83ba9e72eec109 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 8 Aug 2009 01:14:22 -0600
Subject: Added basic context menu affects and styles. Simplified some of the
 action labels in the menu.

---
 modules/digibug/helpers/digibug_event.php | 18 ++++-----
 modules/gallery/helpers/gallery.php       | 30 ++++++++-------
 themes/default/css/screen.css             | 64 ++++++++++++++++++++++++++-----
 themes/default/js/ui.init.js              | 63 +++++++++++++++++++++++-------
 4 files changed, 128 insertions(+), 47 deletions(-)

(limited to 'themes/default')

diff --git a/modules/digibug/helpers/digibug_event.php b/modules/digibug/helpers/digibug_event.php
index efe66a0f..93bc1747 100644
--- a/modules/digibug/helpers/digibug_event.php
+++ b/modules/digibug/helpers/digibug_event.php
@@ -28,19 +28,19 @@ class digibug_event_Core {
 
   static function photo_menu($menu, $theme) {
     $item = $theme->item();
-    $menu->append(
-      Menu::factory("link")
-      ->id("digibug")
-      ->label(t("Print with Digibug"))
-      ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf"))
-      ->css_id("gDigibugLink"));
+    $menu->get("options_menu")
+      ->append(Menu::factory("link")
+        ->id("digibug")
+        ->label(t("Print with Digibug"))
+        ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf"))
+        ->css_id("gDigibugLink"));
   }
 
   static function context_menu($menu, $theme, $item) {
+    $item = $theme->item();
     if ($item->type == "photo") {
-      $menu
-        ->append(
-          Menu::factory("link")
+      $menu->get("options_menu")
+        ->append(Menu::factory("link")
           ->id("digibug")
           ->label(t("Print with Digibug"))
           ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf"))
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 085965a2..72e7aeeb 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -201,28 +201,30 @@ class gallery_Core {
     switch ($item->type) {
     case "movie":
       $edit_title = t("Edit this movie");
-      $move_title = t("Move this movie to another album");
-      $cover_title = t("Choose this movie as the album cover");
       $delete_title = t("Delete this movie");
       break;
 
     case "album":
       $edit_title = t("Edit this album");
-      $move_title = t("Move this album to another album");
-      $cover_title = t("Choose this album as the album cover");
       $delete_title = t("Delete this album");
       break;
 
     default:
       $edit_title = t("Edit this photo");
-      $move_title = t("Move this photo to another album");
-      $cover_title = t("Choose this photo as the album cover");
       $delete_title = t("Delete this photo");
       break;
     }
+    $cover_title = t("Choose as the album cover");
+    $move_title = t("Move to another album");
 
     $csrf = access::csrf_token();
-    $menu->append(Menu::factory("dialog")
+    
+    $menu->append($options_menu = Menu::factory("submenu")
+                  ->id("options")
+                  ->label(t("Options"))
+                  ->css_class("ui-icon-carat-1-n"));
+
+    $options_menu->append(Menu::factory("dialog")
                   ->id("edit")
                   ->label($edit_title)
                   ->css_clasS("ui-icon-pencil")
@@ -230,22 +232,22 @@ class gallery_Core {
 
 
     if ($item->is_photo() && graphics::can("rotate")) {
-      $menu
+      $options_menu
         ->append(Menu::factory("link")
                   ->id("rotate_ccw")
-                 ->label(t("Rotate 90 degrees counter clockwise"))
+                 ->label(t("Rotate 90&deg; counter clockwise"))
                  ->css_class("ui-icon-rotate-ccw")
                  ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&page_type=$page_type")))
         ->append(Menu::factory("link")
                   ->id("rotate_cw")
-                 ->label(t("Rotate 90 degrees clockwise"))
+                 ->label(t("Rotate 90&deg; clockwise"))
                  ->css_class("ui-icon-rotate-cw")
                  ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type")));
     }
 
     // Don't move photos from the photo page; we don't yet have a good way of redirecting after move
     if ($page_type == "album") {
-      $menu
+      $options_menu
         ->append(Menu::factory("dialog")
                  ->id("move")
                  ->label($move_title)
@@ -264,11 +266,11 @@ class gallery_Core {
       } else {
         $disabledState = " ";
       }
-      $menu
+      $options_menu
         ->append(Menu::factory("link")
                  ->id("make_album_cover")
                  ->label($cover_title)
-                 ->css_class($disabledState)
+                 ->css_class("ui-icon-star")
                  ->url(
                    url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type")))
         ->append(Menu::factory("dialog")
@@ -280,7 +282,7 @@ class gallery_Core {
     }
 
     if ($item->is_album()) {
-      $menu
+      $options_menu
         ->append(Menu::factory("dialog")
                  ->id("add_item")
                  ->label(t("Add a photo"))
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index eb092b83..1cb813f3 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -453,26 +453,32 @@ form .gError,
 
 #gContent #gAlbumGrid {
   margin: 1em 0;
+  position: relative;
+  z-index: 1;
 }
 
 #gContent #gAlbumGrid .gItem {
-  border: 1px solid #e8e8e8;
-  border-right-color: #ccc;
-  border-bottom-color: #ccc;
+  background-color: #fff;
+  border: 1px solid #fff;
   float: left;
   font-size: .7em;
-  height: 240px;
+  height: 220px;
   overflow: hidden;
-  padding: 15px 8px 30px 8px;
+  padding: .6em 8px;
   position: relative;
   text-align: center;
   width: 213px;
+  z-index: 1;
 }
 
 #gContent #gAlbumGrid .gItem h2 {
   margin: 5px 0;
 }
 
+.gPhoto h2, .gItem .gMetadata {
+  display: none;
+}
+
 #gContent #gAlbumGrid .gAlbum {
   background-color: #e8e8e8;
 }
@@ -485,6 +491,35 @@ form .gError,
   width: 16px;
 }
 
+#gContent #gAlbumGrid #gHoverItem {
+  background-color: #fff;
+  border: 1px solid #000;
+  display: none;
+  height: auto;
+  margin-top: -1em;
+  margin-left: -.4em;
+  padding: 0;
+  position: absolute;
+  width: auto;
+  z-index: 100;
+}
+
+#gContent #gAlbumGrid #gHoverItem .gItem {
+  float: none;
+  height: 210px;
+  margin: 0;
+  padding: 0 1em 3em;
+}
+
+#gContent #gAlbumGrid #gHoverItem .gItem div {
+  margin-top: 1em !important;
+}
+
+#gHoverItem .gItem h2,
+#gHoverItem .gItem .gMetadata {
+  display: block;
+}
+
 /* Individual photo content ~~~~~~~~~~~~~~ */
 
 #gContent #gItem {
@@ -588,25 +623,34 @@ form .gError,
 
 /* Thumb Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gContent .gContextMenu {
+.gContextMenu {
   bottom: 0;
+  display: none;
   left: 0;
   position: absolute;
   width: 100%;
-  display: none;
 }
 
-#gContent .gContextMenu li {
+.gContextMenu li {
   border-left: none;
   border-right: none;
   border-bottom: none;
 }
 
-#gContent .gContextMenu li li {
+.gContextMenu li li {
   padding: .3em;
 }
 
-#gContent .gContextMenu a:hover {
+
+#gHoverItem .gContextMenu {
+  display: block;
+}
+
+#gHoverItem .gContextMenu li {
+  text-align: left;
+}
+
+#gHoverItem .gContextMenu a:hover {
   text-decoration: none;
 }
 
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 6414cbcc..b3c1d514 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -96,21 +96,56 @@ $(document).ready(function() {
   );
 
   // Initialize context menus
-  if ($("#gContent .gContextMenu").length) {
-    $("#gContent .gContextMenu li").addClass("ui-state-default");
-    $(".gContextMenu").parent().hover(
-      function() {
-        $(this).find(".gContextMenu").slideDown("fast");
-        var dialogLinks = $(this).find(".gDialogLink");
-        for (var i = 0; i < dialogLinks.length; i++) {
-          $(dialogLinks[i]).bind("click", handleDialogEvent);
+  // @todo Switch Options icon to carat-1-s when menu's open
+  // @todo apply hover affect to links
+  $(".gItem").hover(
+    function(){
+      var pos = $(this).position();
+      var itemClasses = $(this).attr("class");
+      var bgColor = $(this).css("background-color");
+      var cont = $(this).parent();
+      var iconSpan = "<span class=\"ui-icon ui-icon-carat-1-n\"></span>";
+      $("#gHoverItem .ui-icon-carat-1-n").html(iconSpan + $("#gHoverItem .ui-icon-carat-1-n").html());
+
+      $("#gHoverItem").remove();
+      cont.append("<div id=\"gHoverItem\"><div class=\"" + itemClasses + "\">" 
+          + $(this).html() + "</div></div>");
+      $("#gHoverItem").css("top", pos.top);
+      $("#gHoverItem").css("left", pos.left);
+      $("#gHoverItem").css("background-color", bgColor);
+      $("#gHoverItem").fadeIn("fast");
+      $("#gHoverItem").hover(
+        function(){
+          // Initialize context menus
+          $("#gContent .gContextMenu li").addClass("ui-state-default");
+          $(".gContextMenu ul").hide();
+          $(".gContextMenu").hover(
+            function() {
+              $(this).find("ul").slideDown("fast");
+              var optLinks = $(this).find("a");
+              for (var i = 0; i < optLinks.length; i++) {
+                var iconClass = $(optLinks[i]).attr("class").match(/ui-icon-.[^\s]*/);
+                iconSpan = "<span class=\"ui-icon " + iconClass + "\"></span>";
+                $(optLinks[i]).html(iconSpan + $(optLinks[i]).html());
+                if ($(optLinks[i]).hasClass("gDialogLink")) {
+                  $(optLinks[i]).bind("click", handleDialogEvent);
+                }
+              }
+              $("#gContent .gContextMenu li a").addClass("gButtonLink ui-icon-left");
+            },
+            function() {
+              $(this).find("ul").slideUp("slow");
+            }
+          );
+        },
+        function() {
+          $(this).hide();
         }
-      },
-      function() {
-        $(this).find(".gContextMenu").slideUp("slow");
-      }
-    );
-  }
+      );
+    },
+    function(){
+    }
+  );
 
 });
 
-- 
cgit v1.2.3


From 00098b4d1468b09ccbd5514c6b9634e92955a078 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 8 Aug 2009 11:59:32 -0600
Subject: Handle icon markup and styles in content menu before applying album
 grid hover affect. Dialog link's in context menu are broken currently

---
 themes/default/js/ui.init.js | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 2fc0dc75..91d90b45 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -53,8 +53,13 @@ $(document).ready(function() {
   if ($("#gAlbumGrid").length) {
     // Vertical align thumbnails/metadata in album grid
     $(".gItem").gallery_valign();
-    $(".gQuick").ajaxStop(function(){
-      $(".gItem").gallery_valign();
+    // Apply styles to gContextMenu
+    $(".gContextMenu li").addClass("ui-state-default");
+    $(".gContextMenu a").addClass("gButtonLink ui-icon-left");
+    $(".gContextMenu a").prepend("<span class=\"ui-icon\"></span>");
+    $(".gContextMenu a span").each(function() {
+      var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]*/).toString();
+      $(this).addClass(iconClass);
     });
   }
 
@@ -96,7 +101,6 @@ $(document).ready(function() {
   );
 
   // Initialize context menus
-  // @todo Switch Options icon to carat-1-s when menu's open
   // @todo apply hover affect to links
   $(".gItem").hover(
     function(){
@@ -104,9 +108,6 @@ $(document).ready(function() {
       var itemClasses = $(this).attr("class");
       var bgColor = $(this).css("background-color");
       var cont = $(this).parent();
-      var iconSpan = "<span class=\"ui-icon ui-icon-carat-1-n\"></span>";
-      $("#gHoverItem .ui-icon-carat-1-n").html(iconSpan + $("#gHoverItem .ui-icon-carat-1-n").html());
-
       $("#gHoverItem").remove();
       cont.append("<div id=\"gHoverItem\"><div class=\"" + itemClasses + "\">" 
           + $(this).html() + "</div></div>");
@@ -117,21 +118,12 @@ $(document).ready(function() {
       $("#gHoverItem").hover(
         function(){
           // Initialize context menus
-          $("#gContent .gContextMenu li").addClass("ui-state-default");
           $(".gContextMenu ul").hide();
           $(".gContextMenu").hover(
             function() {
               $(this).find("ul").slideDown("fast");
-              var optLinks = $(this).find("a");
-              for (var i = 0; i < optLinks.length; i++) {
-                var iconClass = $(optLinks[i]).attr("class").match(/ui-icon-.[^\s]*/);
-                iconSpan = "<span class=\"ui-icon " + iconClass + "\"></span>";
-                $(optLinks[i]).html(iconSpan + $(optLinks[i]).html());
-                if ($(optLinks[i]).hasClass("gDialogLink")) {
-                  $(optLinks[i]).bind("click", handleDialogEvent);
-                }
-              }
-              $("#gContent .gContextMenu li a").addClass("gButtonLink ui-icon-left");
+              var dialogLinks = $(this).find(".gDialogLink");
+              $(dialgoLinks).gallery_dialog();
             },
             function() {
               $(this).find("ul").slideUp("slow");
-- 
cgit v1.2.3


From 3a8f1f426294737aac145d15462caa808aef14b1 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 8 Aug 2009 13:20:00 -0600
Subject: Cleanup context menu styles a bit

---
 themes/default/css/screen.css | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 1cb813f3..05d2977a 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -621,7 +621,7 @@ form .gError,
   margin-bottom: 0 !important;
 }
 
-/* Thumb Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Context Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .gContextMenu {
   bottom: 0;
@@ -637,11 +637,10 @@ form .gError,
   border-bottom: none;
 }
 
-.gContextMenu li li {
-  padding: .3em;
+.gContextMenu li a {
+  line-height: 1.6em;
 }
 
-
 #gHoverItem .gContextMenu {
   display: block;
 }
-- 
cgit v1.2.3


From 6641fec60da715161f0f7f11235c1720d17ec19e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 8 Aug 2009 14:37:55 -0700
Subject: Use the same pager layout as we do in photo.html.php.

---
 themes/default/views/movie.html.php | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index 66c80ded..c90a370c 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -2,16 +2,29 @@
 <div id="gItem">
   <?= $theme->photo_top() ?>
 
-  <ul id="gPager">
-    <li><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <? if ($previous_item): ?>
-    <li><span class="ui-icon ui-icon-seek-prev"></span><a href="<?= $previous_item->url() ?>"><?= t("previous") ?></a></li>
-    <? endif ?>
-    <? if ($next_item): ?>
-    <li><a href="<?= $next_item->url() ?>"><?= t("next") ?></a><span class="ui-icon ui-icon-seek-next"></span></li>
-    <? endif ?>
+  <ul class="gPager">
+    <li>
+      <? if ($previous_item): ?>
+      <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
+      <? else: ?>
+      <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+      <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
+      <? endif; ?>
+    </li>
+    <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
+    <li class="txtright">
+      <? if ($next_item): ?>
+      <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
+      <? else: ?>
+      <a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
+      <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
+      <? endif ?>
+    </li>
   </ul>
 
+
   <?= $item->movie_img(array("class" => "gMovie", "id" => "gMovieId-{$item->id}")) ?>
 
   <div id="gInfo">
-- 
cgit v1.2.3


From 9fa4e8972596d015d4e4259aabb600c886d6381e Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 8 Aug 2009 20:39:19 -0600
Subject: Fixed typo. Dialog links still broken. Now, wiht more speling!

---
 themes/default/js/ui.init.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/default')

diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 91d90b45..a8c558c5 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -123,7 +123,7 @@ $(document).ready(function() {
             function() {
               $(this).find("ul").slideDown("fast");
               var dialogLinks = $(this).find(".gDialogLink");
-              $(dialgoLinks).gallery_dialog();
+              $(dialogLinks).gallery_dialog();
             },
             function() {
               $(this).find("ul").slideUp("slow");
-- 
cgit v1.2.3


From 2f4c4a3f706d98be7dd41f8fa7c9124314c515c8 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 9 Aug 2009 11:31:31 -0600
Subject: Rename resizeImage gallery_fit_image to follow convention. Move the
 function to gallery.common.js.

---
 lib/gallery.common.js        | 21 ++++++++++++++++++++-
 themes/default/js/ui.init.js | 24 ++++--------------------
 2 files changed, 24 insertions(+), 21 deletions(-)

(limited to 'themes/default')

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 7e6acad9..08656a83 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -12,7 +12,7 @@
       if (container == null) {
         container = 'div';
       }
-      $(this).html("<" + container + ">" + $(this).html() + "</" + container + ">");
+      $(this).html("<" + container + " class=\"gValign\">" + $(this).html() + "</" + container + ">");
       var el = $(this).children(container + ":first");
       var elh = $(el).height();
       var ph = $(this).height();
@@ -52,4 +52,23 @@
       $(this).toggleClass("gLoading" + size);
     });
   };
+
+  /**
+   * Reduce the width of an image if it's wider than its parent container
+   * @param elementID The image's container
+   */
+  $.fn.gallery_fit_image = function() {
+    var photo = $(this).find("img").filter(function() {
+      return this.id.match(/gPhotoId-\d+/);
+    });
+    var cont_width = $(this).width();
+    var photo_width = photo.width();
+    if (cont_width < photo_width) {
+      var proportion = cont_width / photo_width;
+      photo.width(cont_width);
+      photo.height(proportion * photo.height());
+    }
+  };
+
 })(jQuery);
+
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index a8c558c5..29680a48 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -58,16 +58,15 @@ $(document).ready(function() {
     $(".gContextMenu a").addClass("gButtonLink ui-icon-left");
     $(".gContextMenu a").prepend("<span class=\"ui-icon\"></span>");
     $(".gContextMenu a span").each(function() {
-      var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]*/).toString();
+      var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString();
       $(this).addClass(iconClass);
     });
   }
 
-  // Photo/Item item view only
+  // Photo/Item item view
   if ($("#gItem").length) {
-    // Ensure that sized image versions
-    // fit inside their container
-    sizedImage();
+    // Ensure the resized image fits within its container
+    $("#gItem").gallery_fit_image();
 
     // Collapse comments form, insert button to expand
     if ($("#gAddCommentForm").length) {
@@ -140,18 +139,3 @@ $(document).ready(function() {
   );
 
 });
-
-/**
- * Reduce width of sized photo if it's wider than its parent container
- */
-function sizedImage() {
-  var containerWidth = $("#gItem").width();
-  var oPhoto = $("#gItem img").filter(function() {
-    return this.id.match(/gPhotoId-/);
-  });
-  if (containerWidth < oPhoto.width()) {
-    var proportion = containerWidth / oPhoto.width();
-    oPhoto.width(containerWidth);
-    oPhoto.height(proportion * oPhoto.height());
-  }
-}
-- 
cgit v1.2.3


From 1231e095c824ed9961b1156d89f6a1cae231f96f Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 9 Aug 2009 12:46:17 -0600
Subject: Keep image placement from shifting on hover, set gHoverItem height
 properly.

---
 themes/default/css/screen.css | 21 +++++++--------------
 themes/default/js/ui.init.js  | 38 +++++++++++++++++++++++++++++---------
 2 files changed, 36 insertions(+), 23 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 05d2977a..6a29e95f 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -475,7 +475,8 @@ form .gError,
   margin: 5px 0;
 }
 
-.gPhoto h2, .gItem .gMetadata {
+#gContent .gPhoto h2,
+#gContent .gItem .gMetadata {
   display: none;
 }
 
@@ -484,7 +485,7 @@ form .gError,
 }
 
 #gContent #gAlbumGrid .gAlbum h2 span {
-  background: transparent url('../images/ico-album.png') no-repeat top left !important;
+  background: transparent url('../images/ico-album.png') no-repeat top left;
   display: inline-block;
   height: 16px;
   margin-right: 5px;
@@ -496,8 +497,6 @@ form .gError,
   border: 1px solid #000;
   display: none;
   height: auto;
-  margin-top: -1em;
-  margin-left: -.4em;
   padding: 0;
   position: absolute;
   width: auto;
@@ -505,18 +504,11 @@ form .gError,
 }
 
 #gContent #gAlbumGrid #gHoverItem .gItem {
-  float: none;
-  height: 210px;
-  margin: 0;
-  padding: 0 1em 3em;
-}
-
-#gContent #gAlbumGrid #gHoverItem .gItem div {
-  margin-top: 1em !important;
+  border: none;
 }
 
-#gHoverItem .gItem h2,
-#gHoverItem .gItem .gMetadata {
+#gContent #gHoverItem .gItem h2,
+#gContent #gHoverItem .gItem .gMetadata {
   display: block;
 }
 
@@ -627,6 +619,7 @@ form .gError,
   bottom: 0;
   display: none;
   left: 0;
+  margin-top: 2em;
   position: absolute;
   width: 100%;
 }
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 29680a48..9d8acf28 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -86,7 +86,6 @@ $(document).ready(function() {
       duration: 1000,
       hash: true
     });
-
   }
 
   // Add hover state for buttons
@@ -103,16 +102,30 @@ $(document).ready(function() {
   // @todo apply hover affect to links
   $(".gItem").hover(
     function(){
-      var pos = $(this).position();
-      var itemClasses = $(this).attr("class");
-      var bgColor = $(this).css("background-color");
-      var cont = $(this).parent();
+      var position = $(this).position();
+      var item_classes = $(this).attr("class");
+      var bg_color = $(this).css("background-color");
+      var container = $(this).parent();
       $("#gHoverItem").remove();
-      cont.append("<div id=\"gHoverItem\"><div class=\"" + itemClasses + "\">" 
+      container.append("<div id=\"gHoverItem\"><div class=\"" + item_classes + "\">"
           + $(this).html() + "</div></div>");
-      $("#gHoverItem").css("top", pos.top);
-      $("#gHoverItem").css("left", pos.left);
-      $("#gHoverItem").css("background-color", bgColor);
+      $("#gHoverItem").css("top", position.top);
+      $("#gHoverItem").css("left", position.left);
+      $("#gHoverItem").css("background-color", bg_color);
+
+      var v_align = $(this).find(".gValign");
+      var title = $(this).find("h2");
+      var meta = $(this).find(".gMetadata");
+      var context = $(this).find(".gContextMenu");
+      var context_label = $(this).find(".gContextMenu li:first");
+      $("#gHoverItem .gItem").height(
+          $(v_align).gallery_height()
+          + $(title).gallery_height()
+          + $(meta).gallery_height()
+          + parseInt($(context).css("margin-top").replace("px",""))
+          + $(context_label).gallery_height()
+        );
+      
       $("#gHoverItem").fadeIn("fast");
       $("#gHoverItem").hover(
         function(){
@@ -138,4 +151,11 @@ $(document).ready(function() {
     }
   );
 
+  $.fn.gallery_height = function() {
+    var ht = $(this).height();
+    var mt = $(this).css("margin-top").replace("px","");
+    var mb = $(this).css("margin-bottom").replace("px","");
+    return ht + parseInt(mt) + parseInt(mb);
+  };
+
 });
-- 
cgit v1.2.3


From c85d9b41d9fdc7f6ca19386f5eedbd2dea119b46 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 9 Aug 2009 23:12:25 -0600
Subject: First stab at context menu for resize. It's quirky and needs work.

---
 themes/default/js/ui.init.js | 153 ++++++++++++++++++++++---------------------
 1 file changed, 78 insertions(+), 75 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 9d8acf28..3726d305 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -49,11 +49,8 @@ $(document).ready(function() {
   // Apply jQuery UI button css to submit inputs
   $("input[type=submit]:not(.gShortForm input)").addClass("ui-state-default ui-corner-all");
 
-  // Album view only
-  if ($("#gAlbumGrid").length) {
-    // Vertical align thumbnails/metadata in album grid
-    $(".gItem").gallery_valign();
-    // Apply styles to gContextMenu
+  // Apply styles and icon classes to gContextMenu
+  if ($(".gContextMenu").length) {
     $(".gContextMenu li").addClass("ui-state-default");
     $(".gContextMenu a").addClass("gButtonLink ui-icon-left");
     $(".gContextMenu a").prepend("<span class=\"ui-icon\"></span>");
@@ -63,10 +60,83 @@ $(document).ready(function() {
     });
   }
 
+  // Album view only
+  if ($("#gAlbumGrid").length) {
+    // Vertical align thumbnails/metadata in album grid
+    $(".gItem").gallery_valign();
+
+    // Initialize context menus
+    $(".gItem").hover(
+      function(){
+        var position = $(this).position();
+        var item_classes = $(this).attr("class");
+        var bg_color = $(this).css("background-color");
+        var container = $(this).parent();
+        $("#gHoverItem").remove();
+        container.append("<div id=\"gHoverItem\"><div class=\"" + item_classes + "\">"
+            + $(this).html() + "</div></div>");
+        $("#gHoverItem").css("top", position.top);
+        $("#gHoverItem").css("left", position.left);
+        $("#gHoverItem").css("background-color", bg_color);
+        $.fn.gallery_hover_init();
+        var v_align = $(this).find(".gValign");
+        var title = $(this).find("h2");
+        var meta = $(this).find(".gMetadata");
+        var context = $(this).find(".gContextMenu");
+        var context_label = $(this).find(".gContextMenu li:first");
+        $("#gHoverItem .gItem").height(
+            $(v_align).gallery_height()
+            + $(title).gallery_height()
+            + $(meta).gallery_height()
+            + parseInt($(context).css("margin-top").replace("px",""))
+            + $(context_label).gallery_height()
+          );
+
+        $("#gHoverItem").fadeIn("fast");
+        $("#gHoverItem").hover(
+          function(){
+            // Initialize context menus
+            $(".gContextMenu ul").hide();
+            $(".gContextMenu").hover(
+              function() {
+                $(this).find("ul").slideDown("fast");
+                var dialogLinks = $(this).find(".gDialogLink");
+                $(dialogLinks).gallery_dialog();
+              },
+              function() {
+                $(this).find("ul").slideUp("slow");
+              }
+            );
+          },
+          function() {
+            $(this).hide();
+          }
+        );
+      }
+    );
+  }
+
   // Photo/Item item view
   if ($("#gItem").length) {
     // Ensure the resized image fits within its container
-    $("#gItem").gallery_fit_image();
+    $("#gItem").gallery_fit_photo();
+
+    // Initialize context menus
+    var resize = $("#gItem").gallery_get_photo();
+    $(resize).hover(
+      function(){
+        $(".gContextMenu").hover(
+          function() {
+            $(this).find("ul").slideDown("fast");
+            var dialogLinks = $(this).find(".gDialogLink");
+            $(dialogLinks).gallery_dialog();
+          },
+          function() {
+            $(this).find("ul").slideUp("slow");
+          }
+        );
+      }
+    );
 
     // Collapse comments form, insert button to expand
     if ($("#gAddCommentForm").length) {
@@ -88,74 +158,7 @@ $(document).ready(function() {
     });
   }
 
-  // Add hover state for buttons
-  $(".ui-state-default").hover(
-    function(){
-      $(this).addClass("ui-state-hover");
-    },
-    function(){
-      $(this).removeClass("ui-state-hover");
-    }
-  );
-
-  // Initialize context menus
-  // @todo apply hover affect to links
-  $(".gItem").hover(
-    function(){
-      var position = $(this).position();
-      var item_classes = $(this).attr("class");
-      var bg_color = $(this).css("background-color");
-      var container = $(this).parent();
-      $("#gHoverItem").remove();
-      container.append("<div id=\"gHoverItem\"><div class=\"" + item_classes + "\">"
-          + $(this).html() + "</div></div>");
-      $("#gHoverItem").css("top", position.top);
-      $("#gHoverItem").css("left", position.left);
-      $("#gHoverItem").css("background-color", bg_color);
-
-      var v_align = $(this).find(".gValign");
-      var title = $(this).find("h2");
-      var meta = $(this).find(".gMetadata");
-      var context = $(this).find(".gContextMenu");
-      var context_label = $(this).find(".gContextMenu li:first");
-      $("#gHoverItem .gItem").height(
-          $(v_align).gallery_height()
-          + $(title).gallery_height()
-          + $(meta).gallery_height()
-          + parseInt($(context).css("margin-top").replace("px",""))
-          + $(context_label).gallery_height()
-        );
-      
-      $("#gHoverItem").fadeIn("fast");
-      $("#gHoverItem").hover(
-        function(){
-          // Initialize context menus
-          $(".gContextMenu ul").hide();
-          $(".gContextMenu").hover(
-            function() {
-              $(this).find("ul").slideDown("fast");
-              var dialogLinks = $(this).find(".gDialogLink");
-              $(dialogLinks).gallery_dialog();
-            },
-            function() {
-              $(this).find("ul").slideUp("slow");
-            }
-          );
-        },
-        function() {
-          $(this).hide();
-        }
-      );
-    },
-    function(){
-    }
-  );
-
-  $.fn.gallery_height = function() {
-    var ht = $(this).height();
-    var mt = $(this).css("margin-top").replace("px","");
-    var mb = $(this).css("margin-bottom").replace("px","");
-    return ht + parseInt(mt) + parseInt(mb);
-  };
+  // Initialize button hover effect
+  $.fn.gallery_hover_init();
 
 });
-- 
cgit v1.2.3


From cea1d4f1f3d295284f3ba19f0d73bb2785b6ed29 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 9 Aug 2009 23:32:53 -0600
Subject: Forgot to commit the css for the resize photo view context menu.

---
 themes/default/css/screen.css | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 6a29e95f..5ab9083d 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -515,6 +515,7 @@ form .gError,
 /* Individual photo content ~~~~~~~~~~~~~~ */
 
 #gContent #gItem {
+  position: relative;
   width: 99%;
 }
 
@@ -616,14 +617,25 @@ form .gError,
 /* Context Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .gContextMenu {
+  position: absolute;
   bottom: 0;
-  display: none;
   left: 0;
+}
+
+.gItem .gContextMenu {
+  display: none;
   margin-top: 2em;
-  position: absolute;
   width: 100%;
 }
 
+#gItem .gContextMenu {
+  font-size: .7em;
+}
+
+#gItem .gContextMenu ul {
+  display: none;
+}
+
 .gContextMenu li {
   border-left: none;
   border-right: none;
-- 
cgit v1.2.3


From cbba45fffc7368280e9529f55e108d0080175b6a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 10 Aug 2009 23:05:05 -0700
Subject: Create the concept of an "ajax link" and use it for thumbnail
 rotation and album covers in the context menu.

Notes:
- This requires context_menu() to have a CSS selector that refers to the
  <img> that we're operating on, otherwise we don't know how to find the
  thumbnail, etc.
- Create Menu_Element_Ajax_Link which has an ajax_handler attribute
  that contains a snippet of JS that we're going to run when the ajax
  call returns.
- Add $.gallery_replace_image in gallery.common.js
- Add lib/gallery.ajax.js which can be used to ajaxify any link, and have
  ui.init.js in the themes call that on all .gAjaxLink elements.
---
 lib/gallery.ajax.js                       |  15 +++
 lib/gallery.common.js                     |   4 +
 modules/gallery/helpers/gallery.php       | 191 ++++++++++++++++--------------
 modules/gallery/libraries/Menu.php        |  34 ++++++
 modules/gallery/libraries/Theme_View.php  |   6 +-
 themes/admin_default/js/ui.init.js        |   3 +
 themes/admin_default/views/admin.html.php |   1 +
 themes/default/js/ui.init.js              |   9 +-
 themes/default/views/album.html.php       |   2 +-
 themes/default/views/movie.html.php       |   2 +-
 themes/default/views/page.html.php        |   1 +
 themes/default/views/photo.html.php       |   2 +-
 12 files changed, 169 insertions(+), 101 deletions(-)
 create mode 100644 lib/gallery.ajax.js

(limited to 'themes/default')

diff --git a/lib/gallery.ajax.js b/lib/gallery.ajax.js
new file mode 100644
index 00000000..4f26745d
--- /dev/null
+++ b/lib/gallery.ajax.js
@@ -0,0 +1,15 @@
+(function($) {
+  $.widget("ui.gallery_ajax",  {
+    _init: function() {
+      this.element.click(function(event) {
+	eval("var ajax_handler = " + $(event.currentTarget).attr("ajax_handler"));
+	$.get($(event.currentTarget).attr("href"), function(data) {
+		eval("var data = " + data);
+		ajax_handler(data);
+	      });
+	event.preventDefault();
+	return false;
+      });
+    }
+  });
+})(jQuery);
diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index fdb7a1cc..53c2fafb 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -104,5 +104,9 @@
     );
   };
 
+  // Ajax handler for replacing an image, used in Ajax thumbnail rotation
+  $.gallery_replace_image = function(data, thumb) {
+    $(thumb).attr({src: data.src, width: data.width, height: data.height});
+  };
 })(jQuery);
 
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 42097a99..c81af842 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -197,108 +197,117 @@ class gallery_Core {
     return $menu;
   }
 
-  static function context_menu($menu, $theme, $item) {
-    $page_type = $theme->page_type();
-    switch ($item->type) {
-    case "movie":
-      $edit_title = t("Edit this movie");
-      $delete_title = t("Delete this movie");
-      break;
-
-    case "album":
-      $edit_title = t("Edit this album");
-      $delete_title = t("Delete this album");
-      break;
-
-    default:
-      $edit_title = t("Edit this photo");
-      $delete_title = t("Delete this photo");
-      break;
-    }
-    $cover_title = t("Choose as the album cover");
-    $move_title = t("Move to another album");
-
-    $csrf = access::csrf_token();
-
+  static function context_menu($menu, $theme, $item, $thumb_css_selector) {
     $menu->append($options_menu = Menu::factory("submenu")
                   ->id("options_menu")
                   ->label(t("Options"))
                   ->css_class("ui-icon-carat-1-n"));
 
-    $options_menu->append(Menu::factory("dialog")
-                          ->id("edit")
-                          ->label($edit_title)
-                          ->css_class("ui-icon-pencil")
-                          ->url(url::site("quick/form_edit/$item->id?page_type=$page_type")));
+    if (access::can("edit", $item)) {
+      $page_type = $theme->page_type();
+      switch ($item->type) {
+      case "movie":
+        $edit_title = t("Edit this movie");
+        $delete_title = t("Delete this movie");
+        break;
 
+      case "album":
+        $edit_title = t("Edit this album");
+        $delete_title = t("Delete this album");
+        break;
 
-    if ($item->is_photo() && graphics::can("rotate")) {
-      $options_menu
-        ->append(Menu::factory("link")
-                 ->id("rotate_ccw")
-                 ->label(t("Rotate 90&deg; counter clockwise"))
-                 ->css_class("ui-icon-rotate-ccw")
-                 ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&page_type=$page_type")))
-        ->append(Menu::factory("link")
-                 ->id("rotate_cw")
-                 ->label(t("Rotate 90&deg; clockwise"))
-                 ->css_class("ui-icon-rotate-cw")
-                 ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type")));
-    }
+      default:
+        $edit_title = t("Edit this photo");
+        $delete_title = t("Delete this photo");
+        break;
+      }
+      $cover_title = t("Choose as the album cover");
+      $move_title = t("Move to another album");
 
-    // Don't move photos from the photo page; we don't yet have a good way of redirecting after move
-    if ($page_type == "album") {
-      $options_menu
-        ->append(Menu::factory("dialog")
-                 ->id("move")
-                 ->label($move_title)
-                 ->css_class("ui-icon-folder-open")
-                 ->url(url::site("move/browse/$item->id")));
-    }
+      $csrf = access::csrf_token();
+
+      $options_menu->append(Menu::factory("dialog")
+                            ->id("edit")
+                            ->label($edit_title)
+                            ->css_class("ui-icon-pencil")
+                            ->url(url::site("quick/form_edit/$item->id?page_type=$page_type")));
 
-    $parent = $item->parent();
-    if (access::can("edit", $parent)) {
-      // We can't make this item the highlight if it's an album with no album cover, or if it's
-      // already the album cover.
-      if (($item->type == "album" && empty($item->album_cover_item_id)) ||
-          ($item->type == "album" && $parent->album_cover_item_id == $item->album_cover_item_id) ||
-          $parent->album_cover_item_id == $item->id) {
-        $disabledState = " ui-state-disabled";
-      } else {
-        $disabledState = " ";
+
+      if ($item->is_photo() && graphics::can("rotate")) {
+        $options_menu
+          ->append(
+            Menu::factory("ajax_link")
+            ->id("rotate_ccw")
+            ->label(t("Rotate 90&deg; counter clockwise"))
+            ->css_class("ui-icon-rotate-ccw")
+            ->ajax_handler("function(data) { " .
+                           "\$.gallery_replace_image(data, \$('$thumb_css_selector')) }")
+            ->url(url::site("quick/rotate/$item->id/ccw?csrf=$csrf&page_type=$page_type")))
+          ->append(
+            Menu::factory("ajax_link")
+            ->id("rotate_cw")
+            ->label(t("Rotate 90&deg; clockwise"))
+            ->css_class("ui-icon-rotate-cw")
+            ->ajax_handler("function(data) { " .
+                           "\$.gallery_replace_image(data, \$('$thumb_css_selector')) }")
+            ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type")));
+      }
+
+      // Don't move photos from the photo page; we don't yet have a good way of redirecting after
+      // move
+      if ($page_type == "album") {
+        $options_menu
+          ->append(Menu::factory("dialog")
+                   ->id("move")
+                   ->label($move_title)
+                   ->css_class("ui-icon-folder-open")
+                   ->url(url::site("move/browse/$item->id")));
       }
-      $options_menu
-        ->append(Menu::factory("link")
-                 ->id("make_album_cover")
-                 ->label($cover_title)
-                 ->css_class("ui-icon-star")
-                 ->url(
-                   url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type")))
-        ->append(Menu::factory("dialog")
-                 ->id("delete")
-                 ->label($delete_title)
-                 ->css_class("ui-icon-trash")
-                 ->css_id("gQuickDelete")
-                 ->url(url::site("quick/form_delete/$item->id?csrf=$csrf&page_type=$page_type")));
-    }
 
-    if ($item->is_album()) {
-      $options_menu
-        ->append(Menu::factory("dialog")
-                 ->id("add_item")
-                 ->label(t("Add a photo"))
-                 ->css_class("add_item")
-                 ->url(url::site("simple_uploader/app/$item->id")))
-        ->append(Menu::factory("dialog")
-                 ->id("add_album")
-                 ->label(t("Add an album"))
-                 ->css_class("add_album")
-                 ->url(url::site("form/add/albums/$item->id?type=album")))
-        ->append(Menu::factory("dialog")
-                 ->id("edit_permissions")
-                 ->label(t("Edit permissions"))
-                 ->css_class("permissions")
-                 ->url(url::site("permissions/browse/$item->id")));
+      $parent = $item->parent();
+      if (access::can("edit", $parent)) {
+        // We can't make this item the highlight if it's an album with no album cover, or if it's
+        // already the album cover.
+        if (($item->type == "album" && empty($item->album_cover_item_id)) ||
+            ($item->type == "album" && $parent->album_cover_item_id == $item->album_cover_item_id) ||
+            $parent->album_cover_item_id == $item->id) {
+          $disabledState = " ui-state-disabled";
+        } else {
+          $disabledState = " ";
+        }
+        $options_menu
+          ->append(Menu::factory("ajax_link")
+                   ->id("make_album_cover")
+                   ->label($cover_title)
+                   ->css_class("ui-icon-star")
+                   ->ajax_handler("function(data) { window.location.reload() }")
+                   ->url(url::site("quick/make_album_cover/$item->id?csrf=$csrf")))
+          ->append(Menu::factory("dialog")
+                   ->id("delete")
+                   ->label($delete_title)
+                   ->css_class("ui-icon-trash")
+                   ->css_id("gQuickDelete")
+                   ->url(url::site("quick/form_delete/$item->id?csrf=$csrf&page_type=$page_type")));
+      }
+
+      if ($item->is_album()) {
+        $options_menu
+          ->append(Menu::factory("dialog")
+                   ->id("add_item")
+                   ->label(t("Add a photo"))
+                   ->css_class("add_item")
+                   ->url(url::site("simple_uploader/app/$item->id")))
+          ->append(Menu::factory("dialog")
+                   ->id("add_album")
+                   ->label(t("Add an album"))
+                   ->css_class("add_album")
+                   ->url(url::site("form/add/albums/$item->id?type=album")))
+          ->append(Menu::factory("dialog")
+                   ->id("edit_permissions")
+                   ->label(t("Edit permissions"))
+                   ->css_class("permissions")
+                   ->url(url::site("permissions/browse/$item->id")));
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index 263dc38d..07b2b2b8 100644
--- a/modules/gallery/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
@@ -96,6 +96,37 @@ class Menu_Element_Link extends Menu_Element {
   }
 }
 
+/**
+ * Menu element that provides an AJAX link.
+ */
+class Menu_Element_Ajax_Link extends Menu_Element {
+  public $ajax_handler;
+
+  /**
+   * Set the AJAX handler
+   * @chainable
+   */
+  public function ajax_handler($ajax_handler) {
+    $this->ajax_handler = $ajax_handler;
+    return $this;
+  }
+
+  public function __toString() {
+    if (isset($this->css_id) && !empty($this->css_id)) {
+      $css_id = " id=\"$this->css_id\"";
+    } else {
+      $css_id = "";
+    }
+    if (isset($this->css_class) && !empty($this->css_class)) {
+      $css_class = " $this->css_class";
+    } else {
+      $css_class = "";
+    }
+    return "<li><a$css_id class=\"gAjaxLink $css_class\" href=\"$this->url\" " .
+      "title=\"$this->label\" ajax_handler=\"$this->ajax_handler\">$this->label</a></li>";
+  }
+}
+
 /**
  * Menu element that provides a pop-up dialog
  */
@@ -132,6 +163,9 @@ class Menu_Core extends Menu_Element {
     case "link":
       return new Menu_Element_Link($type);
 
+    case "ajax_link":
+      return new Menu_Element_Ajax_Link($type);
+
     case "dialog":
       return new Menu_Element_Dialog($type);
 
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index a5f5db03..541bce88 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -111,15 +111,15 @@ class Theme_View_Core extends Gallery_View {
     return $menu->compact();
   }
 
-  public function context_menu($item) {
+  public function context_menu($item, $thumbnail_css_selector) {
     $menu = Menu::factory("root")
       ->append(Menu::factory("submenu")
                ->id("context_menu")
                ->label(t("Options")))
       ->css_class("gContextMenu");
 
-    gallery::context_menu($menu, $this, $item);
-    module::event("context_menu", $menu, $this, $item);
+    gallery::context_menu($menu, $this, $item, $thumbnail_css_selector);
+    module::event("context_menu", $menu, $this, $item, $thumbnail_css_selector);
     return $menu->compact();
   }
 
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index e52f0c4c..daa6dd70 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -19,6 +19,9 @@ $(document).ready(function(){
   // Initialize modal dialogs
   $(".gDialogLink").gallery_dialog();
 
+  // Initialize ajax links
+  $(".gDialogLink").gallery_ajax();
+
   // Initialize panels
   $(".gPanelLink").gallery_panel();
 
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index d27f9260..3f4128cb 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -25,6 +25,7 @@
    <script type="text/javascript">
    var MSG_CANCEL = "<?= t('Cancel') ?>";
    </script>
+   <?= $theme->script("gallery.ajax.js") ?>
    <?= $theme->script("gallery.dialog.js") ?>
    <?= $theme->script("superfish/js/superfish.js") ?>
    <?= $theme->script("jquery.dropshadow.js") ?>
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 3726d305..60482972 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -34,6 +34,7 @@ $(document).ready(function() {
   // Initialize dialogs
   $("#gLoginLink").addClass("gDialogLink");
   $(".gDialogLink").gallery_dialog();
+  $(".gAjaxLink").gallery_ajax();
 
   // Initialize view menu
   if ($("#gViewMenu").length) {
@@ -100,8 +101,8 @@ $(document).ready(function() {
             $(".gContextMenu").hover(
               function() {
                 $(this).find("ul").slideDown("fast");
-                var dialogLinks = $(this).find(".gDialogLink");
-                $(dialogLinks).gallery_dialog();
+		$(this).find(".gDialogLink").gallery_dialog();
+		$(this).find(".gAjaxLink").gallery_ajax();
               },
               function() {
                 $(this).find("ul").slideUp("slow");
@@ -128,8 +129,8 @@ $(document).ready(function() {
         $(".gContextMenu").hover(
           function() {
             $(this).find("ul").slideDown("fast");
-            var dialogLinks = $(this).find(".gDialogLink");
-            $(dialogLinks).gallery_dialog();
+            $(this).find(".gDialogLink").gallery_dialog();
+            $(this).find(".gAjaxLink").gallery_ajax();
           },
           function() {
             $(this).find("ul").slideUp("slow");
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index ce57458e..e2890482 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -19,7 +19,7 @@
       <?= $child->thumb_img(array("class" => "gThumbnail")) ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
-    <?= $theme->context_menu($child) ?>
+    <?= $theme->context_menu($child, "#gItemId-{$child->id} .gThumbnail") ?>
     <h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index d255922b..c8ecd769 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -36,5 +36,5 @@
     var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
   </script>
   <?= $theme->photo_bottom() ?>
-  <?= $theme->context_menu($item) ?>
+  <?= $theme->context_menu($item, "#gMovieId-{$item->id}") ?>
 </div>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 66282bae..2cb71b9e 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -53,6 +53,7 @@
     <script type="text/javascript">
     var MSG_CANCEL = "<?= t('Cancel') ?>";
     </script>
+    <?= $theme->script("gallery.ajax.js") ?>
     <?= $theme->script("gallery.dialog.js") ?>
     <?= $theme->script("gallery.form.js") ?>
     <?= $theme->script("superfish/js/superfish.js") ?>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 453417dc..fa5def47 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -47,7 +47,7 @@
     </a>
     <? endif ?>
     <?= $theme->resize_bottom($item) ?>
-    <?= $theme->context_menu($item) ?>
+    <?= $theme->context_menu($item, "#gPhotoId-{$item->id}") ?>
   </div>
 
   <div id="gInfo">
-- 
cgit v1.2.3


From 99d7a0c0dbb799ba64d769475a1534650e98e5b6 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Tue, 11 Aug 2009 00:33:15 -0600
Subject: Make each context menu button clickable from side-to-side

---
 themes/default/css/screen.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'themes/default')

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 5ab9083d..55839c57 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -643,6 +643,7 @@ form .gError,
 }
 
 .gContextMenu li a {
+  display: block;
   line-height: 1.6em;
 }
 
-- 
cgit v1.2.3


From bb6bf17076eff74ee490d17b510150d68f5faa54 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Tue, 11 Aug 2009 00:41:07 -0600
Subject: Move context menu to gallery.common, forgot to include in prior
 commit

---
 themes/default/js/ui.init.js | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 60482972..ef7e43d9 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -34,7 +34,6 @@ $(document).ready(function() {
   // Initialize dialogs
   $("#gLoginLink").addClass("gDialogLink");
   $(".gDialogLink").gallery_dialog();
-  $(".gAjaxLink").gallery_ajax();
 
   // Initialize view menu
   if ($("#gViewMenu").length) {
@@ -96,18 +95,7 @@ $(document).ready(function() {
         $("#gHoverItem").fadeIn("fast");
         $("#gHoverItem").hover(
           function(){
-            // Initialize context menus
-            $(".gContextMenu ul").hide();
-            $(".gContextMenu").hover(
-              function() {
-                $(this).find("ul").slideDown("fast");
-		$(this).find(".gDialogLink").gallery_dialog();
-		$(this).find(".gAjaxLink").gallery_ajax();
-              },
-              function() {
-                $(this).find("ul").slideUp("slow");
-              }
-            );
+            $(this).gallery_context_menu();
           },
           function() {
             $(this).hide();
@@ -124,20 +112,9 @@ $(document).ready(function() {
 
     // Initialize context menus
     var resize = $("#gItem").gallery_get_photo();
-    $(resize).hover(
-      function(){
-        $(".gContextMenu").hover(
-          function() {
-            $(this).find("ul").slideDown("fast");
-            $(this).find(".gDialogLink").gallery_dialog();
-            $(this).find(".gAjaxLink").gallery_ajax();
-          },
-          function() {
-            $(this).find("ul").slideUp("slow");
-          }
-        );
-      }
-    );
+    $(resize).hover(function(){
+      $(this).gallery_context_menu();
+    });
 
     // Collapse comments form, insert button to expand
     if ($("#gAddCommentForm").length) {
-- 
cgit v1.2.3


From 7d36f43d0bf3ab8765820b9496a41f2f75ca85c4 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Wed, 19 Aug 2009 18:51:14 -0600
Subject: Update docblocks and todos

---
 themes/default/js/ui.init.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index ef7e43d9..2391f638 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -1,8 +1,5 @@
 /**
- * Initialize jQuery UI and Plugin elements
- *
- * @todo Standardize how elements requiring listeners are handled
- *        http://docs.jquery.com/Events/live
+ * Initialize jQuery UI and Gallery Plugin elements
  */
 
 var shortForms = new Array(
@@ -13,9 +10,6 @@ var shortForms = new Array(
 
 $(document).ready(function() {
 
-  // Remove .gMenu from thumb menu's before initializing Superfish
-  // @todo gallery_menu should only apply gMenu to top-level menus, submenus should be gSubMenu-N
-
   // Initialize Superfish menus
   $("ul.gMenu").addClass("sf-menu");
   $('ul.sf-menu').superfish({
-- 
cgit v1.2.3


From 457708311a466d8b116d5b28575be1bc3baad864 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 23 Aug 2009 14:58:26 -0600
Subject: Cut down on jittering of the context menu on open on resize view.

---
 lib/gallery.common.js       |  12 ++++++++----
 themes/default/js/.DS_Store | Bin 0 -> 6148 bytes
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 themes/default/js/.DS_Store

(limited to 'themes/default')

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 06775d79..16cb7ea2 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -112,15 +112,19 @@
   };
 
   $.fn.gallery_context_menu = function() {
+    var in_progress = 0;
+    $(".gContextMenu *").removeAttr('title');
     $(".gContextMenu ul").hide();
     $(".gContextMenu").hover(
       function() {
-        $(this).find("ul").slideDown("fast");
-        $(this).find(".gDialogLink").gallery_dialog();
-        $(this).find(".gAjaxLink").gallery_ajax();
+        if (in_progress == 0) {
+          $(this).find("ul").slideDown("fast", function() { in_progress = 1; });
+          $(this).find(".gDialogLink").gallery_dialog();
+          $(this).find(".gAjaxLink").gallery_ajax();
+        }
       },
       function() {
-        $(this).find("ul").slideUp("slow");
+        $(this).find("ul").slideUp("slow", function() { in_progress = 0; });
       }
     );
   };
diff --git a/themes/default/js/.DS_Store b/themes/default/js/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/themes/default/js/.DS_Store differ
-- 
cgit v1.2.3


From deafc01c21887d8b699f26f9358a7acbf765151b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 23 Aug 2009 15:05:18 -0700
Subject: Remove accidentally submitted .DS_Store file.

---
 themes/default/js/.DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 themes/default/js/.DS_Store

(limited to 'themes/default')

diff --git a/themes/default/js/.DS_Store b/themes/default/js/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
Binary files a/themes/default/js/.DS_Store and /dev/null differ
-- 
cgit v1.2.3


From 3d2e36f5b601b5a274efd0c55bf161448409682a Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Thu, 27 Aug 2009 20:34:42 -0400
Subject: fixed CSS bug in the simple uploader  #629 and improved permissions
 UI to include breadcrumbs (consistent with the uploader dialog)

---
 modules/gallery/views/permissions_browse.html.php | 42 +++++++++++------------
 themes/default/css/screen.css                     | 19 ++++++----
 2 files changed, 34 insertions(+), 27 deletions(-)

(limited to 'themes/default')

diff --git a/modules/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index 888a27f7..f990896c 100644
--- a/modules/gallery/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -5,8 +5,9 @@
     $.ajax({
       url: form_url.replace("__ITEM__", id),
       success: function(data) {
-        $("div.form").slideUp();
-        $("div#edit-" + id).html(data).slideDown();
+		    $("#gEditPermissionForm").html(data);
+		    $(".active").removeClass("active");
+		    $("#item-" + id).addClass("active");
       }
     });
   }
@@ -18,7 +19,7 @@
       url: action_url.replace("__CMD__", cmd).replace("__GROUP__", group_id).
            replace("__PERM__", perm_id).replace("__ITEM__", item_id),
       success: function(data) {
-        $("div#edit-" + item_id).load(form_url.replace("__ITEM__", item_id));
+        $("#gEditPermissionForm").load(form_url.replace("__ITEM__", item_id));
       }
     });
   }
@@ -31,26 +32,25 @@
     </li>
   </ul>
   <? endif ?>
-  <ul>
+  
+  <p>Edit permissions for album:</p>
+  
+  <ul class="gBreadcrumbs">
     <? foreach ($parents as $parent): ?>
-    <li>
+    <li id="item-<?= $parent->id ?>">
       <a href="javascript:show(<?= $parent->id ?>)">
-        <?= p::clean($parent->title) ?>
+        <?= p::purify($parent->title) ?>
       </a>
-      <div class="form" id="edit-<?= $parent->id ?>"></div>
-      <ul>
-        <? endforeach ?>
-        <li>
-          <a href="javascript:show(<?= $item->id ?>)">
-            <?= p::purify($item->title) ?>
-          </a>
-          <div class="form" id="edit-<?= $item->id ?>">
-            <?= $form ?>
-          </div>
-        </li>
-        <? foreach ($parents as $parent): ?>
-      </ul>
     </li>
+    <? endforeach ?>
+    <li class="active" id="item-<?= $item->id ?>">
+      <a href="javascript:show(<?= $item->id ?>)">
+    	<?= p::purify($item->title) ?></li>
+	  </a>
+	</li>
   </ul>
-  <? endforeach ?>
-</div>
+  
+  <div id="gEditPermissionForm">
+    <?= $form ?>
+  </div>
+</div>
\ No newline at end of file
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 55839c57..ecae2bb2 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -718,7 +718,7 @@ form .gError,
   font-weight: bold;
 }
 
-#gAddPhotos .gBreadcrumbs {
+#gDialog .gBreadcrumbs li {
   font-size: .9em;
 }
 
@@ -901,6 +901,10 @@ form .gError,
   display: none;
 }
 
+#gDialog p {
+	margin: 0;
+}
+
 /* jQuery UI ThemeRoller buttons */
 
 .gButtonLink {
@@ -1001,6 +1005,14 @@ form .gError,
 
 /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#gEditPermissionForm {
+	clear: both;
+}
+#gEditPermissionForm fieldset {
+	border: 1px solid #cccccc;
+	padding: 0;
+}
+
 #gPermissions .gDenied,
 #gPermissions .gAllowed {
   text-align: center;
@@ -1022,11 +1034,6 @@ form .gError,
   display: inline-block;
 }
 
-#gAddPhotos p {
-  margin: 0;
-  padding: 0;
-}
-
 #gAddPhotosCanvas {
   height: 325px;
   width: 450px;
-- 
cgit v1.2.3


From f1e008a14f2dfb51d1204dad3deb19e2e3df16c8 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 28 Aug 2009 13:47:35 -0600
Subject: Don't clone hover item, apply styles to the original container.
 Contextual menu rotates are now immediately visible. Fixes ticket 667.

---
 themes/default/css/screen.css | 23 +++++------------
 themes/default/js/ui.init.js  | 60 ++++++++++++++++++++++---------------------
 2 files changed, 37 insertions(+), 46 deletions(-)

(limited to 'themes/default')

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 55839c57..cc5f6bcb 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -406,7 +406,6 @@ form .gError,
 }
 
 #gSidebar {
-  background-color: #fff;
   font-size: .9em;
   padding: 0 20px;
   width: 220px;
@@ -492,23 +491,13 @@ form .gError,
   width: 16px;
 }
 
-#gContent #gAlbumGrid #gHoverItem {
+#gContent #gAlbumGrid .gHoverItem {
   background-color: #fff;
   border: 1px solid #000;
-  display: none;
-  height: auto;
-  padding: 0;
-  position: absolute;
-  width: auto;
-  z-index: 100;
-}
-
-#gContent #gAlbumGrid #gHoverItem .gItem {
-  border: none;
 }
 
-#gContent #gHoverItem .gItem h2,
-#gContent #gHoverItem .gItem .gMetadata {
+#gContent .gHoverItem h2,
+#gContent .gHoverItem .gMetadata {
   display: block;
 }
 
@@ -647,15 +636,15 @@ form .gError,
   line-height: 1.6em;
 }
 
-#gHoverItem .gContextMenu {
+.gHoverItem .gContextMenu {
   display: block;
 }
 
-#gHoverItem .gContextMenu li {
+.gHoverItem .gContextMenu li {
   text-align: left;
 }
 
-#gHoverItem .gContextMenu a:hover {
+.gHoverItem .gContextMenu a:hover {
   text-decoration: none;
 }
 
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 2391f638..006d74bb 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -62,39 +62,41 @@ $(document).ready(function() {
     // Initialize context menus
     $(".gItem").hover(
       function(){
+        // Insert invisible placeholder to hold the item's position in the grid
+        var placeHolder = $(this).clone();
+        $(placeHolder).attr("id", "gPlaceHolder");
+        $(placeHolder).css("visibility", "hidden");
+        $(this).after($(placeHolder));
+        // Style and position the item
+        $(this).addClass("gHoverItem");
         var position = $(this).position();
-        var item_classes = $(this).attr("class");
-        var bg_color = $(this).css("background-color");
-        var container = $(this).parent();
-        $("#gHoverItem").remove();
-        container.append("<div id=\"gHoverItem\"><div class=\"" + item_classes + "\">"
-            + $(this).html() + "</div></div>");
-        $("#gHoverItem").css("top", position.top);
-        $("#gHoverItem").css("left", position.left);
-        $("#gHoverItem").css("background-color", bg_color);
-        $.fn.gallery_hover_init();
-        var v_align = $(this).find(".gValign");
+        $(this).css("position", "absolute");
+        $(this).css("top", position.top);
+        $(this).css("left", position.left);
+        $(this).css("z-index", "1000");
+        // Initialize the contextual menu
+        $(this).gallery_context_menu();
+        // Set height based on height of descendents
         var title = $(this).find("h2");
         var meta = $(this).find(".gMetadata");
-        var context = $(this).find(".gContextMenu");
         var context_label = $(this).find(".gContextMenu li:first");
-        $("#gHoverItem .gItem").height(
-            $(v_align).gallery_height()
-            + $(title).gallery_height()
-            + $(meta).gallery_height()
-            + parseInt($(context).css("margin-top").replace("px",""))
-            + $(context_label).gallery_height()
-          );
-
-        $("#gHoverItem").fadeIn("fast");
-        $("#gHoverItem").hover(
-          function(){
-            $(this).gallery_context_menu();
-          },
-          function() {
-            $(this).hide();
-          }
-        );
+        var item_ht = $(this).height();
+        var title_ht = $(title).gallery_height();
+        var meta_ht = $(meta).gallery_height();
+        var context_label_ht = $(context_label).gallery_height();
+        $(this).height(item_ht + title_ht + meta_ht + context_label_ht);
+      },
+      function() {
+        // Reset item height, position, and z-index
+        var sib_height = $(this).next().height();
+        $(this).css("height", sib_height);
+        $(this).css("position", "relative");
+        $(this).css("top", null);
+        $(this).css("left", null);
+        $(this).css("z-index", null);
+        // Remove the placeholder and hover class from the item
+        $("#gPlaceHolder").remove();
+        $(this).removeClass("gHoverItem");
       }
     );
   }
-- 
cgit v1.2.3


From 1d5262f9c354a8564f05a8a31b915ad479f4d361 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 28 Aug 2009 13:44:01 -0700
Subject: Fix ticket #591: reCaptcha always on the page. 1) move creating the
 "Add a comment" button into the comments.html.php 2) use $.get() to retrieve
 the comment add form

---
 modules/comment/helpers/comment_theme.php |  2 --
 modules/comment/js/comment.js             | 10 +++++++++-
 modules/comment/views/comments.html.php   | 10 ++++++++--
 themes/default/css/screen.css             |  7 +++++++
 themes/default/js/ui.init.js              | 12 ------------
 themes/default/views/movie.html.php       |  3 ---
 themes/default/views/photo.html.php       |  3 ---
 7 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'themes/default')

diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index b807e2cf..38a00b5c 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -26,7 +26,6 @@ class comment_theme_Core {
   static function photo_bottom($theme) {
     $block = new Block;
     $block->css_id = "gComments";
-    $block->anchor = t("comments");
     $block->title = t("Comments");
 
     $view = new View("comments.html");
@@ -37,7 +36,6 @@ class comment_theme_Core {
       ->find_all();
 
     $block->content = $view;
-    $block->content .= comment::get_add_form($theme->item())->render("form.html");
     return $block;
   }
 }
\ No newline at end of file
diff --git a/modules/comment/js/comment.js b/modules/comment/js/comment.js
index 00fc6027..9fd63c1a 100644
--- a/modules/comment/js/comment.js
+++ b/modules/comment/js/comment.js
@@ -1,5 +1,13 @@
 $("document").ready(function() {
-  ajaxify_comment_form();
+  $("#gAddCommentButton").click(function(event) {
+    event.preventDefault();
+    $.get($(this).attr("href"),
+          {},
+          function(data) {
+            $("#gCommentDetail").append(data);
+            ajaxify_comment_form();
+          });
+    });
 });
 
 function ajaxify_comment_form() {
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index f7251389..6dce9971 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -1,11 +1,17 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+  <a href="<?= url::site("form/add/comments/{$item->id})") ?>" id="gAddCommentButton"
+   class="gButtonLink ui-corner-all ui-icon-left ui-state-default right">
+  <span class="ui-icon ui-icon-comment"></span>
+  <?= t("Add a comment") ?>
+</a>
+<div id="gCommentDetail">
 <? if (!$comments->count()): ?>
 <p id="gNoCommentsYet">
   <?= t("No comments yet. Be the first to <a %attrs>comment</a>!",
       array("attrs" => "href=\"#add_comment_form\" class=\"showCommentForm\"")) ?>
 </p>
 <? endif ?>
-<ul id="gComments">
+<ul>
   <? foreach ($comments as $comment): ?>
   <li id="gComment-<?= $comment->id ?>">
     <p class="gAuthor">
@@ -26,4 +32,4 @@
   </li>
   <? endforeach ?>
 </ul>
-<a name="add_comment_form"></a>
+</div>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index ecae2bb2..481581a2 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -530,6 +530,7 @@ form .gError,
 
 #gContent #gComments {
   margin-top: 2em;
+  position: relative;
 }
 
 #gContent #gComments ul li {
@@ -561,6 +562,12 @@ form .gError,
   width: 32px;
 }
 
+#gAddCommentButton {
+  position: absolute;
+  right: 0;
+  top: 2px;
+}
+
 #gContent #gAddCommentForm {
   margin-top: 2em;
 }
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 2391f638..67cdb968 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -110,18 +110,6 @@ $(document).ready(function() {
       $(this).gallery_context_menu();
     });
 
-    // Collapse comments form, insert button to expand
-    if ($("#gAddCommentForm").length) {
-      var showCommentForm = '<a href="#add_comment_form"'
-        + ' class="showCommentForm gButtonLink ui-corner-all ui-icon-left ui-state-default right">'
-        + '<span class="ui-icon ui-icon-comment"></span>' + ADD_A_COMMENT + '</a>';
-      $("#gAddCommentForm").hide();
-      $("#gComments").prepend(showCommentForm);
-      $(".showCommentForm").click(function(){
-        $("#gAddCommentForm").show(1000);
-      });
-    }
-
     // Add scroll effect for links to named anchors
     $.localScroll({
       queue: true,
diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php
index c8ecd769..29789f8e 100644
--- a/themes/default/views/movie.html.php
+++ b/themes/default/views/movie.html.php
@@ -32,9 +32,6 @@
        <div><?= nl2br(p::purify($item->description)) ?></div>
   </div>
 
-  <script type="text/javascript">
-    var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
-  </script>
   <?= $theme->photo_bottom() ?>
   <?= $theme->context_menu($item, "#gMovieId-{$item->id}") ?>
 </div>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index fa5def47..39e61ef6 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -55,8 +55,5 @@
     <div><?= nl2br(p::purify($item->description)) ?></div>
   </div>
 
-  <script type="text/javascript">
-    var ADD_A_COMMENT = "<?= t("Add a comment") ?>";
-  </script>
   <?= $theme->photo_bottom() ?>
 </div>
-- 
cgit v1.2.3


From c428e49f3273f04fd220107b4992e6177aa1b265 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Fri, 28 Aug 2009 15:24:21 -0600
Subject: Make gMessage 100% of the width of its container.

---
 themes/admin_default/css/screen.css | 2 +-
 themes/default/css/screen.css       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'themes/default')

diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 88631e81..062c0e41 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -276,7 +276,7 @@ li.gError select {
 /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gMessage {
-  width: 99%;
+  width: 100%;
 }
 
 #gAdminAkismet .gSuccess,
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 26339e35..8a8f634a 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -276,7 +276,7 @@ li.gError select {
 /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gMessage {
-  width: 99%;
+  width: 100%;
 }
 
 #gAdminAkismet .gSuccess,
-- 
cgit v1.2.3


From 5db0b68a70434a16d8881a6e560a9526530a8a60 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 29 Aug 2009 14:01:04 -0600
Subject: Update status message styles. Lighten backgrounds, don't show
 background on Admin Maintenance rows, and added gModuleStatus class.

---
 modules/akismet/views/admin_akismet.html.php       |  2 +-
 modules/comment/views/admin_comments.html.php      |  2 +-
 modules/gallery/views/admin_graphics_gd.html.php   | 12 ++--
 .../views/admin_graphics_graphicsmagick.html.php   | 10 +--
 .../views/admin_graphics_imagemagick.html.php      | 10 +--
 modules/gallery/views/admin_graphics_none.html.php |  5 +-
 modules/gallery/views/admin_maintenance.html.php   | 16 +++--
 modules/gallery/views/admin_modules.html.php       |  2 +-
 themes/admin_default/css/admin_screen.css          |  9 ++-
 themes/admin_default/css/screen.css                | 80 ++++++++++------------
 themes/default/css/screen.css                      | 60 +++++-----------
 11 files changed, 92 insertions(+), 116 deletions(-)

(limited to 'themes/default')

diff --git a/modules/akismet/views/admin_akismet.html.php b/modules/akismet/views/admin_akismet.html.php
index 410902a5..009d8810 100644
--- a/modules/akismet/views/admin_akismet.html.php
+++ b/modules/akismet/views/admin_akismet.html.php
@@ -8,7 +8,7 @@
   </p>
 
   <? if ($valid_key): ?>
-  <div class="gSuccess">
+  <div class="gModuleStatus gSuccess">
     <?= t("Your API Key is valid.  Your comments will be filtered!") ?>
   </div>
   <? endif ?>
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 9fe7164b..03511d91 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -103,7 +103,7 @@
       </th>
     </tr>
     <? foreach ($comments as $i => $comment): ?>
-    <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
+    <tr id="gComment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
       <td>
         <a href="#">
           <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
diff --git a/modules/gallery/views/admin_graphics_gd.html.php b/modules/gallery/views/admin_graphics_gd.html.php
index aa9ee67c..010a31b4 100644
--- a/modules/gallery/views/admin_graphics_gd.html.php
+++ b/modules/gallery/views/admin_graphics_gd.html.php
@@ -7,26 +7,24 @@
         array("url" => "http://www.boutell.com/gd")) ?>
   </p>
   <? if ($tk->installed && $tk->rotate): ?>
-  <p class="gSuccess">
+  <div class="gModuleStatus gInfo">
     <?= t("You have GD version %version.", array("version" => $tk->version)) ?>
-  </p>
+  </div>
   <p>
     <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
   </p>
   <? elseif ($tk->installed): ?>
-
   <? if ($tk->error): ?>
-  <p class="gWarning">
+  <p class="gModuleStatus gWarning">
     <?= $tk->error ?>
   </p>
   <? endif ?>
-
   <p>
     <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
   </p>
   <? else: ?>
-  <p class="gInfo">
+  <div class="gModuleStatus gInfo">
     <?= t("You do not have GD installed.") ?>
-  </p>
+  </div>
   <? endif ?>
 </div>
diff --git a/modules/gallery/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
index bf3ad339..97624850 100644
--- a/modules/gallery/views/admin_graphics_graphicsmagick.html.php
+++ b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
@@ -1,21 +1,21 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="graphicsmagick" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->installed ? "  gInstalledToolkit" : " gUnavailable" ?>">
-  <h3> <?= t("GraphicsMagick") ?> </h3>
   <img class="logo" width="107" height="76" src="<?= url::file("modules/gallery/images/graphicsmagick.png"); ?>" alt="<? t("Visit the GraphicsMagick project site") ?>" />
+  <h3> <?= t("GraphicsMagick") ?> </h3>
   <p>
     <?= t("GraphicsMagick is a standalone graphics program available on most Linux systems.  Please refer to the <a href=\"%url\">GraphicsMagick website</a> for more information.",
         array("url" => "http://www.graphicsmagick.org")) ?>
   </p>
   <? if ($tk->installed): ?>
-  <p class="gSuccess">
+  <div class="gModuleStatus gInfo">
     <?= t("GraphicsMagick version %version is available in %dir", array("version" => $tk->version, "dir" => $tk->dir)) ?>
-  </p>
+  </div>
   <p>
     <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate Graphics Magic") ?></a>
   </p>
   <? else: ?>
-  <p class="gWarning">
+  <div class="gModuleStatus gWarning">
     <?= $tk->error ?>
-  </p>
+  </div>
   <? endif ?>
 </div>
diff --git a/modules/gallery/views/admin_graphics_imagemagick.html.php b/modules/gallery/views/admin_graphics_imagemagick.html.php
index b8f7ffb8..cdff7c2c 100644
--- a/modules/gallery/views/admin_graphics_imagemagick.html.php
+++ b/modules/gallery/views/admin_graphics_imagemagick.html.php
@@ -1,21 +1,21 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="imagemagick" class="gBlock<?= $is_active ? " gSelected" : "" ?><?= $tk->installed ? "  gInstalledToolkit" : " gUnavailable" ?>">
-  <h3> <?= t("ImageMagick") ?> </h3>
   <img class="logo" width="114" height="118" src="<?= url::file("modules/gallery/images/imagemagick.jpg"); ?>" alt="<? t("Visit the ImageMagick project site") ?>" />
+  <h3> <?= t("ImageMagick") ?> </h3>
   <p>
     <?= t("ImageMagick is a standalone graphics program available on most Linux systems.  Please refer to the <a href=\"%url\">ImageMagick website</a> for more information.",
         array("url" => "http://www.imagemagick.org")) ?>
   </p>
   <? if ($tk->installed): ?>
-  <p class="gSuccess">
+  <div class="gModuleStatus gInfo">
     <?= t("ImageMagick version %version is available in %dir", array("version" => $tk->version, "dir" => $tk->dir)) ?>
-  </p>
+  </div>
   <p>
     <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate ImageMagick") ?></a>
   </p>
   <? elseif ($tk->error): ?>
-  <p class="gWarning">
+  <div class="gModuleStatus gWarning">
     <?= $tk->error ?>
-  </p>
+  </div>
   <? endif ?>
 </div>
diff --git a/modules/gallery/views/admin_graphics_none.html.php b/modules/gallery/views/admin_graphics_none.html.php
index be2a580d..e6923a5a 100644
--- a/modules/gallery/views/admin_graphics_none.html.php
+++ b/modules/gallery/views/admin_graphics_none.html.php
@@ -1,6 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="none" class="gBlock">
-  <h3 class="gWarning"> <?= t("No Active Toolkit") ?> </h3>
+
+<div id="none" class="gModuleStatus gWarning gBlock">
+  <h3> <?= t("No Active Toolkit") ?> </h3>
   <p>
     <?= t("We were unable to detect a graphics program.  You must install one of the toolkits below in order to use many Gallery features.") ?>
   </p>
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 450eb754..3649ea58 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -7,7 +7,7 @@
 
   <div id="gAvailableTasks">
     <h2> <?= t("Available Tasks") ?> </h2>
-    <table>
+    <table class="gMessages">
       <tr>
         <th>
           <?= t("Name") ?>
@@ -19,8 +19,9 @@
           <?= t("Action") ?>
         </th>
       </tr>
+      <? $i = 0; ?>
       <? foreach ($task_definitions as $task): ?>
-      <tr class="<?= log::severity_class($task->severity) ?>">
+      <tr class="<?= log::severity_class($task->severity) ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
         <td>
           <?= $task->name ?>
         </td>
@@ -34,17 +35,18 @@
           </a>
         </td>
       </tr>
+      <? $i++ ?>
       <? endforeach ?>
     </table>
   </div>
 
   <? if ($running_tasks->count()): ?>
   <div id="gRunningTasks">
-    <h2> <?= t("Running Tasks") ?> </h2>
     <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
        class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
       <?= t("cancel all") ?></a>
 
+    <h2> <?= t("Running Tasks") ?> </h2>
     <table>
       <tr>
         <th>
@@ -66,8 +68,9 @@
           <?= t("Action") ?>
         </th>
       </tr>
+      <? $i = 0; ?>
       <? foreach ($running_tasks as $task): ?>
-      <tr class="<?= $task->state == "stalled" ? "gWarning" : "" ?>">
+      <tr class="<?= $task->state == "stalled" ? "gWarning" : "" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
         <td>
           <?= gallery::date_time($task->updated) ?>
         </td>
@@ -105,6 +108,7 @@
           </a>
         </td>
       </tr>
+      <? $i++ ?>
       <? endforeach ?>
     </table>
   </div>
@@ -138,8 +142,9 @@
           <?= t("Action") ?>
         </th>
       </tr>
+      <? $i = 0; ?>
       <? foreach ($finished_tasks as $task): ?>
-      <tr class="<?= $task->state == "success" ? "gSuccess" : "gError" ?>">
+      <tr class="<?= $task->state == "success" ? "gSuccess" : "gError" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
         <td>
           <?= gallery::date_time($task->updated) ?>
         </td>
@@ -183,6 +188,7 @@
         </td>
       </tr>
       <? endforeach ?>
+      <? $i++ ?>
     </table>
   </div>
   <? endif ?>
diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 3fddd6cd..168e20d0 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -16,7 +16,7 @@
       </tr>
       <? $i = 0 ?>
       <? foreach ($available as $module_name => $module_info):  ?>
-      <tr class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
+      <tr class="<?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
         <? $data = array("name" => $module_name); ?>
         <? if ($module_info->locked) $data["disabled"] = 1; ?>
         <td> <?= form::checkbox($data, '1', module::is_active($module_name)) ?> </td>
diff --git a/themes/admin_default/css/admin_screen.css b/themes/admin_default/css/admin_screen.css
index 913631dc..7e468442 100644
--- a/themes/admin_default/css/admin_screen.css
+++ b/themes/admin_default/css/admin_screen.css
@@ -35,13 +35,12 @@
 .gSelected img,
 .gAvailable .gBlock img {
   float: left;
-  margin-right: 1em;
+  margin: 0 1em 1em 0;
 }
 
 .rtl .gSelected img,
 .rtl .gAvailable .gBlock img {
   float: right;
-  margin-left: 1em;
 }
 
 .gSelected {
@@ -202,7 +201,7 @@
 #gAdminGraphics .gAvailable .gBlock {
   clear: none;
   float: left;
-  height: 16em;
+  height: 17em;
   margin-right: 1em;
   width: 30%;
 }
@@ -263,8 +262,8 @@ li.gGroup {
 }
 
 li.gGroup h4 {
-  background-color: #EEEEEE;
-  border-bottom: 1px dashed #CCCCCC;
+  background-color: #eee;
+  border-bottom: 1px dashed ccc;
   padding: .5em 0 .5em .5em;
 }
 li.gGroup .gButtonLink {
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 062c0e41..c275eb10 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -108,7 +108,7 @@ table {
 }
 
 #gContent table {
-  margin: 1em 0;
+  margin: 1em 0 3em 0;
 }
 
 caption,
@@ -124,6 +124,10 @@ td {
   vertical-align: top;
 }
 
+#gAdminMaintenance td {
+  vertical-align: middle;
+}
+
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 fieldset {
@@ -279,9 +283,9 @@ li.gError select {
   width: 100%;
 }
 
-#gAdminAkismet .gSuccess,
 #gSiteStatus li,
-#gMessage li {
+#gMessage li,
+.gModuleStatus {
   border: 1px solid #ccc;
   margin-bottom: .4em;
 }
@@ -292,71 +296,62 @@ li.gError select {
   border-bottom: 1px solid #ccc;
 }
 
-#gSiteStatus .gError,
-#gMessage .gError,
-form p.gError,
-#gSiteStatus .gInfo,
-#gMessage .gInfo,
-#gSiteStatus .gSuccess,
-#gMessage .gSuccess,
-#gSiteStatus .gWarning,
-#gMessage .gWarning {
+.gModuleStatus {
+  clear: both;
+  margin-bottom: 1em;
+}
+
+.gError,
+.gInfo,
+.gSuccess,
+.gWarning {
   background-position: .4em 50%;
   background-repeat: no-repeat;
   padding: .4em .5em .4em 30px;
 }
 
 .gError {
-  background-color: #fcc;
-}
-
-form .gError {
-  color: #f00;
-}
-
-#gSiteStatus .gError,
-#gMessage .gError,
-form p.gError {
+  background-color: #f6cbca;
+  color: red;
   background-image: url('../images/ico-error.png');
 }
 
 .gInfo {
   background-color: #e8e8e8;
-}
-
-#gSiteStatus .gInfo,
-#gMessage .gInfo {
   background-image: url('../images/ico-info.png');
 }
 
 .gSuccess {
-  background-color: #96EF95;
-}
-
-#gSiteStatus .gSuccess,
-#gMessage .gSuccess {
+  background-color: #d9efc2;
   background-image: url('../images/ico-success.png');
 }
 
 .gWarning {
-  background-color: #ff9;
+  background-color: #fcf9ce;
+  background-image: url('../images/ico-warning.png');
 }
 
-#gSiteStatus .gWarning,
-#gMessage .gWarning {
-  background-image: url('../images/ico-warning.png');
+table .gError {
+  background-color: #f6cbca !important;
+}
+
+table .gWarning {
+  background-color: #fcf9ce !important;
 }
 
+.gPager .gInfo,
 form .gError,
-.gPager .gInfo {
-  background-color: #fff;
+table .gInfo,
+table .gSuccess {
+  background-color: transparent !important;
 }
 
-#gAdminMaintenance .gError,
-#gAdminMaintenance .gInfo,
-#gAdminMaintenance .gWarning,
-#gAdminMaintenance .gSuccess {
-  background-image: none;
+.gPager .gInfo,
+table .gError,
+table .gInfo,
+table .gSuccess,
+table .gWarning {
+  background-image: none !important;
 }
 
 /* Inline layout (forms, lists) ~~~~~~~~~~ */
@@ -823,7 +818,6 @@ form .gError,
 .ui-widget-overlay {
   background: #000;
   opacity: .7;
-  filter: Alpha(Opacity=70);
 }
 
 #gDialog {
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index d39152e4..82cdb331 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -279,9 +279,9 @@ li.gError select {
   width: 100%;
 }
 
-#gAdminAkismet .gSuccess,
 #gSiteStatus li,
-#gMessage li {
+#gMessage li,
+.gModuleStatus {
   border: 1px solid #ccc;
   margin-bottom: .4em;
 }
@@ -292,71 +292,49 @@ li.gError select {
   border-bottom: 1px solid #ccc;
 }
 
-#gSiteStatus .gError,
-#gMessage .gError,
-form p.gError,
-#gSiteStatus .gInfo,
-#gMessage .gInfo,
-#gSiteStatus .gSuccess,
-#gMessage .gSuccess,
-#gSiteStatus .gWarning,
-#gMessage .gWarning {
+.gModuleStatus {
+  clear: both;
+  margin-bottom: 1em;
+}
+
+.gError,
+.gInfo,
+.gSuccess,
+.gWarning {
   background-position: .4em 50%;
   background-repeat: no-repeat;
   padding: .4em .5em .4em 30px;
 }
 
 .gError {
-  background-color: #fcc;
-}
-
-form .gError {
-  color: #f00;
-}
-
-#gSiteStatus .gError,
-#gMessage .gError,
-form p.gError {
+  background-color: #f6cbca;
+  color: #fc0;
   background-image: url('../images/ico-error.png');
 }
 
 .gInfo {
   background-color: #e8e8e8;
-}
-
-#gSiteStatus .gInfo,
-#gMessage .gInfo {
   background-image: url('../images/ico-info.png');
 }
 
 .gSuccess {
-  background-color: #96EF95;
-}
-
-#gSiteStatus .gSuccess,
-#gMessage .gSuccess {
+  background-color: #d9efc2;
   background-image: url('../images/ico-success.png');
 }
 
 .gWarning {
-  background-color: #ff9;
-}
-
-#gSiteStatus .gWarning,
-#gMessage .gWarning {
+  background-color: #fcf9ce;
   background-image: url('../images/ico-warning.png');
 }
 
 form .gError,
 .gPager .gInfo {
-  background-color: #fff;
+  background-color: #fff !important;
 }
 
-#gAdminMaintenance .gError,
-#gAdminMaintenance .gInfo,
-#gAdminMaintenance .gWarning,
-#gAdminMaintenance .gSuccess {
-  background-image: none;
+.gPager .gInfo {
+  background-image: none !important;
+  padding: 0 !important;
 }
 
 /* Inline layout (forms, lists) ~~~~~~~~~~ */
-- 
cgit v1.2.3