From: Steve Sutton Date: Mon, 25 Aug 2014 19:10:39 +0000 (-0400) Subject: Use Foundation sub-nav X-Git-Tag: v1.1.30^2^2~6 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=aaffed71f911be6ba2589e56b79f3df50cc569b2;p=web%2FKeweenaw.git Use Foundation sub-nav fix leads form to use the jquery-ui datepicker instead of the calendar js that doesn't work with foundation. --- diff --git a/Toolkit/Members/Leads/ExportFileForm.php b/Toolkit/Members/Leads/ExportFileForm.php index 246c600..52bcdaf 100644 --- a/Toolkit/Members/Leads/ExportFileForm.php +++ b/Toolkit/Members/Leads/ExportFileForm.php @@ -30,7 +30,7 @@ class Toolkit_Members_Leads_ExportFileForm { /** * Description of $registeredRules - * + * * @var array * @access protected */ @@ -114,42 +114,18 @@ class Toolkit_Members_Leads_ExportFileForm 'display' => 'Dates' ); $e[] = array( - 'type' => 'date', - 'req' => true, - 'name' => 'start_date', + 'type' => 'text', + 'req' => true, + 'name' => 'start_date', 'display' => 'Start Date', - 'opts' => array( - 'format' => 'm / d / Y', - 'minYear' => 2010,//date('Y') - 5, - 'maxYear' => date('Y'), - 'addEmptyOption' => true, - 'emptyOptionValue' => '', - 'emptyOptionText' => array( - 'm' => 'mm', - 'd' => 'dd', - 'Y' => 'yyyy' - ), - ), - 'att' => array('id' =>'sdate'), + 'opts' => array('id' => 'sdate', 'readonly' => 'readonly') ); $e[] = array( - 'type' => 'date', - 'req' => true, - 'name' => 'end_date', + 'type' => 'text', + 'req' => true, + 'name' => 'end_date', 'display' => 'End Date', - 'opts' => array( - 'format' => 'm / d / Y', - 'minYear' => 2010,//date('Y') - 5, - 'maxYear' => date('Y'), - 'addEmptyOption' => true, - 'emptyOptionValue' => '', - 'emptyOptionText' => array( - 'm' => 'mm', - 'd' => 'dd', - 'Y' => 'yyyy' - ), - ), - 'att' => array('id' =>'edate'), + 'opts' => array('id' => 'edate', 'readonly' => 'readonly') ); $e[] = array( 'type' => 'header', @@ -285,10 +261,10 @@ class Toolkit_Members_Leads_ExportFileForm // }}} // {{{ getStoredQuery() - + /** * Get stored query - * + * * @return boolean|mixed * @access public * @throws PEAR_Error @@ -425,10 +401,10 @@ class Toolkit_Members_Leads_ExportFileForm // @codeCoverageIgnoreEnd // }}} // {{{ storeQuery() - + /** * Description for storeQuery() - * + * * @return void * @access public * @throws PEAR_Error @@ -454,7 +430,7 @@ class Toolkit_Members_Leads_ExportFileForm /** * Call the rendering function to get the form in a string - * + * * @param PDO $dbh PDO * * @access public @@ -463,12 +439,10 @@ class Toolkit_Members_Leads_ExportFileForm public function toHtml(PDO $dbh) { $this->setupRenderers(); - $GLOBALS['styleSheets'][] = MEDIA_APP_BASE_URL . 'libjs/Jscal/system.css'; - $GLOBALS['bottomScripts'][] = MEDIA_APP_BASE_URL . 'libjs/Jscal/utils.js'; - $GLOBALS['bottomScripts'][] = MEDIA_APP_BASE_URL . 'libjs/Jscal/calendar.js'; - $GLOBALS['bottomScripts'][] = MEDIA_APP_BASE_URL . 'libjs/Jscal/calendar-en.js'; - $GLOBALS['bottomScripts'][] = MEDIA_APP_BASE_URL . 'libjs/Jscal/calendar-setup.js'; - $GLOBALS['bottomScripts'][] = MEDIA_BASE_URL . 'Toolkit/Members/Leads/libjs/visitorLeads.js'; + $GLOBALS['styleSheets'][] = JQUERY_UI_CDN_CSS; + $GLOBALS['topScripts'][] = JQUERY_UI_CDN_JS; + $GLOBALS['bottomScripts'][] = MEDIA_BASE_URL + . 'Toolkit/Members/Leads/libjs/visitorLeads.js'; if ($this->validate()) { $export = new Toolkit_Members_Leads_ExportLeads($dbh); @@ -488,4 +462,3 @@ class Toolkit_Members_Leads_ExportFileForm // }}} } -?> diff --git a/Toolkit/Members/Leads/ExportLeads.php b/Toolkit/Members/Leads/ExportLeads.php index 32da058..6235978 100644 --- a/Toolkit/Members/Leads/ExportLeads.php +++ b/Toolkit/Members/Leads/ExportLeads.php @@ -110,8 +110,8 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder */ protected $noRecMessage = 'No Records'; /** - * Path to create the export file - * + * Path to create the export file + * * @var string * @access protected */ @@ -263,7 +263,7 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder * Microsoft Whim:( * * @param PDO $dbh PDO - * + * * @access public * @return boolean */ @@ -309,12 +309,12 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder // }}} // {{{ getDiscovery() - + /** * Description for getDiscovery() - * + * * @return array|mixed $return or Toolkit_Common - * @access public + * @access public */ function getDiscovery() { @@ -334,13 +334,13 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder } }// }}} // {{{ getInterest() - + /** * Description for getInterest() - * + * * @param PDO $dbh PDO - * - * @return array|mixed $return or Toolkit_Common + * + * @return array|mixed $return or Toolkit_Common * @access public */ function getInterest(PDO $dbh) @@ -374,7 +374,7 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder $sql = " SELECT id, create_date, fname, lname, company, address, address2, city, state, zip, phone, fax, email, - discover, interest + interest FROM contact"; if ( $_REQUEST['interest'] && is_array($_REQUEST['interest']) @@ -407,6 +407,14 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder $start_date = implode("/", $_REQUEST['start_date']); $end_date = implode("/", $_REQUEST['end_date']); $params[] = "create_date BETWEEN '{$start_date}'::date AND '{$end_date}'::date"; + } else { + $pattern = '/([0-9]{2})\/([0-9]{2})\/([0-9]{4})/'; + if (preg_match($pattern, $_REQUEST['start_date']) + && preg_match($pattern, $_REQUEST['end_date']) + ) { + $params[] = "create_date BETWEEN '{$_REQUEST['start_date']}'::date " + . "AND '{$_REQUEST['end_date']}'::date"; + } } $params[] = "members = true"; if (!empty($params)) { @@ -416,7 +424,7 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder $sql .= " AND (" . implode(" OR ", $params2). ")"; } $sql .= " ORDER BY id"; - //echo '

