Changed views, added hooks, mainly for detail. Lots of css

diff --git a/assets/email.png b/assets/email.png
deleted file mode 100644 (file)
index 14e0011..0000000
Binary files a/assets/email.png and /dev/null differ

diff --git a/css/front.css b/css/front.css
index f1ba96a..9cdb36d 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- a/views/front/packaging/detail.html
+++ b/views/front/packaging/detail.html
@@ -9,38 +9,47 @@
 <div class="glm-member-package-detail-container">
     
 {if $havePackage}
-    <div class="glm-member-package-container">
+    <div class="glm-member-package-container small-12 columns">
     <!-- Container for member information -->
-        <div class="member">
-            {if $package.member.logo}
-           <div class="glm-member-img-wrap"> 
-            <img src="{$glmPluginMediaURL}/images/medium/{$package.member.logo}">
-           </div> 
-          {/if}
-            <h2 class="member-title"><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$package.member.member_slug}/">{$package.member.member_name}</a></h2>
-            <div class="address">
-                <div class="addr1">{$package.member.addr1}</div>
-              {if $package.member.addr2}
-                <div class="addr2">{$package.member.addr2}</div>
-              {/if}
-                <div class="citystatezip">{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}</div>
-              {if $package.member.country.name}
-                <div class="country">{$package.member.country.name}</div>
-              {/if}
-              {if $package.member.toll_free}
-                <div class="phone">{$package.member.toll_free}</div>
-              {/if}
-              {if $package.member.phone}
-                <div class="phone">{$package.member.phone}</div>
-              {/if}
-              {if $package.member.url}
-                <div><a class="url" title="url" href={$package.member.url}>{$package.member.url}</a></div>
-              {/if}
-              {if $package.member.email}
-                <div><a class="email" title="Email" href="mailto:{$package.member.email}">{$package.member.email}</a></div>
-              {/if}
+            <div class="row">
+                <div id="glm-member-detail-info" class="small-12 medium-6 columns">
+        <!-- Member name, address, and basic information -->                    
+                    <h2 class="glm-member-title">
+                    {$package.member.member}
+                    </h2>
+                  {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}<div>{$package.member.addr1}</div>{/if}
+                      {if $package.member.addr2}<div>{$package.member.addr2}</div>{/if}
+                      {/if}
+                      {if $settings.detail_show_citystatezip}
+                      {if $package.member.city}<span>{$package.member.city}</span>{if $package.member.state.name}, {/if}{/if}<span>{if $package.member.state.name}{$package.member.state.name}</span>{/if}{if $package.member.zip} {$package.member.zip}{/if}
+                      {/if} 
+                      {if $package.member.country.name && $settings.detail_show_country}<div>{$package.member.country.name}</div>{/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}<div>Phone: {$package.member.phone}</div>{/if}
+                    {if $package.member.toll_free && $settings.detail_show_tollfree}<div><b>Toll Free:</b> {$package.member.toll_free}</div>{/if}
+                    {if $package.member.region && $settings.detail_show_region}<div><p><b>Region:</b> {$package.member.region}</div>{/if}
+                    <div></div>
+                    {apply_filters('glm-member-db-front-members-detail-otherDetailBottom', '', $package.member.id)}
+                    <div id="glm-member-detail-social">
+                        <a href="#" target="_blank"><img src="{$baseURL}/assets/blog.png"></a>
+                        <a href="http://www.blogger.com" target="_blank"><img src="{$baseURL}/assets/blogger.png"></a>
+                        <a href="http://www.facebook.com" target="_blank"><img src="{$baseURL}/assets/facebook.png"></a>
+                        <a href="http://www.twitter.com" target="_blank"><img src="{$baseURL}/assets/twitter.png"></a>
+                    </div>
+                </div>      
+
+                {if $package.member.logo && $settings.detail_show_logo}
+                <div class="glm-member-detail-featured-image-wrapper small-12 medium-6 columns">
+<!--                            <img class="glm-member-list-image-left" src="http://placehold.it/500x300">-->
+                        <img CLASS="glm-member-list-image-left" src="{$glmPluginMediaURL}/images/{$settings.detail_logo_size}/{$package.member.logo}">
+                </div>
+                {/if}
             </div>
