Many changes to styling & markup, some config, front.css

diff --git a/config/plugin.ini b/config/plugin.ini
index 969a6e2..74b8572 100644 (file)
--- a/config/plugin.ini
+++ b/config/plugin.ini
@@ -79,14 +79,15 @@ front-config['list_show_detaillink'] = true
 front-config['list_show_logo'] = true
 front-config['list_logo_size'] = small
 front-config['list_show_address'] = true
+front-config['list_show_addr2'] = false
 front-config['list_show_street'] = true
 front-config['list_show_citystatezip'] = true
 front-config['list_show_country'] = false
-front-config['list_show_region'] = true
-front-config['list_show_description'] = true
-front-config['list_show_short_descr'] = false
+front-config['list_show_region'] = false
+front-config['list_show_description'] = false
+front-config['list_show_short_descr'] = true
 front-config['list_show_phone'] = true
-front-config['list_show_tollfree'] = true
+front-config['list_show_tollfree'] = false
 front-config['list_show_url'] = true
 front-config['list_show_url_newtarget'] = true
 front-config['list_show_email'] = true
@@ -114,8 +115,8 @@ front-config['list_map_show_creditcards'] = true
 front-config['list_map_show_amenities'] = true
 ;    Front-end Member Detail Options
 front-config['detail_show_map'] = true
-front-config['detail_show_directions'] = true
-front-config['detail_show_logo'] = true
+front-config['detail_show_directions'] = false
+front-config['detail_show_logo'] = false
 front-config['detail_logo_size'] = large
 front-config['detail_show_description'] = true
 front-config['detail_show_short_descr'] = false
@@ -129,7 +130,7 @@ front-config['detail_show_tollfree'] = true
 front-config['detail_show_url'] = true
 front-config['detail_show_url_newtarget'] = true
 front-config['detail_show_email'] = true
-front-config['detail_show_categories'] = true
+front-config['detail_show_categories'] = false
 front-config['detail_show_creditcards'] = true
 front-config['detail_show_amenities'] = true
 front-config['detail_show_imagegallery'] = true

diff --git a/css/front.css b/css/front.css
index 0c0d148..812b829 100644 (file)
--- a/css/front.css
+++ b/css/front.css
@@ -102,9 +102,9 @@
 /* Maps */
 .glm-map { 
     width: 100%; 
-    height:400px; 
+    height:200px; 
     border: 2px black solid;
-    margin; 10px 0 10px 0;
+    margin: 10px 0 10px 0;
 }
 /* overrride whatever was causing the 100% width for images in Google Maps */
 .glm-map img {

diff --git a/misc/documentation/glm-member-db/plugin.ini b/misc/documentation/glm-member-db/plugin.ini
index 91d9964..c93511c 100644 (file)
--- a/misc/documentation/glm-member-db/plugin.ini
+++ b/misc/documentation/glm-member-db/plugin.ini
@@ -29,7 +29,7 @@ front-config['list_show_citystatezip'] = true
 front-config['list_show_country'] = false
 front-config['list_show_region'] = true
 front-config['list_show_description'] = true
-front-config['list_show_short_descr'] = false
+front-config['list_show_short_descr'] = true
 front-config['list_show_phone'] = true
 front-config['list_show_tollfree'] = true
 front-config['list_show_url'] = true

diff --git a/models/admin/management/import.php b/models/admin/management/import.php
index 71d2609..e503e09 100644 (file)
--- a/models/admin/management/import.php
+++ b/models/admin/management/import.php
@@ -849,7 +849,7 @@ class GlmMembersAdmin_management_import
 
                         // Create truncated short_descr from descritions - Less tags, html encoded characters, newlines, tabs, etc.
                         $stripped = str_replace(PHP_EOL, '', preg_replace('/\t+/', '', preg_replace("/&#?[a-z0-9]{2,8};/i", "", strip_tags($val['description']))));
-                        $short_descr = implode(' ', array_slice(explode(' ', $stripped), 0, 30));
+                        $short_descr = implode(' ', array_slice(explode(' ', $stripped), 0, 190));
                         if (strlen($short_descr) < strlen($stripped)) {
                             $short_descr .= ' ...';
                         }

diff --git a/models/front/members/list.php b/models/front/members/list.php
index 0534b10..75400ec 100644 (file)
--- a/models/front/members/list.php
+++ b/models/front/members/list.php
@@ -158,10 +158,9 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
 
                     // Set default to true for the selected category
                     $categoryData[$catSelected]['default'] = true;
-
+                    
                 }
             }
-
         }
 
         // Get amenity filter data

