Updated view templates, disabled requiredPages checks
authorlaury <laury@gaslightmedia.com>
Tue, 17 May 2016 20:38:08 +0000 (16:38 -0400)
committerlaury <laury@gaslightmedia.com>
Tue, 17 May 2016 20:38:08 +0000 (16:38 -0400)
classes/data/dataMemberInfo.php
classes/data/settings/dataSettingsGeneral.php
classes/glmPluginSupport.php
controllers/admin.php
css/front.css
models/front/members/detail.php
models/front/members/list.php
setup/databaseScripts/create_database_V1.1.5.sql
views/front/members/detail.html
views/front/members/grid.html
views/front/members/list.html

index baf6776..25f2de2 100644 (file)
@@ -310,6 +310,7 @@ class GlmDataMemberInfo extends GlmDataAbstract
             'short_descr' => array (
                 'field' => 'short_descr',
                 'type' => 'text',
+                'maxLength' => '120',
                 'use' => 'a'
             ),
 
@@ -399,11 +400,15 @@ class GlmDataMemberInfo extends GlmDataAbstract
         ;";
         $r['categories'] = $this->wpdb->get_results($sql, ARRAY_A);
 
+        if ((strlen($r['short_descr']) == 0) && ($r['description'] > 0)) {
+            $r['short_descr'] = $r['description'];
+        }
         $dotdotdot = '';
-        if (strlen($r['short_descr']) > 200 ) {
-            $dotdotdot = '...';
+        if (strlen($r['short_descr']) > 120 ) {
+            $dotdotdot = ' ... ';
         }
-        $r['short_descr'] = substr($r['short_descr'], 0, 200).$dotdotdot;
+        $formattedStr = trim(preg_replace('/\s\s+/', ' ', $r['short_descr']));
+        $r['short_descr'] = substr($formattedStr, 0, 120).$dotdotdot;
 
         return $r;
     }
index 14e7696..b3adbe9 100644 (file)
@@ -203,7 +203,7 @@ class GlmDataSettingsGeneral extends GlmDataAbstract
                 'list_show_search_filters_opened' => array(
                         'field' => 'list_show_search_filters_opened',
                         'type' => 'checkbox',
-                        'default' => true,
+                        'default' => false,
                         'use' => 'a'
                 ),
             
@@ -418,7 +418,7 @@ class GlmDataSettingsGeneral extends GlmDataAbstract
                 'list_map_show_opened' => array(
                         'field' => 'list_map_show_opened',
                         'type' => 'checkbox',
-                        'default' => true,
+                        'default' => false,
                         'use' => 'a'
                 ),
             
index 634816a..df8858f 100644 (file)
@@ -509,102 +509,102 @@ class GlmPluginSupport
      *
      * @return void
      */
