diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-08-06 16:15:40 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-08-06 16:15:40 -0700 |
| commit | 3850587519b6f281531651e6790803c3eaa41244 (patch) | |
| tree | d3e2329246f0e883637a2e60602c9df3da28ccb0 /modules/organize/helpers | |
| parent | 7ea05eacd7b8bd18d817996c5240b33b2a79fd18 (diff) | |
| parent | 794a7a5abf38ed828329cb0023df938479e90901 (diff) | |
Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch
Diffstat (limited to 'modules/organize/helpers')
| -rw-r--r-- | modules/organize/helpers/organize_event.php | 2 | ||||
| -rw-r--r-- | modules/organize/helpers/organize_theme.php | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php index 99a28673..887d9c2d 100644 --- a/modules/organize/helpers/organize_event.php +++ b/modules/organize/helpers/organize_event.php @@ -23,7 +23,7 @@ class organize_event_Core { if ($item && access::can("edit", $item) && $item->is_album()) { $menu->get("options_menu") - ->append(Menu::factory("link") + ->append(Menu::factory("dialog") ->id("organize") ->label(t("Organize Album")) ->css_id("gOrganizeLink") diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php index f01ab88b..0fd117c3 100644 --- a/modules/organize/helpers/organize_theme.php +++ b/modules/organize/helpers/organize_theme.php @@ -19,8 +19,9 @@ */ class organize_theme { static function head($theme) { - //$theme->script("organize_init.js"); - $theme->script("organize.js"); - $theme->css("organize.css"); + if (access::can("view", $theme->item()) && access::can("edit", $theme->item())) { + $theme->script("organize.js"); + $theme->css("organize.css"); + } } } |