diff --git a/views/front/members/detail.html b/views/front/members/detail.html
index 0c1778d..3ea26ff 100644 (file)
--- a/views/front/members/detail.html
+++ b/views/front/members/detail.html
@@ -4,11 +4,6 @@
 
         <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$googleMapsBrowserApiKey}"></script>
 
-    {if $detail_show_map}
-        <div id="glm-locationMap-container">
-            <div id="glm-locationMap" class="glm-map">(map loads here)</div>
-        </div>
-    {/if}
     {if $detail_show_directions}
         <div id="glm-directionsMap-container" class="glm-hidden">
             <div id="glm-directionsMap" class="glm-map">(directions load here)</div>
@@ -47,32 +42,55 @@
     <div class="row">
         <div class="small-12 columns glm-member-detail-container">
             <div class="row">
+                    {if $detail_show_map}
+                        <div id="glm-locationMap-container" class="small-12 columns">
+                            <div id="glm-locationMap" class="glm-map">(map loads here)</div>
+                        </div>
+                    {/if}
 <!-- Member Logo - Small -->
     {if $detail_show_logo}
                 <div class="small-12 show-for-small-only columns">
-                    <img CLASS="glm-member-list-image-left" src="{$glmPluginMediaURL}/images/{$detail_logo_size}/{$member.logo}">
+                    <div class="glm-member-list-image-border">
+                        <img CLASS="glm-member-list-image-left" src="{$glmPluginMediaURL}/images/{$detail_logo_size}/{$member.logo}">
+                    </div>
                 </div>
-    {/if}
-                <div class="small-12 medium-8 columns">
-<!-- Member name, address, and basic information -->                    
-                    <h2>{$member.member}</h2>
-          {if $detail_show_address}
-              {if $detail_show_street}
-                    {if $member.addr1}{$member.addr1}<br>{/if}
-                    {if $member.addr2}{$member.addr2}<br>{/if}
-              {/if}
-              {if $detail_show_citystatezip}
-                    {if $member.city.name}{$member.city.name}{if $member.state.name}, {/if}{/if}{if $member.state.name}{$member.state.name}{/if}{if $member.zip} {$member.zip}{/if}
-              {/if} 
-                    {if $member.country.name && $detail_show_country}<br>{$member.country.name}{/if}
-                </p>        
-          {/if} {*list_show_address*}        
-                    {if $member.phone && $detail_show_phone}<br><b>Phone:</b> {$member.phone}{/if}
-                    {if $member.toll_free && $detail_show_tollfree}<br><b>Toll Free:</b> {$member.toll_free}{/if}
-                    {if $member.url && $detail_show_url}<br><b>Web site:</b> <a href="{$member.url}"{if $detail_show_url_newtarget} target="_blank"{/if}>{$member.url}</a>{/if}
-                    {if $member.email && $detail_show_email}<br><b>E-Mail Address:</b> <a href="mailto:{$member.email}">{$member.email}</a>{/if}
-                    {if $member.region.value && $detail_show_region}<br><b>Region:</b> {$member.region.name}{/if}
-                </div>                    
+            {/if} <div class="glm-member-list-image-wrapper medium-5 show-for-medium-up columns">
+                    <div class="glm-member-list-image-border">
+<!--                        <img class="glm-member-list-image-left" src="http://placehold.it/500x300"></div>-->
+                    </div>
+                    <div class="small-12 medium-7 glm-member-info columns">
+        <!-- Member name, address, and basic information -->                    
+                        <h2>
+                      {if $list_show_detaillink}
+                            <a href="{$thisURL}?glm_action=detail&id={$member.member_pointer}">{$member.member}</a>
+                      {else}
+                            {$member.member}
+                      {/if}
+                        </h2>
+                      {if $list_show_address}
+                          {if $list_show_street}
+                          {if $member.addr1}<div>{$member.addr1}</div>{/if}
+                          {if $member.addr2}<div>{$member.addr2}</div>{/if}
+                          {/if}
+                          {if $list_show_citystatezip}
+                          {if $member.city.name}<span>{$member.city.name}</span>{if $member.state.name}, {/if}{/if}<span>{if $member.state.name}{$member.state.name}</span>{/if}{if $member.zip} {$member.zip}{/if}
+                          {/if} 
+                                {if $member.country.name && $list_show_country}<div>{$member.country.name}</div>{/if}
+                      {/if}        
+                        {if $member.phone && $list_show_phone}<div>Phone: {$member.phone}</div>{/if}
+                        {if $member.toll_free && $list_show_tollfree}<div><b>Toll Free:</b> {$member.toll_free}</div>{/if}
+                        {if $member.region.value && $list_show_region}<div><p><b>Region:</b> {$member.region.name}</div>{/if}
+                   
+                        <div class="glm-member-list-links"><br>
+                                {if $member.url && $list_show_url}<a href="{$member.url}"{if $list_show_url_newtarget} target="_blank"{/if}>Website</a>{/if}
+                                {if $member.email && $list_show_email}<a href="mailto:{$member.email}">Email</a>{/if}
+                                {if $detail_show_imagegallery}<a href="#glm-member-detail-photo-gallery">Photo Gallery</a>{/if}
+                                {if $detail_show_imagegallery}<a href="#glm-member-detail-photo-gallery">Coupons</a>{/if}
+                                {if $detail_show_imagegallery}<a href="#glm-member-detail-photo-gallery">Packages</a>{/if}
+                        </div>
+                    </div>            
+    
+
 <!-- Member Logo - Medium and up-->                    
     {if $detail_show_logo}
                 <div class="medium-4 show-for-medium-up columns"><img class="glm-member-list-image-right" src="{$glmPluginMediaURL}/images/{$list_logo_size}/{$member.logo}"></div>