-    public function createPages($requiredPages)
-    {
-        foreach($requiredPages as $requiredPage => $requiredPageInfo) {
-            $trimmedName = GLM_MEMBERS_PLUGIN_OPTION_PREFIX.$requiredPageInfo['underscored_title'];
-            if ($requiredPageInfo['parent'] == 'associate') {
-                $postParent = get_option(GLM_MEMBERS_PLUGIN_OPTION_ASSOCIATE_ID);
-            } else if ($requiredPageInfo['parent'] == 'membersonly') {
-                $postParent = get_option(GLM_MEMBERS_PLUGIN_OPTION_MEMBERS_ONLY_ID);
-            } else if (is_numeric($requiredPageInfo['parent'])) {
-                $postParent = $requiredPageInfo['parent'];
-            } else {
-                $postParent = '0';
-            }
-            $existingPost = get_post(get_option($trimmedName));
-            $newSlug = sanitize_title($requiredPageInfo['title']);
-            $existingSlug = $this->verify_post_slug($newSlug);
-
-
-            // If a post with the ID set in the option does not exist
-            if ( !$existingPost) {
-
-                // If the new slug corresponds to an already existent page, yet the ID option does not exist,
-                //  then it's either the first time this plugin is run on an outdated site or somehow the ID was
-                //  deleted. Either way, replace the option value with whatever is the ID of the page matching
-                //  that slug. The slug is checked by translating the page title.
-                if ($newSlug == $existingSlug) {
-                    $existingID = $this->get_post_id_by_slug($newSlug);
-                    update_option($trimmedName, $existingID);
-                // Otherwise create a new page
-                } else {
-                    // Put together the new page, then update the option with the new ID
-                    $templateUsed = isset($requiredPageInfo['template']) ? $requiredPageInfo['template'] : 'index.php';
-                    $new_id = $this->insertReqPage(
-                            $requiredPageInfo['title'],
-                            $requiredPageInfo['content'],
-                            'publish',
-                            'page',
-                            '1',
-                            $templateUsed,
-                            $postParent
-                        );
-                    update_option($trimmedName, $new_id);
-
-                    // Make extra page if members only is created
-                    if ($new_id == get_option(GLM_MEMBERS_PLUGIN_OPTION_MEMBERS_ONLY_ID)) {
-                        $this->insertReqPage(
-                            'Members Only Sample Subpage',
-                            'This page will automatically be locked to Members Only with the members-only-template',
-                            'publish',
-                            'page',
-                            '1',
-                            $templateUsed,
-                            $new_id
-                        );
-
-                    }
-                }
-            } else {
-                // No page created
-            }
-        }
-
-    }
-
-    public function insertReqPage($pTitle = '--bad page--', $pContent = '', $pPublish = 'publish', $pType = 'page', $pAuthor = '1', $pTemplate = 'index.php', $pParent = '0')
-    {
-        $new_page = array(
-            'post_title' => $pTitle,
-            'post_content' => $pContent,
-            'post_status' => $pPublish,
-            'post_type' => $pType,
-            'post_author' => $pAuthor,
-            'page_template' => $pTemplate ,
-            'post_parent' => $pParent
-        );
-        return wp_insert_post($new_page);
-    }
-
-
-    public function get_post_data($needle = 1, $valueField = 'post_name', $needleField = 'ID')
-    {
-        $value = $this->wpdb->get_var("SELECT $valueField FROM ".$this->wpdb->posts." WHERE $needleField = '".$needle."'");
-        return $value;
-    }
-
-    public function verify_post_slug($postName)
-    {
-        $value = $this->wpdb->get_var("SELECT post_name FROM ".$this->wpdb->posts." WHERE post_name = '".$postName."'");
-        return $value;
-    }
-
-    public function get_post_id_by_slug($postName)
-    {
-        $value = $this->wpdb->get_var("SELECT ID FROM ".$this->wpdb->posts." WHERE post_name = '".$postName."'");
-        return $value;
-    }
+//    public function createPages($requiredPages)
+//    {
+//        foreach($requiredPages as $requiredPage => $requiredPageInfo) {
+//            $trimmedName = GLM_MEMBERS_PLUGIN_OPTION_PREFIX.$requiredPageInfo['underscored_title'];
+//            if ($requiredPageInfo['parent'] == 'associate') {
+//                $postParent = get_option(GLM_MEMBERS_PLUGIN_OPTION_ASSOCIATE_ID);
+//            } else if ($requiredPageInfo['parent'] == 'membersonly') {
+//                $postParent = get_option(GLM_MEMBERS_PLUGIN_OPTION_MEMBERS_ONLY_ID);
+//            } else if (is_numeric($requiredPageInfo['parent'])) {
+//                $postParent = $requiredPageInfo['parent'];
+//            } else {
+//                $postParent = '0';
+//            }
+//            $existingPost = get_post(get_option($trimmedName));
+//            $newSlug = sanitize_title($requiredPageInfo['title']);
+//            $existingSlug = $this->verify_post_slug($newSlug);
+//
+//
+//            // If a post with the ID set in the option does not exist
+//            if ( !$existingPost) {
+//
+//                // If the new slug corresponds to an already existent page, yet the ID option does not exist,
+//                //  then it's either the first time this plugin is run on an outdated site or somehow the ID was
+//                //  deleted. Either way, replace the option value with whatever is the ID of the page matching
+//                //  that slug. The slug is checked by translating the page title.
+//                if ($newSlug == $existingSlug) {
+//                    $existingID = $this->get_post_id_by_slug($newSlug);
+//                    update_option($trimmedName, $existingID);
+//                // Otherwise create a new page
+//                } else {
+//                    // Put together the new page, then update the option with the new ID
+//                    $templateUsed = isset($requiredPageInfo['template']) ? $requiredPageInfo['template'] : 'index.php';
+//                    $new_id = $this->insertReqPage(
+//                            $requiredPageInfo['title'],
+//                            $requiredPageInfo['content'],
+//                            'publish',
+//                            'page',
+//                            '1',
+//                            $templateUsed,
+//                            $postParent
+//                        );
+//                    update_option($trimmedName, $new_id);
+//
+//                    // Make extra page if members only is created
+//                    if ($new_id == get_option(GLM_MEMBERS_PLUGIN_OPTION_MEMBERS_ONLY_ID)) {
+//                        $this->insertReqPage(
+//                            'Members Only Sample Subpage',
+//                            'This page will automatically be locked to Members Only with the members-only-template',
+//                            'publish',
+//                            'page',
+//                            '1',
+//                            $templateUsed,
+//                            $new_id
+//                        );
+//
+//                    }
+//                }
+//            } else {
+//                // No page created
+//            }
+//        }
+//
+//    }
+
+//    public function insertReqPage($pTitle = '--bad page--', $pContent = '', $pPublish = 'publish', $pType = 'page', $pAuthor = '1', $pTemplate = 'index.php', $pParent = '0')
+//    {
+//        $new_page = array(
+//            'post_title' => $pTitle,
+//            'post_content' => $pContent,
+//            'post_status' => $pPublish,
+//            'post_type' => $pType,
+//            'post_author' => $pAuthor,
+//            'page_template' => $pTemplate ,
+//            'post_parent' => $pParent
+//        );
+//        return wp_insert_post($new_page);
+//    }
+
+
+//    public function get_post_data($needle = 1, $valueField = 'post_name', $needleField = 'ID')
+//    {
+//        $value = $this->wpdb->get_var("SELECT $valueField FROM ".$this->wpdb->posts." WHERE $needleField = '".$needle."'");
+//        return $value;
+//    }
+
+//    public function verify_post_slug($postName)
+//    {
+//        $value = $this->wpdb->get_var("SELECT post_name FROM ".$this->wpdb->posts." WHERE post_name = '".$postName."'");
+//        return $value;
+//    }
+
+//    public function get_post_id_by_slug($postName)
+//    {
+//        $value = $this->wpdb->get_var("SELECT ID FROM ".$this->wpdb->posts." WHERE post_name = '".$postName."'");
+//        return $value;
+//    }
 
     /**
      *
index 51f82ce..a99db7d 100644 (file)
@@ -624,11 +624,11 @@ class glmMembersAdmin extends GlmPluginSupport
          * Check Required Pages
          *
          */
