[gh-63] Merging from testing into staging

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@450 20a16fea-79d4-4915-8869-1ea9d5ebf173

sites/all/themes/unl_wdn/page.tpl.php

@@ -58,6 +58,8 @@ Any real output is being deferred to html.tpl.php
  * Regions:
  * - $page['navlinks']: Navigation Links
  * - $page['content']: Main Content Area
+ * - $page['sidebar_first']: Sidebar first
+ * - $page['sidebar_second']: Sidebar second
  * - $page['leftcollinks']: Related Links
  * - $page['contactinfo']: Contact Us
  * - $page['optionalfooter']: Optional Footer
@@ -86,11 +88,40 @@ if (isset($title) && $title) {
 }
 
 
+
+
+
 $t->maincontentarea = $messages . PHP_EOL
                     . render($tabs) . PHP_EOL
-                    . render($action_links) . PHP_EOL
-                    . strtr(render($page['content']), array('sticky-enabled' => 'zentable cool')) . PHP_EOL
-                    ;
+                    . render($action_links) . PHP_EOL;
+
+if ($page['sidebar_first']) {
+    $t->maincontentarea .= '<div id="sidebar-first" class="sidebar col left">' . PHP_EOL
+                         . render($page['sidebar_first']) . PHP_EOL
+                         . '</div>';
+}
+
+if ($page['sidebar_first'] && !$page['sidebar_second']) {
+    $t->maincontentarea .= '<div class="three_col right">' . PHP_EOL;
+} else if ($page['sidebar_first'] && $page['sidebar_second']) {
+    $t->maincontentarea .= '<div class="two_col">' . PHP_EOL;
+} else if (!$page['sidebar_first'] && $page['sidebar_second']) {
+    $t->maincontentarea .= '<div class="three_col left">' . PHP_EOL;
+}
+
+$t->maincontentarea .= strtr(render($page['content']), array('sticky-enabled' => 'zentable cool')) . PHP_EOL;
+
+if ($page['sidebar_second']) {
+    $t->maincontentarea .= '</div>' . PHP_EOL
+                         . '<div id="sidebar-second" class="sidebar col right">' . PHP_EOL
+                         . render($page['sidebar_second']) . PHP_EOL
+                         . '</div>' . PHP_EOL;
+}
+
+if ($page['sidebar_first'] && !$page['sidebar_second']) {
+    $t->maincontentarea .= '</div>' . PHP_EOL;
+} 
+
 
 
 

sites/all/themes/unl_wdn/template.php

@@ -32,6 +32,15 @@ function unl_wdn_preprocess_html(&$vars, $hook)
   $vars['head_title'] = implode(' | ', $head_title);
 }
 
+function unl_wdn_preprocess_page(&$vars, $hook)
+{
+  //Unset the sidebars if on a user page (i.e. user profile or imce file browser)
+  if (arg(0) == 'user') {
+    $vars['page']['sidebar_first'] = array();
+    $vars['page']['sidebar_second'] = array();
+  }
+}
+
 function unl_wdn_get_instance()
 {
     static $instance;

sites/all/themes/unl_wdn/unl_wdn.info

@@ -14,9 +14,13 @@ features[] = node_user_picture
 features[] = comment_user_picture
 features[] = comment_user_verification
 
-regions[content] = Main Content
 regions[page_top] = Page top
 regions[page_bottom] = Page bottom
+
+regions[content] = Main Content
+regions[sidebar_first] = Sidebar first
+regions[sidebar_second] = Sidebar second
+
 regions[navlinks] = Navigation Links
 regions[leftcollinks] = Related Links
 regions[contactinfo] = Contact Us