From: Laury GvR Date: Fri, 25 Sep 2015 14:49:50 +0000 (-0400) Subject: Many changes to styling & markup, some config, front.css X-Git-Tag: v1.0.12~2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=01e7b73f5eee3abbb0a0e3c0550b4bf6f3619a48;p=WP-Plugins%2Fglm-member-db.git Many changes to styling & markup, some config, front.css --- diff --git a/config/plugin.ini b/config/plugin.ini index 969a6e26..74b85723 100644 --- 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 0c0d148c..812b829a 100644 --- 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 91d99640..c93511c9 100644 --- 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 71d26095..e503e096 100644 --- 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 0534b102..75400ec2 100644 --- 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 0c1778d4..3ea26ff9 100644 --- a/views/front/members/detail.html +++ b/views/front/members/detail.html @@ -4,11 +4,6 @@ - {if $detail_show_map} -
-
(map loads here)
-
- {/if} {if $detail_show_directions}
(directions load here)
@@ -47,32 +42,55 @@
+ {if $detail_show_map} +
+
(map loads here)
+
+ {/if} {if $detail_show_logo}
- +
+ +
- {/if} -
- -

{$member.member}

- {if $detail_show_address} - {if $detail_show_street} - {if $member.addr1}{$member.addr1}
{/if} - {if $member.addr2}{$member.addr2}
{/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}
{$member.country.name}{/if} -

- {/if} {*list_show_address*} - {if $member.phone && $detail_show_phone}
Phone: {$member.phone}{/if} - {if $member.toll_free && $detail_show_tollfree}
Toll Free: {$member.toll_free}{/if} - {if $member.url && $detail_show_url}
Web site: {$member.url}{/if} - {if $member.email && $detail_show_email}
E-Mail Address: {$member.email}{/if} - {if $member.region.value && $detail_show_region}
Region: {$member.region.name}{/if} -
+ {/if}
+
+ +
+
+ +

+ {if $list_show_detaillink} + {$member.member} + {else} + {$member.member} + {/if} +

+ {if $list_show_address} + {if $list_show_street} + {if $member.addr1}
{$member.addr1}
{/if} + {if $member.addr2}
{$member.addr2}
{/if} + {/if} + {if $list_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 && $list_show_country}
{$member.country.name}
{/if} + {/if} + {if $member.phone && $list_show_phone}
Phone: {$member.phone}
{/if} + {if $member.toll_free && $list_show_tollfree}
Toll Free: {$member.toll_free}
{/if} + {if $member.region.value && $list_show_region}

Region: {$member.region.name}

{/if} + +

+ {if $member.url && $list_show_url}Website{/if} + {if $member.email && $list_show_email}Email{/if} + {if $detail_show_imagegallery}Photo Gallery{/if} + {if $detail_show_imagegallery}Coupons{/if} + {if $detail_show_imagegallery}Packages{/if} +
+
+ + {if $detail_show_logo}
@@ -80,51 +98,56 @@
-
-
- {if $member.descr && $detail_show_description}

{$member.descr}

{/if} - {if $member.short_descr && $detail_show_short_descr}

{$member.short_descr}

{/if} - - {if $member.categories && $detail_show_categories} -

- {$term_member_cap} Categories -

    - {foreach $member.categories as $c} -
  • - {if $c.parent_name}{$c.parent_name}: {/if}{$c.name} -
    • - {/foreach} -
-

- {/if} - {if $member.cc_type && $detail_show_creditcards} -

- Credit Cards Accepted: -

    - {foreach $member.cc_type.names as $c} -
  • {$c}
    • - {/foreach} -
-

- {/if} - {if $member.amenities && $detail_show_amenities} -

- {$term_member_cap} Amenities -

    - {foreach $member.amenities as $a} -
  • - {$a.name} -
    • - {/foreach} -
-

- {/if} +
+
+
+ {if $member.amenities && $detail_show_amenities} + {$term_member_cap} Amenities & Services +
    + {foreach $member.amenities as $a} +
  • + {$a.name} +
    • + {/foreach} +
+ + {/if} + {if $member.cc_type && $detail_show_creditcards} +

+ Credit Cards Accepted: +

    + {foreach $member.cc_type.names as $c} +
  • {$c}
    • + {/foreach} +
+

+ {/if} + {if $member.categories && $detail_show_categories} +

+ {$term_member_cap} Categories +

    + {foreach $member.categories as $c} +
  • + {if $c.parent_name}{$c.parent_name}: {/if}{$c.name} +
    • + {/foreach} +
+

+ {/if} +
+
+
+
+ {if $member.descr && $detail_show_description}{$member.descr}{/if} + {if $member.short_descr && $detail_show_short_descr}{$member.short_descr}{/if} +
{if $detail_show_imagegallery} -
Image Gallery
+ +
Photo Gallery
diff --git a/views/front/members/list.html b/views/front/members/list.html index 84312678..beeb6b7e 100644 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -79,7 +79,18 @@
{/if} -
+ + +
+
+ +
+ {if $m.logo && $list_show_logo} +
+
+
+ {/if} +

{if $list_show_detaillink} @@ -90,32 +101,37 @@

{if $list_show_address} {if $list_show_street} - {if $m.addr1}
{$m.addr1}
{/if} - {if $m.addr2}
{$m.addr2}
{/if} + {if $m.addr1 && $list_show_address}
{$m.addr1}
{/if} + {if $m.addr2 && $list_show_addr2}
{$m.addr2}
{/if} {/if} {if $list_show_citystatezip} {if $m.city.name}{$m.city.name}{if $m.state.name}, {/if}{/if}{if $m.state.name}{$m.state.name}{/if}{if $m.zip} {$m.zip}{/if} {/if} {if $m.country.name && $list_show_country}
{$m.country.name}
{/if} {/if} - {if $m.phone && $list_show_phone}
Phone: {$m.phone}
{/if} + {if $m.phone && $list_show_phone}
Phone: {$m.phone}
{/if} {if $m.toll_free && $list_show_tollfree}
Toll Free: {$m.toll_free}
{/if} - {if $m.url && $list_show_url}
Web site: {$m.url}
{/if} - {if $m.email && $list_show_email}
E-Mail Address: {$m.email}
{/if} {if $m.region.value && $list_show_region}

Region: {$m.region.name}

{/if} + +

+ {if $m.url && $list_show_url}Website{/if} + {if $m.email && $list_show_email}Email{/if} + View Profile +
- - {if $m.logo && $list_show_logo} -
- {/if}
- +
-
- - {if $m.descr && $list_show_description}

{$m.descr}

{/if} - {if $m.short_descr && $list_show_short_descr}

{$m.short_descr}

{/if} +
+ + {if $m.short_descr && $list_show_short_descr} + {$m.short_descr} ... View Profile + + {elseif $m.descr && $list_show_description} + {$m.descr|truncate:190:false:false} class="test">... View Profile + {/if} + {if $m.categories && $list_show_categories}

{$term_member_cap} Categories