-        foreach ($this->config['addOns'] as $a) {
-            if (isset($a['requiredPages'])) {
-                $this->createPages($a['requiredPages']);
-            }
-        }
+//        foreach ($this->config['addOns'] as $a) {
+//            if (isset($a['requiredPages'])) {
+//                $this->createPages($a['requiredPages']);
+//            }
+//        }
 
         // Loop till we have a final action
         $loopCheck = 0;
index cb61ffe..366d430 100644 (file)
@@ -63,7 +63,7 @@
     border: 1px #ccc solid;
 /*    padding: .4em 0px 0px 0px;*/
     background: white;
-    margin: .4em 0px .4em 0px;
+    margin: .8em 0px .8em 0px;
 }
 .glm-member-db-list-grid-view {
     overflow: hidden;
     line-height: 1.2;
     padding: 15px;
 }
+.glm-member-db-list-view .glm-member-title {
+    text-transform: none;
+}
+.glm-member-db-list-grid-view .glm-member-db-border-wrap {
+    border-radius: 4px;
+}
 #glm-member-list-map-toggle {
     background-color: lightgrey;
     position: absolute;
 .glm-member-db-list-view.map-opened #glm-member-list-map-toggle:before {
     content: "Hide ";
 }
-.glm-member-db-list-grid-view .glm-member-list-listing-container {
+.glm-member-db-list-grid-view #glm-locationMap-container {
     transition: all 0.5s;
-    padding: 0 0 0 2%;
+/*    padding: 0 0 0 2%;*/
     margin-top: 30px;
 }
 @media (min-width: 1024px) {
-    .glm-member-db-list-grid-view .glm-member-list-listing-container {
+    .glm-member-db-list-grid-view #glm-locationMap-container {
         float: right;
     }
 }
