From beb0a413223d71b3f862965665ef3e71d61ddcfd Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 16 Dec 2016 16:15:57 -0500
Subject: [PATCH] New layout for packaging when it is not in default order.

For other than member order need to list packages separately with their
member data in them.
---
 css/front.css                   | 16 ++++++++++++---
 views/front/packaging/list.html | 35 ++++++++++++++++++---------------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/css/front.css b/css/front.css
index ccda116..39259fa 100644
--- a/css/front.css
+++ b/css/front.css
@@ -1,4 +1,4 @@
-/* 
+/*
     Created on : Dec 29, 2015, 4:55:34 PM
     Author     : laury
 */
@@ -136,6 +136,13 @@ div.member div.address {
   width: 30%;
   min-width: 100px;
 }
+.glm-package-list-img-wrap {
+    border-radius: 3px;
+    float: right;
+    margin: 12px 0 12px 12px;
+    overflow: hidden;
+    width: 30%;
+}
 .glm-package-img-wrap {
     border-radius: 3px;
     float: right;
@@ -144,6 +151,9 @@ div.member div.address {
     overflow: hidden;
     width: 30%;
 }
+.glm-member-db-package-info .address {
+    margin-bottom: 20px;
+}
 #glm-member-detail-packages-container .glm-member-db-package-img-wrap {
     max-height: 100px;
     width: 25%;
@@ -172,7 +182,7 @@ div.member div.address {
     line-height: 1;
 }
 .glm-member-package-detail-wrapper .glm-member-db-package-title {
-    
+
 }
 .glm-member-package-detail-wrapper .glm-member-db-package-description {
     margin-bottom: 10px;
@@ -197,4 +207,4 @@ div.member div.address {
 }
 .glm-member-package-list-wrapper .glm-member-list-image-border img {
     border-radius: 4px;
-}
\ No newline at end of file
+}
diff --git a/views/front/packaging/list.html b/views/front/packaging/list.html
index f322850..09954aa 100644
--- a/views/front/packaging/list.html
+++ b/views/front/packaging/list.html
@@ -119,29 +119,18 @@
     {else}
         <h3>List of Packages</h3>
         {foreach $packages as $p}
-            <div class="glm-member-package-container">
+            <div class="glm-member-list-container glm-package-list-container glm-member-container small-12 columns">
 
                 <!-- 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 class="member" style="display:none;">
                 </div>
 
                 <!-- Container for package information -->
-                <div class="glm-member-db-package">
+                <div class="glm-member-list-data small-12 columns">
                     <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}
+                        {if $p.image}<div class="glm-package-list-img-wrap"><img src="{$glmPluginMediaUrl}/images/medium/{$p.image}"></div>{/if}
+
                         <h3 class="glm-member-db-package-title">
                             {if $settings.package_list_show_package_detail_link}
                             <a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/">
@@ -153,6 +142,20 @@
                             </span>
                             {/if}
                         </h3>
+
+                        <strong class="glm-member-title"><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$p.member.member_slug}/">{$p.member.member}</a></strong>
+                        <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"><b>Toll Free:</b> {$p.member.toll_free}</div>{/if}
+                            {if $p.member.phone}<div class="phone"><b>Phone:</b> {$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>
                         {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>
-- 
2.17.1