From 13d8da6f8a85f51fa81216ac2453b39465dc063c Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 31 Aug 2018 18:04:38 -0400
Subject: [PATCH] Off-canvas items no longer redirect, but open

---
 glm-member-db/views/front/members/list.html | 18 ++++++++++--------
 js/app.js                                   | 18 ++++++++++++++----
 js/custom/pageSetup.js                      | 18 ++++++++++++++----
 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index 12dd92a..ead5013 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -139,7 +139,7 @@
                     </p>
                 {/if} {*list_map_show_address*}
                 <div class="glm-member-list-info">
-                    <p>
+                    <p class="glm-member-list-map-info">
                         {if $m.phone && $settings.list_map_show_phone}<b>Phone:</b> {apply_filters('glm_associate_phone_filter', $m.phone)}<br>{/if}
                         {if $m.toll_free && $settings.list_map_show_tollfree}{apply_filters('glm_associate_phone_filter', $m.toll_free)}<br>{/if}
                         {if $m.url && $settings.list_map_show_url}<b>Web site:</b> <a href="{$m.url}"{if $settings.list_map_show_url_newtarget} target="_blank"{/if}>{$m.url}</a><br>{/if}
@@ -221,6 +221,8 @@
             </div>
             <br>
         {/if}
+        <br>
+        showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
     {/if}
 
 
@@ -376,7 +378,7 @@
                             {/if}
                         {/if}
                         {apply_filters('glm-member-db-front-members-list-linksBottom', '', $member.member_pointer)}
-                     </div>
+                    </div>
                     <div class="glm-member-db-socials">
                        {apply_filters('glm-member-db-front-members-social-list', '', $member.member_pointer)}
                     </div>
@@ -427,12 +429,12 @@
                  </div>
 
 
-                    <!-- Laury - This is the one that should go underneath all the address and description area -->
-                {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)}
-                {apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)}
-                </div>
-                 {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
-<!-- Member Description -->
+                        <!-- Laury - This is the one that should go underneath all the address and description area -->
+            {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)}
+            {apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)}
+            </div>
+            {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
+    <!-- Member Description -->
 
      {/foreach} {*$members*}
          </div>
diff --git a/js/app.js b/js/app.js
index 2cde5b1..a91dc98 100644
--- a/js/app.js
+++ b/js/app.js
@@ -11,13 +11,23 @@ var g=a(f(this.selector(c),a("<div></div>").html(c.attr("title")).html())),h=thi
 $(document).foundation();
 $(document).ready(function () {
 
+    const oc_menu           = $(".left-off-canvas-list");
+    const menu_items        = $(".left-off-canvas-list > ul > li.menu-item-has-children");
+    
+    menu_items.on("click", '> a', function (e) {
+        e.preventDefault();
+        $(this).toggleClass('open');
+        $(this).siblings('ul').toggleClass('open');
+        $(this).siblings('a.toggle').toggleClass('open');
+    });
+
     $('ul.children').each(function () {
         $(this).before('<a class="toggle" href="#"></a>');
     });
     $('a.toggle').click('click', function (e) {
-        e.preventDefault();
-        $(this).toggleClass('open');
-        $(this).siblings('ul').toggleClass('open');
+        // e.preventDefault();
+        // $(this).toggleClass('open');
+        // $(this).siblings('ul').toggleClass('open');
     });
     $('#glm-member-password-lost-link').click(function() {
         $('#glm-member-password-lost-form').show();
@@ -34,7 +44,7 @@ $(document).ready(function () {
         useEasing: true,
         useGrouping: true,
         separator: ',',
-        decimal: '.',
+        decimal: '.',   
     };
     $.fn.isInViewport = function(offset) {
         var elementTop      = $(this).offset().top;
diff --git a/js/custom/pageSetup.js b/js/custom/pageSetup.js
index 32f076e..e53b1e2 100644
--- a/js/custom/pageSetup.js
+++ b/js/custom/pageSetup.js
@@ -2,13 +2,23 @@
 $(document).foundation();
 $(document).ready(function () {
 
+    const oc_menu           = $(".left-off-canvas-list");
+    const menu_items        = $(".left-off-canvas-list > ul > li.menu-item-has-children");
+    
+    menu_items.on("click", '> a', function (e) {
+        e.preventDefault();
+        $(this).toggleClass('open');
+        $(this).siblings('ul').toggleClass('open');
+        $(this).siblings('a.toggle').toggleClass('open');
+    });
+
     $('ul.children').each(function () {
         $(this).before('<a class="toggle" href="#"></a>');
     });
     $('a.toggle').click('click', function (e) {
-        e.preventDefault();
-        $(this).toggleClass('open');
-        $(this).siblings('ul').toggleClass('open');
+        // e.preventDefault();
+        // $(this).toggleClass('open');
+        // $(this).siblings('ul').toggleClass('open');
     });
     $('#glm-member-password-lost-link').click(function() {
         $('#glm-member-password-lost-form').show();
@@ -25,7 +35,7 @@ $(document).ready(function () {
         useEasing: true,
         useGrouping: true,
         separator: ',',
-        decimal: '.',
+        decimal: '.',   
     };
     $.fn.isInViewport = function(offset) {
         var elementTop      = $(this).offset().top;
-- 
2.17.1