summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery/controllers')
-rw-r--r--modules/gallery/controllers/albums.php4
-rw-r--r--modules/gallery/controllers/movies.php2
-rw-r--r--modules/gallery/controllers/photos.php2
-rw-r--r--modules/gallery/controllers/quick.php4
4 files changed, 6 insertions, 6 deletions
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 4e37649c..e67df6f6 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -26,7 +26,7 @@ class Albums_Controller extends Items_Controller {
$page_size = module::get_var("gallery", "page_size", 9);
if (!access::can("view", $album)) {
if ($album->id == 1) {
- $view = new Theme_View("page.html", "login");
+ $view = new Theme_View("page.html", "other", "login");
$view->page_title = t("Log in to Gallery");
$view->content = new View("login_ajax.html");
$view->content->form = auth::get_login_form("login/auth_html");
@@ -64,7 +64,7 @@ class Albums_Controller extends Items_Controller {
url::redirect($album->abs_url("page=$max_pages"));
}
- $template = new Theme_View("page.html", "album");
+ $template = new Theme_View("page.html", "collection", "album");
$template->set_global("page", $page);
$template->set_global("max_pages", $max_pages);
$template->set_global("page_size", $page_size);
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 5e78376b..2e2e837c 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -35,7 +35,7 @@ class Movies_Controller extends Items_Controller {
list ($next_item) = $movie->parent()->viewable()->children(1, $position, $where);
}
- $template = new Theme_View("page.html", "movie");
+ $template = new Theme_View("page.html", "item", "movie");
$template->set_global("item", $movie);
$template->set_global("children", array());
$template->set_global("children_count", 0);
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index b9adfd90..0c2ff6ee 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -35,7 +35,7 @@ class Photos_Controller extends Items_Controller {
list ($next_item) = $photo->parent()->viewable()->children(1, $position, $where);
}
- $template = new Theme_View("page.html", "photo");
+ $template = new Theme_View("page.html", "item", "photo");
$template->set_global("item", $photo);
$template->set_global("children", array());
$template->set_global("children_count", 0);
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index a1e7dcc3..f2a77033 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -55,7 +55,7 @@ class Quick_Controller extends Controller {
}
}
- if (Input::instance()->get("page_type") == "album") {
+ if (Input::instance()->get("page_type") == "collection") {
print json_encode(
array("src" => $item->thumb_url() . "?rnd=" . rand(),
"width" => $item->thumb_width,
@@ -118,7 +118,7 @@ class Quick_Controller extends Controller {
$item->delete();
message::success($msg);
- if (Input::instance()->get("page_type") == "album") {
+ if (Input::instance()->get("page_type") == "collection") {
print json_encode(array("result" => "success", "reload" => 1));
} else {
print json_encode(array("result" => "success",