From e76225e949fcb6325391f28dcc56dc9ee51459e2 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Wed, 9 Aug 2017 15:17:49 -0400 Subject: [PATCH] GET variable used to get template for GLMA detail Glm associate list pages now have a parameter added to their link to detail pages, 'entity_template', which index.php will detect if set, and retrieve the entity_template if so. This way the member and event detail pages can still use the template of the list page they originate from. --- .../views/front/events/agenda.html | 32 +- .../views/front/events/list.html | 29 + glm-member-db/views/front/members/list.html | 617 ++++++++++++++++++ index.php | 14 +- js/transpiled/dist.js | 170 +++++ 5 files changed, 840 insertions(+), 22 deletions(-) create mode 100644 glm-member-db-events/views/front/events/list.html create mode 100644 glm-member-db/views/front/members/list.html create mode 100644 js/transpiled/dist.js diff --git a/glm-member-db-events/views/front/events/agenda.html b/glm-member-db-events/views/front/events/agenda.html index ad76461..86f0970 100644 --- a/glm-member-db-events/views/front/events/agenda.html +++ b/glm-member-db-events/views/front/events/agenda.html @@ -41,7 +41,7 @@ {if $rec.name && $rec.name != 'Imported' && $rec.name != 'Imported Event Schedule' } {$rec.name} {/if} - ( {if $event.times|@count > 1} Occurring {/if} + ( {if $event.times|@count > 1} Occurring {/if} {$rec.from_date.date} {if $rec.from_date.date != $rec.to_date.date} - {$rec.to_date.date} @@ -81,7 +81,7 @@ {if $event.image}{/if} {$event.intro}
- Read More + Read More
@@ -145,7 +145,7 @@ var custom_page = '{$customPage}'; var page_slug = '{$pageSlug}'; var retain_date; - + if(!member_id){ member_id = null; } @@ -156,7 +156,7 @@ var retain_date; var calCurrDate = $('#eventCalendar').fullCalendar('getView').start; var d = moment(calCurrDate).add(7, 'days').format('YYYY-MM-01'); - + return retain_date = d; } function in_mobile(){ @@ -166,7 +166,7 @@ return false; } } - + $('#glm-event-from').on("change", function(){ var from_date = $(this).val(); $('#glm-event-to').val(from_date); @@ -178,12 +178,12 @@ event_search.on('click', function(){ sessionStorage.override = 'yes'; }); - + if( sessionStorage.view && sessionStorage.override === 'no' && !in_mobile()){ view = sessionStorage.view; } else if( sessionStorage.override === 'yes' || in_mobile()){ view = 'agenda'; - } + } // AJAX FUNCTION ************************************************ // Get calendar month via AJAX @@ -262,16 +262,16 @@ handleWindowResize: true, lazyFetching: true, eventClick : function (event){ - + sessionStorage.current_calendar_view = get_current_view(); - - + + if(custom_page !== ''){ location.href = event.url + '&glm_event_from=' + event.start.format(); } else { location.href = event.url + '?glm_event_from=' + event.start.format(); } - + return false; }, eventLimit: true, @@ -314,7 +314,7 @@ } }); $(window).on("load", function(){ - + if(sessionStorage.current_calendar_view){ $('#event-date-toggle option').each(function(){ if( $(this).val() === sessionStorage.current_calendar_view){ @@ -324,10 +324,10 @@ } $('#event-date-toggle-container').insertAfter( $('.fc-left')).fadeTo('slow', 1); - + $('#event-date-toggle').on("change", function(){ var selected_date = $(this).val(); - + $('#eventCalendar').fullCalendar('gotoDate', selected_date); eventsCalMonthAJAX(month_obj); if(sessionStorage.current_calendar_view){ @@ -344,7 +344,7 @@ if(sessionStorage.current_calendar_view){ sessionStorage.current_calendar_view = ''; } - + eventsCalMonthAJAX(month_obj); }); @@ -357,7 +357,7 @@ } }); }); - + var dates = $(".agenda-event-recur-dates"); dates.each( function (){ if( $(this).text().indexOf('-') < 0 ){ diff --git a/glm-member-db-events/views/front/events/list.html b/glm-member-db-events/views/front/events/list.html new file mode 100644 index 0000000..6b21f1a --- /dev/null +++ b/glm-member-db-events/views/front/events/list.html @@ -0,0 +1,29 @@ +
+
+ {include file='front/events/searchForm.html'} + {include file='front/events/shortCuts.html'} +
+
+ {foreach $events as $event} +
+
+
{$event.dates}
+
+ {foreach $event.categories as $cat} + {$cat.name}:
+ {/foreach} + {$event.name} +
+
+ {if $event.ongoing} + Ongoing Event + {else} + Repeating Event + {/if} +
+
+
+
+ {/foreach} +
+
diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html new file mode 100644 index 0000000..7fbf734 --- /dev/null +++ b/glm-member-db/views/front/members/list.html @@ -0,0 +1,617 @@ +
+{include file='front/members/header.html'} + {apply_filters('glm-member-db-front-members-list-pageTop', '')} +
+ {if $settings.list_show_map} +
Map
+ {/if} + {if $settings.list_show_search} +
+
+ FILTERS +
+
+
Close
+
+
+ {apply_filters('glm-member-db-front-members-list-searchFormTop', '')} +
+

Refine Search

+
+ {if $settings.list_show_search_category} +
+ By Category: + + + +
+ {/if} + {if $settings.list_show_search_amenities} + {if $amenities|@count gt 0} +
+ By Amenities: + +
+ {/if} + {/if} + {if $settings.list_show_search_region} + {if $regions|@count gt 0} +
+ By Regions: + +
+ {/if} + {/if} + + {if $settings.list_show_search_text} +
+ By Name: +
+ {/if} +
+ {apply_filters('glm-member-db-front-members-list-searchFormBottom', '')} +
+
+
+
+ {/if} {*list_show_search*} + {if $settings.list_show_map} + + {apply_filters('glm-member-db-front-members-list-mapTop', '')} +
+
(map loads here)
+
+ {apply_filters('glm-member-db-front-members-list-mapBottom', '')} + {/if} + {apply_filters('glm-member-db-front-members-list-listHeaderTop', '')} + + + {if $settings.list_show_list && !$blankStart} + {if $settings.list_header_text} +

{$settings.list_header_text}

+ {else} +

List of {$terms.term_member_plur_cap}

+ {/if} + {if $haveMembers} + + + {foreach $mapItems as $m} +
+ {apply_filters('glm-member-db-front-members-list-mapBubbleTop', '', $m.member)} + {if $m.logo && $settings.list_map_show_logo} +
+ +
+ {/if} +
+ {if $settings.list_map_show_detaillink} + {$m.name} + {else} + {$m.name} + {/if} +
+ {if $settings.list_map_show_address} +

+ {if $settings.list_map_show_street} + {if $m.addr1}{$m.addr1}
{/if} + {if $m.addr2}{$m.addr2}
{/if} + {/if} + {if $settings.memb_info_location && $settings.list_map_show_citystatezip} + {if $m.city}{$m.city}{if $m.state}, {/if}{/if}{if $m.state}{$m.state}{/if}{if $m.zip} {$m.zip}{/if} + {/if} + {if $m.country && $settings.list_map_show_country} +
{$m.country} + {/if} +

+ {/if} {*list_map_show_address*} +
+

+ {if $m.phone && $settings.list_map_show_phone}Phone: {apply_filters('glm_associate_phone_filter', $m.phone)}
{/if} + {if $m.toll_free && $settings.list_map_show_tollfree}{apply_filters('glm_associate_phone_filter', $m.toll_free)}
{/if} + {if $m.url && $settings.list_map_show_url}Web site: {$m.url}
{/if} + {if $m.email && $settings.list_map_show_email}E-Mail Address: {$m.email}
{/if} + {if $m.region && $settings.list_map_show_region}Region: {$m.region}{/if} +

+ {if $m.descr && $settings.list_map_show_descr}{$m.descr|nl2br}
{/if} + {if $m.short_descr && $settings.list_map_show_short_descr}{$m.short_descr}
{/if} + {if $m.categories && $settings.list_map_show_categories} +
+ {$terms.term_member_cap} Categories +
    + {foreach $m.categories as $c} +
  • + {if $c.parent_name}{$c.parent_name}: {/if}{$c.name} +
  • + {/foreach} +
+
+ {/if} + + {if $settings.list_map_show_amenities} +
+ Amenities: +
    + {foreach $m.amenities as $a} +
  • {$a.name}
  • + {/foreach} +
+
+ {/if} +
+ {apply_filters('glm-member-db-front-members-list-mapBubbleBottom', '', $m.member)} +
+ {/foreach} + +
{$terms.term_member_plur_cap} found: {$membersFound}
+ + {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')} + + + +
+ {if $settings.list_show_search_alpha} + + {/if} + + {if $paging} +
+ Previous page + Next page +
+ showing {$start} through {$lastDisplayed} of {$filteredMembersFound} + {/if} + + + {if $view == grid} + + + + {else} + + + {foreach $members as $member} + {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)} +
+ {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)} + + +
+ {if $member.logo && $settings.list_show_logo} +
+
+ + {if $member.featured} + + {/if} + +
+
+ {/if} +
+ + {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $member.member_pointer)} +

