From: laury Date: Fri, 13 May 2016 14:22:46 +0000 (-0400) Subject: Offsite images, grid and list view updated and fixed X-Git-Tag: v2.0.0^2~21^2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=7a8f07ca9107483f4eb3495ce720e87295b91e5d;p=WP-Plugins%2Fglm-member-db.git Offsite images, grid and list view updated and fixed --- diff --git a/assets/offsite-link_blk.png b/assets/offsite-link_blk.png new file mode 100644 index 00000000..b448cd81 Binary files /dev/null and b/assets/offsite-link_blk.png differ diff --git a/assets/offsite-link_gry.png b/assets/offsite-link_gry.png new file mode 100644 index 00000000..f90d7517 Binary files /dev/null and b/assets/offsite-link_gry.png differ diff --git a/assets/offsite-link_wht.png b/assets/offsite-link_wht.png new file mode 100644 index 00000000..e4b23d55 Binary files /dev/null and b/assets/offsite-link_wht.png differ diff --git a/controllers/front.php b/controllers/front.php index 61d12011..62050792 100644 --- a/controllers/front.php +++ b/controllers/front.php @@ -53,7 +53,6 @@ class glmMembersFront extends GlmPluginSupport // Now add any shortcodes from the config 'shortcodes' table while (list($key, $val) = each($this->config['shortcodes'])) { - add_shortcode($key, array( $this, diff --git a/css/front.css b/css/front.css index 576ce320..7acdc9bd 100644 --- a/css/front.css +++ b/css/front.css @@ -92,18 +92,18 @@ top: 0; margin: 0; border-radius: 4px; -} -#glm-member-list-map-toggle { - } .glm-member-db-list-grid-view.map-closed #glm-member-list-map-toggle:before { content: "View "; } +.glm-member-db-list-view.map-closed #glm-member-list-map-toggle:before { + content: "View "; +} .glm-member-db-list-grid-view.map-opened #glm-member-list-map-toggle:before { content: "Hide "; } -.glm-member-db-list-grid-view #glm-locationMap-container { - +.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 { transition: all 0.5s; @@ -229,14 +229,17 @@ margin-bottom: 40px; overflow: hidden; } +.glm-member-db-list-view #glm-locationMap-container { + margin-bottom: 40px; + overflow: hidden; +} .glm-member-db-list-grid-view.map-closed #glm-locationMap-container { margin-bottom: 0; height: 0; } -.glm-member-db-list-grid-view.map-closed #glm-locationMap-container #glm-locationMap { -} -.glm-member-db-list-grid-view.map-opened #glm-locationMap-container { - +.glm-member-db-list-view.map-closed #glm-locationMap-container { + margin-bottom: 0; + height: 0; } .glm-member-list-sub-links { color: black; @@ -288,9 +291,12 @@ /* text-align: right;*/ } #glm-directions, -.glm-member-entry-container.glm-member-search { +.glm-member-db-list-grid-view .glm-member-entry-container.glm-member-search { margin-top: 0; } +.glm-member-db-list-view .glm-member-entry-container.glm-member-search { + margin-top: 50px; +} .glm-member-entry-container { border: 1px #ccc solid; padding: .4em; @@ -415,6 +421,18 @@ text-align: center; padding: 15px; } +#glm-member-detail-website-link a:before { + //content: url("../assets/offsite-link_wht.png"); + background-image: url("../assets/offsite-link_wht.png"); + background-repeat: no-repeat; + background-size: contain; + content: " "; + display: inline-block; + height: 15px; + margin-right: 10px; + width: 15px; + +} #glm-member-detail-website-link a { color: white; } diff --git a/js/shortcodeBuilder.js b/js/shortcodeBuilder.js index ed2cb81c..34b0be10 100644 --- a/js/shortcodeBuilder.js +++ b/js/shortcodeBuilder.js @@ -39,7 +39,7 @@ jQuery(document).ready(function ($) { $("#blank-start-scDropdown").show(); $("#id-scDropdown").hide(); $("#view-scDropdown").show(); - $("#map-collapsed-scDropdown").show(); + $("#map-opened-scDropdown").show(); $("[id^='packageList']").hide(); } diff --git a/models/front/members/list.php b/models/front/members/list.php index 09c23bd2..2eaec5f7 100644 --- a/models/front/members/list.php +++ b/models/front/members/list.php @@ -434,14 +434,14 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo } /* - * Check for which view file to use, else default to bars + * Check for which view file to use, else default to list */ $view = "front/members/list.html"; if (isset($actionData['request']['view']) && strtolower($actionData['request']['view']) == "grid") { $view = "front/members/grid.html"; } - + /* * Check for a blank start - No members selected, just search form */ @@ -519,4 +519,4 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo } -?> \ No newline at end of file +?> diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml new file mode 100644 index 00000000..47509625 --- /dev/null +++ b/nbproject/private/private.xml @@ -0,0 +1,4 @@ + + + + diff --git a/setup/shortcodes.php b/setup/shortcodes.php index b7dc61f2..64f774b1 100644 --- a/setup/shortcodes.php +++ b/setup/shortcodes.php @@ -241,12 +241,12 @@ $glmMembersShortcodesDescription = ' allnone Map Options mapmap-name-linkmap-logo - map-collapsedmap-collapsedmap-collapsed - map-descriptionmap-short-descriptionmap-address - map-streetmap-city-state-zipmap-country - map-regionmap-phonemap-toll-free - map-urlmap-url-new-targetmap-email - map-categoriesmap-credit-cardsmap-amenities + map-openedmap-descriptionmap-short-description + map-streetmap-city-state-zipmap-address + map-regionmap-phonemap-country + map-urlmap-url-new-targetmap-toll-free + map-categoriesmap-credit-cardsmap-email + map-amenities Search Form Options searchsearch-textsearch-categories search-amenitiessearch-alpha diff --git a/views/front/members/grid.html b/views/front/members/grid.html index 35740863..6141d315 100644 --- a/views/front/members/grid.html +++ b/views/front/members/grid.html @@ -2,6 +2,7 @@ {if $settings.list_show_map_opened}map-opened{else}map-closed{/if} {if $settings.list_show_search_filters_opened}filters-opened{else}filters-closed{/if} "> +
---testdiv---{if $settings.view.value}$settings.view.value{else}null{/if}---testdiv---
{include file='front/members/header.html'} {apply_filters('glm-member-db-front-members-list-pageTop', '')} @@ -29,38 +30,38 @@
{apply_filters('glm-member-db-front-members-list-searchFormTop', '')} +
+

