Update the members only section

has side nav that turns into top nav on medium

diff --git a/Toolkit/Members/Events/CommonEditEvent.php b/Toolkit/Members/Events/CommonEditEvent.php
index 5bc0a42..3dcd651 100644 (file)
--- a/Toolkit/Members/Events/CommonEditEvent.php
+++ b/Toolkit/Members/Events/CommonEditEvent.php
@@ -676,7 +676,8 @@ class Toolkit_Members_Events_CommonEditEvent
             'type'    => 'submit',
             'req'     => false,
             'name'    => 'submit_rmv',
-            'display' => 'Submit'
+            'display' => 'Submit',
+            'opts'    => array('class' => 'button')
         );
 
         $this->setupElements($e);
@@ -1353,12 +1354,7 @@ class Toolkit_Members_Events_CommonEditEvent
             );
         }
         $event = MemberEvent::createByValues($values);
-//        var_dump($event);
-//        var_dump($values);
-//        exit;
         return $this->eventMapper->saveEvent($event);
-
-//      return true;
     }
 
     //  }}}
@@ -1411,7 +1407,7 @@ class Toolkit_Members_Events_CommonEditEvent
      */
     public function toHtml()
     {
-        $GLOBALS['topScripts'][] = JQUERY_CDN_JS;
+        //$GLOBALS['topScripts'][] = JQUERY_CDN_JS;
         $GLOBALS['bottomScripts'][] = MEDIA_APP_BASE_URL . 'libjs/textlimit.js';
         $baseSecureUrl
             = ($_SERVER['HTTPS'] == 'on')
@@ -1421,7 +1417,7 @@ class Toolkit_Members_Events_CommonEditEvent
             = ($_SERVER['HTTPS'] == 'on')
             ? GLM_APP_BASE_SECURE_URL
             : MEDIA_APP_BASE_URL;
-        $GLOBALS['topScripts'][]
+        $GLOBALS['bottomScripts'][]
             = $appBaseSecureUrl
             . 'libjs/jqueryui/1.8.13/js/jquery-ui-1.8.13.custom.min.js';
         $GLOBALS['topScripts'][] = CKEDITOR_JS.'';

diff --git a/Toolkit/Members/MembersOnly/Navigation/Side.php b/Toolkit/Members/MembersOnly/Navigation/Side.php
index 249d968..b7f371c 100644 (file)
--- a/Toolkit/Members/MembersOnly/Navigation/Side.php
+++ b/Toolkit/Members/MembersOnly/Navigation/Side.php
@@ -12,7 +12,7 @@
  * @version   SVN: $id$
  * @link      <>
  */
-
+$GLOBALS['styleSheets'][] = MEDIA_BASE_URL . 'Toolkit/Members/css/member-admin.css';
 /**
  * Toolkit_Members_MembersOnly_Navigation_Side
  *
@@ -173,10 +173,10 @@ class Toolkit_Members_MembersOnly_Navigation_Side extends Toolkit_NavigationAbst
                         'title' => strip_tags($subPage['navigation_name']),
                         'url' => MEDIA_BASE_URL . 'members-only-area/?rt=Coupons&page_id=' . $subPage['id'],
                         'sub' => array(
-                            'listCoupons' => array(
-                                'title' => 'List Coupons',
-                                'url' => MEDIA_BASE_URL . 'members-only-area/?rt=Coupons&page_id=' . $subPage['id'],
-                            ),
+                            // 'listCoupons' => array(
+                            //     'title' => 'List Coupons',
+                            //     'url' => MEDIA_BASE_URL . 'members-only-area/?rt=Coupons&page_id=' . $subPage['id'],
+                            // ),
                             'addCoupon' => array(
                                 'title' => 'Add Coupon',
                                 'url' => MEDIA_BASE_URL . 'members-only-area/?rt=Coupons&ac=addCoupon&page_id=' . $subPage['id'],
@@ -194,10 +194,10 @@ class Toolkit_Members_MembersOnly_Navigation_Side extends Toolkit_NavigationAbst
                         'title' => strip_tags($subPage['navigation_name']),
                         'url' => MEDIA_BASE_URL . 'members-only-area/?rt='.$routerCalled.'&page_id=' . $subPage['id'],
                         'sub' => array(
-                            'listEvents' => array(
-                                'title' => 'List Events',
-                                'url' => MEDIA_BASE_URL . 'members-only-area/?rt='.$routerCalled.'&page_id=' . $subPage['id'],
-                            ),
+                            // 'listEvents' => array(
+                            //     'title' => 'List Events',
+                            //     'url' => MEDIA_BASE_URL . 'members-only-area/?rt='.$routerCalled.'&page_id=' . $subPage['id'],
+                            // ),
                             'addEvent' => array(
                                 'title' => 'Add Event',
                                 'url' => MEDIA_BASE_URL . 'members-only-area/?rt='.$routerCalled.'&ac=addEvent&page_id=' . $subPage['id'],

diff --git a/Toolkit/Members/css/member-admin.css b/Toolkit/Members/css/member-admin.css
index ba9a8cb..1ad55d3 100755 (executable)
--- a/Toolkit/Members/css/member-admin.css
+++ b/Toolkit/Members/css/member-admin.css
@@ -979,3 +979,25 @@ label.pendingUpdate {
     background: none !important;
     background-color: #d6dfc3 !important;
 }
+#toolbox .sub-nav li {
+    border: solid 1px black;
+    background-color: #d6dfc3;
+    margin-left: 0;
+    display: block;
+    width: 100%;
+    max-width: 130px;
+    margin: 5px 5px;
+    padding: 5px auto 5px auto;
+}
+#toolbox .sub-nav li a {
+    color: black;
+}
+
+@media only screen and (min-width: 40.063em) {
+    #toolbox .sub-nav li {
+        width: 130px;
+    }
+}
+select[name$="]"] {
+    width: 30%;
+}

diff --git a/Toolkit/Page.php b/Toolkit/Page.php
index 41eb93e..532e600 100755 (executable)
--- a/Toolkit/Page.php
+++ b/Toolkit/Page.php
@@ -579,10 +579,10 @@ class Toolkit_Page
         }
         $this->_navigationFactory->setGateway($this->_pageGateway);
         $this->mainNav = $this->_getMainNav($this->_catid);
-        $this->sideNav = $this->_getSideNav($this->_catid);
+        //$this->sideNav = $this->_getSideNav($this->_catid);
         $this->mobileNav = $this->_getMobileNavigation();
         if ($this->memberOnlyPage) {
-            //$this->memberOnlyNav = $this->getMemberOnlyNav();
+            $this->memberOnlyNav = $this->_getSideNav($this->_catid);
         }
 
         $this->newsletterAction = Toolkit_Template_Page::getSeoUrl(
@@ -619,6 +619,8 @@ class Toolkit_Page
             $this->glmSearchSite = GLM_SEARCH_SITE;
             $this->glmSearchLogin = GLM_SEARCH_LOGIN;
             $this->glmSearchKey = GLM_SEARCH_KEY;
+            $this->glmSearchFilterType = GLM_SEARCH_FILTER_TYPE;
+            $this->glmSearchFilterValue = GLM_SEARCH_FILTER_VALUE;
 
             // Check if GLMSearch page called
             if ($_REQUEST['GLMSearch'] == 'true') {
@@ -918,28 +920,49 @@ class Toolkit_Page
             $sideNavArray = $nav->getNavStructure(
                 $this->_pageGateway, $catid
             );
+            return $this->outputMemberSideNavigation($sideNavArray);
+            exit;
+
             return (!empty($sideNavArray))
                 ? $nav->renderPageNav($sideNavArray, 'tree')
                 : '';
         }
     }
 
-    public function getMemberOnlyNav()
+    public function outputMemberSideNavigation($nav, $level = 0)
     {
-        if ($catid == HOME_ID) {
+        static $urlFormat = '<a href="%s"%s>%s</a>';
+        if (!is_array($nav) || empty($nav)) {
             return;
+        }
+        if ($level == 0) {
+            $result = '<ul class="sub-nav" role="navigation" title="Members Only Area"><h3>Members</h3>';
         } else {
-            return true;
-            // side nav
-//            $nav
-//                = $this->_navigationFactory->createSideNav($this->_pageGateway);
-//            $sideNavArray = $nav->getNavStructure(
-//                $this->_pageGateway, $this->catid
-//            );
-//            return (!empty($sideNavArray))
-//                ? $nav->renderPageNav($sideNavArray, 'tree')
-//                : '';
+            //$result .= '<ul>';
         }
+        foreach ($nav as $iterator => $item) {
+            $itemClasses = $liClasses = array();
+            $itemClass = (!empty($liClasses)) ? ' class="'.implode(' ', $itemClasses).'"': '';
+            $link = sprintf(
+                $urlFormat,
+                $item['url'],
+                $itemClass,
+                $item['title']
+            );
+            if ($item['sub']) {
+                //$liClasses[] = 'has-dropdown';
+            }
+            $liClass = (!empty($liClasses)) ? ' class="'.implode(' ', $liClasses).'"': '';
+            $result .= "<li{$liClass} role=\"menuitem\">{$link}</li>\n";
+            if (!empty($item['sub'])) {
+                $result .= $this->outputMemberSideNavigation($item['sub'], $level + 1);
+            }
+
+        }
+        if ($level == 0) {
+            $result .= '</ul>';
+        }
+        return $result;
     }
 
     /**

diff --git a/templates/template.html b/templates/template.html
index 4efeef6..61c88b5 100755 (executable)
--- a/templates/template.html
+++ b/templates/template.html
@@ -188,10 +188,18 @@
                         </div>
                     </div>
                     <div class="row" flexy:if="!isHomePage">
+                        {if:memberOnlyNav}
+                        <div id="toolbox" class="small-12 large-2 columns">
+                            {memberOnlyNav:h}
+                        </div>
+                        <div class="small-12 large-10 columns">
+                            {toolboxContent:h}
+                        </div>
+                        {else:}
                         <div id="toolbox" class="small-12 columns">
-                            {if:memberOnlyNav}{memberOnlyNav:h}{end:}
                             {toolboxContent:h}
                         </div>
+                        {end:}
                     </div>
                     <div id="offer" class="row">
                         <div class="small-12 medium-4 columns text-center">