View changes for grid, list and detail
authorlaury <laury@gaslightmedia.com>
Mon, 16 May 2016 12:58:43 +0000 (08:58 -0400)
committerlaury <laury@gaslightmedia.com>
Mon, 16 May 2016 12:58:43 +0000 (08:58 -0400)
css/front.css
models/admin/management/index.php
models/front/members/detail.php
setup/hooksHelp.html
views/front/members/detail.html
views/front/members/grid.html
views/front/members/list.html

index 7acdc9b..aac7710 100644 (file)
@@ -82,7 +82,7 @@
     text-decoration: none;
     text-transform: none;
     line-height: 1.2;
-    padding-top: 10px;
+    padding: 15px;
 }
 #glm-member-list-map-toggle {
     background-color: lightgrey;
     margin-bottom: 0;
     height: 0;
 }
-.glm-member-list-sub-links {
-    color: black;
-}
 .glm-member-db-list-grid-view li.glm-member-list-record {
     padding: 20px 10px;
 }
-
+.glm-member-db-border-wrap {
+    border: 1px solid #e1e1e1;
+}
 .glm-member-db-list-grid-view .glm-member-list-image-wrapper {
-    border-radius: 4px;
-    border: 1px solid lightgrey;
     position: relative;
     display: block;
     overflow: hidden;
     background-repeat: no-repeat;
     background-size: contain;
 }
+.glm-member-list-sub-links {
+    color: black;
+    height: 50px;
+    padding: 15px;
+    width: 100%;
+}
 .glm-member-list-sub-links > a {
     display: block;
     float: left;
     max-width: 100%;
     height: auto;
 }
+.glm-member-db-list-view .glm-member-list-image {
+    width: 100%;
+}
 .glm-member-db-list-grid-view .glm-member-list-image {
     position: absolute;
     width: 100%;
     border-top-right-radius: 5px;
 }
 .glm-member-list-nameAddress {
+}
+.glm-member-detail-images-thumb {
+    width: 100%;
+}
+.glm-member-detail-image .visible-img {
+    
 }
 .glm-member-list-info {
     clear: both;
     padding: 0;
     overflow: hidden;
 }
+.glm-member-db-list-view .glm-member-list-image-wrapper {
+    height: 250px;
+}
 .glm-member-list-active-info .glm-member-title a {
     text-decoration: underline;
 }
     text-align: center;
     padding: 15px;
 }
-#glm-member-detail-website-link a:before {
+#glm-member-detail-website-link:before {
     //content: url("../assets/offsite-link_wht.png");
     background-image: url("../assets/offsite-link_wht.png");
     background-repeat: no-repeat;
         padding: 0;
     }
 }
-#glm-member-detail-images-container img {
+/*#glm-member-detail-images-container img {
     width: 100%;
-}
+}*/
 .glm-member-button,
 input[type="submit"].glm-member-button {
     padding: 10px 20px;
@@ -510,6 +525,9 @@ input[type="submit"].glm-member-button {
     background: white none repeat scroll 0 0;
     margin-bottom: 5px;
 }
+.glm-member-list-container {
+    padding: 0;
+}
 #glm-member-detail-container {
     background: white none repeat scroll 0 0;
     margin: 20px 0 0;
@@ -631,6 +649,9 @@ input[type="submit"].glm-member-button {
 .glm-member-detail-sub-data-links {
     padding: 10px;
 }
+#glm-member-detail-container .glm-map {
+    height: 250px;
+}
 /*
  * Member Detail End
  */
@@ -702,6 +723,17 @@ input[type="submit"].glm-member-button {
 #glm-member-detail-list-links {
     margin: 10px 0;
 }
+.glm-member-db-list-view .glm-member-list-links #glm-member-list-website-link:before {
+    //content: url("../assets/offsite-link_wht.png");
+    background-image: url("../assets/offsite-link_blk.png");
+    background-repeat: no-repeat;
+    background-size: contain;
+    content: " ";
+    display: inline-block;
+    height: 12px;
+    margin-right: 6px;
+    width: 12px;
+}
 .glm-member-list-links a,
 #glm-member-detail-list-links a {
     display: inline;
