diff --git a/3.0/themes/browny_admin_wind/css/screen.css b/3.0/themes/browny_admin_wind/css/screen.css
index fbabbcc3..b6ccd68d 100644
--- a/3.0/themes/browny_admin_wind/css/screen.css
+++ b/3.0/themes/browny_admin_wind/css/screen.css
@@ -4,23 +4,23 @@
* @requires YUI reset, font, grids CSS
*
* Sheet organization:
- * 1) Basic HTML elements
- * 2) Reusable content blocks
- * 3) Page layout containers
- * 4) Content blocks in specific layout containers
- * 5) States and interactions
- * 6) Positioning and order
- * 7) Navigation and menus
- * 8) ThemeRoller
- * 9) jQuery and jQuery UI
- * 10) Right-to-left language styles
- * 11) More Browny
+ * 1) Basic HTML elements
+ * 2) Reusable content blocks
+ * 3) Page layout containers
+ * 4) Content blocks in specific layout containers
+ * 5) States and interactions
+ * 6) Positioning and order
+ * 7) Navigation and menus
+ * 8) ThemeRoller
+ * 9) jQuery and jQuery UI
+ * 10) Right-to-left language styles
+ * 11) More Browny
*
* @todo Review g-buttonset-vertical
*/
/** *******************************************************************
- * 1) Basic HTML elements
+ * 1) Basic HTML elements
**********************************************************************/
/* ~browny~ */
@@ -284,22 +284,6 @@ fieldset {
margin-bottom: 0;
}
-fieldset {
- margin-bottom: 1em;
-}
-
-#g-content form ul li {
- padding: .4em 0;
-}
-
-#g-dialog form {
- width: 270px;
-}
-
-#g-dialog fieldset {
- margin-bottom: 0;
-}
-
/* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
table {
@@ -328,8 +312,21 @@ th {
white-space: nowrap;
}
+/* Text ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+.g-text-small {
+ font-size: .8em;
+}
+
+.g-text-big {
+ font-size: 1.2em;
+}
+
+.g-text-right {
+ text-align: right;
+}
+
/** *******************************************************************
- * 2) Reusable content blocks
+ * 2) Reusable content blocks
*********************************************************************/
.g-block,
@@ -393,7 +390,8 @@ th {
.g-unavailable {
border-color: #999;
- opacity: 0.4;
+ color: black;
+ opacity: .6;
}
.g-info td {
@@ -433,7 +431,7 @@ ul.enumeration li {
}
/*** ******************************************************************
- * 3) Page layout containers
+ * 3) Page layout containers
*********************************************************************/
/* Dimension and scale ~~~~~~~~~~~~~~~~~~~ */
.g-one-quarter {
@@ -512,7 +510,7 @@ ul.enumeration li {
}
/** *******************************************************************
- * 4) Content blocks in specific layout containers
+ * 4) Content blocks in specific layout containers
*********************************************************************/
/* Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -633,7 +631,7 @@ ul.enumeration li {
padding: .3em .8em;
}
-/* In-line editing ~~~~~~~~~~~~~~~~~~~~ */
+/* In-line editing ~~~~~~~~~~~~~~~~~~~~~~ */
#g-in-place-edit-message {
background-color: #FFF;
}
@@ -823,7 +821,7 @@ form .g-error {
}
/** *******************************************************************
- * 7) Navigation and menus
+ * 7) Navigation and menus
*********************************************************************/
/* Site Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -840,7 +838,7 @@ form .g-error {
}
/** *******************************************************************
- * 8) ThemeRoller Theme
+ * 8) ThemeRoller Theme
**********************************************************************/
/* ~browny~ */
@@ -848,7 +846,7 @@ form .g-error {
@import "themeroller/ui.tabs.css";
/** *******************************************************************
- * 9) jQuery and jQuery UI
+ * 9) jQuery and jQuery UI
*********************************************************************/
/* Generic block container ~~~~~~~~~~~~~~~ */
@@ -929,10 +927,10 @@ button {
background-position: .4em .3em;
border: 1px solid #ccc;
padding: 0;
+ margin-bottom: 1em;
}
#g-action-status {
- margin-bottom: 1em;
}
#g-action-status li,
@@ -1033,7 +1031,7 @@ div#g-action-status {
margin-left: 0;
}
-/* Superfish menu overrides ~~~~~~~~~~~ */
+/* Superfish menu overrides ~~~~~~~~~~~~~~ */
.sf-menu ul {
width: 12em;
}
@@ -1081,6 +1079,11 @@ ul.sf-menu li li li.sfHover ul {
/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~ */
+.ui-widget-overlay {
+ background: #000;
+ opacity: .7;
+}
+
#g-admin-dashboard .ui-state-highlight,
#g-sidebar .ui-state-highlight {
height: 2em;
@@ -1109,7 +1112,7 @@ ul.sf-menu li li li.sfHover ul {
}
/** *******************************************************************
- * 10) Right to left styles
+ * 10) Right to left styles
*********************************************************************/
.rtl {
@@ -1409,7 +1412,7 @@ ul.sf-menu li li li.sfHover ul {
}
/** *******************************************************************
- * 11) More Browny (Extra overrides for better Browny look)
+ * 11) More Browny (Extra overrides for better Browny look)
*********************************************************************/
/* /lib/gallery.common.css ~~~~~~~~~~~~ */
diff --git a/3.0/themes/browny_admin_wind/views/admin.html.php b/3.0/themes/browny_admin_wind/views/admin.html.php
index c8041069..9e011c69 100644
--- a/3.0/themes/browny_admin_wind/views/admin.html.php
+++ b/3.0/themes/browny_admin_wind/views/admin.html.php
@@ -1,9 +1,10 @@
-
+html_attributes() ?> xml:lang="en" lang="en">
+ $theme->start_combining("script,css") ?>
if ($page_title): ?>
= t("Gallery Admin: %page_title", array("page_title" => $page_title)) ?>
@@ -11,8 +12,26 @@
= t("Admin dashboard") ?>
endif ?>
- " type="image/x-icon" />
+ "
+ 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 */ ?>
+
+ = $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" />
- = $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 */ ?>
-
- = $theme->script("gallery.ajax.js") ?>
- = $theme->script("gallery.dialog.js") ?>
- = $theme->script("superfish/js/superfish.js") ?>
- = $theme->script("ui.init.js") ?>
+
+ = $theme->get_combined("script") ?>
- = $theme->admin_head() ?>
+
+ = $theme->get_combined("css") ?>
body_attributes() ?>>
diff --git a/3.0/themes/browny_wind/css/screen.css b/3.0/themes/browny_wind/css/screen.css
index ddd593a6..f3e3adcf 100644
--- a/3.0/themes/browny_wind/css/screen.css
+++ b/3.0/themes/browny_wind/css/screen.css
@@ -4,21 +4,21 @@
* @requires YUI reset, font, grids CSS
*
* Sheet organization:
- * 1) Font sizes, base HTML elements
- * 2) Reusable content blocks
- * 3) Page layout containers
- * 4) Content blocks in specific layout containers
- * 5) States and interactions
- * 6) Positioning and order
- * 7) Navigation and menus
- * 8) ThemeRoller
- * 9) jQuery and jQuery UI
- * 10) Right-to-left language styles
- * 11) More Browny
+ * 1) Font sizes, base HTML elements
+ * 2) Reusable content blocks
+ * 3) Page layout containers
+ * 4) Content blocks in specific layout containers
+ * 5) States and interactions
+ * 6) Positioning and order
+ * 7) Navigation and menus
+ * 8) ThemeRoller
+ * 9) jQuery and jQuery UI
+ * 10) Right-to-left language styles
+ * 11) More Browny
*/
/** *******************************************************************
- * 1) Font sizes, base HTML elements
+ * 1) Font sizes, base HTML elements
**********************************************************************/
/* ~browny~ */
@@ -348,7 +348,7 @@ td {
}
/** *******************************************************************
- * 2) Reusable content blocks
+ * 2) Reusable content blocks
*********************************************************************/
/* ~browny~ */
@@ -362,7 +362,7 @@ td {
}
/*** ******************************************************************
- * 3) Page layout containers
+ * 3) Page layout containers
*********************************************************************/
/* Dimension and scale ~~~~~~~~~~~~~~~~~~~ */
@@ -434,7 +434,7 @@ td {
}
/** *******************************************************************
- * 4) Content blocks in specific layout containers
+ * 4) Content blocks in specific layout containers
*********************************************************************/
/* Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -767,7 +767,7 @@ form .g-error {
}
/** *******************************************************************
- * 7) Navigation and menus
+ * 7) Navigation and menus
*********************************************************************/
/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -869,7 +869,7 @@ form .g-error {
}
/** *******************************************************************
- * 8) ThemeRoller Theme
+ * 8) ThemeRoller Theme
**********************************************************************/
/* ~browny~ */
@@ -878,7 +878,7 @@ form .g-error {
@import "themeroller/ui.tabs.css";
/** *******************************************************************
- * 9) jQuery and jQuery UI
+ * 9) jQuery and jQuery UI
*********************************************************************/
/* Generic block container ~~~~~~~~~~~~~~~ */
@@ -1120,9 +1120,15 @@ div#g-action-status {
margin-left: 0;
}
-/** *******************************************************************
- * 10) Right to left language styles
+/* Autocomplete ~~~~~~~~~~ */
+.ac_loading {
+ background: white url('../images/loading-small.gif') right center no-repeat !important;
+}
+
+/*********************************************************************
+ * 10) Right to left language styles
*********************************************************************/
+
.rtl {
direction: rtl;
}
@@ -1451,7 +1457,7 @@ div#g-action-status {
}
/** *******************************************************************
- * 11) More Browny (Extra overrides for better Browny look)
+ * 11) More Browny (Extra overrides for better Browny look)
*********************************************************************/
/* ~browny~ */
diff --git a/3.0/themes/browny_wind/views/no_sidebar.html.php b/3.0/themes/browny_wind/views/no_sidebar.html.php
index a9eb0e3e..58c57256 100644
--- a/3.0/themes/browny_wind/views/no_sidebar.html.php
+++ b/3.0/themes/browny_wind/views/no_sidebar.html.php
@@ -1,6 +1,11 @@
- - = t("No active sidebar blocks.") ?>
-
">= t("Add blocks") ?>
+ -
+ if (block_manager::get_active("site_sidebar")): ?>
+ = t("Active sidebar blocks have no content.") ?>
+ else: ?>
+ = t("No active sidebar blocks.") ?>
+ endif ?>
+ ">= t("configure blocks") ?>
diff --git a/3.0/themes/browny_wind/views/page.html.php b/3.0/themes/browny_wind/views/page.html.php
index 5e4040bd..2e597f28 100644
--- a/3.0/themes/browny_wind/views/page.html.php
+++ b/3.0/themes/browny_wind/views/page.html.php
@@ -1,50 +1,42 @@
-
+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 ?>
+ = $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 ?>
- " 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): ?>
$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 +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") ?>
+
+
+
+ = $theme->get_combined("script") ?>
+
+
+ = $theme->get_combined("css") ?>
body_attributes() ?>>
@@ -80,7 +88,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() ?>
diff --git a/3.1/themes/browny_admin_wind/css/screen.css b/3.1/themes/browny_admin_wind/css/screen.css
index fbabbcc3..b6ccd68d 100644
--- a/3.1/themes/browny_admin_wind/css/screen.css
+++ b/3.1/themes/browny_admin_wind/css/screen.css
@@ -4,23 +4,23 @@
* @requires YUI reset, font, grids CSS
*
* Sheet organization:
- * 1) Basic HTML elements
- * 2) Reusable content blocks
- * 3) Page layout containers
- * 4) Content blocks in specific layout containers
- * 5) States and interactions
- * 6) Positioning and order
- * 7) Navigation and menus
- * 8) ThemeRoller
- * 9) jQuery and jQuery UI
- * 10) Right-to-left language styles
- * 11) More Browny
+ * 1) Basic HTML elements
+ * 2) Reusable content blocks
+ * 3) Page layout containers
+ * 4) Content blocks in specific layout containers
+ * 5) States and interactions
+ * 6) Positioning and order
+ * 7) Navigation and menus
+ * 8) ThemeRoller
+ * 9) jQuery and jQuery UI
+ * 10) Right-to-left language styles
+ * 11) More Browny
*
* @todo Review g-buttonset-vertical
*/
/** *******************************************************************
- * 1) Basic HTML elements
+ * 1) Basic HTML elements
**********************************************************************/
/* ~browny~ */
@@ -284,22 +284,6 @@ fieldset {
margin-bottom: 0;
}
-fieldset {
- margin-bottom: 1em;
-}
-
-#g-content form ul li {
- padding: .4em 0;
-}
-
-#g-dialog form {
- width: 270px;
-}
-
-#g-dialog fieldset {
- margin-bottom: 0;
-}
-
/* Tables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
table {
@@ -328,8 +312,21 @@ th {
white-space: nowrap;
}
+/* Text ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+.g-text-small {
+ font-size: .8em;
+}
+
+.g-text-big {
+ font-size: 1.2em;
+}
+
+.g-text-right {
+ text-align: right;
+}
+
/** *******************************************************************
- * 2) Reusable content blocks
+ * 2) Reusable content blocks
*********************************************************************/
.g-block,
@@ -393,7 +390,8 @@ th {
.g-unavailable {
border-color: #999;
- opacity: 0.4;
+ color: black;
+ opacity: .6;
}
.g-info td {
@@ -433,7 +431,7 @@ ul.enumeration li {
}
/*** ******************************************************************
- * 3) Page layout containers
+ * 3) Page layout containers
*********************************************************************/
/* Dimension and scale ~~~~~~~~~~~~~~~~~~~ */
.g-one-quarter {
@@ -512,7 +510,7 @@ ul.enumeration li {
}
/** *******************************************************************
- * 4) Content blocks in specific layout containers
+ * 4) Content blocks in specific layout containers
*********************************************************************/
/* Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -633,7 +631,7 @@ ul.enumeration li {
padding: .3em .8em;
}
-/* In-line editing ~~~~~~~~~~~~~~~~~~~~ */
+/* In-line editing ~~~~~~~~~~~~~~~~~~~~~~ */
#g-in-place-edit-message {
background-color: #FFF;
}
@@ -823,7 +821,7 @@ form .g-error {
}
/** *******************************************************************
- * 7) Navigation and menus
+ * 7) Navigation and menus
*********************************************************************/
/* Site Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -840,7 +838,7 @@ form .g-error {
}
/** *******************************************************************
- * 8) ThemeRoller Theme
+ * 8) ThemeRoller Theme
**********************************************************************/
/* ~browny~ */
@@ -848,7 +846,7 @@ form .g-error {
@import "themeroller/ui.tabs.css";
/** *******************************************************************
- * 9) jQuery and jQuery UI
+ * 9) jQuery and jQuery UI
*********************************************************************/
/* Generic block container ~~~~~~~~~~~~~~~ */
@@ -929,10 +927,10 @@ button {
background-position: .4em .3em;
border: 1px solid #ccc;
padding: 0;
+ margin-bottom: 1em;
}
#g-action-status {
- margin-bottom: 1em;
}
#g-action-status li,
@@ -1033,7 +1031,7 @@ div#g-action-status {
margin-left: 0;
}
-/* Superfish menu overrides ~~~~~~~~~~~ */
+/* Superfish menu overrides ~~~~~~~~~~~~~~ */
.sf-menu ul {
width: 12em;
}
@@ -1081,6 +1079,11 @@ ul.sf-menu li li li.sfHover ul {
/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~ */
+.ui-widget-overlay {
+ background: #000;
+ opacity: .7;
+}
+
#g-admin-dashboard .ui-state-highlight,
#g-sidebar .ui-state-highlight {
height: 2em;
@@ -1109,7 +1112,7 @@ ul.sf-menu li li li.sfHover ul {
}
/** *******************************************************************
- * 10) Right to left styles
+ * 10) Right to left styles
*********************************************************************/
.rtl {
@@ -1409,7 +1412,7 @@ ul.sf-menu li li li.sfHover ul {
}
/** *******************************************************************
- * 11) More Browny (Extra overrides for better Browny look)
+ * 11) More Browny (Extra overrides for better Browny look)
*********************************************************************/
/* /lib/gallery.common.css ~~~~~~~~~~~~ */
diff --git a/3.1/themes/browny_admin_wind/views/admin.html.php b/3.1/themes/browny_admin_wind/views/admin.html.php
index c8041069..9e011c69 100644
--- a/3.1/themes/browny_admin_wind/views/admin.html.php
+++ b/3.1/themes/browny_admin_wind/views/admin.html.php
@@ -1,9 +1,10 @@
-
+html_attributes() ?> xml:lang="en" lang="en">
+ $theme->start_combining("script,css") ?>
if ($page_title): ?>
= t("Gallery Admin: %page_title", array("page_title" => $page_title)) ?>
@@ -11,8 +12,26 @@
= t("Admin dashboard") ?>
endif ?>
- " type="image/x-icon" />
+ "
+ 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 */ ?>
+
+ = $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" />
- = $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 */ ?>
-
- = $theme->script("gallery.ajax.js") ?>
- = $theme->script("gallery.dialog.js") ?>
- = $theme->script("superfish/js/superfish.js") ?>
- = $theme->script("ui.init.js") ?>
+
+ = $theme->get_combined("script") ?>
- = $theme->admin_head() ?>
+
+ = $theme->get_combined("css") ?>
body_attributes() ?>>
diff --git a/3.1/themes/browny_wind/css/screen.css b/3.1/themes/browny_wind/css/screen.css
index 01576252..f3e3adcf 100644
--- a/3.1/themes/browny_wind/css/screen.css
+++ b/3.1/themes/browny_wind/css/screen.css
@@ -4,21 +4,21 @@
* @requires YUI reset, font, grids CSS
*
* Sheet organization:
- * 1) Font sizes, base HTML elements
- * 2) Reusable content blocks
- * 3) Page layout containers
- * 4) Content blocks in specific layout containers
- * 5) States and interactions
- * 6) Positioning and order
- * 7) Navigation and menus
- * 8) ThemeRoller
- * 9) jQuery and jQuery UI
- * 10) Right-to-left language styles
- * 11) More Browny
+ * 1) Font sizes, base HTML elements
+ * 2) Reusable content blocks
+ * 3) Page layout containers
+ * 4) Content blocks in specific layout containers
+ * 5) States and interactions
+ * 6) Positioning and order
+ * 7) Navigation and menus
+ * 8) ThemeRoller
+ * 9) jQuery and jQuery UI
+ * 10) Right-to-left language styles
+ * 11) More Browny
*/
/** *******************************************************************
- * 1) Font sizes, base HTML elements
+ * 1) Font sizes, base HTML elements
**********************************************************************/
/* ~browny~ */
@@ -27,6 +27,18 @@ body, html {
font-family: 'Century gothic', Verdana, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
}
+.ui-widget {
+ font-family: 'Century gothic', Verdana, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+}
+
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
+ font-family: 'Century gothic', Verdana, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+}
+
+#g-user-profile #g-comment-detail .g-author {
+ font-family: Cursive, Serif;
+}
+
p {
margin-bottom: 1em;
text-shadow: 0px 1px 1px #F7F5F0;
@@ -336,7 +348,7 @@ td {
}
/** *******************************************************************
- * 2) Reusable content blocks
+ * 2) Reusable content blocks
*********************************************************************/
/* ~browny~ */
@@ -350,7 +362,7 @@ td {
}
/*** ******************************************************************
- * 3) Page layout containers
+ * 3) Page layout containers
*********************************************************************/
/* Dimension and scale ~~~~~~~~~~~~~~~~~~~ */
@@ -422,7 +434,7 @@ td {
}
/** *******************************************************************
- * 4) Content blocks in specific layout containers
+ * 4) Content blocks in specific layout containers
*********************************************************************/
/* Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -742,17 +754,20 @@ form .g-error {
.g-last {
}
+/* ~browny~ */
.g-even {
- background-color: #fff;
+ background-color: #BAAD8B;
+ text-align: right;
}
/* ~browny~ */
.g-odd {
background-color: #EDE4D5;
+ text-align: left;
}
/** *******************************************************************
- * 7) Navigation and menus
+ * 7) Navigation and menus
*********************************************************************/
/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -854,7 +869,7 @@ form .g-error {
}
/** *******************************************************************
- * 8) ThemeRoller Theme
+ * 8) ThemeRoller Theme
**********************************************************************/
/* ~browny~ */
@@ -863,7 +878,7 @@ form .g-error {
@import "themeroller/ui.tabs.css";
/** *******************************************************************
- * 9) jQuery and jQuery UI
+ * 9) jQuery and jQuery UI
*********************************************************************/
/* Generic block container ~~~~~~~~~~~~~~~ */
@@ -922,14 +937,6 @@ ul.sf-menu li li li.sfHover ul {
/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
-.ui-widget {
- font-family: 'Century gothic', Verdana, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
-}
-
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
- font-family: 'Century gothic', Verdana, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
-}
-
.ui-widget-overlay {
background: #000;
opacity: .7;
@@ -1113,9 +1120,15 @@ div#g-action-status {
margin-left: 0;
}
-/** *******************************************************************
- * 10) Right to left language styles
+/* Autocomplete ~~~~~~~~~~ */
+.ac_loading {
+ background: white url('../images/loading-small.gif') right center no-repeat !important;
+}
+
+/*********************************************************************
+ * 10) Right to left language styles
*********************************************************************/
+
.rtl {
direction: rtl;
}
@@ -1433,8 +1446,18 @@ div#g-action-status {
padding-right: 0;
}
+/* ~browny~ */
+.rtl .g-even {
+ text-align: left;
+}
+
+/* ~browny~ */
+.rtl .g-odd {
+ text-align: right;
+}
+
/** *******************************************************************
- * 11) More Browny (Extra overrides for better Browny look)
+ * 11) More Browny (Extra overrides for better Browny look)
*********************************************************************/
/* ~browny~ */
@@ -1497,10 +1520,6 @@ div#g-action-status {
margin-bottom: inherit;
}
-#g-user-profile #g-comment-detail .g-author {
- font-family: Cursive, Serif;
-}
-
#g-user-profile #g-comment-detail .g-author a {
float: left;
position: relative;
@@ -1582,12 +1601,6 @@ div#g-action-status {
#g-exif-data {
font-size: .85em !important;
}
-.g-odd {
- background: #BAAD8B !important;
-}
-.g-even {
- background: #EDE4D5 !important;
-}
/* 3rd Party Modules ~~~~~~~~~~~~~~~~~~~~~ */
@@ -1620,3 +1633,10 @@ table.calendar td:hover {
#g-view-menu #g-download-album-link {
background-image: url('../images/ico-view-downloadalbum.png');
}
+
+/* comment_block */
+.g-odd .g-thumbnail,
+.g-even .g-thumbnail {
+ margin-top: 3px;
+ margin-bottom: 3px;
+}
\ No newline at end of file
diff --git a/3.1/themes/browny_wind/views/no_sidebar.html.php b/3.1/themes/browny_wind/views/no_sidebar.html.php
index a9eb0e3e..58c57256 100644
--- a/3.1/themes/browny_wind/views/no_sidebar.html.php
+++ b/3.1/themes/browny_wind/views/no_sidebar.html.php
@@ -1,6 +1,11 @@
- - = t("No active sidebar blocks.") ?>
-
">= t("Add blocks") ?>
+ -
+ if (block_manager::get_active("site_sidebar")): ?>
+ = t("Active sidebar blocks have no content.") ?>
+ else: ?>
+ = t("No active sidebar blocks.") ?>
+ endif ?>
+ ">= t("configure blocks") ?>
diff --git a/3.1/themes/browny_wind/views/page.html.php b/3.1/themes/browny_wind/views/page.html.php
index 5e4040bd..2e597f28 100644
--- a/3.1/themes/browny_wind/views/page.html.php
+++ b/3.1/themes/browny_wind/views/page.html.php
@@ -1,50 +1,42 @@
-
+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 ?>
+ = $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 ?>
- " 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): ?>
$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 +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") ?>
+
+
+
+ = $theme->get_combined("script") ?>
+
+
+ = $theme->get_combined("css") ?>
body_attributes() ?>>
@@ -80,7 +88,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() ?>