-        </div>
                     <!-- Container for package information -->
         <div class="package">
             <div class="package-info">

diff --git a/views/front/packaging/listForMemberDetail.html b/views/front/packaging/listForMemberDetail.html
index 7450dd0..73579e0 100644 (file)
--- a/views/front/packaging/listForMemberDetail.html
+++ b/views/front/packaging/listForMemberDetail.html
@@ -1,28 +1,31 @@
-{if $havePackages}
-<h1>Packages</h1>
+{if $settings.detail_show_packages && $havePackages && $packages}
+<div id="glm-member-detail-packages-container" class="small-12">
+    <a name="glm-member-detail-packages"></a>
+    <h2>Packages</h2>
 
-<div>
-    {foreach $packages as $p}
-        <!-- Container for each package -->
-        <div class="package">
+    <div class="glm-member-package-container">
+        {foreach $packages as $p}
+            <!-- Container for each package -->
+            <div class="package">
 
-            <!-- Container for package information -->
-            <div class="package-info">
-                
-              {if $p.image}
-               <div class="glm-member-img-wrap">
-                <img src="{$glmPluginMediaURL}/images/medium/{$p.image}">
-               </div> 
-              {/if}
-                <h3 class="package-title"><a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/">{$p.title}</a></h3>
-                {$p.short_descr}
-                <div class="details">
-                    <div><span class="title">Expires: </span><span class="data">{$p.expire_date.date}</span></div>
-                    <div><span class="title">Pricing: </span><span class="data">{$p.pricing}</span></div>
+                <!-- Container for package information -->
+                <div class="package-info">
+
+                  {if $p.image}
+                   <div class="glm-member-img-wrap">
+                    <img src="{$glmPluginMediaURL}/images/medium/{$p.image}">
+                   </div> 
+                  {/if}
+                    <h3 class="package-title"><a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/">{$p.title}</a></h3>
+                    {$p.short_descr}
+                    <div class="details">
+                        <div><span class="title">Expires: </span><span class="data">{$p.expire_date.date}</span></div>
+                        <div><span class="title">Pricing: </span><span class="data">{$p.pricing}</span></div>
+                    </div>
                 </div>
+
             </div>
-        
-        </div>
-    {/foreach} <!-- /package -->
+        {/foreach} <!-- /package -->
+    </div>
 </div>
 {/if}

diff --git a/views/front/packaging/listForMemberListing.html b/views/front/packaging/listForMemberListing.html
index ff59c55..56b20f0 100644 (file)
--- a/views/front/packaging/listForMemberListing.html
+++ b/views/front/packaging/listForMemberListing.html
@@ -1,7 +1,7 @@
 {if $havePackages}
 <h2>Packages</h2>
 
-<div>
+<div class="glm-member-package-container">
     {foreach $packages as $p}
         <!-- Container for each package -->
         <div class="package">

diff --git a/views/front/packaging/packagesLinkForMemberDetail.html b/views/front/packaging/packagesLinkForMemberDetail.html
index 16a699d..7c5fc96 100644 (file)
--- a/views/front/packaging/packagesLinkForMemberDetail.html
+++ b/views/front/packaging/packagesLinkForMemberDetail.html
@@ -1,5 +1,3 @@
-{if $havePackages}
-<div>
-    <a name="Package Stuff">Internal Page Link to Packages</a>
-</div>
+{if $settings.detail_show_packages && $packages}
+    <a href="#glm-member-detail-packages">Packages</a>
 {/if}

diff --git a/views/front/packaging/packagesSidemenuForMemberDetail.html b/views/front/packaging/packagesSidemenuForMemberDetail.html
new file mode 100644 (file)
index 0000000..0f309c8
--- /dev/null
+++ b/views/front/packaging/packagesSidemenuForMemberDetail.html
@@ -0,0 +1,3 @@
+{if $settings.detail_show_packages && $packages}
+    <tr><td id="glm-member-detail-packages-button">Packages</td></tr>
+{/if}
\ No newline at end of file