From 2efd6891560c66e3d02526ab005253100d3d2631 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Tue, 26 Jan 2016 10:31:10 -0500 Subject: [PATCH] Changed views, added hooks, mainly for detail. Lots of css --- assets/email.png | Bin 579 -> 0 bytes css/front.css | 27 ++++--- models/front/packaging/list.php | 3 + setup/frontHooks.php | 13 +++- views/front/packaging/detail.html | 69 ++++++++++-------- .../front/packaging/listForMemberDetail.html | 47 ++++++------ .../front/packaging/listForMemberListing.html | 2 +- .../packagesLinkForMemberDetail.html | 6 +- .../packagesSidemenuForMemberDetail.html | 3 + 9 files changed, 100 insertions(+), 70 deletions(-) delete mode 100644 assets/email.png create mode 100644 views/front/packaging/packagesSidemenuForMemberDetail.html diff --git a/assets/email.png b/assets/email.png deleted file mode 100644 index 14e0011f70f0ca8018c0d09b4c3fa511eb2e236e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 579 zcmV-J0=)f+P)Gb;%qURY-5+~>@HF6Z!^NjYanv5q;S_3wdd zkWxC-Lgk!Otw($ZConeTb3bDr=YBg;tWP+JFSs7DiHeZDxULoMCpyQ1jBVV(YpgVz zO*!XEzh<)uEAfomc>V*Ce*v}P|8m^lN24qRjmXJZj@V`|(2GLSVjTMkW=cS2Lc52> zLi|}T&~{hyd=#~fix}wv7>T`hXy?23pOyiQ;&OCh8?!w?v$3}m+R@6Of_MtAu#1I4 zd?8}HnCg@J6I8|-MsOxxW-X=EN-4FXg){1*8Qy|YN*Az!$GCy@!uEQ^9$_Q21MQ(- zjq1^!Z!tZfVl>pU3o3T_1gey1*D;clg z4C9e=fUAQ*4{-_a!%8NrdL1Ss_d~eFgAOR=oICUACEnm8uH~G+4KpKBO2=_8>Ua3gC8e&8gM@0j7i-WHlv>z^T>JNwNJDiOHs^5tYWt6A?-*taI=sQ?OUfI=` R2pa$Z002ovPDHLkV1mzs{8|72 diff --git a/css/front.css b/css/front.css index f1ba96a..9cdb36d 100644 --- a/css/front.css +++ b/css/front.css @@ -25,11 +25,16 @@ div.member div.address { overflow: hidden; padding: 5px 3%; } -.glm-member-package-container { - background: #f5f5f5 none repeat scroll 0 0; +.glm-member-package-detail-container .glm-member-package-container { border: 1px solid #ccc; margin: 20px 0; } +.glm-member-package-container { + background: #f5f5f5 none repeat scroll 0 0; +} +#glm-member-detail-packages-container > h2 { + color: #92a682; +} .glm-member-package-container .package { overflow: hidden; } @@ -68,6 +73,10 @@ div.member div.address { font-weight: normal; font-size: 18px; } +.glm-member-package-container h2 a, +.glm-member-package-container h2 { + color: #92a682; +} .glm-package-detail-image-wrapper img { float: right; } @@ -80,6 +89,9 @@ div.member div.address { .glm-member-package-container .address > * { line-height: 1.25; } +#glm-member-detail-packages-container .glm-member-package-container .glm-member-img-wrap { + padding: 0; +} .glm-member-package-container .glm-member-img-wrap { float: right; max-height: 200px; @@ -88,13 +100,6 @@ div.member div.address { padding: 20px 3%; min-width: 100px; } -div.member div.address a.email { - display: block; - float: left; - width: auto; - color: #73BF45; - height: 28px; - margin: 0 10px 3px 0; - padding: 4px 0 4px 32px; - background: url(../assets/email.png) 0 50% no-repeat; +.glm-member-list-container h2 { + color: #92A682; } \ No newline at end of file diff --git a/models/front/packaging/list.php b/models/front/packaging/list.php index 3802d0c..44f42c1 100644 --- a/models/front/packaging/list.php +++ b/models/front/packaging/list.php @@ -235,6 +235,9 @@ class GlmMembersFront_packaging_list extends GlmDataPackages case 'packages-link': $view = 'packagesLinkForMemberDetail.html'; break; + case 'detail-sidemenu'; + $view = 'packagesSidemenuForMemberDetail.html'; + break; case 'member-detail': $view = 'listForMemberDetail.html'; break; diff --git a/setup/frontHooks.php b/setup/frontHooks.php index 599881a..2072bcc 100644 --- a/setup/frontHooks.php +++ b/setup/frontHooks.php @@ -61,7 +61,7 @@ if (isset($this->config['addOns']['glm-member-db'])) { ); // Add internal page content links to member detail page - add_filter('glm-member-db-front-members-detail-internalContentLinks', function($content, $id) { + add_filter('glm-member-db-front-members-detail-linksBottom', function($content, $id) { $packageData = do_shortcode('[glm-members-packaging-list member='.$id.', template="packages-link" order="title"]'); $content .= $packageData; return $content; @@ -71,7 +71,7 @@ if (isset($this->config['addOns']['glm-member-db'])) { ); // Add content to member detail page - Get it from the existing package listing shortcode - add_filter('glm-member-db-front-members-detail-descriptionBottom', function($content, $id) { + add_filter('glm-member-db-front-members-detail-dataBottom', function($content, $id) { $packageData = do_shortcode('[glm-members-packaging-list member='.$id.', template="member-detail" order="title"]'); $content .= $packageData; return $content; @@ -79,6 +79,15 @@ if (isset($this->config['addOns']['glm-member-db'])) { 10, 2 ); + + add_filter('glm-member-db-front-members-detail-sidemenuBottom', function($content, $id) { + $packageData = do_shortcode('[glm-members-packaging-list member='.$id.', template="detail-sidemenu" order="title"]'); + $content .= $packageData; + return $content; + }, + 10, + 2 + ); } diff --git a/views/front/packaging/detail.html b/views/front/packaging/detail.html index fa47dac..90b7799 100644 --- a/views/front/packaging/detail.html +++ b/views/front/packaging/detail.html @@ -9,38 +9,47 @@
{if $havePackage} -
+
-
- {if $package.member.logo} -
- -
- {/if} -

