From: Chuck Scott Date: Fri, 22 May 2015 16:20:10 +0000 (-0400) Subject: Reworked front-end member listing to be Foundation aware. X-Git-Tag: v1.0.0~8 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=7543299f108e6a4d3d7793d152ec0cfd24420ec9;p=WP-Plugins%2Fglm-member-db.git Reworked front-end member listing to be Foundation aware. --- diff --git a/css/front.css b/css/front.css index d03e0da3..bf1f9421 100644 --- a/css/front.css +++ b/css/front.css @@ -39,7 +39,7 @@ /* Member List */ .glm-member-list-container { border: 1px #ccc solid; - padding: .4em; + padding: .4em 0px 0px 0px; background: #f8f8f8; margin: .4em 0px .4em 0px; } @@ -48,12 +48,14 @@ padding: .4em; margin: 1em 0px 1em 0px; } -.glm-member-list-image { +.glm-member-list-image-right { float: right; } -.glm-member-list-nameAddress { +.glm-member-list-image-left { float: left; } +.glm-member-list-nameAddress { +} .glm-member-list-info { clear: both; } diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php index a62b83ee..07955ed9 100755 --- a/lib/GlmDataAbstract/DataAbstract.php +++ b/lib/GlmDataAbstract/DataAbstract.php @@ -2289,8 +2289,11 @@ abstract class GlmDataAbstract // Scan all the image size directories and remove this image while (list($k, $v) = each($this->config['imageSizes'])) { - unlink(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$k.'/'.$current_img); + if (is_file(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$k.'/'.$current_img)) { + unlink(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$k.'/'.$current_img); + } } + if (is_file(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$current_img)) unlink(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$current_img); $current_img = ''; @@ -2338,7 +2341,9 @@ abstract class GlmDataAbstract // Move resized file to desired direectory rename(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$sizes[$k]['file'], GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$k.'/'.$newFilename); - unlink(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$sizes[$k]['file']); + if (is_file(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$sizes[$k]['file'])) { + unlink(GLM_MEMBERS_PLUGIN_IMAGES_PATH.'/'.$sizes[$k]['file']); + } } else { diff --git a/views/front/members/list.html b/views/front/members/list.html index 155fe4cd..68552bc9 100644 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -4,116 +4,135 @@ {if $list_show_map} -
(map loads here)
+
(map loads here)
{/if} {if $list_show_search}
-
-


Search for a {$term_member_cap}

- {if $list_search_text} -
- Text Search: -
- {/if} - {if $list_search_category} -
- {$term_member_cap} Category: - +
+
+


Search for a {$term_member_cap}

+
+ {if $list_search_text} +
Text Search:
+ {/if} + {if $list_search_category} +
+ {$term_member_cap} Category: + +
+
+ {/if} + {if $list_search_amenities} +
Amenity search goes here
+ {/if} +
- {/if} - {if $list_search_amenities} -
Amenity search goes here
- {/if} -
{/if} {*list_show_search*} {if $list_show_list} -

List of {$term_member_plur_cap}

+

List of {$term_member_plur_cap}

{if $haveMembers} - + {if $list_search_alpha}
All - {foreach $alphaList as $a} + {foreach $alphaList as $a} {$a.alpha} - {/foreach} + {/foreach}
{/if} - + + {foreach $members as $m} -
- {if $m.logo && $list_show_logo}
{/if} -
-

- {if $list_show_detaillink} - {$m.member} - {else} - {$m.member} - {/if} -

+ +
+
+
+ + {if $m.logo && $list_show_logo} +
+ {/if} +
+ +

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

{if $list_show_address} -

{if $list_show_street} - {if $m.addr1}{$m.addr1}
{/if} - {if $m.addr2}{$m.addr2}
{/if} + {if $m.addr1}{$m.addr1}
{/if} + {if $m.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 $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 $m.country.name && $list_show_country}
{$m.country.name}{/if} {/if} {*list_show_address*} -
-
-

- {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.region.value && $list_show_region}

Region: {$m.region.name}

{/if} -

- {if $m.descr && $list_show_description}

{$m.descr}

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

{$m.short_descr}

{/if} - {if $m.categories && $list_show_categories} -
- {$term_member_cap} Categories -
    - {foreach $m.categories as $c} -
  • - {if $c.parent_name}{$c.parent_name}: {/if}{$c.name} -
    • - {/foreach} -
-
- {/if} - {if $m.cc_type && $list_show_creditcards} -
- Credit Cards Accepted: -
    - {foreach $m.cc_type.names as $c} -
  • {$c}
    • - {/foreach} -
+ {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.region.value && $list_show_region}

Region: {$m.region.name}{/if} +

+ + {if $m.logo && $list_show_logo} +
+ {/if}
- {/if} - {if $list_show_amenities} -
-

Amenities go here

+ + +
+
+ + {if $m.descr && $list_show_description}

{$m.descr}

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

{$m.short_descr}

{/if} + {if $m.categories && $list_show_categories} +

+ {$term_member_cap} Categories +

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

+ {/if} + {if $m.cc_type && $list_show_creditcards} +

+ Credit Cards Accepted: +

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

+ {/if} + {if $list_show_amenities} +

+

Amenities go here

+

+ {/if} +
- {/if} +
- + +
{if $m.logo && $list_map_show_logo}
{/if} @@ -156,7 +175,7 @@ {/foreach}
- {/if}1 + {/if} {if $m.cc_type && $list_map_show_creditcards}
Credit Cards Accepted: @@ -174,104 +193,104 @@ {/if}
- + {/foreach} {*$members*} - {else} -
(no {$term_member_plur} listed)
- {/if} -{/if} {*list_show_list*} - + - - {include file='front/footer.html'}