Filter {$terms.term_member_cap}s

+
+ {if $settings.list_show_search_category}
-

Filter {$terms.term_member_cap}s

+ {$terms.term_member_cap} Category: +
- {if $settings.list_show_search_category} -
- {$terms.term_member_cap} Category: - + + {foreach from=$amenities item=v} + {/foreach} - -
- {/if} - {if $settings.list_show_search_amenities} -
- {$terms.term_member_cap} Amenity: - -
+ +
{/if} - + {if $settings.list_show_search_text}
Text Search: @@ -218,153 +219,151 @@
- {include file='front/footer.html'} - - \ No newline at end of file + + {include file='front/footer.html'} diff --git a/views/front/members/list.html b/views/front/members/list.html index 459b6174..08756cb1 100644 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -1,17 +1,23 @@ +
{include file='front/members/header.html'} - {apply_filters('glm-member-db-front-members-list-pageTop', '')} - +
---testdiv---{if $settings.view.value}$settings.view.value{else}{$settings}{/if}---testdiv---
{if $settings.list_show_map} {apply_filters('glm-member-db-front-members-list-mapTop', '')} -
(map loads here)
+
+
(map loads here)
+
{apply_filters('glm-member-db-front-members-list-mapBottom', '')} {/if} - -{if $settings.list_show_search} - +
+ {if $settings.list_show_map} +
Map
+ {/if} + {if $settings.list_show_search}
@@ -65,206 +71,227 @@
-{/if} {*list_show_search*} - -{apply_filters('glm-member-db-front-members-list-listHeaderTop', '')} -{if $settings.list_show_list && !$blankStart} -

List of {$terms.term_member_plur_cap}

- {if $haveMembers} - - {if $settings.list_show_search_alpha} -
- All - {foreach $alphaList as $a} - {$a.alpha} - {/foreach} -
- {/if} - {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')} - - + {/if} {*list_show_search*} - {foreach $members as $m} + {apply_filters('glm-member-db-front-members-list-listHeaderTop', '')} - {apply_filters('glm-member-db-front-members-list-memberAbove', '', $m.id)} -
-
- {apply_filters('glm-member-db-front-members-list-memberTop', '', $m.id)} -
- - {if $m.logo && $settings.list_show_logo} -
-
- - -
-
-
- {else} -

-
- {/if} - - {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $m.id)} -

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