'.$sql.'

';exit; +// echo '

'.$sql.'

';exit; parent::setQuery($sql); } @@ -425,11 +433,11 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder /** * Description for _getDate() - * + * * @param mixed $key Description for key - * + * * @return string - * @throws RuntimeException + * @throws RuntimeException * @access private */ private function _getDate($key) @@ -450,10 +458,10 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder /** * Description for _getFieldIds() - * + * * @param mixed $key Key - * - * @return string|void + * + * @return string|void * @access private */ private function _getFieldIds($key) @@ -481,10 +489,10 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder /** * Get contact discover fields - * + * * @param int $total Description of $total * @param array $contact Description of $contact - * + * * @return array $discoverFields * @access private */ @@ -504,12 +512,12 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder /** * Get contact interest fields - * + * * @param int $total Description for $total * @param array $contact Description for $contact - * + * * @return array - * @access private + * @access private */ private function _getContactInterestFields($total, $contact) { @@ -526,12 +534,12 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder /** * Get contact discover values - * + * * @param array $contact Contact array * @param array $discover Discover array * @param array &$discoverValues Discover values - * - * @return void + * + * @return void * @access private */ private function _getContactDiscoverValues( @@ -551,11 +559,11 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder /** * Get contact interest values - * + * * @param array $contact Contact array * @param array $interest Interest array * @param array &$interestValues Interest values array - * + * * @return void * @access private */ @@ -572,12 +580,12 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder } // }}} - + /** * Set CSV path - * + * * @return void - * @access public + * @access public */ function setCsvPath() { @@ -592,7 +600,7 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder /** * returns a CSV file of the datagrid - * + * * @param PDO $dbh PDO * * @return string|boolean|mixed Mixed from Toolkit_Common @@ -609,17 +617,17 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder $stmt = $dbh->query($this->sql); while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) { // discovery part - if (!is_null($row['discover'])) { - $this->_getContactDiscoverValues( - $row, - $discover, - $discoverValues - ); - $numOfContactDisc = count($discoverValues[$row['id']]); - if ($numOfContactDisc > $totalDisc) { - $totalDisc = $numOfContactDisc; - } - } +// if (!is_null($row['discover'])) { +// $this->_getContactDiscoverValues( +// $row, +// $discover, +// $discoverValues +// ); +// $numOfContactDisc = count($discoverValues[$row['id']]); +// if ($numOfContactDisc > $totalDisc) { +// $totalDisc = $numOfContactDisc; +// } +// } if (!is_null($row['interest'])) { $this->_getContactInterestValues( $row, @@ -633,12 +641,12 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder } $data[$row['id']] = $row; } - $sdate = $this->_getDate('start_date'); - $edate = $this->_getDate('end_date'); +// $sdate = $row['start_date']; + $edate = $row['end_date']; $interests = $this->_getFieldIds('interest'); - $discover = $this->_getFieldIds('discover'); +// $discover = $this->_getFieldIds('discover'); - $hash = md5($sdate . $edate . $interests . $discover); + $hash = md5($sdate . $edate . $interests); $fname = $this->csvDirPath . "/$hash-" . time(); if (!$fh = fopen($fname, 'w')) { @@ -657,27 +665,27 @@ class Toolkit_Members_Leads_ExportLeads extends Toolkit_DataGridBuilder if (!$fileHeaders) { $fileHeaders = true; - $contactDiscoverHeaders = $this->_getContactDiscoverFields( - $totalDisc, - $discoverValues[$contactId] - ); +// $contactDiscoverHeaders = $this->_getContactDiscoverFields( +// $totalDisc, +// $discoverValues[$contactId] +// ); $contactInterestHeaders = $this->_getContactInterestFields( $totalInt, $interestValues[$contactId] ); fwrite($fh, '"' . implode('","', array_keys($row)) . '"'); - fwrite($fh, ',"' . implode('","', array_keys($contactDiscoverHeaders)) . '"'); +// fwrite($fh, ',"' . implode('","', array_keys($contactDiscoverHeaders)) . '"'); fwrite($fh, ',"' . implode('","', array_keys($contactInterestHeaders)) . '"'); fwrite($fh, "\n"); } fwrite($fh, '"' . implode('","', $row) . '"'); - $contactDiscoverValues = $this->_getContactDiscoverFields( - $totalDisc, - $discoverValues[$contactId] - ); - fwrite($fh, ',' . implode(',', $contactDiscoverValues)); +// $contactDiscoverValues = $this->_getContactDiscoverFields( +// $totalDisc, +// $discoverValues[$contactId] +// ); +// fwrite($fh, ',' . implode(',', $contactDiscoverValues)); $contactInterestValues = $this->_getContactInterestFields( $totalInt, $interestValues[$contactId] diff --git a/Toolkit/Members/Leads/libjs/visitorLeads.js b/Toolkit/Members/Leads/libjs/visitorLeads.js index cf6bb34..3f5aa5a 100644 --- a/Toolkit/Members/Leads/libjs/visitorLeads.js +++ b/Toolkit/Members/Leads/libjs/visitorLeads.js @@ -1,74 +1,66 @@ var Event = { - calendar: '//app.gaslightmedia.com/assets/icons/calendar.png', + calendar: '//app.gaslightmedia.com/assets/icons/calendar.png', + init: function() + { + if ($("#sdate").length > 0) { + $('#sdate').datepicker({ + altField: "#edate", + showOn: "both", + dateFormat: "mm/dd/yy", + buttonImage: Event.calendar, + buttonImageOnly: true, + buttonText: "Calendar" - init: function() - { - if ($('#sdate1').is('select')) { - Event.setupSDateCalendar(); - var fromCal = new Zapatec.Calendar.setup({ - weekNumbers : false, - ifFormat : '%m/%d/%Y', - button : 'startcal', - onUpdate : Event.updateFrom, - showsTime : false - }); - } + }); + $('#edate').datepicker({ + dateFormat: "mm/dd/yy", + showOn: "both", + buttonImage: Event.calendar, + buttonImageOnly: true, + buttonText: "Calendar" + }); + } + }, + updateFrom: function(cal) + { + var date = cal.date; + var month = date.getMonth() + 1; + var day = date.getDate(); + var year = date.getFullYear(); - if ($('#edate1').is('select')) { - Event.setupEDateCalendar(); - var toCal = new Zapatec.Calendar.setup({ - weekNumbers : false, - ifFormat : '%m/%d/%Y', - button : 'endcal', - onUpdate : Event.updateTo, - showsTime : false - }); - } - }, - - updateFrom: function(cal) - { - var date = cal.date; - var month = date.getMonth() + 1; - var day = date.getDate(); - var year = date.getFullYear(); - - $("#sdate1 option[value='"+month+"']").attr('selected', 'selected'); - $("#sdate2 option[value='"+day+"']").attr('selected', 'selected'); - $("#sdate3 option[value='"+year+"']").attr('selected', 'selected'); + $("#sdate1 option[value='" + month + "']").attr('selected', 'selected'); + $("#sdate2 option[value='" + day + "']").attr('selected', 'selected'); + $("#sdate3 option[value='" + year + "']").attr('selected', 'selected'); Event.updateTo(cal); - }, - - updateTo: function(cal) - { - var date = cal.date; - var month = date.getMonth() + 1; - var day = date.getDate(); - var year = date.getFullYear(); + }, + updateTo: function(cal) + { + var date = cal.date; + var month = date.getMonth() + 1; + var day = date.getDate(); + var year = date.getFullYear(); - $("#edate1 option[value='"+month+"']").attr('selected', 'selected'); - $("#edate2 option[value='"+day+"']").attr('selected', 'selected'); - $("#edate3 option[value='"+year+"']").attr('selected', 'selected'); - }, - - setupSDateCalendar: function() - { - var img = ' '; - $('#sdate3').after(img); + $("#edate1 option[value='" + month + "']").attr('selected', 'selected'); + $("#edate2 option[value='" + day + "']").attr('selected', 'selected'); + $("#edate3 option[value='" + year + "']").attr('selected', 'selected'); + }, + setupSDateCalendar: function() + { + var img = ' '; + $('#sdate3').after(img); //$("#startcal").css('display', 'inline'); - }, - - setupEDateCalendar: function() - { - var img = ' '; - $('#edate3').after(img); + }, + setupEDateCalendar: function() + { + var img = ' '; + $('#edate3').after(img); //$("#endcal").css('display', 'inline'); - } + } }; diff --git a/Toolkit/Members/MembersOnly/CommonEventsController.php b/Toolkit/Members/MembersOnly/CommonEventsController.php index 708c8ad..2cac9b2 100644 --- a/Toolkit/Members/MembersOnly/CommonEventsController.php +++ b/Toolkit/Members/MembersOnly/CommonEventsController.php @@ -154,6 +154,12 @@ class Toolkit_Members_MembersOnly_CommonEventsController '; } $html .= ''; + } else { + $html .= '
' + . '
' + . '

