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">
+ $theme->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" />
- = $theme->css("yui/reset-fonts-grids.css") ?>
- = $theme->css("superfish/css/superfish.css") ?>
- = $theme->css("themeroller/ui.base.css") ?>
- = $theme->css("screen.css") ?>
-
+ "
+ type="image/x-icon" />
+ " />
if ($theme->page_type == "collection"): ?>
- if ($thumb_proportion != 1): ?>
+ if (($thumb_proportion = $theme->thumb_proportion($theme->item())) != 1): ?>
$new_width = round($thumb_proportion * 213) ?>
$new_height = round($thumb_proportion * 240) ?>
-
+
endif ?>
endif ?>
+
+ = $theme->script("json2-min.js") ?>
= $theme->script("jquery.js") ?>
= $theme->script("jquery.form.js") ?>
= $theme->script("jquery-ui.js") ?>
@@ -57,9 +51,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 +61,26 @@
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 (locales::is_rtl()): ?>
+ = $theme->css("screen-rtl.css") ?>
+ endif; ?>
+
+
+
+ = $theme->get_combined("css") ?>
+
+
+ = $theme->get_combined("script") ?>
body_attributes() ?>>
@@ -80,7 +93,7 @@
= $header_text ?>
else: ?>
for_html_attr() ?>">
- for_html_attr() ?>" src="= $theme->url("images/logo.png") ?>" />
+ for_html_attr() ?>" src="= url::file("lib/images/logo.png") ?>" />
endif ?>
= $theme->user_menu() ?>
@@ -95,28 +108,16 @@
= $theme->header_bottom() ?>
- if ($theme->item() && !empty($parents)): ?>
+ if (!empty($breadcrumbs)): ?>
endif ?>
@@ -150,4 +151,4 @@
= $theme->page_bottom() ?>
-
+
\ No newline at end of file