From: Laury GvR Date: Thu, 22 Sep 2016 02:25:26 +0000 (-0400) Subject: Updated member view markup. Made hooks for theme. X-Git-Tag: v2.6.0^2~1 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e740468f7bf511208dc80cd203b8e1b873ecef14;p=WP-Plugins%2Fglm-member-db.git Updated member view markup. Made hooks for theme. Made a hook to get the member's name and slug on the front end. --- diff --git a/classes/data/dataMemberInfo.php b/classes/data/dataMemberInfo.php index b75b4155..69812b16 100644 --- a/classes/data/dataMemberInfo.php +++ b/classes/data/dataMemberInfo.php @@ -503,7 +503,7 @@ class GlmDataMemberInfo extends GlmDataAbstract } $dotdotdot = ''; if (strlen($r['short_descr']) > 120 ) { - $dotdotdot = ' ... '; + $dotdotdot = ' ...'; } $formattedStr = trim(preg_replace('/\s\s+/', ' ', $r['short_descr'])); $r['short_descr'] = substr($formattedStr, 0, 120).$dotdotdot; diff --git a/models/admin/management/import/members.php b/models/admin/management/import/members.php index ae24ea3a..ba560312 100644 --- a/models/admin/management/import/members.php +++ b/models/admin/management/import/members.php @@ -794,7 +794,7 @@ if (!$failure) { // Add this member to the names inserted so we can check for duplicates $namesInserted[$membName] = true; - // Create truncated short_descr from descritions - Less tags, html encoded characters, newlines, tabs, etc. + // Create truncated short_descr from descriptions - 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)); diff --git a/setup/frontHooks.php b/setup/frontHooks.php index 79f9bb54..e584ff4c 100644 --- a/setup/frontHooks.php +++ b/setup/frontHooks.php @@ -270,4 +270,22 @@ add_filter('glm_associate_config', function() { }); add_filter('glm_associate_terms', function() { return $this->config['terms']; -}); \ No newline at end of file +}); +add_filter('glm_associate_member', function( $attribute ) { + global $wpdb; + $result = $wpdb->get_var( "SELECT $attribute FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX . "members WHERE member_slug = '".$GLOBALS['glmDetailSlug']."'" ); + return $result; +}); + +function is_member( $id = null ) { + global $wpdb; + if ($id) { + $result = $wpdb->get_var( "SELECT id FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX . "members WHERE id = $id" ); + } else { + $result = $wpdb->get_var( "SELECT id FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX . "members WHERE member_slug = '".$GLOBALS['glmDetailSlug']."'" ); + } + if ($result) { + return true; + } + return false; +} \ No newline at end of file diff --git a/views/front/members/list.html b/views/front/members/list.html index bf1ab8c5..a7f19d26 100644 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -100,24 +100,24 @@ {/if} {if $view == grid} + + {else} - - {foreach $members as $m} - {apply_filters('glm-member-db-front-members-list-memberAbove', '', $m.member_pointer)} + + + {foreach $members as $member} + {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)}
- {apply_filters('glm-member-db-front-members-list-memberTop', '', $m.member_pointer)} + {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
- {if $m.logo && $settings.list_show_logo} + {if $member.logo && $settings.list_show_logo}
- +
{/if} -
- {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $m.member_pointer)} + {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $member.member_pointer)}

{if $settings.list_show_detail_link} - {$m.member} + {$member.member} {else} - {$m.member} + {$member.member} {/if}

