From 35dda08e8e90ce05dbcb9bfa6e9a186b121d3fdf Mon Sep 17 00:00:00 2001 From: floridave Date: Thu, 26 Jul 2012 13:05:13 -0600 Subject: [PATCH] Update 3.0/themes/browny_wind/views/page.html.php update view to be compatible with G3.0.4 --- 3.0/themes/browny_wind/views/page.html.php | 103 +++++++++++---------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/3.0/themes/browny_wind/views/page.html.php b/3.0/themes/browny_wind/views/page.html.php index 5e4040bd..8ea75ea5 100644 --- a/3.0/themes/browny_wind/views/page.html.php +++ b/3.0/themes/browny_wind/views/page.html.php @@ -1,50 +1,44 @@ + - +html_attributes() ?> xml:lang="en" lang="en"> + start_combining("script,css") ?> <? 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 ?> + <?= html::purify($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") ?> + <?= html::purify(item::root()->title) ?> <? endif ?> <? endif ?> - " type="image/x-icon" /> - css("yui/reset-fonts-grids.css") ?> - css("superfish/css/superfish.css") ?> - css("themeroller/ui.base.css") ?> - css("screen.css") ?> - + " + type="image/x-icon" /> + " /> page_type == "collection"): ?> - + thumb_proportion($theme->item())) != 1): ?> - + + + script("json2-min.js") ?> script("jquery.js") ?> script("jquery.form.js") ?> script("jquery-ui.js") ?> @@ -57,9 +51,8 @@ script("gallery.dialog.js") ?> script("superfish/js/superfish.js") ?> script("jquery.localscroll.js") ?> - script("ui.init.js") ?> - head() they get combined */ ?> + page_subtype == "photo"): ?> script("jquery.scrollTo.js") ?> script("gallery.show_full_size.js") ?> @@ -68,6 +61,26 @@ head() ?> + + + script("ui.init.js") ?> + css("yui/reset-fonts-grids.css") ?> + css("superfish/css/superfish.css") ?> + css("themeroller/ui.base.css") ?> + css("screen.css") ?> + + css("screen-rtl.css") ?> + + + + + get_combined("css") ?> + + + get_combined("script") ?> body_attributes() ?>> @@ -80,7 +93,7 @@ user_menu() ?> @@ -95,28 +108,16 @@ header_bottom() ?> - item() && !empty($parents)): ?> + @@ -150,4 +151,4 @@ page_bottom() ?> - + \ No newline at end of file