summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--page.tpl.php4
-rw-r--r--preprocess/preprocess-page.inc321
-rw-r--r--template.php116
-rw-r--r--theme-functions.inc7
-rw-r--r--theme-settings.php4
5 files changed, 281 insertions, 171 deletions
diff --git a/page.tpl.php b/page.tpl.php
index f4adb1b..a144e20 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -168,12 +168,12 @@
<?php if($footer_first || $footer_last || $footer_message): ?>
<div id="footer-wrapper" class="container-<?php print $footer_container_width; ?> clearfix">
<?php if($footer_first): ?>
- <div id="footer-first" class="grid-<?php print $footer_first_classes; ?>">
+ <div id="footer-first" class="<?php print $footer_first_classes; ?>">
<?php print $footer_first; ?>
</div><!-- /#footer-first -->
<?php endif; ?>
<?php if($footer_last || $footer_message): ?>
- <div id="footer-last" class="grid-<?php print $footer_last_classes; ?>">
+ <div id="footer-last" class="<?php print $footer_last_classes; ?>">
<?php print $footer_last; ?>
<?php if ($footer_message): ?>
<div id="footer-message">
diff --git a/preprocess/preprocess-page.inc b/preprocess/preprocess-page.inc
index a3a74e9..cec9c04 100644
--- a/preprocess/preprocess-page.inc
+++ b/preprocess/preprocess-page.inc
@@ -1,23 +1,8 @@
<?php
// $Id$
-
-// Pull out some things from the page.tpl.php and make that code more consise.
-// $header_first
global $theme_key;
-include_once './' . drupal_get_path('theme', 'omega') . '/theme-functions.inc';
-//$settings = theme_get_settings($theme_key);
-//krumo($theme_key);
-//$omega = omega_theme_get_default_settings($theme_key);
-//krumo($settings);
-//krumo($omega);
-// Merge the saved variables and their default values.
-//$settings = array_merge($omega, $settings);
-
-/**
- * The $original_regions array is a set of the default values for the
- * current regions available. This is great so that they can be manipulated
- * and overwritten later in a sub theme if the need arises.
- */
+//include_once './' . drupal_get_path('theme', 'omega') . '/theme-functions.inc';
+$settings = theme_get_settings($theme_key);
/**
* Adding in the ability to combine the sidebars on certain paths in order to adjust
@@ -53,6 +38,7 @@ if ($settings['sidebar_contain_pages']) {
// the width of the wrapper item around the navigation menus & header block regions
// This width plus the logo width should total the width of your grid.
$vars['header_wrapper_width'] = $settings['omega_header_wrapper_width'];
+
// The width of the logo element.
// This width plus the logo width should total the width of your grid.
@@ -64,19 +50,18 @@ $vars['internal_nav_wrapper_width'] = $settings['omega_internal_nav_wrapper_widt
$vars['breadcrumb_slogan_width'] = $settings['omega_breadcrumb_slogan_width'];
$vars['search_width'] = $settings['omega_search_width'];
-
-if ($vars['header_first']) {
- $vars['header_first_classes'] =
- ns('grid-'. $settings['omega_header_wrapper_width'],
- $vars['header_last'], $settings['omega_header_last_width']);
-}
+$header_regions = array(
+ 'header_first' => array(
+ 'data' => $vars['header_first'],
+ 'width' => $settings['omega_header_first_width'],
+ ),
+ 'header_last' => array(
+ 'data' => $vars['header_last'],
+ 'width' => $settings['omega_header_last_width'],
+ ),
+);
+$vars = static_region_builder($header_regions, $settings['omega_header_wrapper_width'], $vars);
-// $header_last
-if ($vars['header_last']) {
- $vars['header_last_classes'] =
- ns('grid-'. $settings['omega_header_wrapper_width'],
- $vars['header_first'], $settings['omega_header_first_width']);
-}
/**
* Preface Region
@@ -106,8 +91,7 @@ $preface_regions = array(
'suffix' => $settings['omega_preface_last_suffix'])
),
);
-//$vars = static_region_builder($preface_regions, $settings['preface_wrapper_grids'], $vars);
-//krumo($vars);
+$vars = static_region_builder($preface_regions, $settings['preface_wrapper_grids'], $vars);
/**
* Body Region
@@ -120,96 +104,180 @@ $preface_regions = array(
* @todo cleanup switch statement
*/
$vars['content_container_width'] = $settings['omega_content_container_width'];
+
+$content_regions = array(
+ 'main_content' => array(
+ 'data' => $vars['content'],
+ 'width' => $settings['omega_content_main_width'],
+ // primary defines which region will get all the extra space
+ // should other regions be left out.
+ 'primary' => TRUE,
+ // we need to tell the "related" zones so that we can determine widths for this primary zone
+ 'related' => array(
+ 'sidebar_first' => array('width' => $settings['omega_sidebar_first_width']),
+ 'sidebar_last' => array('width' => $settings['omega_sidebar_last_width']),
+ ),
+ 'push' => array(
+ 'width' => '',
+ 'conditions' => array(
+ // 'sidebar_last',
+ ),
+ ),
+ 'pull' => array(
+ 'width' => '',
+ 'conditions' => array(
+ // 'main_content',
+ ),
+ ),
+ ),
+ 'sidebar_first' => array(
+ 'data' => $vars['sidebar_first'],
+ 'width' => $settings['omega_sidebar_first_width'],
+ 'push' => array(
+ 'width' => '',
+ 'conditions' => 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',
+ ),
+ ),
+ 'pull' => array(
+ 'width' => '',
+ 'conditions' => array(
+ // same as above
+ // 'main_content',
+ ),
+ ),
+ ),
+ 'sidebar_last' => array(
+ 'data' => $vars['sidebar_last'],
+ 'width' => $settings['omega_sidebar_last_width'],
+ 'push' => array(
+ 'width' => '',
+ 'conditions' => array(
+ // 'sidebar_last',
+ ),
+ ),
+ 'pull' => array(
+ 'width' => '',
+ 'conditions' => array(
+ // 'main_content',
+ ),
+ ),
+ ),
+);
+
+/**
+ * For panels and other modules that may set $show_blocks to false, we will need to
+ * unset the sidebars in this case
+ */
+if (!$vars['show_blocks']) {
+ unset($vars['sidebar_first']);
+ unset($vars['sidebar_last']);
+}
+
+// now we will be switching between our primary content layout types.
switch($settings['omega_content_layout']){
default:
case 'first_content_last':
// FIRST - CONTENT - LAST
- $sl_max_width = $settings['omega_sidebar_first_width'] + $settings['omega_sidebar_last_width'];
- $sl_pull = $settings['omega_content_main_width'] + $settings['omega_sidebar_last_width'];
+ // the distance to pull the "first" / left sidebar to place it on the left of the content
+ // this does always include the right sidebar width, and does not need to account for if
+ // 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
+ // otherwise,
+ $sl_pull = $vars['sidebar_last'] ? $settings['omega_content_main_width'] : $settings['omega_content_main_width'] + $settings['omega_sidebar_last_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'] = FALSE;
+ $content_regions['sidebar_last']['push'] = FALSE;
+ // main_content will only be pushed in this layout
+ $content_regions['main_content']['pull'] = FALSE;
+ $content_regions['main_content']['push'] = array(
+ 'width' => $settings['omega_sidebar_first_width'],
+ 'conditions' => array(
+ 'sidebar_first' => 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' => $settings['omega_sidebar_first_width'],
+ ),
+ ),
+ );
+ // calling the dynamic region builder function to position these elements
+ $vars = dynamic_region_builder($content_regions, $settings['omega_content_container_width'], $vars);
+
- if ($vars['sidebar_first']) {
- $vars['sidebar_first_classes'] =
- ns('grid-'. $sl_max_width,
- $vars['sidebar_last'] || !$vars['sidebar_last'], $settings['omega_sidebar_last_width']
-
- ). ' '. ns('pull-'. $sl_pull,
- $vars['sidebar_last'], $settings['omega_sidebar_last_width']
- );
- }
- if ($vars['sidebar_last']) {
- $vars['sidebar_last_classes'] =
- ns('grid-'. $sl_max_width,
- $vars['sidebar_first'] || !$vars['sidebar_first'], $settings['omega_sidebar_first_width']
- );
- }
- if ($vars['content']) {
- $vars['main_content_classes'] =
- ns('grid-'. $vars['content_container_width'],
- $vars['sidebar_first'], $settings['omega_sidebar_first_width'],
- $vars['sidebar_last'], $settings['omega_sidebar_last_width']
- ). ' '. ns('push-'. $settings['omega_sidebar_first_width'],
- !$vars['sidebar_first'], $settings['omega_sidebar_first_width']
- );
- }
break;
// CONTENT - FIRST - LAST
case 'content_first_last':
- $sl_max_width = $settings['omega_sidebar_first_width'] + $settings['omega_sidebar_last_width'];
- $sl_pull = $settings['omega_content_main_width'] + $settings['omega_sidebar_last_width'];
- if ($vars['sidebar_first']) {
- $vars['sidebar_first_classes'] =
- ns('grid-'. $sl_max_width,
- $vars['sidebar_last'] || !$vars['sidebar_last'], $settings['omega_sidebar_last_width']
- );
- }
- if ($vars['sidebar_last']) {
- $vars['sidebar_last_classes'] =
- ns('grid-'. $sl_max_width,
- $vars['sidebar_first'] || !$vars['sidebar_first'], $settings['omega_sidebar_first_width']
- );
- }
- if ($vars['content']) {
- $vars['main_content_classes'] =
- ns('grid-'. $vars['content_container_width'],
- $vars['sidebar_first'], $settings['omega_sidebar_first_width'],
- $vars['sidebar_last'], $settings['omega_sidebar_last_width']
- );
- }
+ // This is seriously the easiest implementation because source order is used
+ // making push/pull irrelevant in this case.
+
+ // 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;
+ // main_content doesn't move in this layout
+ $content_regions['main_content']['pull'] = FALSE;
+ $content_regions['main_content']['push'] = FALSE;
+ // calling the dynamic region builder function to position these elements
+ $vars = dynamic_region_builder($content_regions, $settings['omega_content_container_width'], $vars);
+
break;
// FIRST - LAST - CONTENT
case 'first_last_content':
- $sl_max_width = $settings['omega_sidebar_first_width'] + $settings['omega_sidebar_last_width'];
-
- $sl_pull = $settings['omega_content_main_width'] + $settings['omega_sidebar_last_width'];
- $sr_pull = $settings['omega_content_main_width'];
-
- if ($vars['sidebar_first']) {
- $vars['sidebar_first_classes'] =
- ns('grid-'. $sl_max_width,
- $vars['sidebar_last'] || !$vars['sidebar_last'], $settings['omega_sidebar_last_width']
- ). ' '. ns('pull-'. $sr_pull
- );
- }
+ // if sidebar_last isn't present, we will pull the first sidebar the combined width of the content & sidebar last spacing
+ // otherwise,
+ $sl_pull = $vars['sidebar_last'] ? $settings['omega_content_main_width'] : $settings['omega_content_main_width'] + $settings['omega_sidebar_last_width'];
+ $sr_pull = $vars['sidebar_first'] ? $settings['omega_content_main_width'] : $settings['omega_content_main_width'] + $settings['omega_sidebar_first_width'];
+ $sc_max_push = $settings['omega_sidebar_first_width'] + $settings['omega_sidebar_last_width'];
+ // let's assign some new data to our $content_regions array to assing pull classes
- if ($vars['sidebar_last']) {
- $vars['sidebar_last_classes'] =
- ns('grid-'. $settings['omega_sidebar_last_width']
- ). ' '. ns('pull-'. $sr_pull
- );
- }
-
- if ($vars['content']) {
- $vars['main_content_classes'] =
- ns('grid-'. $vars['content_container_width'],
- $vars['sidebar_first'], $settings['omega_sidebar_first_width'],
- $vars['sidebar_last'], $settings['omega_sidebar_last_width']
- ). ' '. ns('push-'. $sl_max_width,
- !$vars['sidebar_first'], $settings['omega_sidebar_first_width']
- );
- }
+ // 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;
+ // main_content will only be pushed in this layout
+ $content_regions['main_content']['pull'] = FALSE;
+ $content_regions['main_content']['push'] = array(
+ 'width' => $sc_max_push,
+ 'conditions' => array(
+ 'sidebar_first' => 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' => $settings['omega_sidebar_first_width'],
+ ),
+ 'sidebar_last' => 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' => $settings['omega_sidebar_last_width'],
+ ),
+ ),
+ );
+ // calling the dynamic region builder function to position these elements
+ $vars = dynamic_region_builder($content_regions, $settings['omega_content_container_width'], $vars);
+
break;
}
@@ -249,14 +317,24 @@ $postscript_regions = array(
'suffix' => $settings['omega_postscript_four_suffix'])
),
);
-//$vars = static_region_builder($postscript_regions, $settings['postscript_container_width'], $vars);
+$vars = static_region_builder($postscript_regions, $settings['postscript_container_width'], $vars);
/**
* Footer Region
*/
$vars['footer_container_width'] = $settings['omega_footer_container_width'];
-$vars['footer_first_classes'] = $settings['omega_footer_first_width'];
-$vars['footer_last_classes'] = $settings['omega_footer_last_width'];
+
+$footer_regions = array(
+ 'footer_first' => array(
+ 'data' => $vars['footer_first'],
+ 'width' => $settings['omega_footer_first_width'],
+ ),
+ 'footer_last' => array(
+ 'data' => $vars['footer_last'],
+ 'width' => $settings['omega_footer_last_width'],
+ ),
+);
+$vars = static_region_builder($footer_regions, $settings['omega_footer_container_width'], $vars);
// ZEN - BODY CLASSES
// Classes for body element. Allows advanced theming based on context
@@ -285,28 +363,13 @@ if (!$vars['is_front']) {
$vars['body_classes_array'] = $classes;
$vars['body_classes'] = implode(' ', $classes); // Concatenate with spaces.
-//$vars['logo_img'] = $vars['logo'] ? theme('image', substr($vars['logo'], strlen(base_path())), t($vars['site_name']), t($vars['site_name'])) : '';
+$vars['logo_img'] = $vars['logo'] ? theme('image', substr($vars['logo'], strlen(base_path())), t($vars['site_name']), t($vars['site_name'])) : '';
// NINESIXTY - For easy printing of variables.
$vars['linked_logo_img'] = $vars['logo_img'] ? l($vars['logo_img'], '<front>', array('rel' => 'home', 'title' => t($vars['site_name']), 'html' => TRUE)) : '';
$vars['linked_site_name'] = $vars['site_name'] ? l($vars['site_name'], '<front>', array('rel' => 'home', 'title' => t('Home'))) : '';
-
- if (isset($vars['main_menu'])) {
- $vars['main_menu_links'] = theme('links__system_main_menu', array(
- 'links' => $vars['main_menu'],
- 'attributes' => array(
- 'class' => array('links', 'main-menu'),
- ),
- 'heading' => array(
- 'text' => t('Main menu'),
- 'level' => 'h2',
- 'class' => array('element-invisible'),
- )
- ));
- }
-
-//$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'));
+$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']);
@@ -369,6 +432,4 @@ if ($vars['mission'] && ($settings['mission_statement_pages'] == 'all' || $vars[
}
else {
unset($vars['mission']);
-}
-$vars['omega'] = $omega;
-//krumo($vars); \ No newline at end of file
+} \ No newline at end of file
diff --git a/template.php b/template.php
index 7d44344..5372bf1 100644
--- a/template.php
+++ b/template.php
@@ -142,32 +142,92 @@ function omega_css_reorder($css) {
/**
* The region_builder function will create the variables needed to create
- * a dynamic group of regions. This function is only used for groups of
- * regions that should be displayed inline. Region groups that should be
- * either displayed inline or stacked (header, footer) should not be
- * passed through this function.
+ * a dynamic group of regions. This function is simply a quick pass-thru
+ * that will create either inline or stacked regions. This function will
+ * not do any advanced functionality, but simply assing the appropriate
+ * classes based on the settings for the theme.
*
+ * For a more advanced set of regions, dynamic_region_builder() will be used.
*/
-/**
function static_region_builder($region_data, $container_width, $vars) {
- // let's cycle the region data, and determine what we have
- foreach ($region_data AS $region => $info) {
- // if we do have content for this region, let's create it.
- if ($info['data']) {
- $vars[$region .'_classes'] = ns('grid-'. $info['width']);
- }
- if (is_array($info['spacing'])) {
- foreach ($info['spacing'] AS $attribute => $value) {
- if ($value) {
+ // let's cycle the region data, and determine what we have
+ foreach ($region_data AS $region => $info) {
+ // if we do have content for this region, let's create it.
+ if ($info['data']) {
+ $vars[$region .'_classes'] = ns('grid-'. $info['width']);
+ }
+ if (is_array($info['spacing'])) {
+ foreach ($info['spacing'] AS $attribute => $value) {
+ if ($value) {
+ $vars[$region .'_classes'] .= ' '. $attribute .'-'. $value;
+ }
+ }
+ }
+ }
+ return $vars;
+}
+
+
+function _omega_dynamic_zones($width, $conditions, $vars) {
+ foreach($conditions AS $variable => $reaction) {
+ if(($reaction['type'] && $vars[$variable]) || (!$reaction['type'] && !$vars[$variable])) {
+ $width = $width - $reaction['value'];
+ }
+ }
+ return $width;
+}
+function _omega_dynamic_widths($width, $conditions, $vars) {
+ foreach($conditions AS $variable => $zone) {
+ if(($vars[$variable])) {
+ $width = $width - $zone['width'];
+ }
+ }
+ return $width;
+}
+/**
+ * The dynamic_region_builder function will be used to pass important zones
+ * like the content regions where the regions sent to the function MUST appear
+ * inline, and advanced calculations need to be done in order to display the as such
+ *
+ * Stacked regions are not possible using this function, and should be passed through
+ * static_region_builder() instead.
+ */
+function dynamic_region_builder($region_data, $container_width, $vars) {
+ // let's cycle the region data, and determine what we have
+ foreach ($region_data AS $region => $info) {
+ // if we do have content for this region, let's create it.
+ if ($info['data']) {
+
+ $width = $info['primary'] ? $container_width : $info['width'];
+ $vars[$region .'_classes'] = $info['primary'] ? ns('grid-'. _omega_dynamic_widths($width, $info['related'], $vars)) : ns('grid-'. $info['width']);
+ // we know we have stuff to put here, so we can check for push & pull options
+ if($info['pull']) {
+ // looks like we do wanna pull, or this value would have been false, so let's boogie
+ $vars[$region .'_classes'] .= ' '. ns('pull-'. _omega_dynamic_zones($info['pull']['width'], $info['pull']['conditions'], $vars));
+ //krumo('Pulling '. $region .' '. $vars[$region .'_classes']);
+ }
+ if($info['push']) {
+ // looks like a push
+ $vars[$region .'_classes'] .= ' '. ns('push-'. _omega_dynamic_zones($info['push']['width'], $info['push']['conditions'], $vars));
+ //krumo('Pushing '. $region .' '. $vars[$region .'_classes']);
+ //krumo('Should be pushing '. $info['push']['width'] .' grids.');
+ //krumo($info['push']['conditions']);
+ }
+ }
+ // currently ignored becuase we have not given prefix/suffix class options
+ // to the primary content zones... this will become active again later
+ if (is_array($info['spacing'])) {
+ foreach ($info['spacing'] AS $attribute => $value) {
+ if ($value) {
$vars[$region .'_classes'] .= ' '. $attribute .'-'. $value;
- }
- }
- }
- }
- //krumo($vars);
- return $vars;
+ }
+ }
+ }
+ // \unused prefix/suffix stuffs
+ }
+ return $vars;
}
-*/
+
/**
* The rfilter function takes one argument, an array of values for the regions
* for a "group" of regions like preface or postscript
@@ -187,7 +247,6 @@ function rfilter($vars) {
* @param $omega
* @return classes
*/
-/*
function ao($vars, $elements, $current, $alpha = FALSE, $omega = FALSE){
$classes = array();
$regions = array();
@@ -212,7 +271,7 @@ function ao($vars, $elements, $current, $alpha = FALSE, $omega = FALSE){
}
return $classes[$current];
}
-*/
+
/**
* Converts a string to a suitable html ID attribute.
*
@@ -246,7 +305,6 @@ function omega_id_safe($string) {
* @return
* A string containing the breadcrumb output.
*/
-/*
function omega_breadcrumb($breadcrumb) {
// Determine if we are to display the breadcrumb.
$show_breadcrumb = theme_get_setting('omega_breadcrumb');
@@ -275,14 +333,12 @@ function omega_breadcrumb($breadcrumb) {
// Otherwise, return an empty string.
return '';
}
-*/
/**
* Create a string of attributes form a provided array.
*
* @param $attributes
* @return string
*/
-/*
function omega_render_attributes($attributes) {
if ($attributes) {
$items = array();
@@ -296,13 +352,12 @@ function omega_render_attributes($attributes) {
}
return $output;
}
-*/
+
/**
* Implementation of hook_theme().
*
* @return
*/
-/*
function omega_theme(&$existing, $type, $theme, $path) {
if (!db_is_active()) {
return array();
@@ -310,7 +365,7 @@ function omega_theme(&$existing, $type, $theme, $path) {
include_once './' . drupal_get_path('theme', 'omega') . '/theme-functions.inc';
// Since we are rebuilding the theme registry and the theme settings' default
// values may have changed, make sure they are saved in the database properly.
- //omega_theme_get_default_settings($theme);
+ omega_theme_get_default_settings($theme);
return array(
'id_safe' => array(
'arguments' => array('string'),
@@ -319,4 +374,5 @@ function omega_theme(&$existing, $type, $theme, $path) {
'arguments' => array('attributes'),
),
);
-}// */ \ No newline at end of file
+}// */
+
diff --git a/theme-functions.inc b/theme-functions.inc
index 4072d79..4ca62d3 100644
--- a/theme-functions.inc
+++ b/theme-functions.inc
@@ -33,11 +33,4 @@ function omega_theme_get_default_settings($theme) {
}
// Return the default settings.
return $defaults;
-}
-
-function omega_theme_generate_region_settings() {
-
-}
-function omega_theme_generate_region_options(){
-
} \ No newline at end of file
diff --git a/theme-settings.php b/theme-settings.php
index 04ab962..d39b912 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -14,7 +14,7 @@ include_once './' . drupal_get_path('theme', 'omega') . '/theme-functions.inc';
* @return
* array A form array.
*/
-function omega_form_system_theme_settings_alter(&$form, $form_state) {
+function omega_settings($saved_settings, $subtheme_defaults = array()) {
// Add the form's CSS
//drupal_add_css(drupal_get_path('theme', 'omega') . '/theme-settings.css', 'theme');
// Add javascript to show/hide optional settings
@@ -28,7 +28,7 @@ function omega_form_system_theme_settings_alter(&$form, $form_state) {
}
else {
// Merge the saved variables and their default values.
- //$defaults = omega_theme_get_default_settings('omega');
+ $defaults = omega_theme_get_default_settings('omega');
$settings = array_merge($defaults, $saved_settings);
}