{if $settings.list_show_address} - {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $m.member_pointer)} - {if $settings.list_show_street} - {if $m.addr1 && $settings.list_show_address}{$m.addr1}{/if} - {if $m.addr2 && $settings.list_show_addr2}{$m.addr2}{/if} - {/if} - {if $settings.list_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_show_country}
{$m.country.name}
{/if} - {apply_filters('glm-member-db-front-members-list-memberAddressBottom', '', $m.member_pointer)} +
+ {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $member.member_pointer)} + {if $settings.list_show_street} + {if $member.addr1 && $settings.list_show_address}
{$member.addr1}
{/if} + {if $member.addr2 && $settings.list_show_address}
{$member.addr2}
{/if} + {/if} + {if $settings.list_show_citystatezip} +
+ {if $member.city} + {$member.city}{if $member.state.value}, {/if} + {/if} + {if $member.state.value} + {$member.state.value} + {/if} + {if $member.zip} + {$member.zip} + {/if} +
+ {/if} + {if $member.country.name && $settings.list_show_country} +
{$member.country.name}
+ {/if} + {apply_filters('glm-member-db-front-members-list-memberAddressBottom', '', $member.member_pointer)} +
+ {/if} + {apply_filters('glm-member-db-front-members-list-memberDetailTop', '', $member.member_pointer)} + {if ($member.phone && $settings.list_show_phone) || ($member.toll_free && $settings.list_show_tollfree)} +
+ {if $member.phone && $settings.list_show_phone}Phone: {$member.phone} {/if} + {if $member.toll_free && $settings.list_show_tollfree}Toll Free: {$member.toll_free}{/if} +
{/if} - {apply_filters('glm-member-db-front-members-list-memberDetailTop', '', $m.member_pointer)} -
- {if $m.phone && $settings.list_show_phone}Phone: {$m.phone} {/if} - {if $m.toll_free && $settings.list_show_tollfree}Toll Free: {$m.toll_free}{/if} -
- {if $m.region && $settings.list_show_region}
Region: {$m.region}
{/if} + {if $member.region && $settings.list_show_region}
Region: {$member.region}
{/if}
- {apply_filters('glm-member-db-front-members-social-list', '', $m.member_pointer)} + {apply_filters('glm-member-db-front-members-social-list', '', $member.member_pointer)}
- {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $m.member_pointer)} - {if $m.short_descr && $settings.list_show_short_descr} - {$m.short_descr|nl2br} More - {/if} - {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $m.member_pointer)} + {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $member.member_pointer)} + {if $member.short_descr && $settings.list_show_short_descr} + {$member.short_descr|nl2br} More + {/if} + {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $member.member_pointer)}
- {if $m.categories && $settings.list_show_categories} + {if $member.categories && $settings.list_show_categories}
{$terms.term_member_cap} Categories
    - {foreach $m.categories as $c} + {foreach $member.categories as $c}
  • {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
  • {/foreach}
{/if} - {if $m.cc_type && $settings.list_show_creditcards} + {if $member.cc_type && $settings.list_show_creditcards} Credit Cards Accepted:
    - {foreach $m.cc_type.names as $c} + {foreach $member.cc_type.names as $c}
  • {$c}
  • {/foreach}
{/if} - {if $m.amenities && $settings.list_show_amenities} + {if $member.amenities && $settings.list_show_amenities} {$terms.term_member_cap} Amenities
    - {foreach $m.amenities as $A} + {foreach $member.amenities as $A}
  • {$A.name}
  • @@ -334,55 +352,55 @@ {/if}
- {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $m.member_pointer)} + {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $member.member_pointer)}
- {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $m.member_pointer)} - {apply_filters('glm-member-db-front-members-list-memberBottom', '', $m.member_pointer)} + {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)} + {apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)}
- {apply_filters('glm-member-db-front-members-list-memberBelow', '', $m.member_pointer)} + {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)} -
- {apply_filters('glm-member-db-front-members-list-mapBubbleTop', '', $m.member_pointer)} - {if $m.logo && $settings.list_map_show_logo}
{/if} +
+ {apply_filters('glm-member-db-front-members-list-mapBubbleTop', '', $member.member_pointer)} + {if $member.logo && $settings.list_map_show_logo}
{/if}
{if $settings.list_map_show_detaillink} - {$m.member} + {$member.member} {else} - {$m.member} + {$member.member} {/if}
{if $settings.list_map_show_address}