index e7ce21a..fef2b24 100644 (file)
@@ -100,6 +100,7 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
     {
         $settingsUpdated = false;
         $settingsUpdateError = false;
+        $requiredPagesUpdateError = false;
 
         // General settings are always stored in a record with ID=1.
         $id = 1;
index a3f31f0..af403bf 100644 (file)
@@ -58,6 +58,7 @@ require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberInfo.php');
  * option, which is to display the members dashboard.
  *
  */
+
 class GlmMembersFront_members_detail extends GlmDataMemberInfo
 {
 
@@ -98,7 +99,10 @@ class GlmMembersFront_members_detail extends GlmDataMemberInfo
         parent::__construct(false, false);
 
     }
-
+    
+    public function fancybox_scripts(){
+        
+    }
     /*
      * Perform Model Action
      *
@@ -135,6 +139,15 @@ class GlmMembersFront_members_detail extends GlmDataMemberInfo
      */
     public function modelAction ($actionData = false)
     {
+        wp_enqueue_style('fancyStyle', GLM_MEMBERS_PLUGIN_URL . 'css/fancybox/jquery.fancybox.css');
+        wp_enqueue_style('fancyStyleButtons', GLM_MEMBERS_PLUGIN_URL . 'css/fancybox/jquery.fancybox-buttons.css');
+        wp_enqueue_style('fancyStyleThumbs', GLM_MEMBERS_PLUGIN_URL . 'css/fancybox/jquery.fancybox-thumbs.css');
+        
+        wp_enqueue_script('fancyScript', GLM_MEMBERS_PLUGIN_URL . 'js/fancybox/jquery.fancybox.js', array('jquery'), '', true );
+        wp_enqueue_script('fancyMouse', GLM_MEMBERS_PLUGIN_URL . 'js/fancybox/jquery.mousewheel-3.0.6.pack.js', array('jquery'), '', true );
+        wp_enqueue_script('fancyThumbs', GLM_MEMBERS_PLUGIN_URL . 'js/fancybox/jquery.fancybox-thumbs.js', array('jquery'), '', true );
+        wp_enqueue_script('fancyButtons', GLM_MEMBERS_PLUGIN_URL . 'js/fancybox/jquery.fancybox-buttons.js', array('jquery'), '', true );
+        wp_enqueue_script('fancyMedia', GLM_MEMBERS_PLUGIN_URL . 'js/fancybox/jquery.fancybox-media.js', array('jquery'), '', true );
 
         $where = '';
         $haveMember = false;
@@ -294,4 +307,4 @@ class GlmMembersFront_members_detail extends GlmDataMemberInfo
 
 }
 
-?>
\ No newline at end of file
+?>
index 42d21ab..e64b366 100644 (file)
@@ -572,6 +572,13 @@ public function glmMembersAddTabForMembers($addOnTabs)
             <td>
             </td>
         </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-descriptionBefore</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
         <tr>
             <td>glm-member-db-front-members-detail-descriptionTop</td>
             <td>Filter</td>
@@ -586,6 +593,20 @@ public function glmMembersAddTabForMembers($addOnTabs)
             <td>
             </td>
         </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-descriptionAfter</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-galleryBefore</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
         <tr>
             <td>glm-member-db-front-members-detail-galleryTop</td>
             <td>Filter</td>
@@ -600,6 +621,102 @@ public function glmMembersAddTabForMembers($addOnTabs)
             <td>
             </td>
         </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-galleryAfter</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-imagesBefore</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-imagesAfter</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
+        </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-amenitiesBefore</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-amenitiesAfter</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
+        </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-creditcardsBefore</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-creditcardsAfter</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
+        </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-eventsBefore</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-eventsAfter</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
+        </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-packagingBefore</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-packagingAfter</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
+        </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-categoriesBefore</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
+        <tr>
+            <td>glm-member-db-front-members-detail-categoriesAfter</td>
+            <td>Filter</td>
+            <td>$memberID</td>
+            <td>
+            </td>
+        </tr>
         <tr>
             <td>glm-member-db-front-members-detail-pageBottom</td>
             <td>Filter</td>
index 12e65d1..04dd830 100644 (file)
                         <img CLASS="glm-member-list-image-left" src="{$glmPluginMediaUrl}/images/{$settings.detail_logo_size}/{$member.logo}">
                 </div>
                 {/if}
-                <div id="glm-member-detail-website-link" class="small-12 button glm-button">{if $member.url && $settings.detail_show_url}
-                    <a href="{$member.url}"{if $settings.detail_show_url_newtarget} target="_blank"{/if}>Visit Website</a>{/if}
-                </div>
+                {if $member.url && $settings.detail_show_url}
+                    <a id="glm-member-detail-website-link" class="small-12 button glm-button" href="{$member.url}"{if $settings.detail_show_url_newtarget} target="_blank"{/if}>Visit Website</a>
+                    {/if}
+                
                 <div id="glm-member-detail-contact-info">
     <!-- Member name, address, and basic information -->                    
     
                         </div>
                     </div>
                     {apply_filters('glm-member-db-front-members-detail-descriptionAfter', '', $member.id)}
+                    {apply_filters('glm-member-db-front-members-detail-imageGalleryBefore', '', $member.id)}
                     {if $settings.detail_show_imagegallery && $haveImageGallery}
                     <div id="glm-member-detail-images-toggle" class="glm-member-detail-content-toggle">Photos</div>
                     <div id="glm-member-detail-images-container" class="glm-member-detail-content-data small-12">
                         {apply_filters('glm-member-db-front-members-detail-galleryTop', '', $member.id)}
 <!--                        <h2>Photo Gallery</h2>-->
 
-                            <ul class="clearing-thumbs small-block-grid-1 medium-block-grid-2 large-block-grid-3" data-clearing>
+                            <ul class="small-block-grid-1 medium-block-grid-2 large-block-grid-3">
                         {foreach $imageGallery as $i}
-                                <li><a href="{$glmPluginMediaUrl}/images/large/{$i.file_name}"><img data-caption="{$i.caption}" src="{$glmPluginMediaUrl}/images/small/{$i.file_name}"></a></li>
+                                <li><a class="glm-member-detail-images-thumb" href="{$glmPluginMediaUrl}/images/large/{$i.file_name}"><img data-caption="{$i.caption}" src="{$glmPluginMediaUrl}/images/small/{$i.file_name}"></a></li>
                         {/foreach}
                             </ul>
                         {apply_filters('glm-member-db-front-members-detail-galleryBottom', '', $member.id)}
                         </div>
                     </div>    
                     {/if}
+                    {apply_filters('glm-member-db-front-members-detail-imageGalleryAfter', '', $member.id)}
+                    {apply_filters('glm-member-db-front-members-detail-couponsBefore', '', $member.id)}
+                    {if $settings.detail_show_coupons && $coupons}
+                    <div id="glm-member-detail-coupons-toggle" class="glm-member-detail-content-toggle">Coupons</div>
+                    <div id="glm-member-detail-coupons-container" class="glm-member-detail-content-data small-12">
+                        <a name="glm-member-detail-coupons"></a>
+                        <div class="glm-member-detail-sub-data-links row">
+                            <a class="left glm-member-detail-content-toggle">Collapse</a>
+                            <a class="right link-to-top">Back to top</a>
+                        </div>
+                    </div>
+                    {/if}
+                    {apply_filters('glm-member-db-front-members-detail-couponsAfter', '', $member.id)}
+                    {apply_filters('glm-member-db-front-members-detail-amenitiesBefore', '', $member.id)}
                     {if $member.amenities && $settings.detail_show_amenities}
                     <div id="glm-member-detail-amenities-toggle" class="glm-member-detail-content-toggle">Amenities & Services</div>
                     <div id="glm-member-detail-amenities-container" class="glm-member-detail-content-data small-12">
                         <table class="glm-member-detail-table">
-<!--                            <tr><th>Amenities & Services</th></tr>-->
                             {foreach $member.amenities as $a}
                             <tr>
                                 <td>
                         </div>
                     </div>
                     {/if}
-
+                    {apply_filters('glm-member-db-front-members-detail-amenitiesAfter', '', $member.id)}
+                    {apply_filters('glm-member-db-front-members-detail-creditcardsBefore', '', $member.id)}
                     {if $member.cc_type && $settings.detail_show_creditcards}
                     <div id="glm-member-detail-creditcards-toggle" class="glm-member-detail-content-toggle">Credit Cards</div>
                     <div id="glm-member-detail-creditcards-container" class="glm-member-detail-content-data small-12">
                         </div>
                     </div>
                     {/if}
-                    
+                    {apply_filters('glm-member-db-front-members-detail-creditcardsAfter', '', $member.id)}
+                    {apply_filters('glm-member-db-front-members-detail-categoriesBefore', '', $member.id)}
                     {if $member.categories && $settings.detail_show_categories}
                     <div id="glm-member-detail-categories-toggle" class="glm-member-detail-content-toggle">Categories</div>
                     <div id="glm-member-detail-categories-container" class="glm-member-detail-content-data small-12">
                         </div>
                     </div>
                     {/if}
-
-                    {if $settings.detail_show_coupons && $coupons}
-                    <div id="glm-member-detail-coupons-toggle" class="glm-member-detail-content-toggle">Coupons</div>
-                    <div id="glm-member-detail-coupons-container" class="glm-member-detail-content-data small-12">
-                        <a name="glm-member-detail-coupons"></a>
-                        <div class="glm-member-detail-sub-data-links row">
-                            <a class="left glm-member-detail-content-toggle">Collapse</a>
-                            <a class="right link-to-top">Back to top</a>
-                        </div>
-                    </div>
-                    {/if}
-
+                    {apply_filters('glm-member-db-front-members-detail-categoriesAfter', '', $member.id)}
+                    
                     {apply_filters('glm-member-db-front-members-detail-dataBottom','',$member.id)}
                 </div>
             </div>
         {apply_filters('glm-member-db-front-members-detail-jqueryScriptTop', '', $member.id)}
         
         jQuery(document).ready(function($) {
+            
+            $("a.glm-member-detail-images-thumb").fancybox({
+                'arrows': true,   
+            });
 
         $('.link-to-top').click(function () {
             $('body,html').animate({
             var mapOverflow = 'hidden';
             var mapBtnTxt = 'view map';
             if ($(mapC).height() == 0) {
-                mapNewH = 200;
+                mapNewH = 250;
                 mapV = 'visible';
                 mapBtnTxt = 'hide map'
             }
             $(mapC).animate({
                 overflow: mapOverflow,
                 height: mapNewH
-            }, 200, "swing", function() {
+            }, 250, "swing", function() {
 
             });
             $(this).html(mapBtnTxt);
index 6141d31..c47aba3 100644 (file)
         </div>
         {apply_filters('glm-member-db-front-members-list-mapBottom', '')}
     {/if}
-{apply_filters('glm-member-db-front-members-list-listHeaderTop', '')}
+    {apply_filters('glm-member-db-front-members-list-listHeaderTop', '')}
     <div class="glm-member-list-inner-wrapper">
-    {if $settings.list_show_map}
-        <div id="glm-member-list-map-toggle" class="button glm-button">Map</div>
-    {/if}
-    {if $settings.list_show_search}
-    <div id="glm-member-list-filters-wrapper">
-        <div id="glm-member-list-filters-button" class="button glm-button glm-member-list-filters-toggle">
-            FILTERS
-        </div>
-        <div id="glm-member-list-filters-box">
-            <div id="glm-member-list-filters-close" class="button glm-button glm-member-list-filters-toggle">Close</div> 
-            <form action="{$thisUrl}?glm_action=list" method="post" enctype="multipart/form-data">
-                <div class="small-12 columns glm-member-search glm-member-entry-container glm-member-container">
-                    {apply_filters('glm-member-db-front-members-list-searchFormTop', '')}
-                    <div>
-                        <h3>Filter {$terms.term_member_cap}s</h3>
-                    </div>
-                    {if $settings.list_show_search_category}
+        {if $settings.list_show_map}
+            <div id="glm-member-list-map-toggle" class="button glm-button">Map</div>
+        {/if}
+        {if $settings.list_show_search}
+        <div id="glm-member-list-filters-wrapper">
+            <div id="glm-member-list-filters-button" class="button glm-button glm-member-list-filters-toggle">
+                FILTERS
+            </div>
+            <div id="glm-member-list-filters-box">
+                <div id="glm-member-list-filters-close" class="button glm-button glm-member-list-filters-toggle">Close</div> 
+                <form action="{$thisUrl}?glm_action=list" method="post" enctype="multipart/form-data">
+                    <div class="small-12 columns glm-member-search glm-member-entry-container glm-member-container">
+                        {apply_filters('glm-member-db-front-members-list-searchFormTop', '')}
                         <div>
-                            {$terms.term_member_cap} Category:
-                            <select name="categorySearch" id="categorySelect">
-                            {if !$singleCategory}
-                                <option value="">(all)</option>
-                            {/if}
-                            {foreach from=$categories item=v}
-                                <option value="{$v.id}"{if $v.default} selected="selected"{/if}>
-                                    {if $v.parent}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
-                                </option>
-                            {/foreach}
-                            </select>
+                            <h3>Filter {$terms.term_member_cap}s</h3>
                         </div>
-                    {/if}
-                    {if $settings.list_show_search_amenities}
-                        <div>
-                            {$terms.term_member_cap} Amenity:
-                            <select name="amenitySearch" id="amenitySelect">
-                                <option value=""></option>
-                                {foreach from=$amenities item=v}
-                                    <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
-                                        {$v.name}
+                        {if $settings.list_show_search_category}
+                            <div>
+                                {$terms.term_member_cap} Category:
+                                <select name="categorySearch" id="categorySelect">
+                                {if !$singleCategory}
+                                    <option value="">(all)</option>
+                                {/if}
+                                {foreach from=$categories item=v}
+                                    <option value="{$v.id}"{if $v.default} selected="selected"{/if}>
+                                        {if $v.parent}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
                                     </option>
                                 {/foreach}
-                            </select>
-                        </div>
-                    {/if}
-
-                    {if $settings.list_show_search_text}
-                        <div>
-                            Text Search: <input type="text" name="textSearch" value="{$textSearch}" class="glm-form-text-input">
-                        </div>
-                    {/if}
-                    <div><input class="button glm-member-button centered" type="submit" value="Search"></div>
-                    {apply_filters('glm-member-db-front-members-list-searchFormBottom', '')}
-                </div>
-            </form>
-        </div> <!-- glm-member-list-filters-box -->
-    </div> <!-- glm-member-list-wrapper -->
-    {/if} {*list_show_search*}
-    
-    <div class="glm-member-list-listing-container">
-        
-    {if $settings.list_show_list && !$blankStart}
-        <h3>List of {$terms.term_member_plur_cap}</h3>
-        {if $haveMembers}
-
-            {if $settings.list_show_search_alpha}
-                <div class="glm-alpha-links">
-                    <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSelected}" class="glm-alpha-link{if !$alphaSelected} glm-alpha-link-selected{/if}">All</a>
-                    {foreach $alphaList as $a}
-                        <a href="{$thisUrl}?glm_action=list&alpha={$a.alpha}&textSearch={$textSearch}&categorySearch={$catSelected}" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
-                    {/foreach}
-                </div>
-            {/if}
-        {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')}
-
-        <!-- Member information displayed in list -->
-
-        <ul class="small-block-grid-1 medium-block-grid-2 large-block-grid-3">
-        {foreach $members as $m}
-            <li class="glm-member-list-record">
-                <div class="glm-member-list-image-border">
-                {apply_filters('glm-member-db-front-members-list-memberAbove', '', $m.id)}
-
-                    {if $settings.list_show_detail_link}
-                        <a class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">
-                    {/if}
-                    {if $m.logo && $settings.list_show_logo}<div class=".glm-member-list-image-empty">
-                        <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/grid/{$m.logo}">
-                        <img class="glm-member-filler-image" src="{$assetsUrl}/filler_s.gif">
-                        </div>
-                    {else}
-                        <div class="glm-member-list-image-empty">
-                            <img class="glm-member-filler-image" src="{$assetsUrl}/filler_s.gif">
-                        </div>
-                    {/if}
-                    {if $settings.list_show_detail_link}
-                        </a>
-                    {/if}   
-                </div> <!-- end of div.glm-member-list-record-border -->
-                <h4 class="glm-member-title">
-                    {if $settings.list_show_detail_link}
-                        <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">
-                            {$m.member}
-                        </a>
-                    {else}
-                        {$m.member}
-                    {/if}
-
-                </h4>
-
-                <div class="glm-member-list-sub-links">
-                    {if $m.url && $settings.list_show_url}<a href="{$m.url}"{if $settings.list_show_url_newtarget} target="_blank"{/if}>Website</a>{/if}
-                    {if $m.phone && $settings.list_map_show_phone}<a href="tel:+{$m.phone}">Phone</a>{/if}
-                    <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">More</a>
-                    {apply_filters('glm-member-db-front-members-list-memberBelow', '', $m.id)}
-                </div>
-                <!-- Member information displayed in map bubbles -->
-                <div id="map_info_{$m.id}" class="glm-hidden">
-                    {apply_filters('glm-member-db-front-members-list-mapBubbleTop', '', $m.id)}
-                    {if $m.logo && $settings.list_map_show_logo}
-                        <div class="glm-member-list-image">
-                            <img src="{$glmPluginMediaUrl}/images/{$settings.list_map_logo_size}/{$m.logo}">
-                        </div>
-                    {/if}
-                    <div class="glm-map-member-name">
-                        {if $settings.list_map_show_detaillink}
-                            <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">{$m.member}</a>
-                        {else}
-                            {$m.member}
-                        {/if}
-                    </div>
-                    {if $settings.list_map_show_address}
-                        <p class="glm-map-member-address">
-                            {if $settings.list_map_show_street}
-                                {if $m.addr1}{$m.addr1}<br>{/if}
-                                {if $m.addr2}{$m.addr2}<br>{/if}
-                            {/if}
-                            {if $settings.list_map_show_citystatezip}
-                                {if $m.city}{$m.city}{if $m.state.value}, {/if}{/if}{if $m.state.value}{$m.state.value}{/if}{if $m.zip} {$m.zip}{/if}
-                            {/if}
-                            {if $m.country.name && $settings.list_map_show_country}
-                                <br>{$m.country.name}
-                            {/if}
-                        </p>
-                    {/if} {*list_map_show_address*}
-                    <div class="glm-member-list-info">
-                        <p>
-                            {if $m.phone && $settings.list_map_show_phone}<b>Phone:</b> {$m.phone}<br>{/if}
-                            {if $m.toll_free && $settings.list_map_show_tollfree}<b>Toll Free:</b> {$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}
-                            {if $m.email && $settings.list_map_show_email}<b>E-Mail Address:</b> <a href="mailto:{$m.email}">{$m.email}</a><br>{/if}
-                            {if $m.region && $settings.list_map_show_region}<b>Region:</b> {$m.region}{/if}
-                        </p>
-                        {if $m.descr && $settings.list_map_show_descr}{$m.descr|nl2br}<br>{/if}
-                        {if $m.short_descr && $settings.list_map_show_short_descr}{$m.short_descr}<br>{/if}
-                        {if $m.categories && $settings.list_map_show_categories}
-                            <div class="glm-member-list-items">
-                                <b>{$terms.term_member_cap} Categories</b>
-                                <ul>
-                                {foreach $m.categories as $c}
-                                    <li>
-                                        {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
-                                    </li>
-                                {/foreach}
-                                </ul>
+                                </select>
                             </div>
                         {/if}
-                        {if $m.cc_type && $settings.list_map_show_creditcards}
-                            <div class="glm-member-list-items">
-                                <b>Credit Cards Accepted:</b>
-                                <ul>
-                                {foreach $m.cc_type.names as $c}
-                                    <li>{$c}</li>
-                                {/foreach}
-                                </ul>
+                        {if $settings.list_show_search_amenities}
+                            <div>
+                                {$terms.term_member_cap} Amenity:
+                                <select name="amenitySearch" id="amenitySelect">
+                                    <option value=""></option>
+                                    {foreach from=$amenities item=v}
+                                        <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
+                                            {$v.name}
+                                        </option>
+                                    {/foreach}
+                                </select>
                             </div>
                         {/if}
-                        {if $settings.list_map_show_amenities}
-                            <div class="glm-member-list-items">
-                                <b>Amenities:</b>
-                                <ul>
-                                {foreach $m.amenities as $a}
-                                    <li>{$a.name}</li>
-                                {/foreach}
-                                </ul>
+
+                        {if $settings.list_show_search_text}
+                            <div>
+                                Text Search: <input type="text" name="textSearch" value="{$textSearch}" class="glm-form-text-input">
                             </div>
                         {/if}
+                        <div><input class="button glm-member-button centered" type="submit" value="Search"></div>
+                        {apply_filters('glm-member-db-front-members-list-searchFormBottom', '')}
                     </div>
-                    {apply_filters('glm-member-db-front-members-list-mapBubbleBottom', '', $m.id)}
-                </div> <!-- End of information displayed in map bubbles -->
-            </li> <!-- end of li.glm-member-list-record -->
+                </form>
+            </div> <!-- glm-member-list-filters-box -->
+        </div> <!-- glm-member-list-wrapper -->
+        {/if} {*list_show_search*}
+
+        <div class="glm-member-list-listing-container">
+            {if $settings.list_show_list && !$blankStart}
+                <h3>List of {$terms.term_member_plur_cap}</h3>
+                {if $haveMembers}
 
+                    {if $settings.list_show_search_alpha}
+                        <div class="glm-alpha-links">
+                            <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSelected}" class="glm-alpha-link{if !$alphaSelected} glm-alpha-link-selected{/if}">All</a>
+                            {foreach $alphaList as $a}
+                                <a href="{$thisUrl}?glm_action=list&alpha={$a.alpha}&textSearch={$textSearch}&categorySearch={$catSelected}" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
+                            {/foreach}
+                        </div>
+                    {/if}
+                    {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')}
 
-        {/foreach} {*$members*}
-        {apply_filters('glm-member-db-front-members-list-pageBottom', '')}
-    {else}
-        <div>(no {$terms.term_member_plur} listed)</div>
-    {/if}
+            <!-- Member information displayed in list -->
 
+                    <ul class="small-block-grid-1 medium-block-grid-2 large-block-grid-3">
+                    {foreach $members as $m}
+                        <li class="glm-member-list-record">
+                            <div class="glm-member-db-border-wrap">
+                                <div>
+                                    {apply_filters('glm-member-db-front-members-list-memberAbove', '', $m.id)}
+
+                                    {if $settings.list_show_detail_link}
+                                        <a class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">
+                                    {/if}
+                                    {if $m.logo && $settings.list_show_logo}<div class=".glm-member-list-image-empty">
+                                        <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/grid/{$m.logo}">
+                                        <img class="glm-member-filler-image" src="{$assetsUrl}/filler_s.gif">
+                                        </div>
+                                    {else}
+                                    <div class="glm-member-list-image-empty">
+                                        <img class="glm-member-filler-image" src="{$assetsUrl}/filler_s.gif">
+                                    </div>
+                                    {/if}
+                                    {if $settings.list_show_detail_link}
+                                        </a>
+                                    {/if}   
+                                </div> <!-- end of div.glm-member-list-record-border -->
+                                <h4 class="glm-member-title">
+                                    {if $settings.list_show_detail_link}
+                                        <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">
+                                            {$m.member}
+                                        </a>
+                                    {else}
+                                        {$m.member}
+                                    {/if}
+
+                                </h4>
+
+                                <div class="glm-member-list-sub-links">
+                                    {if $m.url && $settings.list_show_url}<a href="{$m.url}"{if $settings.list_show_url_newtarget} target="_blank"{/if}>Website</a>{/if}
+                                    {if $m.phone && $settings.list_map_show_phone}<a href="tel:+{$m.phone}">Phone</a>{/if}
+                                    <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">More</a>
+                                    {apply_filters('glm-member-db-front-members-list-memberBelow', '', $m.id)}
+                                </div>
+
+                                <!-- Member information displayed in map bubbles -->
+                                <div id="map_info_{$m.id}" class="glm-hidden">
+                                    {apply_filters('glm-member-db-front-members-list-mapBubbleTop', '', $m.id)}
+                                    {if $m.logo && $settings.list_map_show_logo}
+                                        <div class="glm-member-list-image">
+                                            <img src="{$glmPluginMediaUrl}/images/{$settings.list_map_logo_size}/{$m.logo}">
+                                        </div>
+                                    {/if}
+                                    <div class="glm-map-member-name">
+                                        {if $settings.list_map_show_detaillink}
+                                            <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">{$m.member}</a>
+                                        {else}
+                                            {$m.member}
+                                        {/if}
+                                    </div>
+                                    {if $settings.list_map_show_address}
+                                        <p class="glm-map-member-address">
+                                            {if $settings.list_map_show_street}
+                                                {if $m.addr1}{$m.addr1}<br>{/if}
+                                                {if $m.addr2}{$m.addr2}<br>{/if}
+                                            {/if}
+                                            {if $settings.list_map_show_citystatezip}
+                                                {if $m.city}{$m.city}{if $m.state.value}, {/if}{/if}{if $m.state.value}{$m.state.value}{/if}{if $m.zip} {$m.zip}{/if}
+                                            {/if}
+                                            {if $m.country.name && $settings.list_map_show_country}
+                                                <br>{$m.country.name}
+                                            {/if}
+                                        </p>
+                                    {/if} {*list_map_show_address*}
+                                    <div class="glm-member-list-info">
+                                        <p>
+                                            {if $m.phone && $settings.list_map_show_phone}<b>Phone:</b> {$m.phone}<br>{/if}
+                                            {if $m.toll_free && $settings.list_map_show_tollfree}<b>Toll Free:</b> {$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}
+                                            {if $m.email && $settings.list_map_show_email}<b>E-Mail Address:</b> <a href="mailto:{$m.email}">{$m.email}</a><br>{/if}
+                                            {if $m.region && $settings.list_map_show_region}<b>Region:</b> {$m.region}{/if}
+                                        </p>
+                                        {if $m.descr && $settings.list_map_show_descr}{$m.descr|nl2br}<br>{/if}
+                                        {if $m.short_descr && $settings.list_map_show_short_descr}{$m.short_descr}<br>{/if}
+                                        {if $m.categories && $settings.list_map_show_categories}
+                                            <div class="glm-member-list-items">
+                                                <b>{$terms.term_member_cap} Categories</b>
+                                                <ul>
+                                                {foreach $m.categories as $c}
+                                                    <li>
+                                                        {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
+                                                    </li>
+                                                {/foreach}
+                                                </ul>
+                                            </div>
+                                        {/if}
+                                        {if $m.cc_type && $settings.list_map_show_creditcards}
+                                            <div class="glm-member-list-items">
+                                                <b>Credit Cards Accepted:</b>
+                                                <ul>
+                                                {foreach $m.cc_type.names as $c}
+                                                    <li>{$c}</li>
+                                                {/foreach}
+                                                </ul>
+                                            </div>
+                                        {/if}
+                                        {if $settings.list_map_show_amenities}
+                                            <div class="glm-member-list-items">
+                                                <b>Amenities:</b>
+                                                <ul>
+                                                {foreach $m.amenities as $a}
+                                                    <li>{$a.name}</li>
+                                                {/foreach}
+                                                </ul>
+                                            </div>
+                                        {/if}
+                                    </div>
+                                    {apply_filters('glm-member-db-front-members-list-mapBubbleBottom', '', $m.id)}
+                                </div> <!-- End of information displayed in map bubbles -->
+                            </div> <!-- End of glm-member-db-border-wrap -->
+                        </li> <!-- end of li.glm-member-list-record -->
+
+
+            {/foreach} {*$members*}
+            {apply_filters('glm-member-db-front-members-list-pageBottom', '')}
+        {else}
+                <div>(no {$terms.term_member_plur} listed)</div>
+        {/if}
+
+                </ul>
+        </div>
+    </div>
+</div>
     {/if} {*list_show_list*}
     <script type="text/javascript">
         jQuery(document).ready(function($) {
             {/if}
         });
             </script>
-            </ul>
-        </div>
-    </div>
-</div>
     {include file='front/footer.html'}
index 08756cb..5867b34 100644 (file)
@@ -6,14 +6,13 @@
 <div id="testdiv">---testdiv---{if $settings.view.value}$settings.view.value{else}{$settings}{/if}---testdiv---</div>
         <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
 
-{if $settings.list_show_map}
+    {if $settings.list_show_map}
         {apply_filters('glm-member-db-front-members-list-mapTop', '')}
         <div id="glm-locationMap-container">
             <div id="glm-locationMap" class="glm-map">(map loads here)</div>
         </div>
         {apply_filters('glm-member-db-front-members-list-mapBottom', '')}
-{/if}
-    <div class="glm-member-list-inner-wrapper">
+    {/if}
     {if $settings.list_show_map}
         <div id="glm-member-list-map-toggle" class="button glm-button">Map</div>
     {/if}
          <div class="row">
              <div class="glm-member-list-container glm-member-container small-12 columns">
                 {apply_filters('glm-member-db-front-members-list-memberTop', '', $m.id)}
-                <div class="row">
                  <!-- Member Logo - Medium and up-->
+                 
                 {if $m.logo && $settings.list_show_logo}
-                    <div class="glm-member-list-image-wrapper small-12 medium-4 columns">
-                        <div class="glm-member-list-image-border">
-                           <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$m.logo}">
- <!--                            <img class="glm-member-list-image left" src="http://placehold.it/500x300">-->
+                    <div class="glm-member-list-image-wrapper right small-12 medium-4 columns">
+                        <div class="glm-member-list-image-border" style="background: url('{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$m.logo}') no-repeat; background-size: cover; background-position: center center; height: 250px;">
                         </div>
                    </div>
-                     <div class="glm-member-list-active-info small-12 medium-4 columns">
-                {else}
-                     <div class="glm-member-list-image-wrapper small-12 medium-4 columns"><br></div>
-                     <div class="glm-member-list-active-info small-12 medium-4 columns">
                 {/if}
+                    <div class="glm-member-list-data small-12 medium-8 columns">
+                     <div class="glm-member-list-active-info small-12 columns">
  <!-- Member name, address, and basic information -->
                     {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $m.id)}
                     <h4 class="glm-member-title">
-          {if $settings.list_show_detail_link}
-                        <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">{$m.member}</a>
-
-          {else}
-                        {$m.member}
-          {/if}
+                        {if $settings.list_show_detail_link}
+                            <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">{$m.member}</a>
+                        {else}
+                            {$m.member}
+                        {/if}
                     </h4>
-              {if $settings.list_show_address}
-                    {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $m.id)}
-                  {if $settings.list_show_street}
-                  {if $m.addr1 && $settings.list_show_address}<div>{$m.addr1}</div>{/if}
-                  {if $m.addr2 && $settings.list_show_addr2}<div>{$m.addr2}</div>{/if}
-                  {/if}
-                  {if $settings.list_show_citystatezip}
-                  {if $m.city}<span>{$m.city}</span>{if $m.state.value}, {/if}{/if}<span>{if $m.state.value}{$m.state.value}</span>{/if}{if $m.zip} {$m.zip}{/if}
-                  {/if}
-                  {if $m.country.name && $settings.list_show_country}<div>{$m.country.name}</div>{/if}
-                  {apply_filters('glm-member-db-front-members-list-memberAddressBottom', '', $m.id)}
-              {/if}
+                    {if $settings.list_show_address}
+                        {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $m.id)}
+                        {if $settings.list_show_street}
+                            {if $m.addr1 && $settings.list_show_address}<span>{$m.addr1}</span>{/if}
+                            {if $m.addr2 && $settings.list_show_addr2}<span>{$m.addr2}</span>{/if}
+                        {/if}
+                        {if $settings.list_show_citystatezip}
+                            {if $m.city}<span>{$m.city}</span>{if $m.state.value}, {/if}{/if}<span>{if $m.state.value}{$m.state.value}</span>{/if}{if $m.zip} {$m.zip}{/if}
+                        {/if}
+                        {if $m.country.name && $settings.list_show_country}<div>{$m.country.name}</div>{/if}
+                        {apply_filters('glm-member-db-front-members-list-memberAddressBottom', '', $m.id)}
+                    {/if}
                     {apply_filters('glm-member-db-front-members-list-memberDetailTop', '', $m.id)}
                     {if $m.phone && $settings.list_show_phone}<div>Phone: {$m.phone}</div>{/if}
                     {if $m.toll_free && $settings.list_show_tollfree}<div><b>Toll Free:</b> {$m.toll_free}</div>{/if}
                     {if $m.region && $settings.list_show_region}<div><b>Region:</b> {$m.region}</div>{/if}
 
                     <div class="glm-member-list-links"><br>
-                        {if $m.url && $settings.list_show_url}<a href="{$m.url}"{if $settings.list_show_url_newtarget} target="_blank"{/if}>Website</a>{/if}
+                        {if $m.url && $settings.list_show_url}<a id='glm-member-list-website-link' href="{$m.url}"{if $settings.list_show_url_newtarget} target="_blank"{/if}>Website</a>{/if}
                         {if $m.email && $settings.list_show_email}<a href="mailto:{$m.email}">Email</a>{/if}
                      </div>
                     {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $m.id)}
                  </div>
-                <div class="glm-member-list-description small-12 medium-4 left columns">
+
+                <div class="glm-member-list-description small-12 columns">
                     <div>
                     {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $m.id)}
                     {if $m.short_descr && $settings.list_show_short_descr}
                      {/if}
                     {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $m.id)}
                     </div>
-                {if $m.categories && $settings.list_show_categories}
-                        <div class="glm-member-list-items">
-                             <b>{$terms.term_member_cap} Categories</b>
-                             <ul>
-                    {foreach $m.categories as $c}
-                                 <li>
-                                     {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
-                                 </li>
-                    {/foreach}
-                             </ul>
-                {/if}
-                {if $m.cc_type && $settings.list_show_creditcards}
-                             <b>Credit Cards Accepted:</b>
-                             <ul>
-                    {foreach $m.cc_type.names as $c}
-                                 <li>{$c}</li>
-                    {/foreach}
-                             </ul>
-                {/if}
-                {if $m.amenities && $settings.list_show_amenities}
-                            <b>{$terms.term_member_cap} Amenities</b>
-                             <ul>
-                    {foreach $m.amenities as $A}
+                    {if $m.categories && $settings.list_show_categories}
+                    <div class="glm-member-list-items">
+                        <b>{$terms.term_member_cap} Categories</b>
+                        <ul>
+                            {foreach $m.categories as $c}
+                                <li>
+                                    {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
+                                </li>
+                            {/foreach}
+                        </ul>
+                    {/if}
+                    {if $m.cc_type && $settings.list_show_creditcards}
+                        <b>Credit Cards Accepted:</b>
+                        <ul>
+                            {foreach $m.cc_type.names as $c}
+                                <li>{$c}</li>
+                            {/foreach}
+                        </ul>
+                    {/if}
+                    {if $m.amenities && $settings.list_show_amenities}
+                        <b>{$terms.term_member_cap} Amenities</b>
+                        <ul>
+                            {foreach $m.amenities as $A}
                                 <li>
                                     {$A.name}
                                 </li>
-                    {/foreach}
-                             </ul>
-                {/if}
-                    </div>
+                            {/foreach}
+                        </ul>
+                    {/if}
                     </div>
+                </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', '', $m.id)}
-
-                    {apply_filters('glm-member-db-front-members-list-memberBottom', '', $m.id)}
-                 </div>
+                {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $m.id)}
+                {apply_filters('glm-member-db-front-members-list-memberBottom', '', $m.id)}
+                </div>
                  {apply_filters('glm-member-db-front-members-list-memberBelow', '', $m.id)}
 <!-- Member Description -->
         </div>