Temporary changes based on meeting.

diff --git a/css/front.css b/css/front.css
index 67ccbd8..7307c49 100644 (file)
--- a/css/front.css
+++ b/css/front.css
@@ -42,16 +42,19 @@
     background: #f5f5f5;
     margin: .4em 0px .4em 0px;
 }
+.glm-member-list-container .member-title a,
+.glm-member-list-container .member-title {
+    font-size: 22px
+}
 .glm-member-entry-container {
     border: 1px #ccc solid;
     padding: .4em;
     margin: 1em 0px 1em 0px;
 }
 .glm-member-list-image {
-    width: 100%;
+    width: auto;
+    max-width: 100%;
     height: auto;
-    min-width: 300px;
-    min-height: 200px;
 }
 .glm-member-detail-image {
     max-height: 200px;
@@ -73,7 +76,6 @@
     margin-top: .5em;
 }
 .glm-member-list-image-wrapper {
-    max-height: 215px;
     padding: 0;
     overflow: hidden;
 }
@@ -94,17 +96,20 @@
   line-height: 1.2;
 }
 #glm-member-detail-info h2 {
-    font-size: 28px;
+    font-size: 24px;
     padding: 5px 10px;
 }
 #glm-member-detail-info > a {
     margin-right: 15px;
 }
+#glm-member-detail-container > div {
+    margin: 0 -0.9375rem;
+}
 #glm-member-detail-container h2 {
     color: #92a682;    
 }
 #glm-member-detail-sidemenu {
-    border-right: 1px solid lightgrey;
+    clear: left;
 }
 #glm-member-detail-sidemenu,
 #glm-member-detail-data > div {
@@ -115,7 +120,6 @@
 }
 .glm-member-detail-featured-image-wrapper {
     padding: 0;
-    max-height: 200px;
     overflow: hidden;
 }
 .glm-member-detail-featured-image-wrapper img {
@@ -232,9 +236,11 @@ input[type="submit"].glm-member-detail-button {
 #glm-directions {
     padding: 1em;
 }
+.glm-member-list-links,
 #glm-member-detail-list-links {
     margin: 10px 0;
 }
+.glm-member-list-links a,
 #glm-member-detail-list-links a {
     display: inline;
     text-decoration: underline;
@@ -246,6 +252,36 @@ input[type="submit"].glm-member-detail-button {
 #glm-member-detail-social a {
     margin-right: 5px;
 }
+
+#glm-member-detail-description-container {
+    padding: 10px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+.glm-member-detail-border {
+    border: 1px solid lightgrey;
+    padding: 10px;
+}
+#glm-member-detail-photos {
+    margin-top: 20px;
+    b, .clearing-assembled {
+        padding: 5px;
+    }
+}
+#glm-member-detail-sidemenu,
+#glm-member-detail-data > div {
+    padding: 10px;
+ }
+
+#glm-locationMap-container {
+    margin-bottom: 0px;
+}
+#glm-locationMap {
+    margin: 0;
+}
+.glm-member-list-description {
+    padding: 15px 15px 15px 0;
+}
 @media (max-width: 1024px) {
     #glm-member-detail-data > div {
         margin: 0 auto;

diff --git a/views/front/members/detail.html b/views/front/members/detail.html
index 2481fbc..9874193 100644 (file)
--- a/views/front/members/detail.html
+++ b/views/front/members/detail.html
@@ -1,6 +1,6 @@
 {include file='front/members/header.html'}
     <script>
-    document.write('<a class="button glm-member-detail-button" href="' + document.referrer + '">Take me back</a>');
+    document.write('<a class="button glm-member-detail-button" href="' + document.referrer + '"> < Take me back</a>');
 </script>
 
 
@@ -23,10 +23,6 @@
         <div class="row">
             <div id="glm-directions" class="small-12 columns glm-member-entry-container">
                 <div class="row">
-                    <div class="small-12 medium-8 columns">
-                        Enter address to show directions ...
-                        <input id="glm-startLocation" type="text" name="startLocation" class="glm-form-text-input" placeholder=""><br>
-                    </div>
                     <div class="small-12 medium-4 columns">
                         Directions type:
                         <select id="directionsType" name="directionsType">
@@ -34,8 +30,12 @@
                             <option value="WALKING">Walking</option>
                             <option value="BICYCLING">Bicycling</option>
                             <!-- <option value="TRANSIT">Transit Services</option> - Doesn't seem to work -->
-                        </select>
-                    </div>     
+                        </select>  
+                    </div>
+                    <div class="small-12 medium-8 columns">
+                        Enter address to show directions ...
+                        <input id="glm-startLocation" type="text" name="startLocation" class="glm-form-text-input" placeholder=""><br>
+                    </div>
                 </div>
                 <div class="row">
                     <div style="text-align: center;">
@@ -50,7 +50,7 @@
 <!--    <h3>{$terms.term_member_cap} Detail</h3>-->
     <div class="row">
         <div id="glm-member-detail-container" class="small-12 columns glm-member-container">
-            <div class="row">
+            <div>
                 <div id="glm-member-detail-info" class="small-12 medium-6 columns">
         <!-- Member name, address, and basic information -->                    
                     <h2 class="glm-member-title">
@@ -74,18 +74,10 @@
                     {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">
-                        <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 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>
                 </div>      
@@ -93,7 +85,7 @@
                 {if $member.logo && $settings.detail_show_logo}
                 <div class="glm-member-detail-featured-image-wrapper small-12 medium-6 columns">
 <!--                            <img class="glm-member-list-image-left" src="http://placehold.it/500x300">-->
-                        <img CLASS="glm-member-list-image-left" src="{$glmPluginMediaURL}/images/{$settings.detail_logo_size}/{$member.logo}">
+                        <img CLASS="glm-member-list-image" src="{$glmPluginMediaURL}/images/{$settings.detail_logo_size}/{$member.logo}">
                 </div>
                 {/if}
             </div>
@@ -112,7 +104,7 @@
                         <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>
+                        <tr><td id="glm-member-detail-images-button">Photo Gallery</td></tr>
                         {/if}
                         {if $member.cc_type && $settings.detail_show_creditcards}
                         <tr><td id="glm-member-detail-creditcards-button">Accepted Credit Cards</td></tr>
@@ -158,7 +150,7 @@
                             <tr><th>Credit Cards Accepted:</th></tr>
                             {foreach $member.cc_type.names as $c}
                                 <tr><td>{$c}</td></tr>
-                    {/foreach}
+                            {/foreach}
                             </table>        
                         </p>
                     </div>
@@ -217,31 +209,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();
     
@@ -260,30 +227,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-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");
             }
         });