{if $settings.list_map_show_street} - {if $m.addr1}{$m.addr1}
{/if} - {if $m.addr2}{$m.addr2}
{/if} + {if $member.addr1}{$member.addr1}
{/if} + {if $member.addr2}{$member.addr2}
{/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 $member.city}{$member.city}{if $member.state.value}, {/if}{/if}{if $member.state.value}{$member.state.value}{/if}{if $member.zip} {$member.zip}{/if} {/if} - {if $m.country.name && $settings.list_map_show_country}
{$m.country.name}{/if} + {if $member.country.name && $settings.list_map_show_country}
{$member.country.name}{/if}

{/if} {*list_map_show_address*}

- {if $m.phone && $settings.list_map_show_phone}Phone: {$m.phone}
{/if} - {if $m.toll_free && $settings.list_map_show_tollfree}Toll Free: {$m.toll_free}
{/if} - {if $m.url && $settings.list_map_show_url}Web site: {$m.url}
{/if} - {if $m.email && $settings.list_map_show_email}E-Mail Address: {$m.email}
{/if} - {if $m.region && $settings.list_map_show_region}Region: {$m.region}{/if} + {if $member.phone && $settings.list_map_show_phone}Phone: {$member.phone}
{/if} + {if $member.toll_free && $settings.list_map_show_tollfree}Toll Free: {$member.toll_free}
{/if} + {if $member.url && $settings.list_map_show_url}Web site: {$member.url}
{/if} + {if $member.email && $settings.list_map_show_email}E-Mail Address: {$member.email}
{/if} + {if $member.region && $settings.list_map_show_region}Region: {$member.region}{/if}

- {if $m.descr && $settings.list_map_show_descr}{$m.descr|nl2br}
{/if} - {if $m.short_descr && $settings.list_map_show_short_descr}{$m.short_descr}
{/if} - {if $m.categories && $settings.list_map_show_categories} + {if $member.descr && $settings.list_map_show_descr}{$member.descr|nl2br}
{/if} + {if $member.short_descr && $settings.list_map_show_short_descr}{$member.short_descr}
{/if} + {if $member.categories && $settings.list_map_show_categories}
{$terms.term_member_cap} Categories
    - {foreach $m.categories as $c} + {foreach $member.categories as $c}
  • {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
  • @@ -390,11 +408,11 @@
{/if} - {if $m.cc_type && $settings.list_map_show_creditcards} + {if $member.cc_type && $settings.list_map_show_creditcards}
Credit Cards Accepted:
    - {foreach $m.cc_type.names as $c} + {foreach $member.cc_type.names as $c}
  • {$c}
  • {/foreach}
@@ -404,14 +422,14 @@
Amenities:
    - {foreach $m.amenities as $a} + {foreach $member.amenities as $a}
  • {$a.name}
  • {/foreach}
{/if}
- {apply_filters('glm-member-db-front-members-list-mapBubbleBottom', '', $m.member_pointer)} + {apply_filters('glm-member-db-front-members-list-mapBubbleBottom', '', $member.member_pointer)}
{/foreach} {*$members*} @@ -529,17 +547,17 @@ {if $haveMembers} {foreach $members as $m} - {if $m.lat != 0 && $m.lon != 0} + {if $member.lat != 0 && $member.lon != 0} // Create a marker for this member var marker = new google.maps.Marker({ map: map, - position: new google.maps.LatLng({$m.lat}, {$m.lon}), + position: new google.maps.LatLng({$member.lat}, {$member.lon}), draggable: false, animation: google.maps.Animation.DROP, - title: '{$m.member|escape}', - descr: $('#map_info_' + {$m.member_pointer}).html(), - memberID: {$m.member_pointer} + title: '{$member.member|escape}', + descr: $('#map_info_' + {$member.member_pointer}).html(), + memberID: {$member.member_pointer} }); // Add a click listener for this marker @@ -588,9 +606,10 @@ }); }); - + console.log(window.Foundation.version); }); +
{include file='front/footer.html'}