Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

3 files changed, 6 insertions, 6 deletions

diff --git a/modules/organize/helpers/organize.php b/modules/organize/helpers/organize.php
index 9bf4e986..25284771 100644
--- a/modules/organize/helpers/organize.php
+++ b/modules/organize/helpers/organize.php
@@ -43,7 +43,7 @@ class organize_Core {
     $sortPane->hidden("item[]")->value($item->id);
     $sortPane->dropdown("column", array("id" => "gAlbumSortColumn"))
       ->label(t("Sort by"))
-      ->options(array("weight" => t("Default"),
+      ->options(array("weight" => t("Order Added"),
                       "captured" => t("Capture Date"),
                       "created" => t("Creation Date"),
                       "title" => t("Title"),
diff --git a/modules/organize/helpers/organize_menu.php b/modules/organize/helpers/organize_event.php
index 850c1eab..99a28673 100644
--- a/modules/organize/helpers/organize_menu.php
+++ b/modules/organize/helpers/organize_event.php
@@ -17,8 +17,8 @@
  * 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_menu {
-  static function site($menu, $theme) {
+class organize_event_Core {
+  static function site_menu($menu, $theme) {
     $item = $theme->item();
 
     if ($item && access::can("edit", $item) && $item->is_album()) {
diff --git a/modules/organize/helpers/organize_theme.php b/modules/organize/helpers/organize_theme.php
index 02f1f589..e4feba2b 100644
--- a/modules/organize/helpers/organize_theme.php
+++ b/modules/organize/helpers/organize_theme.php
@@ -20,8 +20,8 @@
 class organize_theme {
   static function head($theme) {
     // @tdo remove the addition css and organize.js (just here to test)
-    $theme->script("modules/organize/js/organize_init.js");
-    $theme->script("modules/organize/js/organize.js");
-    $theme->css("modules/organize/css/organize.css");
+    $theme->script("organize_init.js");
+    $theme->script("organize.js");
+    $theme->css("organize.css");
   }
 }