-.glm-member-db-list-grid-view.filters-closed .glm-member-list-listing-container {
+.glm-member-db-list-grid-view.filters-closed #glm-locationMap-container {
     transition: all 0.4s;
     width: 100%;
+    float: right;
     margin-top: 30px;
 }
 @media (min-width: 1024px) {
-    .glm-member-db-list-grid-view.filters-closed .glm-member-list-listing-container {
+    .glm-member-db-list-grid-view.filters-closed #glm-locationMap-container {
         margin-top: 30px;
     }
-    .glm-member-db-list-grid-view.filters-opened .glm-member-list-listing-container {
-        width: 80%;
+    .glm-member-db-list-grid-view.filters-opened #glm-locationMap-container {
+        width: 70%;
     }
 }
 .glm-member-db-list-grid-view #glm-member-list-filters-close {
 }
 .glm-member-db-list-grid-view #glm-locationMap-container  {
     margin-bottom: 40px;
+    width: 100%;
     overflow: hidden;
 }
 .glm-member-db-list-view #glm-locationMap-container  {
 .glm-member-list-nameAddress {
 }
 .glm-member-detail-images-thumb {
+    display: block;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center center;
     width: 100%;
 }
+.testclass {
+}
 .glm-member-detail-image .visible-img {
     
 }
     height: 250px;
 }
 .glm-member-list-active-info .glm-member-title a {
-    text-decoration: underline;
+/*    text-decoration: underline;*/
 }
 .glm-member-db-list-grid-view #glm-member-db-front-container {
     padding: 0;
         padding: 0;
     }    
 }
