From f186220d5431d07abd5d6d3055b0be344cfa51b7 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 6 Jul 2016 14:54:53 -0400
Subject: [PATCH] Packagelist viewfile now allows sidebar on left

There was an error in the markup of the package list view that
caused the footer to appear on top of the center of the page. This
has been resolved, there was a misplaced div ending tag.
---
 views/front/packaging/list.html | 259 ++++++++++++++------------------
 1 file changed, 116 insertions(+), 143 deletions(-)

diff --git a/views/front/packaging/list.html b/views/front/packaging/list.html
index 27142b0..79da261 100644
--- a/views/front/packaging/list.html
+++ b/views/front/packaging/list.html
@@ -1,5 +1,9 @@
-{include file='front/packaging/header.html'}
+<div class="glm-member-db-packaging-list">
 
+    
+    
+{include file='front/packaging/header.html'}
+{apply_filters('glm-member-db-front-members-list-pageTop', '')}
 <!-- 
     NOTE: Image sizes for member db are typically large, medium, small, thumb.
     These may be modified or added to by entries in the glm-member-db/config/plugin.ini file
@@ -8,172 +12,141 @@
 <!-- Container for entire list of packages -->
 <div class="glm-member-package-list-wrapper">
     
-{if $havePackages}
-  
-  <!-- If pacakges are listed by member, use this block -->
+    {if $havePackages}
+    <!-- If packages are listed by member, use this block -->
    
-    {if $byMember}
-        <h3>List of Packages</h3>
-        <!-- /member -->
-        {foreach $members as $m}
+        {if $byMember}
+            <h3>List of Packages</h3>
+            <!-- /member -->
+            {foreach $members as $m}
 
-            <div class="glm-member-list-container glm-package-list-container glm-member-container small-12 columns">
+                <div class="glm-member-list-container glm-package-list-container glm-member-container small-12 columns">
                 
                 <!-- Member Logo - Medium and up-->
-                <div class="glm-member-list-data small-12 columns">
-                    {if $m.logo && $settings.package_list_show_member_image}
-                        <div class="glm-member-list-image-wrapper right small-12 medium-4 columns">
-                            <div class="glm-member-list-image-border">
-                                <img src="{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$m.logo}">
-                            </div>
-                        </div>
-                    {/if}
-
-                    <div class="glm-member-list-active-info small-12 medium-8 columns">
-
-                        <!-- Member name, address, and basic information -->
-                        <h4 class="glm-member-title">
-                           {if $settings.package_list_show_member_link}
-                               <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">{$m.member}</a>
-                           {else}
-                               {$m.member}
-                           {/if}
-                        </h4>
-                        {if $settings.package_list_show_member_address}
-                            <div class="glm-package-list-address">
-                                {if $settings.package_list_show_member_street}
-                                {if $m.addr1}<span>{$m.addr1}</span><br>{/if}
-                                    {if $m.addr2 && $settings.package_list_show_member_second_address}<span>{$m.addr2}</span><br>{/if}
-                                {/if}
-                                {if $settings.package_list_show_member_citystatezip}
-                                    {if $m.city}<span>{$m.city}</span>{if $m.state.value}, {/if}{/if}<span>{if $m.state.value}{$m.state.value}</span>{/if}{if $m.zip} {$m.zip}{/if}
-                                {/if}
-                                {if $m.country.name && $settings.package_list_show_member_country}<div>{$m.country.name}</div>{/if}
+                    <div class="glm-member-list-data small-12 columns">
+                        {if $m.logo && $settings.package_list_show_member_image}
+                            <div class="glm-member-list-image-wrapper right small-12 medium-4 columns">
+                                <div class="glm-member-list-image-border">
+                                    <img src="{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$m.logo}">
+                                </div>
                             </div>
                         {/if}
 
