summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-06-10 08:38:21 +0800
committerTim Almdal <tnalmdal@shaw.ca>2009-06-10 08:39:47 +0800
commitb276eaa68beca1266bf8fd83625ddfad73f44420 (patch)
tree44ead67fed22f9db75fe779ae090d1cf7734df1e
parent98422857ebd5bd5c68b7b0060b6f6aef0b74bcbc (diff)
Add some window dressing to login_page.html in order to make it more in line
with the overall look of the Gallery3 theme Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
Diffstat
-rw-r--r--modules/gallery/controllers/albums.php4
-rw-r--r--themes/default/views/login_page.html.php48
-rw-r--r--themes/default/views/not_authorized.html.php69
3 files changed, 47 insertions, 74 deletions
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 9b837442..f37609e6 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -26,9 +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) {
- $template = new Theme_View("not_authorized.html", "album");
- $template->content = new View("login_page.html");
- print $template;
+ print new Theme_View("login_page.html");
return;
} else {
access::forbidden();
diff --git a/themes/default/views/login_page.html.php b/themes/default/views/login_page.html.php
index 27f8571e..c4880727 100644
--- a/themes/default/views/login_page.html.php
+++ b/themes/default/views/login_page.html.php
@@ -7,11 +7,55 @@
<title>
<?= t("Please Login to Gallery") ?>
</title>
+ <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
+ <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
+ media="screen,print,projection" />
+ <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
+ media="screen" />
+ <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
+ media="screen,print,projection" />
<link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
media="screen,print,projection" />
+ <!--[if lt IE 8]>
+ <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+ media="screen,print,projection" />
+ <![endif]-->
+ <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
+ <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
+ <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
+ <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
+ <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
+ <script src="<?= url::file("lib/gallery.form.js") ?>" type="text/javascript"></script>
+ <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
+ <script src="<?= $theme->url("js/jquery.scrollTo.js") ?>" type="text/javascript"></script>
+ <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script>
+ <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
+ <?= $theme->head() ?>
</head>
- <body>
- <?= user::get_login_form("login/auth_html") ?>
+ <body <?= $theme->main_element_attributes() ?>>
+ <?= $theme->page_top() ?>
+ <div id="doc4" class="yui-t5 gView">
+ <?= $theme->site_status() ?>
+ <div id="gHeader">
+ <?= $theme->display("header.html") ?>
+ </div>
+ <div id="bd">
+ <div id="yui-main">
+ <div class="yui-b">
+ <div id="gContent" class="yui-g">
+ <?= $theme->messages() ?>
+ <?= user::get_login_form("login/auth_html") ?>
+ </div>
+ </div>
+ </div>
+ <div id="gSidebar" class="yui-b">
+ </div>
+ </div>
+ <div id="gFooter">
+ <?= $theme->display("footer.html") ?>
+ </div>
+ </div>
+ <?= $theme->page_bottom() ?>
</body>
</html>
diff --git a/themes/default/views/not_authorized.html.php b/themes/default/views/not_authorized.html.php
deleted file mode 100644
index d009a4ac..00000000
--- a/themes/default/views/not_authorized.html.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Tranisitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>
- <? if (empty($page_title)): ?>
- <?= t("Gallery3 Login") ?>
- <? if (!empty($item)): ?>
- :: <?= p::clean($item->title) ?>
- <? endif ?>
- <? else: ?>
- <?= $page_title ?>
- <? endif ?>
- <?= $theme->page_type ?>
- </title>
- <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
- <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
- media="screen,print,projection" />
- <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
- media="screen" />
- <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
- media="screen,print,projection" />
- <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
- media="screen,print,projection" />
- <!--[if lt IE 8]>
- <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
- media="screen,print,projection" />
- <![endif]-->
- <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/gallery.form.js") ?>" type="text/javascript"></script>
- <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
- <script src="<?= $theme->url("js/jquery.scrollTo.js") ?>" type="text/javascript"></script>
- <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script>
- <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
- <?= $theme->head() ?>
- </head>
-
- <body <?= $theme->main_element_attributes() ?>>
- <?= $theme->page_top() ?>
- <div id="doc4" class="yui-t5 gView">
- <?= $theme->site_status() ?>
- <div id="gHeader">
- <?= $theme->display("header.html") ?>
- </div>
- <div id="bd">
- <div id="yui-main">
- <div class="yui-b">
- <div id="gContent" class="yui-g">
- <?= $theme->messages() ?>
- <?= $content ?>
- </div>
- </div>
- </div>
- <div id="gSidebar" class="yui-b">
- </div>
- </div>
- <div id="gFooter">
- <?= $theme->display("footer.html") ?>
- </div>
- </div>
- <?= $theme->page_bottom() ?>
- </body>
-</html>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 21:12:15 +0000