diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-16 22:24:15 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-16 22:24:15 -0700 |
| commit | 74d9d0901ff452762d70562cb63d66563bd3860e (patch) | |
| tree | adaba07fe223fcc15d0209fea4e8f23ed864ca3c | |
| parent | 9d76797b17d65540a903ef37eee6edca3e83108b (diff) | |
| parent | e94eaa6b88f1311455e12df4f1e5099a4c314f94 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
| -rw-r--r-- | modules/gallery/libraries/Theme_View.php | 6 | ||||
| -rw-r--r-- | themes/default/views/sidebar.html.php | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php index 541bce88..130e2dce 100644 --- a/modules/gallery/libraries/Theme_View.php +++ b/modules/gallery/libraries/Theme_View.php @@ -111,6 +111,12 @@ class Theme_View_Core extends Gallery_View { return $menu->compact(); } + public function movie_menu() { + $menu = Menu::factory("root"); + module::event("movie_menu", $menu, $this); + return $menu->compact(); + } + public function context_menu($item, $thumbnail_css_selector) { $menu = Menu::factory("root") ->append(Menu::factory("submenu") diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php index 928ecb93..04379eb6 100644 --- a/themes/default/views/sidebar.html.php +++ b/themes/default/views/sidebar.html.php @@ -6,6 +6,8 @@ <?= $theme->album_menu() ?> <? elseif ($page_type == "photo") : ?> <?= $theme->photo_menu() ?> + <? elseif ($page_type == "movie") : ?> + <?= $theme->movie_menu() ?> <? elseif ($page_type == "tag") : ?> <?= $theme->tag_menu() ?> <? endif ?> |