-.glm-member-list-active-info {
-    padding: 15px;
+.glm-member-db-list-view .glm-member-list-active-info {
+    padding: 0;
 }
 /*
  * Member List End
@@ -525,8 +539,16 @@ input[type="submit"].glm-member-button {
     background: white none repeat scroll 0 0;
     margin-bottom: 5px;
 }
-.glm-member-list-container {
+.glm-member-db-list-view .glm-member-list-container {
     padding: 0;
+    height: 200px;
+}
+.glm-member-db-list-view .glm-member-db-phone-tollfree {
+    
+}
+.glm-member-db-list-view .glm-member-db-phone-tollfree:before {
+    padding-left: 15px;
+    content: "";
 }
 #glm-member-detail-container {
     background: white none repeat scroll 0 0;
@@ -720,8 +742,8 @@ input[type="submit"].glm-member-button {
 #glm-directions {
     padding: 1em;
 }
-#glm-member-detail-list-links {
-    margin: 10px 0;
+.glm-member-db-list-view .glm-member-list-links {
+    margin-top: 3px;
 }
 .glm-member-db-list-view .glm-member-list-links #glm-member-list-website-link:before {
     //content: url("../assets/offsite-link_wht.png");
@@ -762,7 +784,8 @@ input[type="submit"].glm-member-button {
     margin-bottom: 25px;
 }
 .glm-member-list-description {
-    padding: 15px 15px 15px 0;
+    margin-top: 15px;
+    padding: 0;
 }
 .glm-searchTitle{
     margin-top: -45px;
index 25f7fb3..a3c7356 100644 (file)
@@ -297,7 +297,6 @@ class GlmMembersFront_members_detail extends GlmDataMemberInfo
 
         // Since the ID we recieved with the member data is the pointer to the member info record, replace it with member ID
         $memberData['id'] = $memberData['member_pointer'];
-
         // Compile template data
         $templateData = array(
             'haveMember' => $haveMember,
index 2eaec5f..0649dfb 100644 (file)
@@ -41,21 +41,21 @@ $GLOBALS['showOpts'] = array(
     'search-amenities' =>       'list_show_search_amenities',
     'search-alpha' =>           'list_show_search_alpha',
     'list' =>                   'list_show_list',
-    'name-link' =>                 'list_show_detail_link',
+    'name-link' =>             'list_show_detail_link',
     'logo' =>                   'list_show_logo',
     'address' =>                'list_show_address',
     'street' =>                        'list_show_street',
     'city-state-zip' =>         'list_show_citystatezip',
-    'country' =>                   'list_show_country',
+    'country' =>               'list_show_country',
     'region' =>                        'list_show_region',
     'description' =>            'list_show_descr',
-    'short-description' =>         'list_show_short_descr',
+    'short-description' =>     'list_show_short_descr',
     'phone' =>                  'list_show_phone',
     'toll-free' =>              'list_show_tollfree',
     'url' =>                    'list_show_url',
     'url-new-target' =>         'list_show_url_newtarget',
     'email' =>                  'list_show_email',
-    'categories' =>                'list_show_categroies',
+    'categories' =>            'list_show_categroies',
     'credit-cards' =>           'list_show_creditcards',
     'amentities' =>             'list_show_amenities'
 );
index 5d0496a..afbb3c7 100644 (file)
@@ -210,7 +210,7 @@ CREATE TABLE {prefix}settings_general (
   canonical_member_page TINYTEXT DEFAULT NULL,
   list_show_map BOOLEAN DEFAULT '1',
   list_show_list BOOLEAN DEFAULT '1',
-  list_show_search_filters_opened BOOLEAN DEFAULT '1',
+  list_show_search_filters_opened BOOLEAN DEFAULT '0',
   list_show_search BOOLEAN DEFAULT '1',
   list_show_search_text BOOLEAN DEFAULT '1',
   list_show_search_category BOOLEAN DEFAULT '1',
@@ -234,7 +234,7 @@ CREATE TABLE {prefix}settings_general (
   list_show_categories BOOLEAN DEFAULT '0',
   list_show_creditcards BOOLEAN DEFAULT '0',
   list_show_amenities BOOLEAN DEFAULT '0',
-  list_map_show_opened BOOLEAN DEFAULT '1',
+  list_map_show_opened BOOLEAN DEFAULT '0',
   list_map_show_detaillink BOOLEAN DEFAULT '1',
   list_map_show_logo BOOLEAN DEFAULT '0',
   list_map_logo_size TINYTEXT NULL,
index 63fb10f..1955baa 100644 (file)
                         {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 class="socialtest">
+                        {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $m.id)}
+                       Social:{apply_filters('glm-member-db-front-members-social-list', '', $m.id)}
+                    </div>
                 </div>
                 
                 {if $settings.detail_show_map}
 <!-- Attributes: amenitities, credit cards, etc -->
             <div id="glm-member-detail-descr-row" class="small-12 medium-8 columns">
                 {apply_filters('glm-member-db-front-members-detail-attributesTop', '', $member.id)}
-                
+                {if $featuredImage}
                 <div class="glm-member-detail-featured-image-wrapper small-12 columns">
-                    <img src="{$glmPluginMediaUrl}/images/{$settings.detail_logo_size}/{$member.logo}">
+                    <img src="{$glmPluginMediaUrl}/images/large/{$featuredImage}">
+                    {if $featuredImageCaption}
+                    <div class="glm-member-detail-featured-image-caption">
+                        {$featuredImageCaption}
+                    </div>
+                    {/if}
                 </div>
+                {/if}
                 <div id="glm-member-detail-intro-desc">
                     {if $member.short_descr && $settings.detail_show_short_descr}{$member.short_descr|nl2br}{/if}
                 </div>
 
                             <ul class="small-block-grid-1 medium-block-grid-2 large-block-grid-3">
                         {foreach $imageGallery as $i}
-                                <li><a class="glm-member-detail-images-thumb" rel="gallery1" href="{$glmPluginMediaUrl}/images/large/{$i.file_name}"><img data-caption="{$i.caption}" src="{$glmPluginMediaUrl}/images/small/{$i.file_name}"></a></li>
+                               {$i.caption}
+                                <li>
+                                    <a class="glm-member-detail-images-thumb" rel="gallery1" href="{$glmPluginMediaUrl}/images/large/{$i.file_name}" style="background-image: url('{$glmPluginMediaUrl}/images/small/{$i.file_name}')">
+                                        <img class="glm-member-filler-image" src="{$assetsUrl}/filler_s.gif">
+                                    </a>
+                                </li>
                         {/foreach}
                             </ul>
                         {apply_filters('glm-member-db-front-members-detail-galleryBottom', '', $member.id)}
index 2488013..ea06a49 100644 (file)
@@ -1,23 +1,13 @@
 <div class="glm-member-db-list-grid-view 
-    {if $settings.list_show_map_opened}map-opened{else}map-closed{/if}
+    {if $settings.list_map_show_opened}map-opened{else}map-closed{/if}
     {if $settings.list_show_search_filters_opened}filters-opened{else}filters-closed{/if}
 ">
 <!--    <div id="testdiv">---testdiv---{if $settings.view.value}$settings.view.value{else}null{/if}---testdiv---</div>-->
 {include file='front/members/header.html'}
 
         {apply_filters('glm-member-db-front-members-list-pageTop', '')}
-
-    {if $settings.list_show_map}        
-        <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
-        {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}
-    {apply_filters('glm-member-db-front-members-list-listHeaderTop', '')}
-    <div class="glm-member-list-inner-wrapper">
-        {if $settings.list_show_map}
+<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}
@@ -52,7 +42,7 @@
                             <div>
                                 {$terms.term_member_cap} Amenity:
                                 <select name="amenitySearch" id="amenitySelect">
-                                    <option value=""></option>
+                                    <option value=""></option>https://www.youtube.com/watch?v=18tGkzfPbmA
                                     {foreach from=$amenities item=v}
                                         <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
                                             {$v.name}
             </div> <!-- glm-member-list-filters-box -->
         </div> <!-- glm-member-list-wrapper -->
         {/if} {*list_show_search*}
+    {if $settings.list_show_map}        
+        <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
+        {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}
+    {apply_filters('glm-member-db-front-members-list-listHeaderTop', '')}
+    
+        
 
         <div class="glm-member-list-listing-container">
             {if $settings.list_show_list && !$blankStart}
                                     {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">
+                                    {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>
                 });
                 $(".glm-member-list-filters-toggle").click( function() {
                     $(".glm-member-db-list-grid-view").toggleClass("filters-opened");
-                    $(".glm-member-db-list-grid-view").toggleClass("filters-closed");
+                    $(".glm-member-db-list-grid-view").toggleClass("filters-closed");  
+                    $("#glm-locationMap-container").one("webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend",
+                        function() {
+                            var center = map.getCenter();
+                            google.maps.event.trigger(map, "resize");
+                            map.setCenter(center);
+                    });
                 });
             {/if}
 
             {if $settings.list_show_map}
-
-                $("#glm-member-list-map-toggle").click( function() {
-                    $(".glm-member-db-list-grid-view").toggleClass("map-opened");
-                    $(".glm-member-db-list-grid-view").toggleClass("map-closed");
-                    var currentScroll = $(window).scrollTop(); // get current position
-                    var mapTop = $("#glm-locationMap-container").offset().top-10;
-                    {if $settings.list_show_search}fixmeTop = $('#glm-member-list-filters-button').offset().top;{/if}
-                    if (currentScroll >= mapTop) {
-                        $('body,html').animate({
-                            scrollTop: $("#glm-locationMap-container").offset().top-10
-                        }, 50);
-                    } else {
-                        $('body,html').animate({
-                            scrollTop: $("#glm-locationMap-container").offset().top-10
-                        }, 400);
-                    }
-                });
                         /*
                          * Google Maps
                          *  API reference: https://developers.google.com/maps/documentation/javascript/reference
                          */
 
+
                         // Create a Google Map object
                         var map = new google.maps.Map(document.getElementById('glm-locationMap'), {
                                 center: new google.maps.LatLng({$settings.maps_default_lat}, {$settings.maps_default_lon}),
                             disableDefaultUI: false,
                             mapTypeId: google.maps.MapTypeId.MAP,
                         });
-
+                        
+                        $("#glm-member-list-map-toggle").click( function() {
+                            $(".glm-member-db-list-grid-view").toggleClass("map-opened");
+                            $(".glm-member-db-list-grid-view").toggleClass("map-closed");
+                            var center = map.getCenter();
+                            google.maps.event.trigger(map, "resize");
+                            map.setCenter(center);
+
+                            var currentScroll = $(window).scrollTop(); // get current position
+                            var mapTop = $("#glm-locationMap-container").offset().top-10;
+                            {if $settings.list_show_search}fixmeTop = $('#glm-member-list-filters-button').offset().top;{/if}
+                            if (currentScroll >= mapTop) {
+                                $('body,html').animate({
+                                    scrollTop: $("#glm-locationMap-container").offset().top-10
+                                }, 50);
+                            } else {
+                                $('body,html').animate({
+                                    scrollTop: $("#glm-locationMap-container").offset().top-10
+                                }, 400);
+                            }
+                        });
                         var geocoder = new google.maps.Geocoder();
                         var bounds = new google.maps.LatLngBounds();
                         var infowindow = new google.maps.InfoWindow();
index 9e6d43f..5949f58 100644 (file)
                         {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}
+                    <div>
+                        {if $m.phone && $settings.list_show_phone}<span class="glm-member-db-phone">Phone: {$m.phone} </span>{/if}
+                        {if $m.toll_free && $settings.list_show_tollfree}<span class="glm-member-db-phone-tollfree"><b>Toll Free:</b> {$m.toll_free}</span>{/if}
+                    </div>
                     {if $m.region && $settings.list_show_region}<div><b>Region:</b> {$m.region}</div>{/if}
 
-                    <div class="glm-member-list-links"><br>
+                    <div class="glm-member-list-links">
                         {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 class="socialtest">
+                        {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $m.id)}
+                       Social:{apply_filters('glm-member-db-front-members-social-list', '', $m.id)}
+                    </div>
                  </div>
-
+                    
                 <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}
-                        {$m.short_descr|nl2br}
-                    {elseif $m.descr && $settings.list_show_description}
-                        {$m.descr|nl2br}
+                        {$m.short_descr|nl2br}<a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">more</a>
                      {/if}
                     {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $m.id)}
                     </div>