summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhimerus2010-05-14 13:59:02 (GMT)
committer himerus2010-05-14 13:59:02 (GMT)
commitcbeb61303d230b27e5081f618dc30bba49385dc6 (patch)
tree84b269aae3b9a477bfb4c16c689fdfa5741b596d
parent536039da27cae793ccdc29cc51266d2b60becc4e (diff)
Updating sidebar_last to be sidebar_second per #798414
-rw-r--r--omega.info14
-rw-r--r--page.tpl.php6
-rw-r--r--preprocess/preprocess-page.inc60
-rw-r--r--theme-settings.php20
4 files changed, 50 insertions, 50 deletions
diff --git a/omega.info b/omega.info
index 4d67ee5..ee6e189 100644
--- a/omega.info
+++ b/omega.info
@@ -15,7 +15,7 @@ stylesheets[all][] = css/custom.css
scripts[] = js/omega.js
regions[sidebar_first] = sidebar first
-regions[sidebar_last] = sidebar last
+regions[sidebar_second] = sidebar second
regions[header_first] = header first
regions[header_last] = header last
@@ -58,8 +58,8 @@ settings[sidebar_contain_pages] = ''
settings[omega_default_container_width] = 16
settings[omega_branding_wrapper_width] = 16
-settings[omega_header_logo_width] = 4
-settings[omega_header_menu_width] = 12
+settings[omega_header_logo_width] = 6
+settings[omega_header_menu_width] = 10
settings[omega_header_wrapper_width] = 16
settings[omega_header_first_width] = 8
@@ -84,7 +84,7 @@ settings[omega_content_layout] = first_content_last
settings[omega_content_container_width] = 16
settings[omega_sidebar_first_width] = 4
settings[omega_content_main_width] = 8
-settings[omega_sidebar_last_width] = 4
+settings[omega_sidebar_second_width] = 4
settings[omega_postscript_container_width] = 16
settings[omega_postscript_one_width] = 4
@@ -100,8 +100,8 @@ settings[omega_postscript_four_width] = 4
settings[omega_postscript_four_prefix] = 0
settings[omega_postscript_four_suffix] = 0
-settings[omega_footer_container_width] = 16
-settings[omega_footer_first_width] = 16
-settings[omega_footer_last_width] = 16
+settings[omega_footer_container_width] = 12
+settings[omega_footer_first_width] = 6
+settings[omega_footer_last_width] = 6
; / 960gs default region settings \ No newline at end of file
diff --git a/page.tpl.php b/page.tpl.php
index a369287..5600452 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -131,9 +131,9 @@
</div><!-- /#sidebar-first -->
<?php endif; ?>
- <?php if ($page['sidebar_last']): ?>
- <div id="sidebar-last" class="column sidebar region <?php print $sidebar_last_classes; ?>">
- <?php print render($page['sidebar_last']); ?>
+ <?php if ($page['sidebar_second']): ?>
+ <div id="sidebar-last" class="column sidebar region <?php print $sidebar_second_classes; ?>">
+ <?php print render($page['sidebar_second']); ?>
</div><!-- /#sidebar-last -->
<?php endif; ?>
</div><!-- /#main-content-container -->
diff --git a/preprocess/preprocess-page.inc b/preprocess/preprocess-page.inc
index 82acbbd..cd42811 100644
--- a/preprocess/preprocess-page.inc
+++ b/preprocess/preprocess-page.inc
@@ -7,8 +7,8 @@ global $theme_key;
* layouts based on context of the page. My main purpose for this is in the admin
* section to help widen up the layout if two sidebars are being used.
*
- * All it does is combine the sidebar_first and sidebar_last into sidebar_first and
- * unset the sidebar_last variable. This resets the layout to act like only one
+ * All it does is combine the sidebar_first and sidebar_second into sidebar_first and
+ * unset the sidebar_second variable. This resets the layout to act like only one
* sidebar is present in certain paths
*/
if (theme_get_setting('sidebar_contain_pages')) {
@@ -20,8 +20,8 @@ if (theme_get_setting('sidebar_contain_pages')) {
}
$page_match = !(theme_get_setting('sidebar_combine') xor $page_match);
if ($page_match && substr($_GET['q'], 0, 17) != 'admin/build/block') {
- $vars['page']['sidebar_first'] = $vars['page']['sidebar_first']. $vars['page']['sidebar_last'];
- unset($vars['page']['sidebar_last']);
+ $vars['page']['sidebar_first'] = $vars['page']['sidebar_first']. $vars['page']['sidebar_second'];
+ unset($vars['page']['sidebar_second']);
}
}
@@ -93,7 +93,7 @@ $vars = static_region_builder($preface_regions, theme_get_setting('preface_wrapp
/**
* Body Region
- * Configuration of $sidebar_first, $sidebar_last, and the main content zone
+ * Configuration of $sidebar_first, $sidebar_second, and the main content zone
*
* This section needs MUCH cleanup as I know I can condense the switch
* statement to be much shorter than completely redeclaring each zone
@@ -113,12 +113,12 @@ $content_regions = array(
// we need to tell the "related" zones so that we can determine widths for this primary zone
'related' => array(
'sidebar_first' => array('width' => theme_get_setting('omega_sidebar_first_width')),
- 'sidebar_last' => array('width' => theme_get_setting('omega_sidebar_last_width')),
+ 'sidebar_second' => array('width' => theme_get_setting('omega_sidebar_second_width')),
),
'push' => array(
'width' => '',
'conditions' => array(
- // 'sidebar_last',
+ // 'sidebar_second',
),
),
'pull' => array(
@@ -137,7 +137,7 @@ $content_regions = array(
// this just needs the region name it depends on in this primary array
// must be a region in this group though, not a region outside the
// $content_regions area.
- // 'sidebar_last',
+ // 'sidebar_second',
),
),
'pull' => array(
@@ -148,13 +148,13 @@ $content_regions = array(
),
),
),
- 'sidebar_last' => array(
- 'data' => $vars['page']['sidebar_last'],
- 'width' => theme_get_setting('omega_sidebar_last_width'),
+ 'sidebar_second' => array(
+ 'data' => $vars['page']['sidebar_second'],
+ 'width' => theme_get_setting('omega_sidebar_second_width'),
'push' => array(
'width' => '',
'conditions' => array(
- // 'sidebar_last',
+ // 'sidebar_second',
),
),
'pull' => array(
@@ -173,7 +173,7 @@ $content_regions = array(
/*
if (!$vars['page']['show_blocks']) {
unset($vars['page']['sidebar_first']);
- unset($vars['page']['sidebar_last']);
+ unset($vars['page']['sidebar_second']);
}
*/
@@ -188,9 +188,9 @@ switch(theme_get_setting('omega_content_layout')){
// there is content available in that region or not. If there wasn't content in it, the
// primary content region would swallow up that extra grid space anyway.
- // if sidebar_last isn't present, we will pull the first sidebar the combined width of the content & sidebar last spacing
+ // if sidebar_second isn't present, we will pull the first sidebar the combined width of the content & sidebar last spacing
// otherwise,
- $sl_pull = $vars['page']['sidebar_last'] ? theme_get_setting('omega_content_main_width') : theme_get_setting('omega_content_main_width') + theme_get_setting('omega_sidebar_last_width');
+ $sl_pull = $vars['page']['sidebar_second'] ? theme_get_setting('omega_content_main_width') : theme_get_setting('omega_content_main_width') + theme_get_setting('omega_sidebar_second_width');
// let's assign some new data to our $content_regions array to assing pull classes
@@ -198,9 +198,9 @@ switch(theme_get_setting('omega_content_layout')){
$content_regions['sidebar_first']['pull']['width'] = $sl_pull;
$content_regions['sidebar_first']['pull']['conditions'] = array();
$content_regions['sidebar_first']['push'] = FALSE;
- // sidebar_last doesn't move in this layout
- $content_regions['sidebar_last']['pull'] = FALSE;
- $content_regions['sidebar_last']['push'] = FALSE;
+ // sidebar_second doesn't move in this layout
+ $content_regions['sidebar_second']['pull'] = FALSE;
+ $content_regions['sidebar_second']['push'] = FALSE;
// main_content will only be pushed in this layout
$content_regions['main_content']['pull'] = FALSE;
$content_regions['main_content']['push'] = array(
@@ -228,9 +228,9 @@ switch(theme_get_setting('omega_content_layout')){
// sidebar_first doesn't move in this layout
$content_regions['sidebar_first']['pull'] = FALSE;
$content_regions['sidebar_first']['push'] = FALSE;
- // sidebar_last doesn't move in this layout
- $content_regions['sidebar_last']['pull'] = FALSE;
- $content_regions['sidebar_last']['push'] = FALSE;
+ // sidebar_second doesn't move in this layout
+ $content_regions['sidebar_second']['pull'] = FALSE;
+ $content_regions['sidebar_second']['push'] = FALSE;
// main_content doesn't move in this layout
$content_regions['main_content']['pull'] = FALSE;
$content_regions['main_content']['push'] = FALSE;
@@ -241,21 +241,21 @@ switch(theme_get_setting('omega_content_layout')){
// FIRST - LAST - CONTENT
case 'first_last_content':
- // if sidebar_last isn't present, we will pull the first sidebar the combined width of the content & sidebar last spacing
+ // if sidebar_second isn't present, we will pull the first sidebar the combined width of the content & sidebar last spacing
// otherwise,
- $sl_pull = $vars['page']['sidebar_last'] ? theme_get_setting('omega_content_main_width') : theme_get_setting('omega_content_main_width') + theme_get_setting('omega_sidebar_last_width');
+ $sl_pull = $vars['page']['sidebar_second'] ? theme_get_setting('omega_content_main_width') : theme_get_setting('omega_content_main_width') + theme_get_setting('omega_sidebar_second_width');
$sr_pull = $vars['page']['sidebar_first'] ? theme_get_setting('omega_content_main_width') : theme_get_setting('omega_content_main_width') + theme_get_setting('omega_sidebar_first_width');
- $sc_max_push = theme_get_setting('omega_sidebar_first_width') + theme_get_setting('omega_sidebar_last_width');
+ $sc_max_push = theme_get_setting('omega_sidebar_first_width') + theme_get_setting('omega_sidebar_second_width');
// let's assign some new data to our $content_regions array to assing pull classes
// sidebar_first will be pulled an exact amount assuming it exists in this layout
$content_regions['sidebar_first']['pull']['width'] = $sl_pull;
$content_regions['sidebar_first']['pull']['conditions'] = array();
$content_regions['sidebar_first']['push'] = FALSE;
- // sidebar_last doesn't move in this layout
- $content_regions['sidebar_last']['pull']['width'] = $sr_pull;
- $content_regions['sidebar_last']['pull']['conditions'] = array();
- $content_regions['sidebar_last']['push'] = FALSE;
+ // sidebar_second doesn't move in this layout
+ $content_regions['sidebar_second']['pull']['width'] = $sr_pull;
+ $content_regions['sidebar_second']['pull']['conditions'] = array();
+ $content_regions['sidebar_second']['push'] = FALSE;
// main_content will only be pushed in this layout
$content_regions['main_content']['pull'] = FALSE;
$content_regions['main_content']['push'] = array(
@@ -267,11 +267,11 @@ switch(theme_get_setting('omega_content_layout')){
'type' => FALSE,
'value' => theme_get_setting('omega_sidebar_first_width'),
),
- 'sidebar_last' => array(
+ 'sidebar_second' => array(
// type should either be TRUE or FALSE
// false value here will use a ! operator in front of the variable in the ns() function
'type' => FALSE,
- 'value' => theme_get_setting('omega_sidebar_last_width'),
+ 'value' => theme_get_setting('omega_sidebar_second_width'),
),
),
);
diff --git a/theme-settings.php b/theme-settings.php
index f5dfb8d..2bcec25 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -355,7 +355,7 @@ function omega_form_system_theme_settings_alter(&$form, &$form_state) {
$form['omega_container']['omega_regions']['main'] = array(
'#type' => 'fieldset',
'#title' => t('Content Layout Configuration'),
- '#description' => t('<p>Grid configurations for Content Zone, Sidebar First and Sidebar Last. The "main" regions here are the only true "smart" zone that will use the maximum container width to determine the appropriate width for elements in this zone based on which regions are displayed on the current page.</p><p>If your container grid is 16 grids, and you have a configuration of 4-8-4, which would imply two sidebars and the content zone, if all regions are present, this layout of 4-8-4 will be respected. However, if on a page, the first sidebar is empty of content, the content zone would then incorporate those leftover 4 grids, so your layout would be 12-4.'),
+ '#description' => t('<p>Grid configurations for Content Zone, Sidebar First and Sidebar Second. The "main" regions here are the only true "smart" zone that will use the maximum container width to determine the appropriate width for elements in this zone based on which regions are displayed on the current page.</p><p>If your container grid is 16 grids, and you have a configuration of 4-8-4, which would imply two sidebars and the content zone, if all regions are present, this layout of 4-8-4 will be respected. However, if on a page, the first sidebar is empty of content, the content zone would then incorporate those leftover 4 grids, so your layout would be 12-4.'),
'#collapsible' => TRUE,
'#collapsed' => TRUE,
);
@@ -365,9 +365,9 @@ function omega_form_system_theme_settings_alter(&$form, &$form_state) {
'#title' => t('Content Zone Layout'),
'#default_value' => theme_get_setting('omega_content_layout'),
'#options' => array(
- 'first_content_last' => t('Sidebar First - Content - Sidebar Last'),
- 'content_first_last' => t('Content - Sidebar First - Sidebar Last'),
- 'first_last_content' => t('Sidebar First - Sidebar Last - Content'),
+ 'first_content_last' => t('Sidebar First - Content - Sidebar Second'),
+ 'content_first_last' => t('Content - Sidebar First - Sidebar Second'),
+ 'first_last_content' => t('Sidebar First - Sidebar Second - Content'),
),
);
$form['omega_container']['omega_regions']['main']['omega_content_container_width'] = array(
@@ -382,19 +382,19 @@ function omega_form_system_theme_settings_alter(&$form, &$form_state) {
'#title' => t('Contextual Width for Sidebar First'),
'#default_value' => theme_get_setting('omega_sidebar_first_width'),
'#options' => $grids,
- '#description' => t('This number, combined with the Content Main and Sidebar Last determine the share of your grid for each element.'),
+ '#description' => t('This number, combined with the Content Main and Sidebar Second determine the share of your grid for each element.'),
);
$form['omega_container']['omega_regions']['main']['omega_content_main_width'] = array(
'#type' => 'select',
'#title' => t('Contextual Width for Main Content Region'),
'#default_value' => theme_get_setting('omega_content_main_width'),
'#options' => $grids,
- '#description' => t('This number, combined with the Sidebar First and Sidebar Last determine the share of your grid for each element.'),
+ '#description' => t('This number, combined with the Sidebar First and Sidebar Second determine the share of your grid for each element.'),
);
- $form['omega_container']['omega_regions']['main']['omega_sidebar_last_width'] = array(
+ $form['omega_container']['omega_regions']['main']['omega_sidebar_second_width'] = array(
'#type' => 'select',
- '#title' => t('Contextual Width for Sidebar Last'),
- '#default_value' => theme_get_setting('omega_sidebar_last_width'),
+ '#title' => t('Contextual Width for Sidebar Second'),
+ '#default_value' => theme_get_setting('omega_sidebar_second_width'),
'#options' => $grids,
'#description' => t('This number, combined with the Sidebar First and Main Content determine the share of your grid for each element.'),
);
@@ -403,7 +403,7 @@ function omega_form_system_theme_settings_alter(&$form, &$form_state) {
$form['omega_container']['omega_regions']['main']['sidebar_combine'] = array(
'#type' => 'radios',
'#title' => t('Combine Sidebars'),
- '#description' => t('This is useful for administrative pages, and in certain contexts. You may choose to in certain areas, combine the <strong>$sidebar_first</strong> and <strong>$sidebar_last</strong> to create one sidebar from the content of both.'),
+ '#description' => t('This is useful for administrative pages, and in certain contexts. You may choose to in certain areas, combine the <strong>$sidebar_first</strong> and <strong>$sidebar_second</strong> to create one sidebar from the content of both.'),
'#options' => $options,
'#default_value' => theme_get_setting('sidebar_combine'),
);