diff --git a/sites/all/themes/unl_wdn/page.tpl.php b/sites/all/themes/unl_wdn/page.tpl.php index c4f145081d6a62b7d29ef91280705fbf671b2220..7d4ab4f8c3eb6309a207e96ae0edf4c5b3205837 100644 --- a/sites/all/themes/unl_wdn/page.tpl.php +++ b/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; +} + diff --git a/sites/all/themes/unl_wdn/template.php b/sites/all/themes/unl_wdn/template.php index 010a66f3adc3abec60d9399999c0db165ccdfddc..6906e9a3fc7276c1c44b07c269e67704baf0e8f7 100644 --- a/sites/all/themes/unl_wdn/template.php +++ b/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; diff --git a/sites/all/themes/unl_wdn/unl_wdn.info b/sites/all/themes/unl_wdn/unl_wdn.info index 4354e7f27c8f521ef10016f97ab76976e5ed6cf2..84a8c5d74843fc6d802b9f3775a85e1cb83a2c2f 100644 --- a/sites/all/themes/unl_wdn/unl_wdn.info +++ b/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