diff --git a/3.0/modules/tag_albums/controllers/admin_tag_albums.php b/3.0/modules/tag_albums/controllers/admin_tag_albums.php index a1b39cbf..6267e33c 100644 --- a/3.0/modules/tag_albums/controllers/admin_tag_albums.php +++ b/3.0/modules/tag_albums/controllers/admin_tag_albums.php @@ -36,6 +36,9 @@ class Admin_Tag_Albums_Controller extends Admin_Controller { array("id" => "g-tag-albums-admin-form")); $tag_albums_tagsort_group = $form->group("Tag_Albums_Tag_Sort")->label(t("\"All Tags\" Album Preferences")); + $tag_albums_tagsort_group->input("tag_page_title") + ->label(t("Page Title")) + ->value(module::get_var("tag_albums", "tag_page_title")); $tag_albums_tagsort_group->dropdown("tag_index") ->label(t("Tag album's index should display:")) ->options( @@ -98,6 +101,7 @@ class Admin_Tag_Albums_Controller extends Admin_Controller { $form = $this->_get_admin_form(); if ($form->validate()) { Kohana_Log::add("error",print_r($form,1)); + module::set_var("tag_albums", "tag_page_title", $form->Tag_Albums_Tag_Sort->tag_page_title->value); module::set_var("tag_albums", "tag_index", $form->Tag_Albums_Tag_Sort->tag_index->value); module::set_var("tag_albums", "tag_index_scope", count($form->Tag_Albums_Tag_Sort->tag_index_scope->value)); module::set_var("tag_albums", "tag_index_filter", count($form->Tag_Albums_Tag_Sort->tag_index_filter->value)); diff --git a/3.0/modules/tag_albums/controllers/tag_albums.php b/3.0/modules/tag_albums/controllers/tag_albums.php index 5b4875ca..7ff2cbd9 100644 --- a/3.0/modules/tag_albums/controllers/tag_albums.php +++ b/3.0/modules/tag_albums/controllers/tag_albums.php @@ -180,7 +180,7 @@ class tag_albums_Controller extends Controller { // Inherit permissions, title and description from the album that linked to this page, // if available, if not use the root album and some default values. $album = ""; - $page_title = t("All Tags"); + $page_title = module::get_var("tag_albums", "tag_page_title", "All Tags"); $page_description = ""; if ($id == "") { $album = ORM::factory("item", 1); @@ -463,9 +463,9 @@ class tag_albums_Controller extends Controller { $parent_url = url::site("tag_albums/"); $tag_album_breadcrumbs[0] = new Tag_Albums_Breadcrumb(item::root()->title, item::root()->url()); if (module::get_var("tag_albums", "tag_index", "default") == "default") { - $tag_album_breadcrumbs[1] = new Tag_Albums_Breadcrumb("All Tags", url::site("tag_albums/") . "?show=" . $id); + $tag_album_breadcrumbs[1] = new Tag_Albums_Breadcrumb(module::get_var("tag_albums", "tag_page_title", "All Tags"), url::site("tag_albums/") . "?show=" . $id); } else { - $tag_album_breadcrumbs[1] = new Tag_Albums_Breadcrumb("All Tags", url::site("tag_albums/")); + $tag_album_breadcrumbs[1] = new Tag_Albums_Breadcrumb(module::get_var("tag_albums", "tag_page_title", "All Tags"), url::site("tag_albums/")); } $tag_album_breadcrumbs[2] = new Tag_Albums_Breadcrumb($display_tag->name, ""); } @@ -585,7 +585,7 @@ class tag_albums_Controller extends Controller { $tag_album_breadcrumbs = array_reverse($tag_album_breadcrumbs, true); } else { $tag_album_breadcrumbs[0] = new Tag_Albums_Breadcrumb(item::root()->title, item::root()->url()); - $tag_album_breadcrumbs[1] = new Tag_Albums_Breadcrumb("All Tags", url::site("tag_albums/")); + $tag_album_breadcrumbs[1] = new Tag_Albums_Breadcrumb(module::get_var("tag_albums", "tag_page_title", "All Tags"), url::site("tag_albums/")); $tag_album_breadcrumbs[2] = new Tag_Albums_Breadcrumb($display_tag->name, url::site("tag_albums/tag/" . $display_tag->id) . "?show=" . $item->id); $tag_album_breadcrumbs[3] = new Tag_Albums_Breadcrumb($item->title, ""); $parent_url = url::site("tag_albums/tag/" . $display_tag->id); diff --git a/3.1/modules/tag_albums/controllers/admin_tag_albums.php b/3.1/modules/tag_albums/controllers/admin_tag_albums.php index a1b39cbf..6267e33c 100644 --- a/3.1/modules/tag_albums/controllers/admin_tag_albums.php +++ b/3.1/modules/tag_albums/controllers/admin_tag_albums.php @@ -36,6 +36,9 @@ class Admin_Tag_Albums_Controller extends Admin_Controller { array("id" => "g-tag-albums-admin-form")); $tag_albums_tagsort_group = $form->group("Tag_Albums_Tag_Sort")->label(t("\"All Tags\" Album Preferences")); + $tag_albums_tagsort_group->input("tag_page_title") + ->label(t("Page Title")) + ->value(module::get_var("tag_albums", "tag_page_title")); $tag_albums_tagsort_group->dropdown("tag_index") ->label(t("Tag album's index should display:")) ->options( @@ -98,6 +101,7 @@ class Admin_Tag_Albums_Controller extends Admin_Controller { $form = $this->_get_admin_form(); if ($form->validate()) { Kohana_Log::add("error",print_r($form,1)); + module::set_var("tag_albums", "tag_page_title", $form->Tag_Albums_Tag_Sort->tag_page_title->value); module::set_var("tag_albums", "tag_index", $form->Tag_Albums_Tag_Sort->tag_index->value); module::set_var("tag_albums", "tag_index_scope", count($form->Tag_Albums_Tag_Sort->tag_index_scope->value)); module::set_var("tag_albums", "tag_index_filter", count($form->Tag_Albums_Tag_Sort->tag_index_filter->value)); diff --git a/3.1/modules/tag_albums/controllers/tag_albums.php b/3.1/modules/tag_albums/controllers/tag_albums.php index 5b4875ca..7ff2cbd9 100644 --- a/3.1/modules/tag_albums/controllers/tag_albums.php +++ b/3.1/modules/tag_albums/controllers/tag_albums.php @@ -180,7 +180,7 @@ class tag_albums_Controller extends Controller { // Inherit permissions, title and description from the album that linked to this page, // if available, if not use the root album and some default values. $album = ""; - $page_title = t("All Tags"); + $page_title = module::get_var("tag_albums", "tag_page_title", "All Tags"); $page_description = ""; if ($id == "") { $album = ORM::factory("item", 1); @@ -463,9 +463,9 @@ class tag_albums_Controller extends Controller { $parent_url = url::site("tag_albums/"); $tag_album_breadcrumbs[0] = new Tag_Albums_Breadcrumb(item::root()->title, item::root()->url()); if (module::get_var("tag_albums", "tag_index", "default") == "default") { - $tag_album_breadcrumbs[1] = new Tag_Albums_Breadcrumb("All Tags", url::site("tag_albums/") . "?show=" . $id); + $tag_album_breadcrumbs[1] = new Tag_Albums_Breadcrumb(module::get_var("tag_albums", "tag_page_title", "All Tags"), url::site("tag_albums/") . "?show=" . $id); } else { - $tag_album_breadcrumbs[1] = new Tag_Albums_Breadcrumb("All Tags", url::site("tag_albums/")); + $tag_album_breadcrumbs[1] = new Tag_Albums_Breadcrumb(module::get_var("tag_albums", "tag_page_title", "All Tags"), url::site("tag_albums/")); } $tag_album_breadcrumbs[2] = new Tag_Albums_Breadcrumb($display_tag->name, ""); } @@ -585,7 +585,7 @@ class tag_albums_Controller extends Controller { $tag_album_breadcrumbs = array_reverse($tag_album_breadcrumbs, true); } else { $tag_album_breadcrumbs[0] = new Tag_Albums_Breadcrumb(item::root()->title, item::root()->url()); - $tag_album_breadcrumbs[1] = new Tag_Albums_Breadcrumb("All Tags", url::site("tag_albums/")); + $tag_album_breadcrumbs[1] = new Tag_Albums_Breadcrumb(module::get_var("tag_albums", "tag_page_title", "All Tags"), url::site("tag_albums/")); $tag_album_breadcrumbs[2] = new Tag_Albums_Breadcrumb($display_tag->name, url::site("tag_albums/tag/" . $display_tag->id) . "?show=" . $item->id); $tag_album_breadcrumbs[3] = new Tag_Albums_Breadcrumb($item->title, ""); $parent_url = url::site("tag_albums/tag/" . $display_tag->id);