From 3dbf0f7ee070a15822806e4903da505c254dcbee Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 9 Mar 2016 11:17:34 -0500
Subject: [PATCH] Clean up detail, states abbreviations rather than full names

---
 css/front.css                   |  3 +-
 views/front/members/detail.html | 87 ++++++++++++---------------------
 views/front/members/list.html   |  4 +-
 3 files changed, 36 insertions(+), 58 deletions(-)

diff --git a/css/front.css b/css/front.css
index 7af1f075..fc78dd39 100644
--- a/css/front.css
+++ b/css/front.css
@@ -42,6 +42,7 @@
     background: #f5f5f5;
     margin: .4em 0px .4em 0px;
 }
+#glm-directions,
 .glm-member-entry-container.glm-member-search {
     margin-top: 0;
 }
@@ -83,7 +84,7 @@
     overflow: hidden;
 }
 .glm-member-list-active-info .glm-member-title a {
-        text-decoration: underline;
+    text-decoration: underline;
 }
 .glm-member-list-active-info {
     padding: 15px;
diff --git a/views/front/members/detail.html b/views/front/members/detail.html
index 2c7a0927..d4169ea2 100644
--- a/views/front/members/detail.html
+++ b/views/front/members/detail.html
@@ -63,7 +63,7 @@
                       {if $member.addr2}<div>{$member.addr2}</div>{/if}
                       {/if}
                       {if $settings.detail_show_citystatezip}
-                      {if $member.city}<span>{$member.city}</span>{if $member.state.name}, {/if}{/if}<span>{if $member.state.name}{$member.state.name}</span>{/if}{if $member.zip} {$member.zip}{/if}
+                      {if $member.city}<span>{$member.city}</span>{if $member.state.value}, {/if}{/if}<span>{if $member.state.value}{$member.state.value}</span>{/if}{if $member.zip} {$member.zip}{/if}
                       {/if} 
                       {if $member.country.name && $settings.detail_show_country}<div>{$member.country.name}</div>{/if}
                       {apply_filters('glm-member-db-front-members-detail-addressBottom', '', $member.id)}
@@ -74,17 +74,16 @@
                     {if $member.region && $settings.detail_show_region}<div><b>Region:</b> {$member.region}</div>{/if}
                     <div></div>
                     {apply_filters('glm-member-db-front-members-detail-otherDetailBottom', '', $member.id)}
-                    <div id="glm-member-detail-social">
+<!--                    <div id="glm-member-detail-social">
                         <a href="#" target="_blank"><img src="{$baseUrl}/assets/blog.png"></a>
                         <a href="http://www.blogger.com" target="_blank"><img src="{$baseUrl}/assets/blogger.png"></a>
                         <a href="http://www.facebook.com" target="_blank"><img src="{$baseUrl}/assets/facebook.png"></a>
                         <a href="http://www.twitter.com" target="_blank"><img src="{$baseUrl}/assets/twitter.png"></a>
-                    </div>
+                    </div>-->
                     <div id="glm-member-detail-list-links">
                         {apply_filters('glm-member-db-front-members-detail-linksTop', '', $member.id)}
                         {if $member.url && $settings.detail_show_url}<a href="{$member.url}"{if $settings.detail_show_url_newtarget} target="_blank"{/if}>Website</a>{/if}
                         {if $member.email && $settings.detail_show_email}<a href="mailto:{$member.email}">Email</a>{/if}
-                        {if $settings.detail_show_imagegallery && $haveImageGallery}<a href="#glm-member-detail-images">Photo Gallery</a>{/if}
                         {if $settings.detail_show_coupons && $coupons}<a href="#glm-member-detail-coupons">Coupons</a>{/if}
                         {apply_filters('glm-member-db-front-members-detail-linksBottom', '', $member.id)}
                     </div>
@@ -108,12 +107,12 @@
                         <th><b>Member Info</b></th>
                         <tr><td id="glm-member-detail-fullprofile-button">Full profile</td></tr>
                         <tr><td id="glm-member-detail-description-button" class="selected">Description</td></tr>
-                        {if $member.amenities && $settings.detail_show_amenities}
-                        <tr><td id="glm-member-detail-amenities-button">Amenities & Services</td></tr>
-                        {/if}
                         {if $settings.detail_show_imagegallery && $haveImageGallery}
                         <tr><td id="glm-member-detail-images-button">Image Gallery</td></tr>
                         {/if}
+                        {if $member.amenities && $settings.detail_show_amenities}
+                        <tr><td id="glm-member-detail-amenities-button">Amenities & Services</td></tr>
+                        {/if}
                         {if $member.cc_type && $settings.detail_show_creditcards}
                         <tr><td id="glm-member-detail-creditcards-button">Accepted Credit Cards</td></tr>
                         {/if}
@@ -136,6 +135,22 @@
 			</div>
                     </div>
                     {apply_filters('glm-member-db-front-members-detail-descriptionAfter', '', $member.id)}
+                    {if $settings.detail_show_imagegallery && $haveImageGallery}
+                    <div id="glm-member-detail-images-container" class="small-12">
+                        {apply_filters('glm-member-db-front-members-detail-galleryTop', '', $member.id)}
+                        <a name="glm-member-detail-images-container"></a>
+                        <h2>Photo Gallery</h2>
+
+                        <div class="small-12 columns">
+                            <ul class="clearing-thumbs small-block-grid-2 medium-block-grid-3 large-block-grid-4" data-clearing>
+                        {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>
+                        {/foreach}
+                            </ul>
+                        </div>
+                        {apply_filters('glm-member-db-front-members-detail-galleryBottom', '', $member.id)}
+                    </div>    
+                    {/if}
                     {if $member.amenities && $settings.detail_show_amenities}
                     <div id="glm-member-detail-amenities-container" class="small-12 medium-9">
                         <table class="glm-member-detail-table">
@@ -185,22 +200,6 @@
                     </div>
                     {/if}
 
-                    {if $settings.detail_show_imagegallery && $haveImageGallery}
-                    <div id="glm-member-detail-images-container" class="small-12">
-                        {apply_filters('glm-member-db-front-members-detail-galleryTop', '', $member.id)}
-                        <a name="glm-member-detail-images-container"></a>
-                        <h2>Photo Gallery</h2>
-
-                        <div class="small-12 columns">
-                            <ul class="clearing-thumbs small-block-grid-2 medium-block-grid-3 large-block-grid-4" data-clearing>
-                        {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>
-                        {/foreach}
-                            </ul>
-                        </div>
-                        {apply_filters('glm-member-db-front-members-detail-galleryBottom', '', $member.id)}
-                    </div>    
-                    {/if}
                     {apply_filters('glm-member-db-front-members-detail-dataBottom','',$member.id)}
                 </div>
             </div>
@@ -216,31 +215,6 @@
         {apply_filters('glm-member-db-front-members-detail-jqueryScriptTop', '', $member.id)}
         
         jQuery(document).ready(function($) {
-
-        $("#glm-member-detail-list-links a").on("click", function( e ) {
-                e.preventDefault();
-                var target = $(this).attr("href");
-                $(target+"-container").show();
-                $(target+"-button").addClass("selected");
-                $("#glm-member-detail-data").show();
-                setTimeout(function() {
-                    $("body, html").animate({ 
-                        scrollTop: $(target+"-container").offset().top 
-                    }, 600);
-                }, 500);
-                    
-        });
-//        $("#glm-member-detail-list-links a").on("click", function( e ) {
-//                e.preventDefault();
-//                $("#glm-member-detail-images-container").show();
-//                $("#glm-member-detail-data").show();
-//                setTimeout(function() {
-//                    $("body, html").animate({ 
-//                        scrollTop: $("#glm-member-detail-images").offset().top 
-//                    }, 600);
-//                }, 500);
-//
-//        });
         
         $("#glm-member-detail-data").children().not("#glm-member-detail-description-container").hide();
     
@@ -259,30 +233,33 @@
         });
         $("#glm-member-detail-sidemenu table tr td").not("#glm-member-detail-description-button").not("#glm-member-detail-fullprofile-button").on("click", function( e ) {
             var target = $(this).attr("id").slice(0, -7);
-            console.log($(this).attr("id"));
-            console.log(target);
-            console.log(target+"-container");
              if ( $("#"+target+"-container").css('display') == 'none' ){
+                $("#glm-member-detail-data").show().children().hide();
                 $("#"+target+"-container").show();
-                $("#glm-member-detail-data").show();
+                $("#glm-member-detail-sidemenu table tr td").removeClass("selected");
                 $(this).addClass("selected");
              } else {
                 $("#"+target+"-container").hide(); 
                 $(this).removeClass("selected");
-                $("#glm-member-detail-fullprofile-button").removeClass("selected");
+                $("#glm-member-detail-fullprofile-button").removeClass("selected");                
+                $("#glm-member-detail-data").show().children().hide();
+                $("#glm-member-detail-sidemenu table tr td").removeClass("selected");
              }
         });
         
         $("#glm-member-detail-description-button" ).click(function() {
             if ( $("#glm-member-detail-description-container").css('display') == 'none' ){
+                $("#glm-member-detail-data").show().children().hide();    
                 $("#glm-member-detail-description").show();
-                $("#glm-member-detail-data").show();
                 $("#glm-member-detail-description-container").show();
-                    $("#glm-member-detail-description-button").addClass("selected");
+                $("#glm-member-detail-sidemenu table tr td").removeClass("selected");
+                $("#glm-member-detail-description-button").addClass("selected");
             } else {
                 $("#glm-member-detail-description-container").hide();
+                $("#glm-member-detail-data").show().children().hide();
                 $("#glm-member-detail-description-button").removeClass("selected");
                 $("#glm-member-detail-fullprofile-button").removeClass("selected");
+                $("#glm-member-detail-sidemenu table tr td").removeClass("selected");
             }
         });
        
diff --git a/views/front/members/list.html b/views/front/members/list.html
index 6f9b7960..0c2328f3 100644
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -119,7 +119,7 @@
                   {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.name}, {/if}{/if}<span>{if $m.state.name}{$m.state.name}</span>{/if}{if $m.zip} {$m.zip}{/if}
+                  {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)}
@@ -202,7 +202,7 @@
                 {if $m.addr2}{$m.addr2}<br>{/if}
               {/if}
               {if $settings.list_map_show_citystatezip}
-                {if $m.city}{$m.city}{if $m.state.name}, {/if}{/if}{if $m.state.name}{$m.state.name}{/if}{if $m.zip} {$m.zip}{/if}
+                {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>        
-- 
2.17.1