-                        <div>
-                            {if $m.phone && $settings.package_list_show_member_phone}<span class="glm-member-db-phone"><b>Phone:</b> {$m.phone} </span>{/if}
-                             {if $m.toll_free && $settings.package_list_show_member_tollfree}<span class="glm-member-db-phone-tollfree"><b>Toll Free:</b> {$m.toll_free}</span>{/if}
-                        </div>
-                        {if $m.region && $settings.package_list_show_member_region}<div><b>Region:</b> {$m.region}</div>{/if}
-
-                        <div class="glm-member-list-links">
-                            {if $m.url && $settings.package_list_show_member_website_url}<a id='glm-member-list-website-link' href="{$m.url}"{if $settings.package_list_show_member_website_url} target="_blank"{/if}>Visit Website</a>{/if}
-                            {if $m.email && $settings.package_list_show_member_email}<a href="mailto:{$m.email}">Email</a>{/if}
-                        </div>
+                        <div class="glm-member-list-active-info small-12 medium-8 columns">
 
+                            <!-- Member name, address, and basic information -->
+                            <h4 class="glm-member-title">
+                               {if $settings.package_list_show_member_link}
+                                   <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">{$m.member}</a>
+                               {else}
+                                   {$m.member}
+                               {/if}
+                            </h4>
+                            {if $settings.package_list_show_member_address}
+                                <div class="glm-package-list-address">
+                                    {if $settings.package_list_show_member_street}
+                                    {if $m.addr1}<span>{$m.addr1}</span><br>{/if}
+                                        {if $m.addr2 && $settings.package_list_show_member_second_address}<span>{$m.addr2}</span><br>{/if}
+                                    {/if}
+                                    {if $settings.package_list_show_member_citystatezip}
+                                        {if $m.city}<span>{$m.city}</span>{if $m.state.value}, {/if}{/if}<span>{if $m.state.value}{$m.state.value}</span>{/if}{if $m.zip} {$m.zip}{/if}
+                                    {/if}
+                                    {if $m.country.name && $settings.package_list_show_member_country}<div>{$m.country.name}</div>{/if}
+                                </div>
+                            {/if}
 
-                        <div class="glm-member-list-description small-12 columns">
                             <div>
-                                {if $m.short_descr && $settings.package_list_show_member_short_descr}
-                                    {$m.short_descr|nl2br}<a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/"> More</a>
-                                {/if}
+                                {if $m.phone && $settings.package_list_show_member_phone}<span class="glm-member-db-phone"><b>Phone:</b> {$m.phone} </span>{/if}
+                                {if $m.toll_free && $settings.package_list_show_member_tollfree}<span class="glm-member-db-phone-tollfree"><b>Toll Free:</b> {$m.toll_free}</span>{/if}
                             </div>
-                        </div>
-                        <div class="glm-member-package-list small-12 columns">
-                            {foreach $m.packages as $p}
-                                <!-- Container for each package -->
-                                <div class="glm-member-db-package">
+                            {if $m.region && $settings.package_list_show_member_region}<div><b>Region:</b> {$m.region}</div>{/if}
 
-                                    <!-- Container for package information -->
-                                    <div class="glm-member-db-package-info">
+                            <div class="glm-member-list-links">
+                                {if $m.url && $settings.package_list_show_member_website_url}<a id='glm-member-list-website-link' href="{$m.url}"{if $settings.package_list_show_member_website_url} target="_blank"{/if}>Visit Website</a>{/if}
+                                {if $m.email && $settings.package_list_show_member_email}<a href="mailto:{$m.email}">Email</a>{/if}
+                            </div>
 
