summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
authorNathan Kinkade <nkinkade@nkinka.de>2011-01-14 01:12:32 +0000
committerNathan Kinkade <nkinkade@nkinka.de>2011-01-14 01:12:32 +0000
commit2898fe3b82ce10d045dd2c274a3290bacf209a00 (patch)
tree5aced91bb92d8c9136cabf60ebc918248328907a /themes
parent47cbef684d41a4d51a9848091997e10b909abf32 (diff)
parente4a43c99e421c830e569eaae6294286ed51e0ad8 (diff)
Git pull from devel line.
Diffstat (limited to 'themes')
-rw-r--r--themes/admin_wind/views/admin.html.php38
-rw-r--r--themes/wind/views/no_sidebar.html.php9
-rw-r--r--themes/wind/views/page.html.php62
3 files changed, 66 insertions, 43 deletions
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index c8041069..54b30c6f 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -4,6 +4,7 @@
<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" />
+ <? $theme->start_combining("script,css") ?>
<title>
<? if ($page_title): ?>
<?= t("Gallery Admin: %page_title", array("page_title" => $page_title)) ?>
@@ -11,8 +12,26 @@
<?= t("Admin dashboard") ?>
<? endif ?>
</title>
- <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" />
+ <link rel="shortcut icon"
+ href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
+ type="image/x-icon" />
+ <?= $theme->script("jquery.js") ?>
+ <?= $theme->script("jquery.form.js") ?>
+ <?= $theme->script("jquery-ui.js") ?>
+ <?= $theme->script("gallery.common.js") ?>
+ <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
+ <script type="text/javascript">
+ var MSG_CANCEL = <?= t("Cancel")->for_js() ?>;
+ </script>
+ <?= $theme->script("gallery.ajax.js") ?>
+ <?= $theme->script("gallery.dialog.js") ?>
+ <?= $theme->script("superfish/js/superfish.js") ?>
+
+ <?= $theme->admin_head() ?>
+
+ <? /* Theme specific CSS/JS goes last so that it can override module CSS/JS */ ?>
+ <?= $theme->script("ui.init.js") ?>
<?= $theme->css("yui/reset-fonts-grids.css") ?>
<?= $theme->css("themeroller/ui.base.css") ?>
<?= $theme->css("superfish/css/superfish.css") ?>
@@ -22,20 +41,11 @@
media="screen,print,projection" />
<![endif]-->
- <?= $theme->script("jquery.js") ?>
- <?= $theme->script("jquery.form.js") ?>
- <?= $theme->script("jquery-ui.js") ?>
- <?= $theme->script("gallery.common.js") ?>
- <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
- <script type="text/javascript">
- var MSG_CANCEL = <?= t("Cancel")->for_js() ?>;
- </script>
- <?= $theme->script("gallery.ajax.js") ?>
- <?= $theme->script("gallery.dialog.js") ?>
- <?= $theme->script("superfish/js/superfish.js") ?>
- <?= $theme->script("ui.init.js") ?>
+ <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->
+ <?= $theme->get_combined("script") ?>
- <?= $theme->admin_head() ?>
+ <!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->
+ <?= $theme->get_combined("css") ?>
</head>
<body <?= $theme->body_attributes() ?>>
diff --git a/themes/wind/views/no_sidebar.html.php b/themes/wind/views/no_sidebar.html.php
index a9eb0e3e..58c57256 100644
--- a/themes/wind/views/no_sidebar.html.php
+++ b/themes/wind/views/no_sidebar.html.php
@@ -1,6 +1,11 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<ul class="g-message-block">
- <li class="g-warning"><?= t("No active sidebar blocks.") ?>
- <br/><a href="<?= url::site("admin/sidebar") ?>"><?= t("Add blocks") ?></a>
+ <li class="g-warning">
+ <? if (block_manager::get_active("site_sidebar")): ?>
+ <?= t("Active sidebar blocks have no content.") ?>
+ <? else: ?>
+ <?= t("No active sidebar blocks.") ?>
+ <? endif ?>
+ <a href="<?= url::site("admin/sidebar") ?>"><?= t("configure blocks") ?></a>
</li>
</ul>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index b3379416..441866d5 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -4,47 +4,39 @@
<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" />
+ <? $theme->start_combining("script,css") ?>
<title>
<? if ($page_title): ?>
<?= $page_title ?>
<? else: ?>
<? if ($theme->item()): ?>
- <? if ($theme->item()->is_album()): ?>
- <?= t("Browse Album :: %album_title", array("album_title" => $theme->item()->title)) ?>
- <? elseif ($theme->item()->is_photo()): ?>
- <?= t("Photo :: %photo_title", array("photo_title" => $theme->item()->title)) ?>
- <? else: ?>
- <?= t("Movie :: %movie_title", array("movie_title" => $theme->item()->title)) ?>
- <? endif ?>
+ <?= $theme->item()->title ?>
<? elseif ($theme->tag()): ?>
- <?= t("Browse Tag :: %tag_title", array("tag_title" => $theme->tag()->name)) ?>
+ <?= t("Photos tagged with %tag_title", array("tag_title" => $theme->tag()->name)) ?>
<? else: /* Not an item, not a tag, no page_title specified. Help! */ ?>
- <?= t("Gallery") ?>
+ <?= item::root()->title ?>
<? endif ?>
<? endif ?>
</title>
- <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" />
- <?= $theme->css("yui/reset-fonts-grids.css") ?>
- <?= $theme->css("superfish/css/superfish.css") ?>
- <?= $theme->css("themeroller/ui.base.css") ?>
- <?= $theme->css("screen.css") ?>
- <!--[if lte IE 8]>
- <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
- media="screen,print,projection" />
- <![endif]-->
+ <link rel="shortcut icon"
+ href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
+ type="image/x-icon" />
+
<? if ($theme->page_type == "collection"): ?>
<? if ($thumb_proportion != 1): ?>
<? $new_width = round($thumb_proportion * 213) ?>
<? $new_height = round($thumb_proportion * 240) ?>
- <style type="text/css">
- .g-view #g-content #g-album-grid .g-item {
- width: <?= $new_width ?>px;
- height: <?= $new_height ?>px;
- /* <?= $thumb_proportion ?> */
- }
- </style>
+ <style type="text/css">
+ .g-view #g-content #g-album-grid .g-item {
+ width: <?= $new_width ?>px;
+ height: <?= $new_height ?>px;
+ /* <?= $thumb_proportion ?> */
+ }
+ </style>
<? endif ?>
<? endif ?>
+
+ <?= $theme->script("json2-min.js") ?>
<?= $theme->script("jquery.js") ?>
<?= $theme->script("jquery.form.js") ?>
<?= $theme->script("jquery-ui.js") ?>
@@ -57,9 +49,8 @@
<?= $theme->script("gallery.dialog.js") ?>
<?= $theme->script("superfish/js/superfish.js") ?>
<?= $theme->script("jquery.localscroll.js") ?>
- <?= $theme->script("ui.init.js") ?>
- <? /* These are page specific, but if we put them before $theme->head() they get combined */ ?>
+ <? /* These are page specific but they get combined */ ?>
<? if ($theme->page_subtype == "photo"): ?>
<?= $theme->script("jquery.scrollTo.js") ?>
<?= $theme->script("gallery.show_full_size.js") ?>
@@ -68,6 +59,23 @@
<? endif ?>
<?= $theme->head() ?>
+
+ <? /* Theme specific CSS/JS goes last so that it can override module CSS/JS */ ?>
+ <?= $theme->script("ui.init.js") ?>
+ <?= $theme->css("yui/reset-fonts-grids.css") ?>
+ <?= $theme->css("superfish/css/superfish.css") ?>
+ <?= $theme->css("themeroller/ui.base.css") ?>
+ <?= $theme->css("screen.css") ?>
+ <!--[if lte IE 8]>
+ <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+ media="screen,print,projection" />
+ <![endif]-->
+
+ <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->
+ <?= $theme->get_combined("script") ?>
+
+ <!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->
+ <?= $theme->get_combined("css") ?>
</head>
<body <?= $theme->body_attributes() ?>>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 07:32:11 +0000