- {if $settings.list_show_address} - {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $m.id)} - {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.id)} - {/if} - {apply_filters('glm-member-db-front-members-list-memberDetailTop', '', $m.id)} - {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 $settings.list_show_list && !$blankStart} +

List of {$terms.term_member_plur_cap}

+ {if $haveMembers} -

- {if $m.url && $settings.list_show_url}Website{/if} - {if $m.email && $settings.list_show_email}Email{/if} -
- {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $m.id)} -
-
-
- {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} - {/if} - {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $m.id)} -
- {if $m.categories && $settings.list_show_categories} - {$terms.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 && $settings.list_show_creditcards} - Credit Cards Accepted: -
    - {foreach $m.cc_type.names as $c} -
  • {$c}
    • - {/foreach} -
- {/if} - {if $m.amenities && $settings.list_show_amenities} - {$terms.term_member_cap} Amenities -
    - {foreach $m.amenities as $A} -
  • - {$A.name} -
    • - {/foreach} -
- {/if} + {if $settings.list_show_search_alpha} +
+ All + {foreach $alphaList as $a} + {$a.alpha} + {/foreach} +
+ {/if} + {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')} + + + + {foreach $members as $m} + + {apply_filters('glm-member-db-front-members-list-memberAbove', '', $m.id)} + +
+
+ {apply_filters('glm-member-db-front-members-list-memberTop', '', $m.id)} +
+ + {if $m.logo && $settings.list_show_logo} +
+
+ +
+
+
+ {else} +

+
+ {/if} + + {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $m.id)} +

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

+ {if $settings.list_show_address} + {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $m.id)} + {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.id)} + {/if} + {apply_filters('glm-member-db-front-members-list-memberDetailTop', '', $m.id)} + {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 $m.url && $settings.list_show_url}Website{/if} + {if $m.email && $settings.list_show_email}Email{/if} +
+ {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $m.id)} +
+
+
+ {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} + {/if} + {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $m.id)} +
+ {if $m.categories && $settings.list_show_categories} +
+ {$terms.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 && $settings.list_show_creditcards} + Credit Cards Accepted: +
    + {foreach $m.cc_type.names as $c} +
  • {$c}
    • + {/foreach} +
+ {/if} + {if $m.amenities && $settings.list_show_amenities} + {$terms.term_member_cap} Amenities +
    + {foreach $m.amenities as $A} +
  • + {$A.name} +
    • + {/foreach} +
+ {/if} +
{apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $m.id)} {apply_filters('glm-member-db-front-members-list-memberBottom', '', $m.id)} -
+
{apply_filters('glm-member-db-front-members-list-memberBelow', '', $m.id)} -
- - -
- {apply_filters('glm-member-db-front-members-list-mapBubbleTop', '', $m.id)} +
+ + +
+ {apply_filters('glm-member-db-front-members-list-mapBubbleTop', '', $m.id)} {if $m.logo && $settings.list_map_show_logo}
{/if} -
- {if $settings.list_map_show_detaillink} - {$m.member} - {else} - {$m.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} - {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} +

+ {if $settings.list_map_show_detaillink} + {$m.member} + {else} + {$m.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} + {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} {if $m.country.name && $settings.list_map_show_country}
{$m.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 $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} -
- {$terms.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 && $settings.list_map_show_creditcards} -
- Credit Cards Accepted: -
    - {foreach $m.cc_type.names as $c} -
  • {$c}
    • - {/foreach} -
-
- {/if} - {if $settings.list_map_show_amenities} -
- Amenities: -
    - {foreach $m.amenities as $a} -
  • {$a.name}
    • - {/foreach} -
-
- {/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 $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} +
+ {$terms.term_member_cap} Categories +
    + {foreach $m.categories as $c} +
  • + {if $c.parent_name}{$c.parent_name}: {/if}{$c.name} +
    • + {/foreach} +
- {apply_filters('glm-member-db-front-members-list-mapBubbleBottom', '', $m.id)} -
- - {/foreach} {*$members*} - {apply_filters('glm-member-db-front-members-list-pageBottom', '')} -{else} -
(no {$terms.term_member_plur} listed)
-{/if} - -{/if} {*list_show_list*} - - +
+
{include file='front/footer.html'}