-                                        {if $p.image && $settings.package_list_show_image}
-                                            <div class="glm-package-img-wrap">
-                                                <img src="{$glmPluginMediaUrl}/images/medium/{$p.image}">
-                                            </div> 
-                                        {/if}
-                                        <h3 class="glm-member-db-package-title"><a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/">{$p.title}</a></h3>
-                                        {if $p.short_descr && $settings.package_list_show_short_descr}<div class="glm-member-db-package-list-short-description">{$p.short_descr}</div>{/if}
-                                        <div class="details">
-                                            {if $p.expire_date.date && $settings.package_list_show_expire_date}
-                                                <div><span class="glm-member-db-package-detail-title">Expires: </span><span class="glm-member-db-package-detail-data">{$p.expire_date.date}</span></div>
-                                            {/if}
-                                            {if $p.pricing && $settings.package_list_show_pricing}
-                                                <div><span class="glm-member-db-package-detail-title">Pricing: </span><span class="glm-member-db-package-detail-data">{$p.pricing}</span></div>
-                                            {/if}
-                                        </div> <!-- /package details --> 
-                                    </div> <!-- /package info container --> 
-                                </div> <!-- /package-container --> 
-                            {/foreach} <!-- /package --> 
-                        </div>
-                    </div>
-                </div>
-            </div>
-        {/foreach} {*$members*}
-    </div>
-  <!-- If packages are listed by package, use this block -->
-  {else}
-  <h3>List of Packages</h3>
-    {foreach $packages as $p}
-    
-        <div class="glm-member-package-container">
 
+                            <div class="glm-member-list-description small-12 columns">
+                                <div>
+                                    {if $m.short_descr && $settings.package_list_show_member_short_descr}
+                                        {$m.short_descr|nl2br}<a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/"> More</a>
+                                    {/if}
+                                </div>
+                            </div>
+                            <div class="glm-member-package-list small-12 columns">
+                                {foreach $m.packages as $p}
+                                    <!-- Container for each package -->
+                                    <div class="glm-member-db-package">
+
+                                        <!-- Container for package information -->
+                                        <div class="glm-member-db-package-info">
+                                            
+                                            {if $p.image && $settings.package_list_show_image}
+                                                <div class="glm-package-img-wrap">
+                                                 <img src="{$glmPluginMediaUrl}/images/medium/{$p.image}">
+                                                </div> 
+                                            {/if}
+                                            <h3 class="glm-member-db-package-title"><a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/">{$p.title}</a></h3>
+                                            {if $p.short_descr && $settings.package_list_show_short_descr}<div class="glm-member-db-package-list-short-description">{$p.short_descr}</div>{/if}
+                                            <div class="details">
+                                                {if $p.expire_date.date && $settings.package_list_show_expire_date}
+                                                    <div><span class="glm-member-db-package-detail-title">Expires: </span><span class="glm-member-db-package-detail-data">{$p.expire_date.date}</span></div>
+                                                {/if}
+                                                {if $p.pricing && $settings.package_list_show_pricing}
+                                                    <div><span class="glm-member-db-package-detail-title">Pricing: </span><span class="glm-member-db-package-detail-data">{$p.pricing}</span></div>
+                                                {/if}
+                                            </div> <!-- /package details --> 
+                                        </div> <!-- /package info container --> 
+                                    </div> <!-- /package-container --> 
+                                {/foreach} <!-- /package --> 
+                            </div> <!-- package list-->
+                        </div> <!-- member list active info -->
+                    </div> <!-- member list data -->
+                </div> <!-- member list container -->
+            {/foreach} {*$members*}
+  <!-- If packages are listed by package, use this block. If by member, the block above -->
+    {else}
+        <h3>List of Packages</h3>
+        {foreach $packages as $p}
+            <div class="glm-member-package-container">
     
