Index: nitobe.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/nitobe/nitobe.info,v retrieving revision 1.9.2.2 diff -u -r1.9.2.2 nitobe.info --- nitobe.info 1 Aug 2009 17:58:31 -0000 1.9.2.2 +++ nitobe.info 26 Dec 2009 23:20:02 -0000 @@ -11,11 +11,13 @@ ; -------------------------------------------------------------------------- ; Theme regions. ; -------------------------------------------------------------------------- +regions[leaderboard] = Leaderboard regions[header] = Header regions[masthead] = Masthead regions[content] = Content regions[left] = Left Sidebar regions[right] = Right Sidebar +regions[page_bottom] = Page Bottom regions[bottom_left] = Bottom Left regions[bottom_center_left] = Bottom Center Left regions[bottom_center_right] = Bottom Center Right @@ -56,5 +58,46 @@ settings[nitobe_header_always_show] = FALSE settings[nitobe_remove_not_verified] = FALSE settings[nitobe_suppress_comment_reply] = FALSE +settings[nitobe_sidebar_left] = "4" +settings[nitobe_sidebar_right] = "4" settings[nitobe_content_placement] = "center" settings[nitobe_title_effect] = TRUE + + ; -------------------------------------------------------------------------- + ; Nitobe's Skinr block classes. These can be applied to blocks on each + ; blocks configuration page. This requires the Skinr module: + ; http://drupal.org/project/skinr + ; -------------------------------------------------------------------------- + +skinr[nitobe-block-grid][title] = Width +skinr[nitobe-block-grid][type] = select +skinr[nitobe-block-grid][description] = Select the width for this block. All blocks with widths set will float left to align themselves horizontally. A block with no width set will take up the full with of the region (and clear the other blocks above it). This allows you to build complex block layouts in sidebars and other regions. +skinr[nitobe-block-grid][features][] = block +skinr[nitobe-block-grid][features][] = panels_pane + +skinr[nitobe-block-grid][options][1][label] = grid-1 +skinr[nitobe-block-grid][options][1][class] = grid-1 +skinr[nitobe-block-grid][options][2][label] = grid-2 +skinr[nitobe-block-grid][options][2][class] = grid-2 +skinr[nitobe-block-grid][options][4][label] = grid-3 +skinr[nitobe-block-grid][options][4][class] = grid-3 +skinr[nitobe-block-grid][options][5][label] = grid-4 +skinr[nitobe-block-grid][options][5][class] = grid-4 + +skinr[nitobe-block-grid][options][6][label] = grid-5 +skinr[nitobe-block-grid][options][6][class] = grid-5 +skinr[nitobe-block-grid][options][8][label] = grid-6 +skinr[nitobe-block-grid][options][8][class] = grid-6 +skinr[nitobe-block-grid][options][9][label] = grid-7 +skinr[nitobe-block-grid][options][9][class] = grid-7 + +skinr[nitobe-block-margin][title] = Grid Margin +skinr[nitobe-block-margin][type] = select +skinr[nitobe-block-margin][description] = To align blocks correctly you may need to add margin left or right, but never both. +skinr[nitobe-block-margin][features][] = block +skinr[nitobe-block-margin][features][] = panels_pane + +skinr[nitobe-block-margin][options][1][label] = Margin left +skinr[nitobe-block-margin][options][1][class] = block-margin-left +skinr[nitobe-block-margin][options][2][label] = margin right +skinr[nitobe-block-margin][options][2][class] = block-margin-right Index: template.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/nitobe/template.php,v retrieving revision 1.21.2.4 diff -u -r1.21.2.4 template.php --- template.php 18 Oct 2009 14:20:42 -0000 1.21.2.4 +++ template.php 27 Dec 2009 01:54:21 -0000 @@ -270,7 +270,8 @@ * - 'nitobe_block_id' - A complete unique ID for the block. * - 'nitobe_block_class' - The CSS classes to apply to the block. If * the Block Class module is installed, those classes will be added - * to these. + * to these. If the Skinr module is installed you can use it to set + * classes on blocks. */ function nitobe_preprocess_block(&$vars) { $block = &$vars['block']; @@ -286,6 +287,12 @@ } elseif (function_exists('block_class')) { $vars['nitobe_block_class'] .= (' ' . block_class($block)); } + + // -------------------------------------------------------------------------- + // Add support for Skinr module classes http://drupal.org/project/skinr. + if (function_exists('node_skinr_data') && !empty($vars['skinr'])) { + $vars['nitobe_block_class'] .= (' ' . $vars['skinr']); + } } @@ -628,10 +635,12 @@ // -- Determine the classes for the content and sidebars. $has_left = (($layout == 'left') || ($layout == 'both')); $has_right = (($layout == 'right') || ($layout == 'both')); + $left_width = theme_get_setting('nitobe_sidebar_left'); + $right_width = theme_get_setting('nitobe_sidebar_right'); - $vars['nitobe_classes']['content'] = nitobe_ns('grid-16', $has_left, 4, $has_right, 4); - $vars['nitobe_classes']['left'] = 'grid-4'; - $vars['nitobe_classes']['right'] = 'grid-4'; + $vars['nitobe_classes']['content'] = nitobe_ns('grid-16', $has_left, $left_width, $has_right, $right_width); + $vars['nitobe_classes']['left'] = 'grid-'. $left_width; + $vars['nitobe_classes']['right'] = 'grid-'. $right_width; $vars['nitobe_content_width'] = $vars['nitobe_classes']['content']; // -------------------------------------------------------------------------- @@ -649,27 +658,27 @@ $push_pull = array( 'center' => array( 'left' => array( - 'content' => 'push-4', - 'left' => 'pull-12', + 'content' => 'push-'. $left_width, + 'left' => nitobe_ns('pull-16', 16, $left_width), ), 'both' => array( - 'content' => 'push-4', - 'left' => 'pull-8', + 'content' => 'push-'. $left_width, + 'left' => nitobe_ns('pull-16', 16, $left_width + $right_width), ), ), 'left' => array( 'left' => array( - 'content' => 'push-4', - 'left' => 'pull-12', + 'content' => 'push-'. $left_width, + 'left' => nitobe_ns('pull-16', 16, $left_width), ), 'right' => array( - 'content' => 'push-4', - 'right' => 'pull-12', + 'content' => 'push-'. $right_width, + 'right' => nitobe_ns('pull-16', 16, $right_width), ), 'both' => array( - 'content' => 'push-8', - 'left' => 'pull-8', - 'right' => 'pull-8', + 'content' => 'push-'. $left_width + $right_width, + 'left' => nitobe_ns('pull-16', 16, $left_width + $right_width), + 'right' => nitobe_ns('pull-16', 16, $left_width + $right_width), ), ), ); Index: theme-settings.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/nitobe/theme-settings.php,v retrieving revision 1.9.8.2 diff -u -r1.9.8.2 theme-settings.php --- theme-settings.php 1 Aug 2009 17:58:31 -0000 1.9.8.2 +++ theme-settings.php 26 Dec 2009 19:35:49 -0000 @@ -39,6 +39,50 @@ ); // -------------------------------------------------------------------------- + // -- Set the width of the left sidebar. + $default = $settings['nitobe_sidebar_left']; + $desc = t('Set the width of the left sidebar.'); + $options = array( + '2' => 'grid-2', + '3' => 'grid-3', + '4' => 'grid-4', + '5' => 'grid-5', + '6' => 'grid-6', + '7' => 'grid-7', + '8' => 'grid-8', + ); + + $form['nitobe_sidebar_left'] = array( + '#type' => 'select', + '#title' => t('Sidebar Left Width'), + '#options' => $options, + '#default_value' => $default, + '#description' => $desc, + ); + + // -------------------------------------------------------------------------- + // -- Set the width of the right sidebar. + $default = $settings['nitobe_sidebar_right']; + $desc = t('Set the width of the right sidebar.'); + $options = array( + '2' => 'grid-2', + '3' => 'grid-3', + '4' => 'grid-4', + '5' => 'grid-5', + '6' => 'grid-6', + '7' => 'grid-7', + '8' => 'grid-8', + ); + + $form['nitobe_sidebar_right'] = array( + '#type' => 'select', + '#title' => t('Sidebar Right Width'), + '#options' => $options, + '#default_value' => $default, + '#description' => $desc, + ); + + // -------------------------------------------------------------------------- // -- Get the header image list. $images = _nitobe_get_header_list(TRUE); $options = array('' => 'Random Header Image'); Index: styles/framework/960.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/nitobe/styles/framework/Attic/960.css,v retrieving revision 1.1.2.2 diff -u -r1.1.2.2 960.css --- styles/framework/960.css 1 Aug 2009 17:58:31 -0000 1.1.2.2 +++ styles/framework/960.css 26 Dec 2009 22:07:03 -0000 @@ -140,3 +140,4 @@ .container-16 .pull-14 { left: -840px; } .container-16 .pull-15 { left: -900px; } .container-16 .pull-16 { left: -960px; } + Index: styles/style.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/nitobe/styles/Attic/style.css,v retrieving revision 1.1.2.2 diff -u -r1.1.2.2 style.css --- styles/style.css 1 Aug 2009 17:58:31 -0000 1.1.2.2 +++ styles/style.css 27 Dec 2009 01:33:00 -0000 @@ -128,6 +128,7 @@ /* **************************************************************************** * Header area * ************************************************************************* */ + #title-group { float: left; margin-right: 10px; @@ -389,6 +390,17 @@ } /* **************************************************************************** + * Leaderboard and Page bottom regions + * ************************************************************************* */ +#leaderboard { + margin-bottom: 10px; +} + +#page-bottom { + margin-top: 10px; +} + +/* **************************************************************************** * Nodes * ************************************************************************* */ .node { @@ -572,6 +584,26 @@ .block ul.menu li ul.menu li.last, .block ul.menu li ul.menu li ul.menu li.last { border: 0; } +.block-region { clear: both; } + +/* Helper classes for Skinr block classes */ +.block { clear: both; } + +.context-block .grid-1, +.context-block .grid-2, +.context-block .grid-3, +.context-block .grid-4, +.context-block .grid-5, +.context-block .grid-6, +.context-block .grid-7 { + clear: none; + margin-left: 0; + margin-right: 0; +} + +.context-block .block-margin-left { margin-left: 20px; } +.context-block .block-margin-right { margin-right: 20px; } + /* **************************************************************************** * Comment Core * ************************************************************************* */ Index: templates/block.tpl.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/nitobe/templates/Attic/block.tpl.php,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 block.tpl.php --- templates/block.tpl.php 1 Aug 2009 17:58:31 -0000 1.1.2.1 +++ templates/block.tpl.php 27 Dec 2009 02:06:00 -0000 @@ -19,4 +19,3 @@ content ?> -
\ No newline at end of file Index: templates/page.tpl.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/nitobe/templates/Attic/page.tpl.php,v retrieving revision 1.1.2.2 diff -u -r1.1.2.2 page.tpl.php --- templates/page.tpl.php 18 Oct 2009 14:20:54 -0000 1.1.2.2 +++ templates/page.tpl.php 27 Dec 2009 01:27:13 -0000 @@ -59,6 +59,11 @@
+ +
+ +
+
@@ -127,6 +132,12 @@
+
+ +
+ +
+