diff --git a/includes/password.inc b/includes/password.inc index 143410c73cd..6c145cf9eed 100644 --- a/includes/password.inc +++ b/includes/password.inc @@ -45,7 +45,7 @@ function _password_itoa64() { * @return * Encoded string */ -function _password_base64_encode($input, $count) { +function _password_base64_encode($input, $count) { $output = ''; $i = 0; $itoa64 = _password_itoa64(); diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index 965eed45091..83590a24bd7 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -241,6 +241,7 @@ function template_preprocess_maintenance_page(&$variables) { } $variables['head_title'] = implode(' | ', $head_title); $variables['base_path'] = base_path(); + $variables['front_page'] = url(); $variables['breadcrumb'] = ''; $variables['feed_icons'] = ''; $variables['footer_message'] = filter_xss_admin(variable_get('site_footer', FALSE)); diff --git a/themes/garland/maintenance-page.tpl.php b/themes/garland/maintenance-page.tpl.php index e299fc92e39..54f66320ba6 100644 --- a/themes/garland/maintenance-page.tpl.php +++ b/themes/garland/maintenance-page.tpl.php @@ -20,10 +20,10 @@ - > +
@@ -68,9 +68,9 @@
- ' . $title . ''; endif; ?> - +

+
diff --git a/themes/garland/minnelli/minnelli.css b/themes/garland/minnelli/minnelli.css index 85360e486e2..e55942cb2cf 100644 --- a/themes/garland/minnelli/minnelli.css +++ b/themes/garland/minnelli/minnelli.css @@ -4,7 +4,7 @@ body #wrapper #container { width: 560px; } -body.sidebars #wrapper #container { +body.two-sidebars #wrapper #container { width: 980px; } diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php index 5aed7ccc996..1c73bc8fa0e 100644 --- a/themes/garland/page.tpl.php +++ b/themes/garland/page.tpl.php @@ -9,52 +9,31 @@ - > + - -
+
-
+
+ + +
+
diff --git a/themes/garland/print.css b/themes/garland/print.css index 58154aa606f..bdd895818a4 100644 --- a/themes/garland/print.css +++ b/themes/garland/print.css @@ -12,12 +12,12 @@ ul.primary-links, ul.secondary-links, display: none; } -body.sidebars, body.sidebar-left, body.sidebar-right, body { +body.two-sidebars, body.sidebar-left, body.sidebar-right, body { width: 640px; } -body.sidebar-left #center, body.sidebar-right #center, body.sidebars #center, -body.sidebar-left #squeeze, body.sidebar-right #squeeze, body.sidebars #squeeze { +body.sidebar-left #center, body.sidebar-right #center, body.two-sidebars #center, +body.sidebar-left #squeeze, body.sidebar-right #squeeze, body.two-sidebars #squeeze { margin: 0; } diff --git a/themes/garland/style.css b/themes/garland/style.css index d1ca3c87067..8c310c7e944 100644 --- a/themes/garland/style.css +++ b/themes/garland/style.css @@ -384,7 +384,7 @@ table .form-button, table .form-submit { } /* With 3 columns, require a minimum width of 1000px to ensure there is enough horizontal space. */ -body.sidebars { +body.two-sidebars { min-width: 980px; } /* With 2 columns, require a minimum width of 800px. */ @@ -405,7 +405,7 @@ body.sidebar-left #center { body.sidebar-right #center { margin-right: -210px; } -body.sidebars #center { +body.two-sidebars #center { margin: 0 -210px; } @@ -416,7 +416,7 @@ body.sidebar-left #squeeze { body.sidebar-right #squeeze { margin-right: 210px; } -body.sidebars #squeeze { +body.two-sidebars #squeeze { margin: 0 210px; } @@ -505,7 +505,7 @@ body.sidebar-right #footer { margin-right: -210px; } -body.sidebars #footer { +body.two-sidebars #footer { margin: 0 -210px; } diff --git a/themes/garland/template.php b/themes/garland/template.php index a38ba1519bd..36c45c21f57 100644 --- a/themes/garland/template.php +++ b/themes/garland/template.php @@ -1,29 +1,6 @@ ' . implode(' › ', $breadcrumb) . '
'; } @@ -40,7 +17,7 @@ function phptemplate_breadcrumb($breadcrumb) { /** * Allow themable wrapping of all comments. */ -function phptemplate_comment_wrapper($content, $node) { +function garland_comment_wrapper($content, $node) { if (!$content || $node->type == 'forum') { return '
' . $content . '
'; } @@ -50,10 +27,27 @@ function phptemplate_comment_wrapper($content, $node) { } /** - * Override or insert PHPTemplate variables into the templates. + * Override or insert variables into the page template. */ -function phptemplate_preprocess_page(&$vars) { +function garland_preprocess_page(&$vars) { $vars['tabs2'] = menu_secondary_local_tasks(); + $vars['primary_nav'] = isset($vars['primary_links']) ? theme('links', $vars['primary_links'], array('class' => 'links primary-links')) : FALSE; + $vars['secondary_nav'] = isset($vars['secondary_links']) ? theme('links', $vars['secondary_links'], array('class' => 'links secondary-links')) : FALSE; + $vars['ie_styles'] = garland_get_ie_styles(); + + // Prepare header + $site_fields = array(); + if (!empty($vars['site_name'])) { + $site_fields[] = check_plain($vars['site_name']); + } + if (!empty($vars['site_slogan'])) { + $site_fields[] = check_plain($vars['site_slogan']); + } + $vars['site_title'] = implode(' ', $site_fields); + if (!empty($site_fields)) { + $site_fields[0] = ''. $site_fields[0] .''; + } + $vars['site_html'] = implode(' ', $site_fields); // Hook into color.module if (module_exists('color')) { @@ -64,13 +58,14 @@ function phptemplate_preprocess_page(&$vars) { /** * Returns the rendered local tasks. The default implementation renders * them as tabs. Overridden to split the secondary tasks. - * - * @ingroup themeable */ -function phptemplate_menu_local_tasks() { +function garland_menu_local_tasks() { return menu_primary_local_tasks(); } +/** + * Format the "Submitted by username on date/time" for each comment. + */ function phptemplate_comment_submitted($comment) { return t('!datetime — !username', array( @@ -79,7 +74,10 @@ function phptemplate_comment_submitted($comment) { )); } -function phptemplate_node_submitted($node) { +/** + * Format the "Submitted by username on date/time" for each node. + */ +function garland_node_submitted($node) { return t('!datetime — !username', array( '!username' => theme('username', $node), @@ -90,13 +88,13 @@ function phptemplate_node_submitted($node) { /** * Generates IE CSS links for LTR and RTL languages. */ -function phptemplate_get_ie_styles() { +function garland_get_ie_styles() { global $language; - $iecss = ''; + $ie_styles = ''. "\n"; if (defined('LANGUAGE_RTL') && $language->direction == LANGUAGE_RTL) { - $iecss .= ''; + $ie_styles .= ' '. "\n"; } - return $iecss; + return $ie_styles; }