-            <!-- Container for member information if displayed with each package -->
-            <div class="member">
-                {if $p.member.logo}
-               <div class="glm-member-img-wrap"> 
-                <img src="{$glmPluginMediaUrl}/images/medium/{$p.member.logo}">
-               </div> 
-              {/if}
-                <h4 class="glm-member-title"><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$p.member.member_slug}/">{$p.member.member_name}</a></h4>
-                <div class="address">
-                    <div class="addr1">{$p.member.addr1}</div>
-                  {if $p.member.addr2}
-                    <div class="addr2">{$p.member.addr2}</div>
-                  {/if}
-                    <div class="citystatezip">{if $p.member.city}{$p.member.city}, {/if}{if $p.member.state.name}{$p.member.state.name} {/if}{if $p.member.zip}{$p.member.zip}{/if}</div>
-                  {if $p.member.country.name}
-                    <div class="country">{$p.member.country.name}</div>
-                  {/if}
-                  {if $p.member.toll_free}
-                    <div class="phone">{$p.member.toll_free}</div>
-                  {/if}
-                  {if $p.member.phone}
-                    <div class="phone">{$p.member.phone}</div>
-                  {/if}
-                  {if $p.member.url}
-                  <a class="url" title="url" href={$p.member.url}>{$p.member.url}</a>
-                  {/if}
-                  {if $p.member.email}
-                    <a class="email" title="Email" href="mailto:{$p.member.email}">{$p.member.email}</a>
-                  {/if}
+                <!-- Container for member information if displayed with each package -->
+                <div class="member">
+                    {if $p.member.logo}<div class="glm-member-img-wrap"><img src="{$glmPluginMediaUrl}/images/medium/{$p.member.logo}"></div>{/if}
+                    <h4 class="glm-member-title"><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$p.member.member_slug}/">{$p.member.member_name}</a></h4>
+                    <div class="address">
+                        <div class="addr1">{$p.member.addr1}</div>
+                        {if $p.member.addr2}<div class="addr2">{$p.member.addr2}</div>{/if}
+                        <div class="citystatezip">{if $p.member.city}{$p.member.city}, {/if}{if $p.member.state.name}{$p.member.state.name} {/if}{if $p.member.zip}{$p.member.zip}{/if}</div>
+                        {if $p.member.country.name}<div class="country">{$p.member.country.name}</div>{/if}
+                        {if $p.member.toll_free}<div class="phone">{$p.member.toll_free}</div>{/if}
+                        {if $p.member.phone}<div class="phone">{$p.member.phone}</div>{/if}
+                        {if $p.member.url}<a class="url" title="url" href={$p.member.url}>{$p.member.url}</a>{/if}
+                        {if $p.member.email}<a class="email" title="Email" href="mailto:{$p.member.email}">{$p.member.email}</a>{/if}
+                    </div>
                 </div>
-            </div>
         
-            <!-- Container for package information -->
-            <div class="glm-member-db-package">
-                <div class="glm-member-db-package-info">
+                <!-- Container for package information -->
+                <div class="glm-member-db-package">
+                    <div class="glm-member-db-package-info">
                     
-                  {if $p.image}
-                   <div class="glm-package-img-wrap">
-                    <img src="{$glmPluginMediaUrl}/images/medium/{$p.image}">
-                   </div>
-                  {/if}
-                    <h3 class="glm-member-db-package-title"><a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/">{$p.title}</a></h3>
-                  {if $p.descr}
-                    {$p.descr|nl2br}
-                  {else if $p.short_descr}
-                    {$p.short_descr}
-                  {/if}
-                    <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>
+                        {if $p.image}<div class="glm-package-img-wrap"><img src="{$glmPluginMediaUrl}/images/medium/{$p.image}"></div>{/if}
+                        <h3 class="glm-member-db-package-title"><a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/">{$p.title}</a></h3>
+                        {if $p.descr}{$p.descr|nl2br}{else if $p.short_descr}{$p.short_descr}{/if}
+                        <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>
-        </div>
         
-    {/foreach}
-  
-  {/if} <!-- if by member -->
-  
-  
+        {/foreach}
+    {/if} <!-- if by member -->
 {else}
     (Sorry, no packages currently listed.)
 {/if}
 </div> <!-- /package wrapper -->
-
+</div> <!-- packaging list wrapper -->
 {include file='front/footer.html'}
-- 
2.17.1