Members Only Section

Updates for the member only section
These will need to be merged into demo also.

diff --git a/Toolkit/Events/libjs/edit-event.js b/Toolkit/Events/libjs/edit-event.js
index 16be645..042592c 100644 (file)
--- a/Toolkit/Events/libjs/edit-event.js
+++ b/Toolkit/Events/libjs/edit-event.js
@@ -93,14 +93,14 @@ var Events =
        }
     },
     show_hide_reacur: function() {
-       if ($(":checkbox[name='reacur']").attr('checked')) {
+       if ($(":checkbox[name='reacur']").prop('checked')) {
                $(".recur-event").show();
        } else {
                $(".recur-event").hide();
        }
     },
     show_hide_recurr: function() {
-       if ($(":checkbox[name='recurr']").attr('checked')) {
+       if ($(":checkbox[name='recurr']").prop('checked')) {
                $(".recur-event").show();
        } else {
                $(".recur-event").hide();

diff --git a/Toolkit/Members/Events/CommonEditEvent.php b/Toolkit/Members/Events/CommonEditEvent.php
index 5bc0a42..4d10702 100644 (file)
--- a/Toolkit/Members/Events/CommonEditEvent.php
+++ b/Toolkit/Members/Events/CommonEditEvent.php
@@ -1411,7 +1411,8 @@ class Toolkit_Members_Events_CommonEditEvent
      */
     public function toHtml()
     {
-        $GLOBALS['topScripts'][] = JQUERY_CDN_JS;
+        $GLOBALS['styleSheets'][]   = JQUERY_UI_CDN_CSS;
+        $GLOBALS['topScripts'][]    = JQUERY_CDN_JS;
         $GLOBALS['bottomScripts'][] = MEDIA_APP_BASE_URL . 'libjs/textlimit.js';
         $baseSecureUrl
             = ($_SERVER['HTTPS'] == 'on')
@@ -1421,9 +1422,7 @@ class Toolkit_Members_Events_CommonEditEvent
             = ($_SERVER['HTTPS'] == 'on')
             ? GLM_APP_BASE_SECURE_URL
             : MEDIA_APP_BASE_URL;
-        $GLOBALS['topScripts'][]
-            = $appBaseSecureUrl
-            . 'libjs/jqueryui/1.8.13/js/jquery-ui-1.8.13.custom.min.js';
+        $GLOBALS['topScripts'][]  = JQUERY_UI_CDN_JS;
         $GLOBALS['topScripts'][] = CKEDITOR_JS.'';
 
         $this->setupRenderers();

diff --git a/Toolkit/Members/Events/EditEvent.php b/Toolkit/Members/Events/EditEvent.php
index e4c2127..17efd63 100755 (executable)
--- a/Toolkit/Members/Events/EditEvent.php
+++ b/Toolkit/Members/Events/EditEvent.php
@@ -1293,13 +1293,12 @@ class Toolkit_Members_Events_EditEvent
      */
     public function toHtml()
     {
-        $GLOBALS['topScripts'][] = JQUERY_CDN_JS;
-        $baseSecureUrl   = MEDIA_BASE_URL;
-        $appBaseSecueUrl = MEDIA_APP_BASE_URL;
-        $GLOBALS['topScripts'][]
-            = $appBaseSecueUrl
-            . 'libjs/jqueryui/1.8.13/js/jquery-ui-1.8.13.custom.min.js';
-        $GLOBALS['topScripts'][] = CKEDITOR_JS.'';
+        $GLOBALS['styleSheets'][] = JQUERY_UI_CDN_CSS;
+        $GLOBALS['topScripts'][]  = JQUERY_CDN_JS;
+        $baseSecureUrl            = MEDIA_BASE_URL;
+        $appBaseSecueUrl          = MEDIA_APP_BASE_URL;
+        $GLOBALS['topScripts'][]  = JQUERY_UI_CDN_JS;
+        $GLOBALS['topScripts'][]  = CKEDITOR_JS.'';
 
         $this->setupRenderers();
         if ($this->validate()) {

diff --git a/Toolkit/Members/MembersOnly/CommonEventsController.php b/Toolkit/Members/MembersOnly/CommonEventsController.php
index f8d219b..708c8ad 100644 (file)
--- a/Toolkit/Members/MembersOnly/CommonEventsController.php
+++ b/Toolkit/Members/MembersOnly/CommonEventsController.php
@@ -68,7 +68,8 @@ class Toolkit_Members_MembersOnly_CommonEventsController
         );
         $glmPage->isMemberOnlySection = true;
         $glmPage->fetchPage();
-
+        $GLOBALS['styleSheets'][]
+            = MEDIA_BASE_URL . 'Toolkit/Members/css/member-admin.css';
         $glmPage->toolboxContent->membersOnly = $eventContent;
         $baseSecureUrl
             = ($_SERVER['HTTPS'] == 'on')
@@ -82,9 +83,7 @@ class Toolkit_Members_MembersOnly_CommonEventsController
             = $baseSecureUrl . 'css/contactform.css';
         $GLOBALS['styleSheets'][]
             = $baseSecureUrl . 'Toolkit/Members/css/member-admin.css';
-        $GLOBALS['styleSheets'][]
-            = $appBaseSecueUrl
-            . 'libjs/jqueryui/1.8.13/development-bundle/themes/base/jquery.ui.all.css';
+        $GLOBALS['styleSheets'][] = JQUERY_UI_CDN_CSS;
 
         $glmPage->topScripts    = Toolkit_Common::getScripts($GLOBALS['topScripts']);
         $glmPage->bottomScripts = Toolkit_Common::getScripts($GLOBALS['bottomScripts']);
@@ -121,6 +120,7 @@ class Toolkit_Members_MembersOnly_CommonEventsController
                 <th>Status</th>
                 <th>Start</th>
                 <th>End</th>
+                <th>&nbsp;</th>
                     </tr>';
             foreach( $data as $row ){
                 $html .= '<tr>
@@ -143,6 +143,14 @@ class Toolkit_Members_MembersOnly_CommonEventsController
                     <td>
                         '.$row->getEnding().'
                     </td>
+                    <td>
+                        <div class="buttons">
+                            <a onclick="return(confirm(\'This will delete this Event! Are you sure?\'));"
+                            href="'.$this->page.'?rt=CommonEvents&amp;ac=deleteEvent&amp;id='.$row->getId().'">
+                            Delete
+                        </a>
+                        </div>
+                    </td>
                 </tr>';
             }
             $html .= '</table>';
@@ -152,6 +160,24 @@ class Toolkit_Members_MembersOnly_CommonEventsController
     }
 
     //  }}}
+    public function deleteEventAction()
+    {
+        $eventId = filter_var($_REQUEST['id'], FILTER_VALIDATE_INT);
+        if ($eventId) {
+            $eventMapper = new EventMapper(Toolkit_Database::getInstance());
+            $event       = $eventMapper->fetchEvent($eventId);
+            $member      = $event->getMember();
+            $html   = '<pre>'.print_r($event, true).'</pre>';
+            $html  .= '<pre>'.print_r($member, true).'</pre>';
+            $html  .= '<pre>'.print_r($this->registry->memberId, true).'</pre>';
+            if ($this->registry->memberId == $member) {
+                $eventMapper->deleteEvent($event);
+            }
+        }
+        header('Location: ' . MEDIA_BASE_URL
+            . '/members-only-area/?rt=CommonEvents&page_id=' . MEMBERS_EVENTS_PAGE);
+        exit;
+    }
     //  {{{ addEventAction()
     /**
      * Description of addEventAction()

diff --git a/Toolkit/Members/MembersOnly/CouponsController.php b/Toolkit/Members/MembersOnly/CouponsController.php
index 2bf4094..3bff68b 100644 (file)
--- a/Toolkit/Members/MembersOnly/CouponsController.php
+++ b/Toolkit/Members/MembersOnly/CouponsController.php
@@ -41,6 +41,8 @@ class Toolkit_Members_MembersOnly_CouponsController
      */
        private function _createPage($couponContent)
        {
+        $GLOBALS['styleSheets'][]
+            = MEDIA_BASE_URL . 'Toolkit/Members/css/member-admin.css';
                $breadCrumbsFactory = new Toolkit_BreadCrumbsFactory(
                        new Toolkit_Toolbox_PageGatewayPublishFactory(
                                $this->registry->dbh

diff --git a/Toolkit/Members/MembersOnly/EditProfileController.php b/Toolkit/Members/MembersOnly/EditProfileController.php
index 3e1d176..5aa83c5 100644 (file)
--- a/Toolkit/Members/MembersOnly/EditProfileController.php
+++ b/Toolkit/Members/MembersOnly/EditProfileController.php
@@ -39,6 +39,8 @@ class Toolkit_Members_MembersOnly_EditProfileController
      */
        public function indexAction()
        {
+        $GLOBALS['styleSheets'][]
+            = MEDIA_BASE_URL . 'Toolkit/Members/css/member-admin.css';
                $breadCrumbsFactory = new Toolkit_BreadCrumbsFactory(
                        new Toolkit_Toolbox_PageGatewayPublishFactory(
                                $this->registry->dbh

diff --git a/Toolkit/Members/MembersOnly/EventsController.php b/Toolkit/Members/MembersOnly/EventsController.php
index 333f85b..d0575ab 100644 (file)
--- a/Toolkit/Members/MembersOnly/EventsController.php
+++ b/Toolkit/Members/MembersOnly/EventsController.php
@@ -43,6 +43,8 @@ class Toolkit_Members_MembersOnly_EventsController
      */
        private function _createPage($eventContent)
        {
+        $GLOBALS['styleSheets'][]
+            = MEDIA_BASE_URL . 'Toolkit/Members/css/member-admin.css';
                $breadCrumbsFactory = new Toolkit_BreadCrumbsFactory(
                        new Toolkit_Toolbox_PageGatewayPublishFactory(
                                $this->registry->dbh
@@ -78,9 +80,7 @@ class Toolkit_Members_MembersOnly_EventsController
             = $baseSecureUrl . 'css/contactform.css';
         $GLOBALS['styleSheets'][]
             = $baseSecureUrl . 'Toolkit/Members/css/member-admin.css';
-        $GLOBALS['styleSheets'][]
-            = $appBaseSecueUrl
-            . 'libjs/jqueryui/1.8.13/development-bundle/themes/base/jquery.ui.all.css';
+        $GLOBALS['styleSheets'][] = JQUERY_UI_CDN_CSS;
 
                $glmPage->topScripts    = Toolkit_Common::getScripts($GLOBALS['topScripts']);
                $glmPage->bottomScripts = Toolkit_Common::getScripts($GLOBALS['bottomScripts']);

diff --git a/Toolkit/Members/MembersOnly/IndexController.php b/Toolkit/Members/MembersOnly/IndexController.php
index bef724c..4590a14 100644 (file)
--- a/Toolkit/Members/MembersOnly/IndexController.php
+++ b/Toolkit/Members/MembersOnly/IndexController.php
@@ -64,7 +64,8 @@ class Toolkit_Members_MembersOnly_IndexController
                //$glmPage->title = $toolbox->title();
 
                $glmPage->fetchPage();
-
+        $GLOBALS['styleSheets'][]
+            = MEDIA_BASE_URL . 'Toolkit/Members/css/member-admin.css';
                $glmPage->topScripts    = Toolkit_Common::getScripts($GLOBALS['topScripts']);
                $glmPage->bottomScripts = Toolkit_Common::getScripts($GLOBALS['bottomScripts']);
                $glmPage->styles        = Toolkit_Common::getStyleSheets();

diff --git a/Toolkit/Members/MembersOnly/LeadsController.php b/Toolkit/Members/MembersOnly/LeadsController.php
index 21893d8..c26c868 100644 (file)
--- a/Toolkit/Members/MembersOnly/LeadsController.php
+++ b/Toolkit/Members/MembersOnly/LeadsController.php
@@ -62,7 +62,8 @@ class Toolkit_Members_MembersOnly_LeadsController
                );
         $glmPage->isMemberOnlySection = true;
                $glmPage->fetchPage();
-
+        $GLOBALS['styleSheets'][]
+            = MEDIA_BASE_URL . 'Toolkit/Members/css/member-admin.css';
         // Export File Form
         $export = new Toolkit_Members_Leads_ExportFileForm(
             'file_export',

diff --git a/Toolkit/Members/MembersOnly/ReportsController.php b/Toolkit/Members/MembersOnly/ReportsController.php
index e6cee3e..0ea751f 100644 (file)
--- a/Toolkit/Members/MembersOnly/ReportsController.php
+++ b/Toolkit/Members/MembersOnly/ReportsController.php
@@ -63,7 +63,8 @@ class Toolkit_Members_MembersOnly_ReportsController
                //$glmPage->title = $toolbox->title();
 
                $glmPage->fetchPage();
-
+        $GLOBALS['styleSheets'][]
+            = MEDIA_BASE_URL . 'Toolkit/Members/css/member-admin.css';
                if (   defined('EXPOSURE_REPORTS_LIST')
                        && EXPOSURE_REPORTS_LIST
                ) {

diff --git a/templates/template.html b/templates/template.html
index b6b3537..73c6a4d 100755 (executable)
--- a/templates/template.html
+++ b/templates/template.html
@@ -131,9 +131,18 @@
             <!-- Content -->
             <div class="row collapse" id="main">
                 {if:isMemberOnlySection}
-                    {sideNav:h}
-                {end:}
+                <div id="subnav_wrapper" class="small-12 medium-2 columns right">
+                    <nav id="subnav">
+                        {sideNav:h}
+                    </nav>
+                </div>
+                <div class="small-12 medium-10 columns">
+                    <flexy:include src="toolbox.html">
+                </div>
+                {else:}
                 <flexy:include src="toolbox.html">
+                {end:}
+
               <!-- ######### /Placeholder content ######### -->
             </div>