{$package.member.member_name}

-
-
{$package.member.addr1}
- {if $package.member.addr2} -
{$package.member.addr2}
- {/if} -
{if $package.member.city}{$package.member.city}, {/if}{if $package.member.state.name}{$package.member.state.name} {/if}{if $package.member.zip}{$package.member.zip}{/if}
- {if $package.member.country.name} -
{$package.member.country.name}
- {/if} - {if $package.member.toll_free} -
{$package.member.toll_free}
- {/if} - {if $package.member.phone} -
{$package.member.phone}
- {/if} - {if $package.member.url} - - {/if} - {if $package.member.email} - - {/if} +
+
+ +

+ {$package.member.member} +

+ {if $settings.detail_show_address} + {apply_filters('glm-member-db-front-members-detail-addressTop', '', $package.member.id)} + {if $settings.detail_show_street} + {if $package.member.addr1}
{$package.member.addr1}
{/if} + {if $package.member.addr2}
{$package.member.addr2}
{/if} + {/if} + {if $settings.detail_show_citystatezip} + {if $package.member.city}{$package.member.city}{if $package.member.state.name}, {/if}{/if}{if $package.member.state.name}{$package.member.state.name}{/if}{if $package.member.zip} {$package.member.zip}{/if} + {/if} + {if $package.member.country.name && $settings.detail_show_country}
{$package.member.country.name}
{/if} + {apply_filters('glm-member-db-front-members-detail-addressBottom', '', $package.member.id)} + {/if} + {apply_filters('glm-member-db-front-members-detail-otherDetailTop', '', $package.member.id)} + {if $package.member.phone && $settings.detail_show_phone}
Phone: {$package.member.phone}
{/if} + {if $package.member.toll_free && $settings.detail_show_tollfree}
Toll Free: {$package.member.toll_free}
{/if} + {if $package.member.region && $settings.detail_show_region}

Region: {$package.member.region}

{/if} +
+ {apply_filters('glm-member-db-front-members-detail-otherDetailBottom', '', $package.member.id)} +
+ + + + +
+
+ + {if $package.member.logo && $settings.detail_show_logo} +
+ + +
+ {/if}
-
diff --git a/views/front/packaging/listForMemberDetail.html b/views/front/packaging/listForMemberDetail.html index 7450dd0..73579e0 100644 --- a/views/front/packaging/listForMemberDetail.html +++ b/views/front/packaging/listForMemberDetail.html @@ -1,28 +1,31 @@ -{if $havePackages} -

Packages

+{if $settings.detail_show_packages && $havePackages && $packages} +
+ +

Packages

-
- {foreach $packages as $p} - -
+
+ {foreach $packages as $p} + +
- -
- - {if $p.image} -
- -
- {/if} -

{$p.title}

- {$p.short_descr} -
-
Expires: {$p.expire_date.date}
-
Pricing: {$p.pricing}
+ +
+ + {if $p.image} +
+ +
+ {/if} +

{$p.title}

+ {$p.short_descr} +
+
Expires: {$p.expire_date.date}
+
Pricing: {$p.pricing}
+
+
- -
- {/foreach} + {/foreach} +
{/if} diff --git a/views/front/packaging/listForMemberListing.html b/views/front/packaging/listForMemberListing.html index ff59c55..56b20f0 100644 --- a/views/front/packaging/listForMemberListing.html +++ b/views/front/packaging/listForMemberListing.html @@ -1,7 +1,7 @@ {if $havePackages}

Packages

-
+
{foreach $packages as $p}
diff --git a/views/front/packaging/packagesLinkForMemberDetail.html b/views/front/packaging/packagesLinkForMemberDetail.html index 16a699d..7c5fc96 100644 --- a/views/front/packaging/packagesLinkForMemberDetail.html +++ b/views/front/packaging/packagesLinkForMemberDetail.html @@ -1,5 +1,3 @@ -{if $havePackages} - +{if $settings.detail_show_packages && $packages} + Packages {/if} diff --git a/views/front/packaging/packagesSidemenuForMemberDetail.html b/views/front/packaging/packagesSidemenuForMemberDetail.html new file mode 100644 index 0000000..0f309c8 --- /dev/null +++ b/views/front/packaging/packagesSidemenuForMemberDetail.html @@ -0,0 +1,3 @@ +{if $settings.detail_show_packages && $packages} + Packages +{/if} \ No newline at end of file -- 2.17.1