Index: omega.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/omega/omega.info,v retrieving revision 1.6.2.2 diff -u -p -d -r1.6.2.2 omega.info --- omega.info 12 Oct 2009 02:10:01 -0000 1.6.2.2 +++ omega.info 22 Oct 2009 17:04:22 -0000 @@ -46,27 +46,40 @@ features[] = favicon features[] = primary_links features[] = secondary_links - ; Set the default settings to be used in theme-settings.php -settings[omega_header_wrapper_width] = 12 -settings[omega_header_logo_width] = 4 +settings[omega_default_container_width] = 16 +settings[omega_branding_wrapper_width] = 16 +settings[omega_header_wrapper_width] = 16 +settings[omega_header_menu_width] = 16 -settings[omega_header_first_width] = 6 -settings[omega_header_last_width] = 6 +settings[omega_header_logo_width] = 16 +settings[omega_header_first_width] = 8 +settings[omega_header_last_width] = 8 +settings[omega_internal_nav_wrapper_width] = 16 +settings[omega_breadcrumb_slogan_width] = 10 +settings[omega_search_width] = 6 + +settings[omega_preface_wrapper_grids] = 16 settings[omega_preface_first_width] = 4 settings[omega_preface_middle_width] = 4 settings[omega_preface_last_width] = 8 +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_postscript_container_width] = 16 settings[omega_postscript_one_width] = 4 settings[omega_postscript_two_width] = 4 settings[omega_postscript_three_width] = 4 settings[omega_postscript_four_width] = 4 +settings[omega_footer_container_width] = 16 +settings[omega_footer_first_width] = 8 +settings[omega_footer_last_width] = 8 + settings[omega_content_layout] = first_content_last settings[front_page_title_display] = title_slogan settings[page_title_display_custom] = '' Index: page.tpl.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/omega/page.tpl.php,v retrieving revision 1.6.2.2 diff -u -p -d -r1.6.2.2 page.tpl.php --- page.tpl.php 12 Oct 2009 02:10:01 -0000 1.6.2.2 +++ page.tpl.php 22 Oct 2009 17:04:22 -0000 @@ -1,7 +1,7 @@ - @@ -15,176 +15,157 @@
- + - +
- -
- -
- - -
- -
- -
- - - - - - - - + +
+ +
+ + +
+ +
+ +
+
-
+
-
+
- - - -
+ + +
- -
- -
- - -
- -
- - -
- -
- -
- + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
-
- -
-
- - - - - -
- -
- - -
- - - -

- +
-
- -
- -
- -
-
+
+
+ +
+ +
+ +
+ + +

