From: Steve Sutton Date: Thu, 14 Aug 2014 18:56:49 +0000 (-0400) Subject: Toolkit_Page X-Git-Tag: V1.0^2~75 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=c1334f4b05c5251c278ae22c35262713dab1bdf3;p=web%2FKeweenaw.git Toolkit_Page update the navigation for main so the background image is now real image tag so we can add border to it (orange) also add external.js script --- diff --git a/Toolkit/Page.php b/Toolkit/Page.php index 988d8bf..e76815f 100755 --- a/Toolkit/Page.php +++ b/Toolkit/Page.php @@ -162,6 +162,7 @@ class Toolkit_Page $GLOBALS['bottomScripts'][] = MEDIA_BASE_URL . 'js/pageSetup.js'; $GLOBALS['styleSheets'][] = $this->mediaBaseURL . 'fancybox/jquery.fancybox.css'; $GLOBALS['bottomScripts'][] = $this->mediaBaseURL . "fancybox/jquery.fancybox.js"; + $GLOBALS['bottomScripts'][] = $this->glmAppBaseURL . 'libjs/external.js'; } /** @@ -449,9 +450,6 @@ class Toolkit_Page } $this->pageTitle = $this->_getPageTitle($this->_catid); -// if (defined('MAIN_LEVEL_NAV_ARRAY') && MAIN_LEVEL_NAV_ARRAY) { -// $mainNavArray = unserialize(MAIN_LEVEL_NAV_ARRAY); -// } $bodyFactory = new Toolkit_Template_Page_BodyFactory( $this->_breadCrumbs, $this->_pageGateway, @@ -463,6 +461,7 @@ class Toolkit_Page $this->toolboxContent = $this->_toolboxPage->getBody( $this->_catid, $bodyFactory ); +// echo '
'.print_r($this->toolboxContent, true).'
';exit; $page = $this->_pageGateway->find($this->_catid); $this->topParentId = $this->_pageGateway->findTopParent($this->_catid); @@ -722,10 +721,13 @@ class Toolkit_Page ? ' class="'.$className.'"' : ' class="dropdown"'; } - $styleCode = ($backgroundImage) - ? 'style="background-image: url('.$backgroundImage.');"' - : ''; + $styleCode = '';//($backgroundImage) +// ? 'style="background-image: url('.$backgroundImage.');"' +// : ''; $result = "{$tabs}\n"; + if ($backgroundImage) { + $result .= ''; + } foreach ($array as $i => $node) { $classes = array(); if ($mobile && $node['class']) {