final changes for a simple, D7 working version of Omega. region settings, general...
authorhimerus
Mon, 10 May 2010 01:00:49 +0000 (01:00 +0000)
committerhimerus
Mon, 10 May 2010 01:00:49 +0000 (01:00 +0000)
omega.info
page.tpl.php
preprocess/preprocess-html.inc [new file with mode: 0644]
preprocess/preprocess-page.inc
template.php

index 2b6a58c..4d67ee5 100644 (file)
@@ -34,18 +34,6 @@ regions[postscript_four] = postscript 4
 regions[footer_first] = footer first
 regions[footer_last] = footer last
 
-features[] = logo
-features[] = name
-features[] = slogan
-features[] = mission
-features[] = node_user_picture
-features[] = comment_user_picture
-features[] = search
-features[] = favicon
-features[] = primary_links
-features[] = secondary_links
-
-
 ; Set the default settings to be used in theme-settings.php
 
 ; Non-960gs default settings
index 17c02ee..a369287 100644 (file)
           <?php endif; ?>
         <?php endif; ?>
       </div><!-- /#branding -->
-
-      <?php if ($main_menu_links || $secondary_menu_links): ?>
+      <?php if ($primary_nav || $secondary_nav): ?>
         <div id="site-menu" class="grid-<?php print $header_menu_width; ?>">
-        <?php if($main_menu_links): ?>
-          <div><?php print $main_menu_links; ?></div>
+       
+        <?php if($primary_nav): ?>
+          <div><?php print $primary_nav; ?></div>
         <?php endif; ?>
-        <?php if($secondary_menu_links): ?>
-          <div><?php print $secondary_menu_links; ?></div>
+        <?php if($secondary_nav): ?>
+          <div><?php print $secondary_nav; ?></div>
         <?php endif; ?>
         </div><!-- /#site-menu -->
       <?php endif; ?>
diff --git a/preprocess/preprocess-html.inc b/preprocess/preprocess-html.inc
new file mode 100644 (file)
index 0000000..13a86d7
--- /dev/null
@@ -0,0 +1,6 @@
+<?php
+// NINESIXTY - Make sure framework styles are placed above all others.
+if(isset($vars['css'])) {
+  $vars['css_alt'] = omega_css_reorder($vars['css']);
+  $vars['styles'] = drupal_get_css($vars['css_alt']);
+}
\ No newline at end of file
index 6ef9a54..82acbbd 100644 (file)
@@ -355,44 +355,9 @@ if(isset($vars['site_name'])) {
 //$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'));
 
-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'),
-      )
-    ));
-  }
-  else {
-    $vars['primary_nav'] = FALSE;
-  }
-  if (isset($vars['secondary_menu'])) {
-    $vars['secondary_menu_links'] = theme('links__system_secondary_menu', array(
-      'links' => $vars['secondary_menu'],
-      'attributes' => array(
-        'class' => array('links', 'secondary-menu'),
-      ),
-      'heading' => array(
-        'text' => t('Secondary menu'),
-        'level' => 'h2',
-        'class' => array('element-invisible'),
-      )
-    ));
-  }
-  else {
-    $vars['secondary_nav'] = FALSE;
-  }
+  
+
 
-// NINESIXTY - Make sure framework styles are placed above all others.
-if(isset($vars['css'])) {
-  $vars['css_alt'] = omega_css_reorder($vars['css']);
-  $vars['styles'] = drupal_get_css($vars['css_alt']);
-}
 
 
 // ACQUIA-MARINA
index 6160647..7743714 100644 (file)
@@ -45,15 +45,52 @@ function omega_preprocess(&$vars, $hook) {
  * Preprocessor for page.tpl.php template file.
  * The default functionality can be found in preprocess/preprocess-page.inc
  */
-function omega_preprocess_page(&$vars, $hook) {
-  
+function omega_preprocess_page(&$vars) {
+  if (isset($vars['main_menu'])) {
+    $vars['primary_nav'] = 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'),
+      )
+    ));
+  }
+  else {
+    $vars['primary_nav'] = FALSE;
+    drupal_set_message('<strong>$vars[main_menu]</strong> not present... WTF...', 'error');
+  }
+  if (isset($vars['secondary_menu'])) {
+    $vars['secondary_nav'] = theme('links__system_secondary_menu', array(
+      'links' => $vars['secondary_menu'],
+      'attributes' => array(
+        'class' => array('links', 'secondary-menu'),
+      ),
+      'heading' => array(
+        'text' => t('Secondary menu'),
+        'level' => 'h2',
+        'class' => array('element-invisible'),
+      )
+    ));
+  }
+  else {
+    $vars['secondary_nav'] = FALSE;
+    drupal_set_message('<strong>$vars[secondary_menu]</strong> not present... WTF...', 'error');
+  }
+  /*
+  if(function_exists('krumo')) {
+       krumo($vars);
+  }*/
 } // end preprocess_page
-function omega_preprocess_node(&$vars, $hook) {
+function omega_preprocess_node(&$vars) {
   
 } // end preprocess_node
 
 function omega_process_page(&$vars) {
-  //krumo($vars);
+  
 }
 function omega_process_node(&$vars) {