@@ -80,51 +98,56 @@
             </div>
 
 <!-- Member Description -->                
-            <div class="row">
-                <div class="small-12 columns">
-                    {if $member.descr && $detail_show_description}<p>{$member.descr}</p>{/if}
-                    {if $member.short_descr && $detail_show_short_descr}<p>{$member.short_descr}</p>{/if}
-                    
-            {if $member.categories && $detail_show_categories}
-                    <p>           
-                        <b>{$term_member_cap} Categories</b>
-                        <ul>
-                {foreach $member.categories as $c}
-                            <li>
-                                {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
-                            </li>
-                {/foreach}
-                        </ul>
-                    </p>
-            {/if}
-            {if $member.cc_type && $detail_show_creditcards}
-                    <p>           
-                        <b>Credit Cards Accepted:</b>
-                        <ul>
-                {foreach $member.cc_type.names as $c}
-                            <li>{$c}</li>
-                {/foreach}
-                        </ul>        
-                    </p>
-            {/if}
-            {if $member.amenities && $detail_show_amenities}
-                    <p>
-                        <b>{$term_member_cap} Amenities</b>
-                        <ul>
-                {foreach $member.amenities as $a}
-                            <li>
-                                {$a.name}
-                            </li>
-                {/foreach}
-                        </ul>
-                    </p>
-            {/if}
+            <div id="glm-member-detail-descr-row" class="row" data-equalizer>
+                <div id="glm-member-detail-amenities-container" class="small-12 medium-4 columns" >
+                    <div class="glm-member-detail-border"data-equalizer-watch>
+                    {if $member.amenities && $detail_show_amenities}
+                                <b>{$term_member_cap} Amenities & Services</b>
+                                <ul>
+                        {foreach $member.amenities as $a}
+                                    <li>
+                                        {$a.name}
+                                    </li>
+                        {/foreach}
+                                </ul>
+
+                    {/if}
+                    {if $member.cc_type && $detail_show_creditcards}
+                            <p>           
+                                <b>Credit Cards Accepted:</b>
+                                <ul>
+                        {foreach $member.cc_type.names as $c}
+                                    <li>{$c}</li>
+                        {/foreach}
+                                </ul>        
+                            </p>
+                    {/if}
+                    {if $member.categories && $detail_show_categories}
+                            <p>           
+                                <b>{$term_member_cap} Categories</b>
+                                <ul>
+                        {foreach $member.categories as $c}
+                                    <li>
+                                        {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
+                                    </li>
+                        {/foreach}
+                                </ul>
+                            </p>
+                    {/if}
+                    </div>
+                </div>
+                <div id="glm-member-detail-description-container" class="small-12 medium-8 columns" >
+                    <div class="glm-member-detail-border"data-equalizer-watch>
+                    {if $member.descr && $detail_show_description}{$member.descr}{/if}
+                    {if $member.short_descr && $detail_show_short_descr}{$member.short_descr}{/if}
+                    </div>
                 </div>
             </div>
             
 <!-- Image Gallery -->
     {if $detail_show_imagegallery}
-            <div class="row"><div class="small-12 columns"><b>Image Gallery</b></div></div>
+    <a name="glm-member-detail-photo-gallery"></a>
+            <div class="row"><div class="small-12 columns"><b>Photo Gallery</b></div></div>
 
             <div class="row">
                 <div class="small-12 columns">

diff --git a/views/front/members/list.html b/views/front/members/list.html
index 8431267..beeb6b7 100644 (file)
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -79,7 +79,18 @@
                         <img class="glm-member-list-image-left" src="{$glmPluginMediaURL}/images/{$list_logo_size}/{$m.logo}">
                     </div>
                 {/if}
-                    <div class="small-12 medium-8 columns">
+                
+                <!-- Member Logo - Medium and up-->                    
+                <div class="glm-member-list-image-wrapper medium-3 show-for-medium-up columns">
+                    <div class="glm-member-list-image-border">
+<!--                        <img class="glm-member-list-image-left" src="http://placehold.it/500x300"></div>-->
+                    </div>
+                {if $m.logo && $list_show_logo}
+                <div class="glm-member-list-image-border">
+                    <div class="glm-member-list-image-wrapper medium-4 show-for-medium-up columns"><img class="glm-member-list-image-left" src="{$glmPluginMediaURL}/images/{$list_logo_size}/{$m.logo}"></div>
+                </div>
+                {/if}
+                    <div class="small-12 medium-9 glm-member-info columns">
 <!-- Member name, address, and basic information -->                    
                         <h2>
               {if $list_show_detaillink}
@@ -90,32 +101,37 @@
                         </h2>
               {if $list_show_address}
                   {if $list_show_street}
-                  {if $m.addr1}<div>{$m.addr1}</div>{/if}
-                      {if $m.addr2}<div>{$m.addr2}</div>{/if}
+                  {if $m.addr1 && $list_show_address}<div>{$m.addr1}</div>{/if}
+                  {if $m.addr2 && $list_show_addr2}<div>{$m.addr2}</div>{/if}
                   {/if}
                   {if $list_show_citystatezip}
                   {if $m.city.name}<span>{$m.city.name}</span>{if $m.state.name}, {/if}{/if}<span>{if $m.state.name}{$m.state.name}</span>{/if}{if $m.zip} {$m.zip}{/if}
                   {/if} 
                         {if $m.country.name && $list_show_country}<div>{$m.country.name}</div>{/if}
               {/if}        
-                        {if $m.phone && $list_show_phone}<div><b>Phone:</b> {$m.phone}</div>{/if}
+                        {if $m.phone && $list_show_phone}<div>Phone: {$m.phone}</div>{/if}
                         {if $m.toll_free && $list_show_tollfree}<div><b>Toll Free:</b> {$m.toll_free}</div>{/if}
-                        {if $m.url && $list_show_url}<div><b>Web site:</b> <a href="{$m.url}"{if $list_show_url_newtarget} target="_blank"{/if}>{$m.url}</a></div>{/if}
-                        {if $m.email && $list_show_email}<div><b>E-Mail Address:</b> <a href="mailto:{$m.email}">{$m.email}</a></div>{/if}
                         {if $m.region.value && $list_show_region}<div><p><b>Region:</b> {$m.region.name}</div>{/if}
+                    
+                        <div class="glm-member-list-links"><br>
+                                {if $m.url && $list_show_url}<a href="{$m.url}"{if $list_show_url_newtarget} target="_blank"{/if}>Website</a>{/if}
+                                {if $m.email && $list_show_email}<a href="mailto:{$m.email}">Email</a>{/if}
+                                <a href="{$thisURL}?glm_action=detail&id={$m.member_pointer}">View Profile</a>
+                        </div>
                     </div>
-<!-- Member Logo - Medium and up-->                    
-                {if $m.logo && $list_show_logo}
-                    <div class="medium-4 show-for-medium-up columns"><img class="glm-member-list-image-right" src="{$glmPluginMediaURL}/images/{$list_logo_size}/{$m.logo}"></div>
-                {/if}
                 </div>
-                
+                <br>
 <!-- Member Description -->                
                 <div class="row">
-                    <div class="small-12 columns">
-               
-                        {if $m.descr && $list_show_description}<p>{$m.descr}</p>{/if}
-                        {if $m.short_descr && $list_show_short_descr}<p>{$m.short_descr}</p>{/if}
+                    <div class="test small-12 columns">
+                        
+                {if $m.short_descr && $list_show_short_descr}
+                {$m.short_descr} <a href="{$thisURL}?glm_action=detail&id={$m.member_pointer}">... View Profile</a>
+
+                {elseif $m.descr && $list_show_description}
+                {$m.descr|truncate:190:false:false} class="test"><span>... View Profile</span>
+                {/if}
+                        
                 {if $m.categories && $list_show_categories}
                         <p>
                             <b>{$term_member_cap} Categories</b>