From f7a720d2e827925f6fbae4981e2a17fd79eb31f6 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 8 Jun 2009 23:17:28 -0700 Subject: Rename main_element_attributes() callback to body_attributes() to be more intuitive for themers. --- themes/admin_default/views/admin.html.php | 2 +- themes/default/views/page.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'themes') diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index 721c4dd5..b7cfaa40 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -31,7 +31,7 @@ admin_head() ?> - main_element_attributes() ?>> + body_attributes() ?>> admin_page_top() ?>
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php index 6c77fb72..0c84129f 100644 --- a/themes/default/views/page.html.php +++ b/themes/default/views/page.html.php @@ -54,7 +54,7 @@ head() ?> - main_element_attributes() ?>> + body_attributes() ?>> page_top() ?>
site_status() ?> -- cgit v1.2.3 From 798444f40bbc0344568e9744abf7034b9a59febd Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 9 Jun 2009 19:45:15 -0700 Subject: Replace login_page.html.php with the form, wrapped in our default page type. --- modules/gallery/controllers/albums.php | 4 ++- themes/default/views/login_page.html.php | 61 -------------------------------- 2 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 themes/default/views/login_page.html.php (limited to 'themes') diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php index f37609e6..34fee917 100644 --- a/modules/gallery/controllers/albums.php +++ b/modules/gallery/controllers/albums.php @@ -26,7 +26,9 @@ class Albums_Controller extends Items_Controller { $page_size = module::get_var("gallery", "page_size", 9); if (!access::can("view", $album)) { if ($album->id == 1) { - print new Theme_View("login_page.html"); + $view = new Theme_View("page.html", "page"); + $view->content = user::get_login_form("login/auth_html"); + print $view; return; } else { access::forbidden(); diff --git a/themes/default/views/login_page.html.php b/themes/default/views/login_page.html.php deleted file mode 100644 index c4880727..00000000 --- a/themes/default/views/login_page.html.php +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - <?= t("Please Login to Gallery") ?> - - " type="image/x-icon" /> - " - media="screen,print,projection" /> - " - media="screen" /> - " - media="screen,print,projection" /> - " - media="screen,print,projection" /> - - - - - - - - - - - - head() ?> - - - main_element_attributes() ?>> - page_top() ?> -
- site_status() ?> -
- display("header.html") ?> -
-
-
-
-
- messages() ?> - -
-
-
-
-
-
-
- display("footer.html") ?> -
-
- page_bottom() ?> - - -- cgit v1.2.3