summaryrefslogtreecommitdiff
path: root/modules/organize/helpers
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-08-06 21:36:17 -0700
committerBharat Mediratta <bharat@menalto.com>2009-08-06 21:52:23 -0700
commita245c57400398d2b4b1c2aea94f590a9c0a7d8a8 (patch)
treee3631c5d4a5af82a7da965f55cc918c6276118e5 /modules/organize/helpers
parentb2ef37f612f4369a72966e0efbc362039fba1734 (diff)
Further streamline the code.
Organize_Controller: * Remove unnecessary constants * Rename index() to dialog() * Simplify _get_micro_thumb_grid organize.js: * Move sizing code in here from organize_dialog.html.php organize_dialog.html.php: * Move CSS and JS links in here so that we only load them when we need them. * Move sizing code into organize.js organize_thumb_grid.html.php: * Move pagination logic in here, since it's view centric * Collapse the css class determination code and inline it
Diffstat (limited to 'modules/organize/helpers')
-rw-r--r--modules/organize/helpers/organize_event.php2
-rw-r--r--modules/organize/helpers/organize_theme.php27
2 files changed, 1 insertions, 28 deletions
diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index 887d9c2d..7d6b3e24 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -27,7 +27,7 @@ class organize_event_Core {
->id("organize")
->label(t("Organize Album"))
->css_id("gOrganizeLink")
- ->url(url::site("organize/index/{$item->id}")));
+ ->url(url::site("organize/dialog/{$item->id}")));
}
}
}
diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
deleted file mode 100644
index 0fd117c3..00000000
--- a/modules/organize/helpers/organize_theme.php
+++ /dev/null
@@ -1,27 +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 organize_theme {
- static function head($theme) {
- if (access::can("view", $theme->item()) && access::can("edit", $theme->item())) {
- $theme->script("organize.js");
- $theme->css("organize.css");
- }
- }
-}