+ {if $settings.list_show_detail_link} + {$member.member} + {else} + {$member.member} + {/if} +

+ {if $settings.list_show_address} +
+ {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $member.member_pointer)} + {if $settings.list_show_street} + {if $member.addr1 && $settings.list_show_address}
{$member.addr1}
{/if} + {if $member.addr2 && $settings.list_show_address}
{$member.addr2}
{/if} + {/if} + {if $settings.memb_info_location && $settings.list_show_citystatezip} +
+ {if $member.city} + {$member.city}{if $member.state.value}, {/if} + {/if} + {if $member.state.value} + {$member.state.value} + {/if} + {if $member.zip} + {$member.zip} + {/if} +
+ {/if} + {if $member.country.name && $settings.list_show_country} +
{$member.country.name}
+ {/if} + {apply_filters('glm-member-db-front-members-list-memberAddressBottom', '', $member.member_pointer)} +
+ {/if} + {apply_filters('glm-member-db-front-members-list-memberDetailTop', '', $member.member_pointer)} + {if ($settings.memb_info_contact && $member.phone && $settings.list_show_phone) || ($settings.memb_info_contact && $member.toll_free && $settings.list_show_tollfree)} +
+ {if $member.phone && $settings.list_show_phone}Phone: {apply_filters('glm_associate_phone_filter', $member.phone)} {/if} + {if $member.toll_free && $settings.list_show_tollfree}{apply_filters('glm_associate_phone_filter', $member.toll_free)}{/if} +
+ {/if} + {if $settings.memb_info_location && $member.region && $settings.list_show_region}
Region: {$member.region}
{/if} + + +
+ {apply_filters('glm-member-db-front-members-social-list', '', $member.member_pointer)} +
+ +
+
+ {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $member.member_pointer)} + {if $member.short_descr && $settings.list_show_short_descr} + {$member.short_descr|nl2br} + {if $settings.list_show_detail_link} + More + {/if} + {/if} + {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $member.member_pointer)} +
+ {if $member.categories && $settings.list_show_categories} +
+ {$terms.term_member_cap} Categories +
    + {foreach $member.categories as $c} +
  • + {if $c.parent_name}{$c.parent_name}: {/if}{$c.name} +
  • + {/foreach} +
