summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-03-05 21:25:22 -0800
committerBharat Mediratta <bharat@menalto.com>2010-03-05 21:25:22 -0800
commit6429110cd0766f265215b5001659dcb69277f4c3 (patch)
tree187d9a46f954c61a0d12eae7d8697e1f2b53acf5
parent05d345e16dd04a4c8c766ffeb35bf56ff2362cd9 (diff)
parente4ed7e983d227ad7c81557ce6e56cb404db686bd (diff)
Merge branch 'master' of git://github.com/fpaterno/gallery3
-rw-r--r--modules/gallery/helpers/gallery_event.php2
-rw-r--r--modules/organize/helpers/organize_event.php5
2 files changed, 3 insertions, 4 deletions
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 4fd447bd..d723cc1b 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -383,7 +383,7 @@ class gallery_event_Core {
->id("delete")
->label($delete_title)
->css_class("ui-icon-trash")
- ->css_id("g-quick-delete")
+ ->css_class("g-quick-delete")
->url(url::site("quick/form_delete/$item->id?csrf=$csrf&amp;from_id=$theme_item->id&amp;page_type=$page_type")));
}
diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index 4b048630..a9d64637 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -26,7 +26,7 @@ class organize_event_Core {
->append(Menu::factory("dialog")
->id("organize")
->label(t("Organize album"))
- ->css_id("g-organize-link")
+ ->css_id("g-menu-organize-link")
->url(url::site("organize/dialog/{$item->id}")));
}
}
@@ -37,8 +37,7 @@ class organize_event_Core {
->append(Menu::factory("dialog")
->id("organize")
->label(t("Organize album"))
- ->css_id("g-organize-link")
- ->css_class("ui-icon-folder-open")
+ ->css_class("ui-icon-folder-open g-organize-link")
->url(url::site("organize/dialog/{$item->id}")));
}
}