From d38ef240c963983610ddb66a19eacd12409ed936 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Mon, 18 Aug 2014 08:31:36 -0400 Subject: [PATCH] Working in members-only-area add side nav Rework for output of members only pages Conflicts: templates/toolbox.html --- .../MembersOnly/CommonEventsController.php | 4 +-- .../MembersOnly/EditProfileController.php | 18 ++++++------ .../Members/MembersOnly/EventsController.php | 5 ++-- .../Members/MembersOnly/IndexController.php | 13 +++++---- .../Members/MembersOnly/LeadsController.php | 18 ++++++------ .../MembersOnly/Navigation/Factory.php | 28 +++++++++++-------- .../Members/MembersOnly/ReportsController.php | 4 +-- Toolkit/Page.php | 5 ++++ templates/template.html | 5 +++- templates/toolbox.html | 4 ++- 10 files changed, 58 insertions(+), 46 deletions(-) diff --git a/Toolkit/Members/MembersOnly/CommonEventsController.php b/Toolkit/Members/MembersOnly/CommonEventsController.php index 75c343a..f8d219b 100644 --- a/Toolkit/Members/MembersOnly/CommonEventsController.php +++ b/Toolkit/Members/MembersOnly/CommonEventsController.php @@ -66,10 +66,10 @@ class Toolkit_Members_MembersOnly_CommonEventsController $keywordReplacement, MEMBERS_EVENTS_PAGE ); - + $glmPage->isMemberOnlySection = true; $glmPage->fetchPage(); - $glmPage->toolboxContent .= $eventContent; + $glmPage->toolboxContent->membersOnly = $eventContent; $baseSecureUrl = ($_SERVER['HTTPS'] == 'on') ? BASE_SECURE_URL diff --git a/Toolkit/Members/MembersOnly/EditProfileController.php b/Toolkit/Members/MembersOnly/EditProfileController.php index 96fe87c..3e1d176 100644 --- a/Toolkit/Members/MembersOnly/EditProfileController.php +++ b/Toolkit/Members/MembersOnly/EditProfileController.php @@ -1,9 +1,9 @@ @@ -15,9 +15,9 @@ /** * Toolkit_Members_MembersOnly_EditProfileController - * + * * Description of Toolkit_Members_MembersOnly_EditProfileController - * + * * @category Toolkit * @package Members_MembersOnly * @author Jamie Kahgee @@ -33,9 +33,9 @@ class Toolkit_Members_MembersOnly_EditProfileController /** * Description of indexAction() - * + * * @return void - * @access public + * @access public */ public function indexAction() { @@ -59,16 +59,14 @@ class Toolkit_Members_MembersOnly_EditProfileController $keywordReplacement, MEMBERS_PROFILE_FORM_PAGE ); - - //$glmPage->title = $toolbox->title(); - + $glmPage->isMemberOnlySection = true; $glmPage->fetchPage(); // need to work at removing this $_REQUEST['id'] = $_GET['id'] = $this->registry->memberId; $member = new Toolkit_Membersonly(); - $glmPage->toolboxContent .= $member->toHtml( + $glmPage->toolboxContent->membersOnly = $member->toHtml( $this->registry->dbh, $this->registry->memberId ); diff --git a/Toolkit/Members/MembersOnly/EventsController.php b/Toolkit/Members/MembersOnly/EventsController.php index ac1ea5e..333f85b 100644 --- a/Toolkit/Members/MembersOnly/EventsController.php +++ b/Toolkit/Members/MembersOnly/EventsController.php @@ -63,10 +63,9 @@ class Toolkit_Members_MembersOnly_EventsController $keywordReplacement, MEMBERS_EVENTS_PAGE ); - + $glmPage->isMemberOnlySection = true; $glmPage->fetchPage(); - - $glmPage->toolboxContent .= $eventContent; + $glmPage->toolboxContent->membersOnly = $eventContent; $baseSecureUrl = ($_SERVER['HTTPS'] == 'on') ? BASE_SECURE_URL diff --git a/Toolkit/Members/MembersOnly/IndexController.php b/Toolkit/Members/MembersOnly/IndexController.php index c67095c..bef724c 100644 --- a/Toolkit/Members/MembersOnly/IndexController.php +++ b/Toolkit/Members/MembersOnly/IndexController.php @@ -1,9 +1,9 @@ @@ -15,9 +15,9 @@ /** * Toolkit_Members_MembersOnly_IndexController - * + * * Description of Toolkit_Members_MembersOnly_IndexController - * + * * @category Toolkit * @package Members_MembersOnly * @author Jamie Kahgee @@ -33,9 +33,9 @@ class Toolkit_Members_MembersOnly_IndexController /** * Description of indexAction() - * + * * @return void - * @access public + * @access public */ public function indexAction() { @@ -59,6 +59,7 @@ class Toolkit_Members_MembersOnly_IndexController $keywordReplacement, $this->registry->pageid ); + $glmPage->isMemberOnlySection = true; //$glmPage->title = $toolbox->title(); diff --git a/Toolkit/Members/MembersOnly/LeadsController.php b/Toolkit/Members/MembersOnly/LeadsController.php index f5ceb24..21893d8 100644 --- a/Toolkit/Members/MembersOnly/LeadsController.php +++ b/Toolkit/Members/MembersOnly/LeadsController.php @@ -1,9 +1,9 @@ @@ -11,14 +11,14 @@ * @license Gaslight Media * @version SVN: $id$ * @link <> - * + * */ /** * Toolkit_Members_MembersOnly_LeadsController - * + * * Description of Toolkit_Members_MembersOnly_LeadsController - * + * * @category Toolkit * @package Members_MembersOnly * @author Steve Sutton @@ -34,9 +34,9 @@ class Toolkit_Members_MembersOnly_LeadsController /** * Description of indexAction() - * + * * @return void - * @access public + * @access public */ public function indexAction() { @@ -60,7 +60,7 @@ class Toolkit_Members_MembersOnly_LeadsController $keywordReplacement, MEMBERS_LEADS_PAGE ); - + $glmPage->isMemberOnlySection = true; $glmPage->fetchPage(); // Export File Form @@ -74,7 +74,7 @@ class Toolkit_Members_MembersOnly_LeadsController ); $export->configureForm(); - $glmPage->toolboxContent .= $export->toHtml($this->registry->dbh); + $glmPage->toolboxContent->membersOnly = $export->toHtml($this->registry->dbh); $glmPage->topScripts = Toolkit_Common::getScripts($GLOBALS['topScripts']); $glmPage->bottomScripts = Toolkit_Common::getScripts($GLOBALS['bottomScripts']); diff --git a/Toolkit/Members/MembersOnly/Navigation/Factory.php b/Toolkit/Members/MembersOnly/Navigation/Factory.php index e5a95dc..0a4631f 100644 --- a/Toolkit/Members/MembersOnly/Navigation/Factory.php +++ b/Toolkit/Members/MembersOnly/Navigation/Factory.php @@ -1,9 +1,9 @@ @@ -15,9 +15,9 @@ /** * Toolkit_Members_MembersOnly_Navigation_Factory - * + * * Description of Toolkit_Members_MembersOnly_Navigation_Factory - * + * * @category Toolkit * @package Members_MembersOnly * @author Jamie Kahgee @@ -32,7 +32,7 @@ class Toolkit_Members_MembersOnly_Navigation_Factory /** * Description of $_gateway * @var Toolkit_Toolbox_PageGatewayAbstract - * @access private + * @access private */ private $_gateway; @@ -40,7 +40,7 @@ class Toolkit_Members_MembersOnly_Navigation_Factory * Description of setGateway() * * @param Toolkit_Toolbox_PageGatewayAbstract $gateway Toolbox Gateway - * + * * @return void * @access public */ @@ -51,15 +51,19 @@ class Toolkit_Members_MembersOnly_Navigation_Factory /** * Description of createSideNav() - * - * @return \Toolkit_Members_MembersOnly_Navigation_Side + * + * @return \Toolkit_Members_MembersOnly_Navigation_Side * @access public */ public function createSideNav() { - $nav = new Toolkit_Members_MembersOnly_Navigation_Side( +// $nav = new Toolkit_Members_MembersOnly_Navigation_Side( +// new HTML_Menu(), +// new HTML_Menu_DirectTreeRenderer() +// ); + $nav = new Toolkit_Members_MembersOnly_Navigation_Side( new HTML_Menu(), - new HTML_Menu_DirectTreeRenderer() + new Toolkit_Template_Navigation_Renderer_DirectTreeSideNavTitle($this->_gateway) ); $conf = new Config; @@ -74,8 +78,8 @@ class Toolkit_Members_MembersOnly_Navigation_Factory /** * Description for createMainNav() - * - * @return \Toolkit_Template_Navigation_MainNavigationStatic + * + * @return \Toolkit_Template_Navigation_MainNavigationStatic * @access public */ public function createMainNav() diff --git a/Toolkit/Members/MembersOnly/ReportsController.php b/Toolkit/Members/MembersOnly/ReportsController.php index 5261544..e6cee3e 100644 --- a/Toolkit/Members/MembersOnly/ReportsController.php +++ b/Toolkit/Members/MembersOnly/ReportsController.php @@ -59,7 +59,7 @@ class Toolkit_Members_MembersOnly_ReportsController $keywordReplacement, MEMBERS_REPORTS_PAGE ); - + $glmPage->isMemberOnlySection = true; //$glmPage->title = $toolbox->title(); $glmPage->fetchPage(); @@ -99,7 +99,7 @@ class Toolkit_Members_MembersOnly_ReportsController $out .= $dReport->toHtml($rEngine); - $glmPage->toolboxContent .= $out; + $glmPage->toolboxContent->membersOnly = $out; $glmPage->topScripts = Toolkit_Common::getScripts($GLOBALS['topScripts']); $glmPage->bottomScripts = Toolkit_Common::getScripts($GLOBALS['bottomScripts']); diff --git a/Toolkit/Page.php b/Toolkit/Page.php index 8fc8f36..8e0e9f2 100755 --- a/Toolkit/Page.php +++ b/Toolkit/Page.php @@ -830,6 +830,11 @@ class Toolkit_Page $sideNavArray = $nav->getNavStructure( $this->_pageGateway, $catid ); +// echo '
'.print_r($sideNavArray, true).'
';exit; +// return $this->_arrayToListHTML( +// $sideNavArray, 0, 'side-nav' +// ); + return (!empty($sideNavArray)) ? $nav->renderPageNav($sideNavArray, 'tree') : ''; diff --git a/templates/template.html b/templates/template.html index 853cb95..b6b3537 100755 --- a/templates/template.html +++ b/templates/template.html @@ -130,7 +130,10 @@
- + {if:isMemberOnlySection} + {sideNav:h} + {end:} +
diff --git a/templates/toolbox.html b/templates/toolbox.html index 76e59cb..dbd834b 100644 --- a/templates/toolbox.html +++ b/templates/toolbox.html @@ -128,5 +128,7 @@ {end:} - +{if:toolboxContent.membersOnly} + {toolboxContent.membersOnly:h} +{end:} -- 2.17.1