+ {/if} + {if $member.cc_type && $settings.list_show_creditcards} + Credit Cards Accepted: +
    + {foreach $member.cc_type.names as $c} +
  • {$c}
  • + {/foreach} +
+ {/if} + {if $member.amenities && $settings.list_show_amenities} + {$terms.term_member_cap} Amenities +
    + {foreach $member.amenities as $A} +
  • + {$A.name} +
  • + {/foreach} +
+ {/if} +
+
+ {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $member.member_pointer)} +
+ + + + {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)} + {apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)} +
+ {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)} + + + {/foreach} {*$members*} +
+ + {/if} {*end grid view check*} + + {if $paging} +
+ Previous page + Next page +
+ showing {$start} through {$lastDisplayed} of {$filteredMembersFound} + {/if} + + {apply_filters('glm-member-db-front-members-list-pageBottom', '')} + {else} +
(no {$terms.term_member_plur} listed)
+ {/if} + + {/if} {*list_show_list*} + + +
+
+{include file='front/footer.html'} diff --git a/index.php b/index.php index 5341725..44862cb 100644 --- a/index.php +++ b/index.php @@ -2,15 +2,17 @@ diff --git a/js/transpiled/dist.js b/js/transpiled/dist.js new file mode 100644 index 0000000..f0f5e2b --- /dev/null +++ b/js/transpiled/dist.js @@ -0,0 +1,170 @@ +'use strict'; + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +// Load foundation +/*jshint esversion: 6 */ + +jQuery(document).ready(function ($) { + 'use strict'; + + $(document).foundation(); + + $('ul.children').each(function () { + $(this).before(''); + }); + $('a.toggle').click('click', function () { + $(this).toggleClass('open'); + $(this).siblings('ul').toggleClass('open'); + }); + // $('.top-bar-left').find('ul.menu.vertical').each(function (){ + // var menuImg = $(this).parent('li').prop('id'); + // var menuNum = menuImg.match(/\d+/)[0]; + // var menuImgSrc = 'img_for_menu_' + menuNum; + // if (window['img_for_menu_' + menuNum]) { + // $(this).find('li.image-placeholder').html(''); + // } else { + // $(this).find('li.image-placeholder').parent('ul').addClass('no-image-subul'); + // $(this).find('li.image-placeholder').remove(); + // } + // //console.log('ul = ' + menuImg); + // //console.log('menu-id = ' + menuNum); + // }); + + var test = function test() { + _classCallCheck(this, test); + }; + + ; + // cached element to use in js / jquery dom manipulation + var page = $("body"); + var svg = page.find('svg'); + var search_member = page.find('#member-categories'); + var search_input = page.find(".site-search"); + var main_search_btn = page.find('.topbar-search-button'); + var dropdown_search = page.find('.dropdown-search'); + var search_close = page.find(".topbar-search-close"); + var dropdown_button = page.find('.dropdown-search-button'); + var off_canvas = page.find(".off-canvas"); + var password_form = page.find("#glm-member-password-lost-form"); + var password_link = page.find("#glm-member-password-lost-link"); + + var current_off_canvas = $('.off-canvas .current-menu-item'); + var current_menu = current_off_canvas.find('.menu'); + current_menu.addClass('open'); + + // page.find($('.top-bar-left')).find('.main-nav').find('li:eq(0)').before($('.map')); + // $('li.map').css({ + // "display": "block", + // 'float': 'left' + // }); + + // page.find('.map').hover( function(){ + // $(this).addClass('is-active'); + // $(this).find($('.map-ul')).addClass("js-dropdown-active"); + // }, function(){ + // var self = this; + // $(self).find($('.map-ul')).removeClass("js-dropdown-active"); + // $(this).removeClass('is-active'); + // }); + + // hover effects for svg text + // $(svg).find('text').hover( function(){ + // $(this).prev().css('fill', '#1E3D67'); + // $(this).css({ + // "stroke": "white", + // "fill": "white" + // }); + // }, function(){ + // $(this).prev().css('fill', 'white'); + // $(this).css({ + // "stroke": "#1E3D67", + // "fill": "#1E3D67" + // }); + // }); + // + // // hover effects for svg rect + // $(svg).find('.tag').hover( function(){ + // $(this).css('fill', '#1E3D67'); + // $(this).next().css({ + // "stroke": "white", + // "fill": "white" + // }); + // }, function(){ + // $(this).css('fill', 'white'); + // $(this).next().css({ + // "stroke": "#1E3D67", + // "fill": "#1E3D67" + // }); + // }); + + // weather widget hover effect + $('#activate-weather').mouseover(function () { + $('#weather-widget').slideDown(); + }).mouseout(function () { + $('#weather-widget').slideUp(); + }); + + // search dropdown animations + $(main_search_btn).on("click", function () { + $(dropdown_search).slideDown(); + $(search_close).animate({ + opacity: 1 + }, 500); + }); + $(search_close).on("click", function () { + $(dropdown_search).slideUp(); + $(this).animate({ + opacity: 0 + }, 500); + }); + + // disable member dropdown if text is in the search box + $(search_input).on("keyup change", function () { + var checker = $.trim($(this).val()).length === 0; + $(search_member).attr('disabled', !checker); + + if ($(search_member).attr('disabled')) { + dropdown_button.css("display", "none"); + } else { + dropdown_button.css("display", "block"); + } + }); + + // strip br tags from the off canvas sidemenu item titles + off_canvas.find('ul').find('li').each(function () { + $(this).children("a").html(function (i, oldHTML) { + return oldHTML.replace(/
/g, ' '); + }); + }); + + password_link.on("click", function () { + password_form.toggle("slow", function () {}); + }); + + $('.ui-datepicker-trigger').insertBefore("#check_in"); + $('
').insertAfter("#check_in"); + + // adjust the offset of the sticky header(s) for page target scrolling using #div anchors + if ($(window).width() > 1023) { + $("#main-content a[href^='#']").on('click', function (e) { + e.preventDefault(); + if ($("#header-content").hasClass("is-stuck")) { + $('html, body').animate({ + scrollTop: $(this.hash).offset().top - $('#header-content').height() + }, 400); + } else if ($("#header-content").hasClass("is-at-top") || !$("#header-content").hasClass("is-at-top is-stuck")) { + $('html, body').animate({ + scrollTop: $(this.hash).offset().top - ($('#header-content').height() - $("#roof").height()) + }, 400); + } + }); + } + + var chamber_header = $("#chamber").children(".side-menu").children("h1"); + chamber_header.each(function () { + if ($(this).text().match(/Economic Development/)) { + $(this).css('font-size', '1.9rem'); + } + }); +}); \ No newline at end of file -- 2.17.1