Merge branch 'feature/CanonicalDetailPages' into develop

Conflicts:
	glm-member-db-packaging.php
	views/front/packaging/detail.html
	views/front/packaging/list.html

diff --cc glm-member-db-packaging.php
index 6b93df2,d09727d..8ed9f8d
--- 1/glm-member-db-packaging.php
--- 2/glm-member-db-packaging.php
+++ b/glm-member-db-packaging.php
@@@ -1,4 -1,4 +1,4 @@@
--<?php
++z<?php
  /**
   * Plugin Name: GLM Members Database Packaging
   * Plugin URI: http://www.gaslightmedia.com/

diff --cc views/front/packaging/list.html
index f05288a,120807a..3fa7949
--- 1/views/front/packaging/list.html
--- 2/views/front/packaging/list.html
+++ b/views/front/packaging/list.html
@@@ -18,12 -18,10 +18,12 @@@
  
              <!-- Container for member information if multiple packages are listed under one member. - Only shows before first package for this member -->
              <div class="member">
 -              {if $m.logo}
 +                {if $m.logo}
 +               <div class="glm-member-img-wrap"> 
                  <img src="{$glmPluginMediaURL}/images/medium/{$m.logo}">
 +               </div> 
                {/if}
-                 <h2 class="member-title"><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">{$m.member_name}</a></h2>
+                 <h2 class="member-title"><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">{$m.member_name} this is a test</a></h2>
                  <div class="address">
                      <div class="addr1">{$m.addr1}</div>
                    {if $m.addr2}
@@@ -56,16 -54,10 +56,12 @@@
                  <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="{$thisURL}?glm_action=detail&packageID={$p.id}">{$p.title}</a></h3>
-                   {if $p.descr}
-                     {$p.descr}
-                   {else if $p.short_descr}
+                     <h3 class="package-title"><a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/">{$p.title}</a></h3>
                      {$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>
@@@ -123,13 -113,11 +119,13 @@@
                  <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="{$thisURL}?glm_action=detail&packageID={$p.id}">{$p.title}</a></h3>
+                     <h3 class="package-title"><a href="{$siteBaseUrl}{$settings.canonical_package_page}/{$p.package_slug}/">{$p.title}</a></h3>
                    {if $p.descr}
-                     {$p.descr}
+                     {$p.descr|nl2br}
                    {else if $p.short_descr}
                      {$p.short_descr}
                    {/if}