+ +
+ +
- - - - - - - -
- -
- -
- -
- - -
- -
- - -
- -
- - -
- -
- -
- - - - +
+ +
+
+ + + + + + + + + + +
+ +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+ + - + - + \ No newline at end of file Index: template.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/omega/template.php,v retrieving revision 1.7.2.2 diff -u -p -d -r1.7.2.2 template.php --- template.php 12 Oct 2009 02:10:01 -0000 1.7.2.2 +++ template.php 22 Oct 2009 17:04:22 -0000 @@ -224,7 +224,7 @@ function omega_breadcrumb($breadcrumb) { * @return string */ function omega_render_attributes($attributes) { - if($attributes) { + if ($attributes) { $items = array(); foreach($attributes as $attribute => $data) { if(is_array($data)) { Index: theme-functions.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/omega/theme-functions.inc,v retrieving revision 1.5.2.2 diff -u -p -d -r1.5.2.2 theme-functions.inc --- theme-functions.inc 12 Oct 2009 02:10:01 -0000 1.5.2.2 +++ theme-functions.inc 22 Oct 2009 17:04:22 -0000 @@ -36,8 +36,8 @@ function omega_theme_get_default_setting } function omega_theme_generate_region_settings() { - + } function omega_theme_generate_region_options(){ - + } \ No newline at end of file Index: theme-settings.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/omega/theme-settings.php,v retrieving revision 1.8.2.4 diff -u -p -d -r1.8.2.4 theme-settings.php --- theme-settings.php 14 Oct 2009 01:21:55 -0000 1.8.2.4 +++ theme-settings.php 22 Oct 2009 17:04:22 -0000 @@ -1,25 +1,27 @@ 0) { + if (count($subtheme_defaults) > 0) { // Allow a subtheme to override the default values. $settings = array_merge($subtheme_defaults, $saved_settings); } @@ -28,14 +30,15 @@ function omega_settings($saved_settings, $defaults = omega_theme_get_default_settings('omega'); $settings = array_merge($defaults, $saved_settings); } - for($i=1;$i<=24;$i++){ - $grids[$i]= $i; - } - $containers = array( + + for ($i = 1; $i <= 24; $i++){ + $grids[$i] = $i; + } + $containers = array( '12' => '12 column grid', - '16' => '16 column grid', - '24' => '24 column grid' - ); + '16' => '16 column grid', + '24' => '24 column grid' + ); $form['omega_container'] = array( '#type' => 'fieldset', '#title' => t('Omega 960 settings'), @@ -43,171 +46,164 @@ function omega_settings($saved_settings, '#collapsible' => TRUE, '#collapsed' => FALSE, ); - // General Settings - $form['omega_container']['omega_general'] = array( - '#type' => 'fieldset', - '#title' => t('General Omega 960 Settings'), - '#description' => t('Configure generic options on rendering content in this theme.'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - // Page titles - $form['omega_container']['omega_general']['page_format_titles'] = array( - '#type' => 'fieldset', - '#title' => t('Page titles'), - '#description' => t('This is the title that displays in the title bar of your web browser. Your site title, slogan, and mission can all be set on your Site Information page. [NOTE: For more advanced page title functionality, consider using the "Page Title" module. However, the Page titles theme settings do not work in combination with the "Page Title" module and will be disabled if you have it enabled.]'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - if (module_exists('page_title') == FALSE) { - // front page title - $form['omega_container']['omega_general']['page_format_titles']['front_page_format_titles'] = array( - '#type' => 'fieldset', - '#title' => t('Front page title'), - '#description' => t('Your front page in particular should have important keywords for your site in the page title'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - $form['omega_container']['omega_general']['page_format_titles']['front_page_format_titles']['front_page_title_display'] = array( - '#type' => 'select', - '#title' => t('Set text of front page title'), - '#collapsible' => TRUE, - '#collapsed' => FALSE, - '#default_value' => $saved_settings['front_page_title_display'], - '#options' => array( - 'title_slogan' => t('Site title | Site slogan'), - 'slogan_title' => t('Site slogan | Site title'), - 'title_mission' => t('Site title | Site mission'), - 'custom' => t('Custom (below)'), - ), - ); - $form['omega_container']['omega_general']['page_format_titles']['front_page_format_titles']['page_title_display_custom'] = array( - '#type' => 'textfield', - '#title' => t('Custom'), - '#size' => 60, - '#default_value' => $saved_settings['page_title_display_custom'], - '#description' => t('Enter a custom page title for your front page'), - ); - // other pages title - $form['omega_container']['omega_general']['page_format_titles']['other_page_format_titles'] = array( - '#type' => 'fieldset', - '#title' => t('Other page titles'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - $form['omega_container']['omega_general']['page_format_titles']['other_page_format_titles']['other_page_title_display'] = array( - '#type' => 'select', - '#title' => t('Set text of other page titles'), - '#collapsible' => TRUE, - '#collapsed' => FALSE, - '#default_value' => $saved_settings['other_page_title_display'], - '#options' => array( - 'ptitle_slogan' => t('Page title | Site slogan'), - 'ptitle_stitle' => t('Page title | Site title'), - 'ptitle_smission' => t('Page title | Site mission'), - 'ptitle_custom' => t('Page title | Custom (below)'), - 'custom' => t('Custom (below)'), - ), - ); - $form['omega_container']['omega_general']['page_format_titles']['other_page_format_titles']['other_page_title_display_custom'] = array( - '#type' => 'textfield', - '#title' => t('Custom'), - '#size' => 60, - '#default_value' => $saved_settings['other_page_title_display_custom'], - '#description' => t('Enter a custom page title for all other pages'), - ); - // SEO configurable separator - $form['omega_container']['omega_general']['page_format_titles']['configurable_separator'] = array( - '#type' => 'textfield', - '#title' => t('Title separator'), - '#description' => t('Customize the separator character used in the page title'), - '#size' => 60, - '#default_value' => $saved_settings['configurable_separator'], - ); - } else { - $form['omega_container']['omega_general']['page_format_titles']['#description'] = 'NOTICE: You currently have the "Page Title" module installed and enabled, so the Page titles theme settings have been disabled to prevent conflicts. If you wish to re-enable the Page titles theme settings, you must first disable the "Page Title" module.'; - $form['omega_container']['omega_general']['page_format_titles']['configurable_separator']['#disabled'] = 'disabled'; - } - // Breadcrumb - $form['omega_container']['omega_general']['breadcrumb'] = array( - '#type' => 'fieldset', - '#title' => t('Breadcrumb settings'), - '#attributes' => array('id' => 'omega-breadcrumb'), - '#collapsible' => TRUE, + // General Settings + $form['omega_container']['omega_general'] = array( + '#type' => 'fieldset', + '#title' => t('General Omega 960 Settings'), + '#description' => t('Configure generic options on rendering content in this theme.'), + '#collapsible' => TRUE, '#collapsed' => TRUE, ); - $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb'] = array( - '#type' => 'select', - '#title' => t('Display breadcrumb'), - '#default_value' => $saved_settings['omega_breadcrumb'], - '#options' => array( - 'yes' => t('Yes'), - 'admin' => t('Only in admin section'), - 'no' => t('No'), - ), - ); - $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_separator'] = array( - '#type' => 'textfield', - '#title' => t('Breadcrumb separator'), - '#description' => t('Text only. Don’t forget to include spaces.'), - '#default_value' => $saved_settings['omega_breadcrumb_separator'], - '#size' => 5, - '#maxlength' => 10, - ); - $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_home'] = array( - '#type' => 'checkbox', - '#title' => t('Show home page link in breadcrumb'), - '#default_value' => $saved_settings['omega_breadcrumb_home'], - ); - $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_trailing'] = array( - '#type' => 'checkbox', - '#title' => t('Append a separator to the end of the breadcrumb'), - '#default_value' => $saved_settings['omega_breadcrumb_trailing'], - '#description' => t('Useful when the breadcrumb is placed just before the title.'), - ); - $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_title'] = array( - '#type' => 'checkbox', - '#title' => t('Append the content title to the end of the breadcrumb'), - '#default_value' => $saved_settings['omega_breadcrumb_title'], - '#description' => t('Useful when the breadcrumb is not placed just before the title.'), - ); - - - - // Mission Statement - $form['omega_container']['omega_general']['mission_statement'] = array( - '#type' => 'fieldset', - '#title' => t('Mission statement'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - $form['omega_container']['omega_general']['mission_statement']['mission_statement_pages'] = array( - '#type' => 'radios', - '#title' => t('Where should your mission statement be displayed?'), - '#default_value' => $saved_settings['mission_statement_pages'], - '#options' => array( - 'home' => t('Display mission statement only on front page'), - 'all' => t('Display mission statement on all pages'), - ), - ); - - // Region Settings - $form['omega_container']['omega_regions'] = array( - '#type' => 'fieldset', - '#title' => t('960gs Region Settings'), - '#description' => t('Configure how your regions are rendered. This area is currently a quick implementation of an interface to allow end users to quickly build out and adjust the default page layout. This feature will be improved over time, and include much more flexibility.'), - '#collapsible' => TRUE, - '#collapsed' => FALSE, - ); - // Header Blocks - $form['omega_container']['omega_regions']['headers'] = array( + // Page titles + $form['omega_container']['omega_general']['page_format_titles'] = array( '#type' => 'fieldset', - '#title' => t('Header Configuration'), - '#description' => t('Header region zones, including Primary & Secondary menus, Header first and Header Last.'), + '#title' => t('Page titles'), + '#description' => t('This is the title that displays in the title bar of your web browser. Your site title, slogan, and mission can all be set on your Site Information page. [NOTE: For more advanced page title functionality, consider using the "Page Title" module. However, the Page titles theme settings do not work in combination with the "Page Title" module and will be disabled if you have it enabled.]'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + if (module_exists('page_title') == FALSE) { + // front page title + $form['omega_container']['omega_general']['page_format_titles']['front_page_format_titles'] = array( + '#type' => 'fieldset', + '#title' => t('Front page title'), + '#description' => t('Your front page in particular should have important keywords for your site in the page title'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['omega_container']['omega_general']['page_format_titles']['front_page_format_titles']['front_page_title_display'] = array( + '#type' => 'select', + '#title' => t('Set text of front page title'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + '#default_value' => $saved_settings['front_page_title_display'], + '#options' => array( + 'title_slogan' => t('Site title | Site slogan'), + 'slogan_title' => t('Site slogan | Site title'), + 'title_mission' => t('Site title | Site mission'), + 'custom' => t('Custom (below)'), + ), + ); + $form['omega_container']['omega_general']['page_format_titles']['front_page_format_titles']['page_title_display_custom'] = array( + '#type' => 'textfield', + '#title' => t('Custom'), + '#size' => 60, + '#default_value' => $saved_settings['page_title_display_custom'], + '#description' => t('Enter a custom page title for your front page'), + ); + + // other pages title + $form['omega_container']['omega_general']['page_format_titles']['other_page_format_titles'] = array( + '#type' => 'fieldset', + '#title' => t('Other page titles'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['omega_container']['omega_general']['page_format_titles']['other_page_format_titles']['other_page_title_display'] = array( + '#type' => 'select', + '#title' => t('Set text of other page titles'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + '#default_value' => $saved_settings['other_page_title_display'], + '#options' => array( + 'ptitle_slogan' => t('Page title | Site slogan'), + 'ptitle_stitle' => t('Page title | Site title'), + 'ptitle_smission' => t('Page title | Site mission'), + 'ptitle_custom' => t('Page title | Custom (below)'), + 'custom' => t('Custom (below)'), + ), + ); + $form['omega_container']['omega_general']['page_format_titles']['other_page_format_titles']['other_page_title_display_custom'] = array( + '#type' => 'textfield', + '#title' => t('Custom'), + '#size' => 60, + '#default_value' => $saved_settings['other_page_title_display_custom'], + '#description' => t('Enter a custom page title for all other pages'), + ); + // SEO configurable separator + $form['omega_container']['omega_general']['page_format_titles']['configurable_separator'] = array( + '#type' => 'textfield', + '#title' => t('Title separator'), + '#description' => t('Customize the separator character used in the page title'), + '#size' => 60, + '#default_value' => $saved_settings['configurable_separator'], + ); + } + else { + $form['omega_container']['omega_general']['page_format_titles']['#description'] = 'NOTICE: You currently have the "Page Title" module installed and enabled, so the Page titles theme settings have been disabled to prevent conflicts. If you wish to re-enable the Page titles theme settings, you must first disable the "Page Title" module.'; + $form['omega_container']['omega_general']['page_format_titles']['configurable_separator']['#disabled'] = 'disabled'; + } + + // Breadcrumb + $form['omega_container']['omega_general']['breadcrumb'] = array( + '#type' => 'fieldset', + '#title' => t('Breadcrumb settings'), + '#attributes' => array('id' => 'omega-breadcrumb'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb'] = array( + '#type' => 'select', + '#title' => t('Display breadcrumb'), + '#default_value' => $saved_settings['omega_breadcrumb'], + '#options' => array( + 'yes' => t('Yes'), + 'admin' => t('Only in admin section'), + 'no' => t('No'), + ), + ); + $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_separator'] = array( + '#type' => 'textfield', + '#title' => t('Breadcrumb separator'), + '#description' => t('Text only. Don’t forget to include spaces.'), + '#default_value' => $saved_settings['omega_breadcrumb_separator'], + '#size' => 5, + '#maxlength' => 10, + ); + $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_home'] = array( + '#type' => 'checkbox', + '#title' => t('Show home page link in breadcrumb'), + '#default_value' => $saved_settings['omega_breadcrumb_home'], + ); + $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_trailing'] = array( + '#type' => 'checkbox', + '#title' => t('Append a separator to the end of the breadcrumb'), + '#default_value' => $saved_settings['omega_breadcrumb_trailing'], + '#description' => t('Useful when the breadcrumb is placed just before the title.'), + ); + $form['omega_container']['omega_general']['breadcrumb']['omega_breadcrumb_title'] = array( + '#type' => 'checkbox', + '#title' => t('Append the content title to the end of the breadcrumb'), + '#default_value' => $saved_settings['omega_breadcrumb_title'], + '#description' => t('Useful when the breadcrumb is not placed just before the title.'), + ); + + // Mission Statement + $form['omega_container']['omega_general']['mission_statement'] = array( + '#type' => 'fieldset', + '#title' => t('Mission statement'), '#collapsible' => TRUE, '#collapsed' => TRUE, ); + $form['omega_container']['omega_general']['mission_statement']['mission_statement_pages'] = array( + '#type' => 'radios', + '#title' => t('Where should your mission statement be displayed?'), + '#default_value' => $saved_settings['mission_statement_pages'], + '#options' => array( + 'home' => t('Display mission statement only on front page'), + 'all' => t('Display mission statement on all pages'), + ), + ); + + // Region Settings + $form['omega_container']['omega_regions'] = array( + '#type' => 'fieldset', + '#title' => t('960gs Region Settings'), + '#description' => t('Configure how your regions are rendered. This area is currently a quick implementation of an interface to allow end users to quickly build out and adjust the default page layout. This feature will be improved over time, and include much more flexibility.'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + ); $form['omega_container']['omega_regions']['omega_default_container_width'] = array( '#type' => 'select', '#title' => t('Default container width'), @@ -216,6 +212,15 @@ function omega_settings($saved_settings, '#weight' => -50, '#description' => t('This width is used for regions like $help, $messages and other non-important regions in page.tpl.php'), ); + + // Header Blocks + $form['omega_container']['omega_regions']['headers'] = array( + '#type' => 'fieldset', + '#title' => t('Header Configuration'), + '#description' => t('Header region zones, including Primary & Secondary menus, Header first and Header Last.'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); $form['omega_container']['omega_regions']['headers']['omega_branding_wrapper_width'] = array( '#type' => 'select', '#title' => t('Wrapper Area width for Header/Navigation Elements'), @@ -223,13 +228,6 @@ function omega_settings($saved_settings, '#options' => $containers, '#description' => t('Total of the two numbers for header first and header last. This will also be the default value for navigation in that zone.'), ); - $form['omega_container']['omega_regions']['headers']['omega_header_logo_width'] = array( - '#type' => 'select', - '#title' => t('Width for Logo/Branding area'), - '#default_value' => $saved_settings['omega_header_logo_width'], - '#options' => $grids, - '#description' => t('Total of the two numbers for header first and header last. This will also be the default value for navigation in that zone.'), - ); $form['omega_container']['omega_regions']['headers']['omega_header_menu_width'] = array( '#type' => 'select', '#title' => t('Wrapper Area width for Menu Elements'), @@ -237,7 +235,13 @@ function omega_settings($saved_settings, '#options' => $grids, '#description' => t('Width of menu elements.'), ); - + $form['omega_container']['omega_regions']['headers']['omega_header_logo_width'] = array( + '#type' => 'select', + '#title' => t('Width for Logo/Branding area'), + '#default_value' => $saved_settings['omega_header_logo_width'], + '#options' => $grids, + '#description' => t('Total of the two numbers for header first and header last. This will also be the default value for navigation in that zone.'), + ); $form['omega_container']['omega_regions']['headers']['omega_header_wrapper_width'] = array( '#type' => 'select', '#title' => t('Wrapper Area width for Header/Navigation Elements'), @@ -254,7 +258,7 @@ function omega_settings($saved_settings, ); $form['omega_container']['omega_regions']['headers']['omega_header_last_width'] = array( '#type' => 'select', - '#title' => t('Contextual Width for Header First'), + '#title' => t('Contextual Width for Header Last'), '#default_value' => $saved_settings['omega_header_last_width'], '#options' => $grids, '#description' => t('This number, paired with the Header First determine the share of your grid for each element.'), @@ -280,8 +284,7 @@ function omega_settings($saved_settings, '#options' => $grids, '#description' => t(''), ); - - + // Preface Blocks $form['omega_container']['omega_regions']['preface'] = array( '#type' => 'fieldset', @@ -318,6 +321,7 @@ function omega_settings($saved_settings, '#options' => $grids, '#description' => t('This number, combined with the Preface First and Preface Middle determine the share of your grid for each element.'), ); + // Main Body Regions $form['omega_container']['omega_regions']['main'] = array( '#type' => 'fieldset', @@ -367,20 +371,21 @@ function omega_settings($saved_settings, ); $options = array(t('Combine Sidebars on all except the listed pages.'), t('Combine Sidebars on only the listed pages.')); $description = t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '')); - $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 $sidebar_first and $sidebar_last to create one sidebar from the content of both.'), - '#options' => $options, - '#default_value' => $saved_settings['sidebar_combine'], - ); - $form['omega_container']['omega_regions']['main']['sidebar_contain_pages'] = array( - '#type' => 'textarea', - '#title' => t('Pages'), - '#default_value' => $saved_settings['sidebar_contain_pages'], - '#description' => $description, - ); - // Preface Blocks + $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 $sidebar_first and $sidebar_last to create one sidebar from the content of both.'), + '#options' => $options, + '#default_value' => $saved_settings['sidebar_combine'], + ); + $form['omega_container']['omega_regions']['main']['sidebar_contain_pages'] = array( + '#type' => 'textarea', + '#title' => t('Pages'), + '#default_value' => $saved_settings['sidebar_contain_pages'], + '#description' => $description, + ); + + // Postscript Blocks $form['omega_container']['omega_regions']['postscript'] = array( '#type' => 'fieldset', '#title' => t('Postscript Configuration'), @@ -423,7 +428,8 @@ function omega_settings($saved_settings, '#options' => $grids, '#description' => t('This number, combined with the other Postscript content zones determines the share of your grid for each element.'), ); - // Preface Blocks + + // Footer Blocks $form['omega_container']['omega_regions']['footer'] = array( '#type' => 'fieldset', '#title' => t('Footer Configuration'), @@ -454,4 +460,4 @@ function omega_settings($saved_settings, ); // Return theme settings form return $form; -} \ No newline at end of file +} \ No newline at end of file Index: css/defaults.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/omega/css/defaults.css,v retrieving revision 1.7.2.2 diff -u -p -d -r1.7.2.2 defaults.css --- css/defaults.css 12 Oct 2009 02:42:27 -0000 1.7.2.2 +++ css/defaults.css 22 Oct 2009 17:04:23 -0000 @@ -3,10 +3,10 @@ * Omega, for Drupal 6.x * Jake Strawn - http://himerus.com * Project Page - http://drupal.org/project/omega - * + * * The defaults.css file is the default set of default styles * normally available with the Omega base theme. - * All of these styles are easily overwritten, but here to give + * All of these styles are easily overwritten, but here to give * a bit more "sexy" right out of the box. * * @@ -17,13 +17,13 @@ * 3.) Pager Navigation - Styling for pager navigation * 4.) clear-block code - default drupal clear-block definitions * 5.) Cleanup CSS - Primarily sizing & margins for default elements - * 6.) - * 7.) + * 6.) + * 7.) */ - + /** ################# 1.) Generic Page Elements ####################### */ body { - background: #EEE; + background: #FFF; } .description { @@ -48,7 +48,7 @@ body { } #footer-message p { - margin: 0; + margin: 0; } fieldset { @@ -85,30 +85,30 @@ fieldset .form-text { border: 1px solid #b8d3e5; } -.messages, -.status, -.warning, +.messages, +.status, +.warning, .error { padding: 10px; } .messages ul { - margin-left: 20px; + margin-left: 20px; } .new { font-size: 1.5em; color: #FF0000; display: block; - text-align: right; + text-align: right; } .indented { - margin-left: 30px; + margin-left: 30px; } .comment-preview { - padding: 20px; + padding: 20px; } .help { @@ -122,7 +122,7 @@ fieldset .form-text { } .help p { - margin-bottom: 10px; + margin-bottom: 10px; } .preview { @@ -140,14 +140,14 @@ div.error, tr.error { background-color: #FFCCCC; } -.form-item input.error, +.form-item input.error, .form-item textarea.error { border: 1px solid #c52020; color: #363636; } #branding img { - vertical-align: top; + vertical-align: top; } #site-name { @@ -175,11 +175,12 @@ div.error, tr.error { } #search-box { - text-align: right; + text-align: right; + float: right; } #search-box label, #search-box .form-submit { - display: none; + display: none; } #search-box .form-text { @@ -189,7 +190,7 @@ div.error, tr.error { .breadcrumb { font-size: 1.2em; - padding: 0; + padding: 0; } #slogan { @@ -203,21 +204,21 @@ div.error, tr.error { } .block p { - margin: 0; + margin: 0; } #mission { margin: 0 0 20px 0; - padding: 0; + padding: 0; } #mission p { margin: 0; padding: 0; font-style: italic; - font-size: 12px; + font-size: 12px; } .sidebar .block { - margin-bottom: 20px; + margin-bottom: 20px; } .sidebar ul { @@ -228,24 +229,24 @@ div.error, tr.error { .sidebar ul li { list-style-position: outside; margin: 0; -} +} .node { padding-bottom: 10px; margin-bottom: 20px; - border-bottom: 1px solid #38322B; + border-bottom: 1px solid #38322B; } .block .content { - padding: 0; + padding: 0; } /** ################# 2.) Content Tabs ####################### */ #content-tabs { padding: 10px; - background-color: #fff; - border: 1px solid #b8d3e5; + background-color: #f2f2f2; + border: 1px solid #ddd; display: block;; margin: 0 0 20px 0; font-family: Georgia, serif; @@ -342,7 +343,7 @@ div.error, tr.error { font-size: 0.8em; font-weight: bold; padding: 4px; - text-decoration: none; + text-decoration: none; } .pager li.pager-current { @@ -353,11 +354,11 @@ div.error, tr.error { padding: 8px; background-color: #D9DBCD; border: 1px solid #38322B; - + } .pager li.pager-ellipsis { - display: none; + display: none; } .pager-first, @@ -410,10 +411,10 @@ div.error, tr.error { /* Fix the HORRIBLE styling of the default comment block */ .block-comment .item-list, -.block-comment .item-list ul, +.block-comment .item-list ul, .block-comment .item-list li { margin: 0; - padding: 0; + padding: 0; } .block-comment .item-list li { @@ -459,7 +460,7 @@ table { margin-left: 0; } -#main-content ul.links li, +#main-content ul.links li, #main-content ul.links li a { padding-left: 0; } \ No newline at end of file Index: preprocess/preprocess-page.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/omega/preprocess/preprocess-page.inc,v retrieving revision 1.4.2.4 diff -u -p -d -r1.4.2.4 preprocess-page.inc --- preprocess/preprocess-page.inc 14 Oct 2009 01:21:55 -0000 1.4.2.4 +++ preprocess/preprocess-page.inc 22 Oct 2009 17:04:23 -0000 @@ -1,5 +1,6 @@ ', array('rel' => 'home', 'title' => t($vars['site_name']), 'html' => TRUE)) : ''; $vars['linked_site_name'] = $vars['site_name'] ? l($vars['site_name'], '', array('rel' => 'home', 'title' => t('Home'))) : ''; $vars['main_menu_links'] = theme('links', $vars['primary_links'], array('class' => 'links main-menu')); $vars['secondary_menu_links'] = theme('links', $vars['secondary_links'], array('class' => 'links secondary-menu')); + // NINESIXTY - Make sure framework styles are placed above all others. $vars['css_alt'] = omega_css_reorder($vars['css']); $vars['styles'] = drupal_get_css($vars['css_alt']); Index: starterkit/omega_starterkit.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/omega/starterkit/Attic/omega_starterkit.info,v retrieving revision 1.1.2.2 diff -u -p -d -r1.1.2.2 omega_starterkit.info --- starterkit/omega_starterkit.info 14 Oct 2009 01:21:55 -0000 1.1.2.2 +++ starterkit/omega_starterkit.info 22 Oct 2009 17:04:23 -0000 @@ -85,7 +85,7 @@ settings[omega_sidebar_first_width] = 4 settings[omega_content_main_width] = 8 settings[omega_sidebar_last_width] = 4 -settings[omega_postscript_container_width] = 16 +settings[omega_postscript_container_width] = 16 settings[omega_postscript_one_width] = 4 settings[omega_postscript_two_width] = 4 settings[omega_postscript_three_width] = 4 @@ -95,5 +95,4 @@ settings[omega_footer_container_width] = settings[omega_footer_first_width] = 16 settings[omega_footer_last_width] = 16 - ; / 960gs default region settings \ No newline at end of file Index: starterkit/page.tpl.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/omega/starterkit/page.tpl.php,v retrieving revision 1.1.2.1 diff -u -p -d -r1.1.2.1 page.tpl.php --- starterkit/page.tpl.php 12 Oct 2009 01:34:52 -0000 1.1.2.1 +++ starterkit/page.tpl.php 22 Oct 2009 17:04:23 -0000 @@ -1,7 +1,7 @@ - @@ -15,176 +15,157 @@
- + - +
- -
- -
- - -
- -
- -
- - - - - - - - + +
+ +
+ + +
+ +
+ +
+
-
+
-
+
- - - -
+ + +
- -
- -
- - -
- -
- - -
- -
- -
- + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
-
- -
-
- - - - - -
- -
- - -
- - - -

- +
-
- -
- -
- -
-
+
+
+ +
+ +
+ +
+ + +

+ +
+ +
- - - - - - - -
- -
- -
- -
- - -
- -
- - -
- -
- - -
- -
- -
- - - - - -
+ + + + + + +
+ +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+ + - + - + \ No newline at end of file Index: starterkit/theme-settings.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/themes/omega/starterkit/theme-settings.php,v retrieving revision 1.1.2.2 diff -u -p -d -r1.1.2.2 theme-settings.php --- starterkit/theme-settings.php 14 Oct 2009 01:21:55 -0000 1.1.2.2 +++ starterkit/theme-settings.php 22 Oct 2009 17:04:23 -0000 @@ -3,6 +3,7 @@ // Include the definition of zen_settings() and zen_theme_get_default_settings(). include_once './' . drupal_get_path('theme', 'omega') . '/theme-settings.php'; + /** * Implementation of THEMEHOOK_settings() function. *