You currently have no events!

' + . '
' + . '
'; } $this->_createPage($html); diff --git a/Toolkit/Members/MembersOnly/Navigation/Side.php b/Toolkit/Members/MembersOnly/Navigation/Side.php index 249d968..3e35367 100644 --- a/Toolkit/Members/MembersOnly/Navigation/Side.php +++ b/Toolkit/Members/MembersOnly/Navigation/Side.php @@ -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 84a8ab5..975fe65 100755 --- a/Toolkit/Members/css/member-admin.css +++ b/Toolkit/Members/css/member-admin.css @@ -1047,4 +1047,32 @@ select[name^="btime"], select[name^="etime"] {width: 25% !important;} } #main ol ol ol ol { list-style: none; +} +input.hasDatepicker { + width: 85% !important; + float:left; +} + +#subNav { + background-color: #fff; + margin: 0; + padding: 0; +} +#subNav a { + color: #000; +} +#subNav dl { + display: block; + background-color: #dddfdd; + border-radius: 10px; +} +#subNav dd { + margin-left: 5px; +} +#subNav h2 { + width: 100%; + margin-top: 0; + margin-bottom: 20px; + clear: right; + color: #25c2e6; } \ No newline at end of file diff --git a/Toolkit/Page.php b/Toolkit/Page.php index 8e0e9f2..b51e86c 100755 --- a/Toolkit/Page.php +++ b/Toolkit/Page.php @@ -830,10 +830,8 @@ class Toolkit_Page $sideNavArray = $nav->getNavStructure( $this->_pageGateway, $catid ); -// echo '
'.print_r($sideNavArray, true).'
';exit; -// return $this->_arrayToListHTML( -// $sideNavArray, 0, 'side-nav' -// ); + return $this->outputMemberSideNavigation($sideNavArray); + exit; return (!empty($sideNavArray)) ? $nav->renderPageNav($sideNavArray, 'tree') @@ -841,6 +839,40 @@ class Toolkit_Page } } + public function outputMemberSideNavigation($nav, $level = 0) + { + static $urlFormat = '%s'; + if (!is_array($nav) || empty($nav)) { + return; + } + if ($level == 0) { + $result = '
'; + } else { + $result .= '
'; + } + 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 .= "{$link}\n"; + if (!empty($item['sub'])) { + $result .= $this->outputMemberSideNavigation($item['sub'], $level + 1); + } + + } + $result .= '
'; + return $result; + } + /** * Add Google Search module * diff --git a/styles.css b/styles.css index f9daedd..be82505 100644 --- a/styles.css +++ b/styles.css @@ -1384,4 +1384,4 @@ footer .copyright .separator { .header-content .content p, .bottom-content .content p { font-size: 10pt; -} +} \ No newline at end of file diff --git a/templates/template.html b/templates/template.html index 0d85f2a..cb31845 100755 --- a/templates/template.html +++ b/templates/template.html @@ -127,24 +127,27 @@ {end:} {end:} - + {if:isMemberOnlySection} + + {end:}
{if:isMemberOnlySection} - -
- -
+
+ +
{else:} -
- -
+
+ +
{end:} +