Detail and list views updated, settings for list
authorLaury GvR <laury@gaslightmedia.com>
Wed, 6 Jul 2016 17:26:33 +0000 (13:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 6 Jul 2016 17:26:33 +0000 (13:26 -0400)
Both detail and list views now look presentable and fit the new
member db styles. They're similar to the member detail/list pages.
Both detail and list now have a lot of settings that can be set
in the admin management, which have been added to the database.

classes/data/dataManagement.php
css/front.css
index.php
setup/databaseScripts/create_database_V1.1.1.sql [deleted file]
setup/databaseScripts/create_database_V1.1.2.sql [new file with mode: 0644]
setup/databaseScripts/dbVersions.php
setup/databaseScripts/update_database_V1.1.1.sql
setup/databaseScripts/update_database_V1.1.2.sql [new file with mode: 0644]
views/admin/management/packaging.html
views/front/packaging/detail.html
views/front/packaging/list.html

index 9e75473..6ec0830 100644 (file)
@@ -123,6 +123,167 @@ class GlmDataPackagingManagement extends GlmDataAbstract
                 'use' => 'a'
             ),
             
+            // 
+            'package_list_show_member_image' => array(
+                    'field' => 'package_list_show_member_image',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            
+            // 
+            'package_list_show_member_link' => array(
+                    'field' => 'package_list_show_member_link',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_member_link_newtarget' => array(
+                    'field' => 'package_list_show_member_link_newtarget',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_offsite_url' => array(
+                    'field' => 'package_list_show_offsite_url',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_offsite_url_newtarget' => array(
+                    'field' => 'package_list_show_offsite_url_newtarget',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_image' => array(
+                    'field' => 'package_list_show_image',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_short_descr' => array(
+                    'field' => 'package_list_show_short_descr',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_expire_date' => array(
+                    'field' => 'package_list_show_expire_date',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_pricing' => array(
+                    'field' => 'package_list_show_pricing',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_member_address' => array(
+                    'field' => 'package_list_show_member_address',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_member_short_descr' => array(
+                    'field' => 'package_list_show_member_short_descr',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_member_second_address' => array(
+                    'field' => 'package_list_show_member_second_address',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_member_street' => array(
+                    'field' => 'package_list_show_member_street',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_member_citystatezip' => array(
+                    'field' => 'package_list_show_member_citystatezip',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_member_country' => array(
+                    'field' => 'package_list_show_member_country',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_member_region' => array(
+                    'field' => 'package_list_show_member_region',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_member_phone' => array(
+                    'field' => 'package_list_show_member_phone',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_member_tollfree' => array(
+                    'field' => 'package_list_show_member_tollfree',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_member_email' => array(
+                    'field' => 'package_list_show_member_email',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
+            // 
+            'package_list_show_member_website_url' => array(
+                    'field' => 'package_list_show_member_website_url',
+                    'type' => 'checkbox',
+                    'default' => true,
+                    'use' => 'a'
+            ),
+            
             // 
             'package_detail_show_member_link' => array(
                     'field' => 'package_detail_show_member_link',
index fcb5b7a..7bc965e 100644 (file)
@@ -63,6 +63,10 @@ div.member div.address {
   overflow: hidden;
   text-align: center;
 }
+#glm-member-packaging-front-container .glm-member-list-image-wrapper {
+    overflow: hidden;
+    border-radius: 3px;
+}
 .glm-member-package-container .glm-member-db-package {
     overflow: hidden;
     clear: both;
@@ -133,10 +137,12 @@ div.member div.address {
   min-width: 100px;
 }
 .glm-package-img-wrap {
-    max-height: 100px;
-    width: 20%;
+    border-radius: 3px;
     float: right;
+    margin: 12px 0 12px 12px;
+    max-height: 100px;
     overflow: hidden;
+    width: 30%;
 }
 #glm-member-detail-packages-container .glm-member-db-package-img-wrap {
     max-height: 100px;
@@ -146,4 +152,46 @@ div.member div.address {
 }
 .glm-member-list-container .glm-member-title {
     color: #92A682;
+}
+.glm-member-package-detail-wrapper .glm-member-db-package {
+    border: 0;
+}
+.glm-member-package-detail-wrapper .glm-member-db-package-info {
+    width: 90%;
+    margin: 0 auto;
+}
+.glm-member-package-list-wrapper .glm-member-db-package {
+    background: whitesmoke none repeat scroll 0 0;
+    border: 1px solid lightgrey;
+    border-radius: 4px;
+    margin: 10px 0;
+    padding: 10px;
+}
+.glm-member-package-list-wrapper .glm-member-db-package-title {
+    font-size: 22px;
+    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;
+}
+.glm-member-package-detail-wrapper .details > div {
+    padding-bottom: 6px;
+}
+.glm-member-db-package-info {
+    overflow: hidden;
+}
+.glm-member-list-data {
+    padding: 15px 20px;
+}
+.glm-member-list-container {
+    padding: 0;
+}
+.glm-member-package-wrapper {
+    padding: 0 20px;
+}
+.glm-member-db-package-info .details span.glm-member-db-package-detail-title {
+    font-weight: bold;
 }
\ No newline at end of file
index f891616..dedb22d 100644 (file)
--- a/index.php
+++ b/index.php
@@ -38,7 +38,7 @@
  *  version from this plugin.
  */
 define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.1.6');
-define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.1');
+define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.2');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
 define('GLM_MEMBERS_PACKAGING_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.0.0');
diff --git a/setup/databaseScripts/create_database_V1.1.1.sql b/setup/databaseScripts/create_database_V1.1.1.sql
deleted file mode 100644 (file)
index 8dd31aa..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
--- Gaslight Media Members Database - Packaging 
--- File Created: 12/02/15 15:27:15
--- Database Version: 1.1.1
--- Database Creation Script
--- 
--- To permit each query below to be executed separately,
--- all queries must be separated by a line with four dashes
-
--- Packages 
-CREATE TABLE {prefix}packages (
-  id INT NOT NULL AUTO_INCREMENT,
-  active BOOLEAN NULL,                      -- Package is active
-  title TINYTEXT NULL,                      -- Title of package
-  package_slug TINYTEXT NULL,               -- Package name slug for canonical URLs (lowercase, "-" for spaces, no punctuation)
-  offsite_url TINYTEXT NULL,                -- Url for the package list on the member's site
-  descr TEXT NULL,                          -- Description of package
-  short_descr TINYTEXT NULL,                -- Short description of package
-  image TINYTEXT NULL,                      -- Package image
-  start_date TIMESTAMP NULL,                -- Date display of this package starts
-  end_date TIMESTAMP NULL,                  -- Date display of this package ends (last date of display)
-  expire_date TIMESTAMP NULL,               -- Date package expires (first date it's expired)
-  position INT NULL,                        -- Display order position
-  pricing TINYTEXT NULL,                    -- Pricing, descriptive
-  ref_type INT NULL,                        -- Type of entity this package is associated with
-  ref_dest INT NULL,                        -- Pointer to the specific entity
-  PRIMARY KEY (id),                         
-  INDEX(ref_type),
-  INDEX(ref_dest),
-  INDEX(start_date),
-  INDEX(end_date),
-  INDEX(expire_date)
-);
-
-----
-
--- Package Elements - Items in a package
-CREATE TABLE {prefix}package_elements (
-  id INT NOT NULL AUTO_INCREMENT,
-  package INT NULL,                         -- Pointer to the package
-  active BOOLEAN NULL,                      -- Package is active
-  title TINYTEXT NULL,                      -- Title of element
-  descr TEXT NULL,                          -- Description for this entity's participation in the package
-  short_descr TEXT NULL,                    -- Short description for this entity's participation in the package
-  image TINYTEXT NULL,                      -- Element image
-  position INT NULL,                        -- Display order position
-  ref_type INT NULL,                        -- Type of entity this element is association with
-  ref_dest INT NULL,                        -- Pointer to the specific entity
-  PRIMARY KEY (id),
-  INDEX(package),
-  INDEX(ref_type),
-  INDEX(ref_dest)
-);
-
-----
-
--- Package Management Settings
-CREATE TABLE {prefix}management (
-  id INT NOT NULL AUTO_INCREMENT,
-  canonical_package_page TINYTEXT NULL,          -- Canonical page slug for package detail
-  package_detail_show_image BOOLEAN DEFAULT '1',               
-  package_detail_show_offsite_url BOOLEAN DEFAULT '1',               
-  package_detail_show_offsite_url_newtarget BOOLEAN DEFAULT '1',               
-  package_detail_show_member_link BOOLEAN DEFAULT '1',               
-  package_detail_show_member_link_newtarget BOOLEAN DEFAULT '1',               
-  package_detail_show_member_address BOOLEAN DEFAULT '1',               
-  package_detail_show_member_street BOOLEAN DEFAULT '1',               
-  package_detail_show_member_citystatezip BOOLEAN DEFAULT '1',               
-  package_detail_show_member_country BOOLEAN DEFAULT '1',               
-  package_detail_show_member_region BOOLEAN DEFAULT '1',               
-  package_detail_show_member_phone BOOLEAN DEFAULT '1',               
-  package_detail_show_member_tollfree BOOLEAN DEFAULT '1',               
-  package_detail_show_member_email BOOLEAN DEFAULT '1',            
-  PRIMARY KEY (id)
-);
-
-----
-
--- Set default package management entry
-INSERT INTO {prefix}management
-    ( id, canonical_package_page )
-   VALUES
-    ( 1, 'package-detail' )
-;
-
diff --git a/setup/databaseScripts/create_database_V1.1.2.sql b/setup/databaseScripts/create_database_V1.1.2.sql
new file mode 100644 (file)
index 0000000..c4165c3
--- /dev/null
@@ -0,0 +1,105 @@
+-- Gaslight Media Members Database - Packaging 
+-- File Created: 12/02/15 15:27:15
+-- Database Version: 1.1.2
+-- Database Creation Script
+-- 
+-- To permit each query below to be executed separately,
+-- all queries must be separated by a line with four dashes
+
+-- Packages 
+CREATE TABLE {prefix}packages (
+  id INT NOT NULL AUTO_INCREMENT,
+  active BOOLEAN NULL,                      -- Package is active
+  title TINYTEXT NULL,                      -- Title of package
+  package_slug TINYTEXT NULL,               -- Package name slug for canonical URLs (lowercase, "-" for spaces, no punctuation)
+  offsite_url TINYTEXT NULL,                -- Url for the package list on the member's site
+  descr TEXT NULL,                          -- Description of package
+  short_descr TINYTEXT NULL,                -- Short description of package
+  image TINYTEXT NULL,                      -- Package image
+  start_date TIMESTAMP NULL,                -- Date display of this package starts
+  end_date TIMESTAMP NULL,                  -- Date display of this package ends (last date of display)
+  expire_date TIMESTAMP NULL,               -- Date package expires (first date it's expired)
+  position INT NULL,                        -- Display order position
+  pricing TINYTEXT NULL,                    -- Pricing, descriptive
+  ref_type INT NULL,                        -- Type of entity this package is associated with
+  ref_dest INT NULL,                        -- Pointer to the specific entity
+  PRIMARY KEY (id),                         
+  INDEX(ref_type),
+  INDEX(ref_dest),
+  INDEX(start_date),
+  INDEX(end_date),
+  INDEX(expire_date)
+);
+
+----
+
+-- Package Elements - Items in a package
+CREATE TABLE {prefix}package_elements (
+  id INT NOT NULL AUTO_INCREMENT,
+  package INT NULL,                         -- Pointer to the package
+  active BOOLEAN NULL,                      -- Package is active
+  title TINYTEXT NULL,                      -- Title of element
+  descr TEXT NULL,                          -- Description for this entity's participation in the package
+  short_descr TEXT NULL,                    -- Short description for this entity's participation in the package
+  image TINYTEXT NULL,                      -- Element image
+  position INT NULL,                        -- Display order position
+  ref_type INT NULL,                        -- Type of entity this element is association with
+  ref_dest INT NULL,                        -- Pointer to the specific entity
+  PRIMARY KEY (id),
+  INDEX(package),
+  INDEX(ref_type),
+  INDEX(ref_dest)
+);
+
+----
+
+-- Package Management Settings
+CREATE TABLE {prefix}management (
+  id INT NOT NULL AUTO_INCREMENT,
+  canonical_package_page TINYTEXT NULL,          -- Canonical page slug for package detail
+  package_list_show_image BOOLEAN DEFAULT '1',  
+  package_list_show_short_descr BOOLEAN DEFAULT '1',        
+  package_list_show_expire_date BOOLEAN DEFAULT '1',        
+  package_list_show_pricing BOOLEAN DEFAULT '1',        
+  package_list_show_offsite_url BOOLEAN DEFAULT '1',               
+  package_list_show_offsite_url_newtarget BOOLEAN DEFAULT '1',               
+  package_list_show_member_image BOOLEAN DEFAULT '1',  
+  package_list_show_member_short_descr BOOLEAN DEFAULT '1',  
+  package_list_show_member_link BOOLEAN DEFAULT '1',               
+  package_list_show_member_link_newtarget BOOLEAN DEFAULT '1',               
+  package_list_show_member_address BOOLEAN DEFAULT '1', 
+  package_list_show_member_second_address BOOLEAN DEFAULT '1',
+  package_list_show_member_street BOOLEAN DEFAULT '1',               
+  package_list_show_member_citystatezip BOOLEAN DEFAULT '1',               
+  package_list_show_member_country BOOLEAN DEFAULT '1',               
+  package_list_show_member_region BOOLEAN DEFAULT '1',               
+  package_list_show_member_phone BOOLEAN DEFAULT '1',               
+  package_list_show_member_tollfree BOOLEAN DEFAULT '1',               
+  package_list_show_member_email BOOLEAN DEFAULT '1',   
+  package_list_show_member_website_url BOOLEAN DEFAULT '1',
+  package_list_show_member_website_url_newtarget BOOLEAN DEFAULT '1',   
+  package_detail_show_image BOOLEAN DEFAULT '1',                            
+  package_detail_show_offsite_url BOOLEAN DEFAULT '1',               
+  package_detail_show_offsite_url_newtarget BOOLEAN DEFAULT '1',               
+  package_detail_show_member_link BOOLEAN DEFAULT '1',               
+  package_detail_show_member_link_newtarget BOOLEAN DEFAULT '1',               
+  package_detail_show_member_address BOOLEAN DEFAULT '1',               
+  package_detail_show_member_street BOOLEAN DEFAULT '1',               
+  package_detail_show_member_citystatezip BOOLEAN DEFAULT '1',               
+  package_detail_show_member_country BOOLEAN DEFAULT '1',               
+  package_detail_show_member_region BOOLEAN DEFAULT '1',               
+  package_detail_show_member_phone BOOLEAN DEFAULT '1',               
+  package_detail_show_member_tollfree BOOLEAN DEFAULT '1',               
+  package_detail_show_member_email BOOLEAN DEFAULT '1',              
+  PRIMARY KEY (id)
+);
+
+----
+
+-- Set default package management entry
+INSERT INTO {prefix}management
+    ( id, canonical_package_page )
+   VALUES
+    ( 1, 'package-detail' )
+;
+
index 0a419aa..0410016 100644 (file)
@@ -16,6 +16,7 @@
 $glmMembersPackagingDbVersions = array(
             '0.0.2' => array('version' => '0.0.2', 'tables' => 2),
             '1.1.0' => array('version' => '1.1.0', 'tables' => 3),
-            '1.1.1' => array('version' => '1.1.1', 'tables' => 3)
+            '1.1.1' => array('version' => '1.1.1', 'tables' => 3),
+            '1.1.2' => array('version' => '1.1.2', 'tables' => 3)
 );
 
index 60736b2..9c385ea 100644 (file)
@@ -59,4 +59,56 @@ ALTER TABLE {prefix}management ADD COLUMN package_detail_show_member_tollfree BO
 
 ----
 
-ALTER TABLE {prefix}management ADD COLUMN package_detail_show_member_email BOOLEAN DEFAULT '1';
\ No newline at end of file
+ALTER TABLE {prefix}management ADD COLUMN package_detail_show_member_email BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_image BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_offsite_url BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_offsite_url_newtarget BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_link BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_link_newtarget BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_address BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_street BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_citystatezip BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_country BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_region BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_phone BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_tollfree BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_email BOOLEAN DEFAULT '1';
\ No newline at end of file
diff --git a/setup/databaseScripts/update_database_V1.1.2.sql b/setup/databaseScripts/update_database_V1.1.2.sql
new file mode 100644 (file)
index 0000000..eb8aa04
--- /dev/null
@@ -0,0 +1,90 @@
+-- Gaslight Media Members Database 
+-- File Created: 7/06/16 09:08:33
+-- Database Version: 1.1.2
+-- Database Update From Previous Version Script
+-- 
+-- To permit each query below to be executed separately,
+-- all queries must be separated by a line with four dashses
+
+-- Package Management Settings
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_image BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_offsite_url BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_offsite_url_newtarget BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_link BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_link_newtarget BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_address BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_street BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_citystatezip BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_country BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_region BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_phone BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_tollfree BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_email BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_pricing BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_short_descr BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_expire_date BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_image BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_short_descr BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_second_address BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_website_url BOOLEAN DEFAULT '1';
+
+----
+
+ALTER TABLE {prefix}management ADD COLUMN package_list_show_member_website_url_newtarget BOOLEAN DEFAULT '1';
\ No newline at end of file
index f017962..900c3f6 100644 (file)
@@ -7,6 +7,7 @@
         
         <h2 class="nav-tab-wrapper" style="margin-bottom: 1em;">
             <a id="glm-settings-general" data-show-table="glm-table-packaging-general" class="glm-settings-tab nav-tab nav-tab-active">Packaging General</a>
+            <a id="glm-settings-list" data-show-table="glm-table-packaging-list" class="glm-settings-tab nav-tab">Package List</a>
             <a id="glm-settings-detail" data-show-table="glm-table-packaging-detail" class="glm-settings-tab nav-tab">Package Detail</a>
             {if $settingsUpdated}<span class="glm-notice glm-flash-updated glm-right">Settings Updated</span>{/if}
             {if $settingsUpdateError}<span class="glm-error glm-flash-updated glm-right">Settings Update Error</span>{/if}
           </tr>
         </table>
         
+        <!-- Package List Settings -->
+        <table id="glm-table-packaging-list" class="glm-admin-table glm-settings-table glm-hidden">
+            <tr>
+                <td>
+                    <table class="glm-admin-table">
+                        <tr><td colspan="2"><h2>Package List Display Options</h2></td></tr>
+                        <!-- package info -->
+                        <tr><th>Show Package Image:</th><td><input type="checkbox" name="package_list_show_image"{if $packagingSettings.fieldData.package_list_show_image.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Package Short Description:</th><td><input type="checkbox" name="package_list_show_short_descr"{if $packagingSettings.fieldData.package_list_show_short_descr.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Package Expire Date:</th><td><input type="checkbox" name="package_list_show_expire_date"{if $packagingSettings.fieldData.package_list_show_expire_date.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Package Pricing:</th><td><input type="checkbox" name="package_list_show_pricing"{if $packagingSettings.fieldData.package_list_show_pricing.value} checked="checked"{/if}></td></tr>
+                        <!-- member info -->
+                        <tr><th>Show Member Image:</th><td><input type="checkbox" name="package_list_show_member_image"{if $packagingSettings.fieldData.package_list_show_member_image.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Member Short Description:</th><td><input type="checkbox" name="package_list_show_member_short_descr"{if $packagingSettings.fieldData.package_list_show_member_short_descr.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Link to Member Detail:</th><td><input type="checkbox" name="package_list_show_member_link"{if $packagingSettings.fieldData.package_list_show_member_link.value} checked="checked"{/if}></td></tr>
+                        <tr>
+                            <th>Show Link to Member Detail:</th>
+                            <td>
+                                <input type="checkbox" name="package_list_show_member_link"{if $packagingSettings.fieldData.package_list_show_member_link.value} checked="checked"{/if}>
+                                Open link in new tab: <input type="checkbox" name="package_list_show_member_link_newtarget"{if $packagingSettings.fieldData.package_list_show_member_link_newtarget.value} checked="checked"{/if}>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>Show Link to Member Detail:</th>
+                            <td>
+                                <input type="checkbox" name="package_list_show_member_link"{if $packagingSettings.fieldData.package_list_show_member_link.value} checked="checked"{/if}>
+                                Open link in new tab: <input type="checkbox" name="package_list_show_member_link_newtarget"{if $packagingSettings.fieldData.package_list_show_member_link_newtarget.value} checked="checked"{/if}>
+                            </td>
+                        </tr>
+                        <tr><th>Show Member Address:</th><td><input type="checkbox" name="package_list_show_member_address"{if $packagingSettings.fieldData.package_list_show_member_address.value} checked="checked"{/if}></td></tr>
+                        <tr>
+                            <th>Address Options:</th>
+                            <td>  
+                                <table class="glm-admin-table">
+                                    <tr><th>Show Member Street:</th><td><input type="checkbox" name="package_list_show_member_street"{if $packagingSettings.fieldData.package_list_show_member_street.value} checked="checked"{/if}></td></tr>
+                                    <tr><th>Show Member Second Address:</th><td><input type="checkbox" name="package_list_show_member_second_address"{if $packagingSettings.fieldData.package_list_show_member_second_address.value} checked="checked"{/if}></td></tr>
+                                    <tr><th>Show Member City, State and Zip</th><td><input type="checkbox" name="package_list_show_member_citystatezip"{if $packagingSettings.fieldData.package_list_show_member_citystatezip.value} checked="checked"{/if}></td></tr>                      
+                                    <tr><th>Show Member Country:</th><td><input type="checkbox" name="package_list_show_member_country"{if $packagingSettings.fieldData.package_list_show_member_country.value} checked="checked"{/if}></td></tr>                      
+                                    <tr><th>Show Member Region</th><td><input type="checkbox" name="package_list_show_member_region"{if $packagingSettings.fieldData.package_list_show_member_region.value} checked="checked"{/if}></td></tr>                                         
+                                </table>
+                            </td>
+                        </tr> 
+                        <tr><th>Show Member Phone Number:</th><td><input type="checkbox" name="package_list_show_member_phone"{if $packagingSettings.fieldData.package_list_show_member_phone.value} checked="checked"{/if}></td></tr>
+                        <tr><th>Show Member Toll Free Number:</th><td><input type="checkbox" name="package_list_show_member_tollfree"{if $packagingSettings.fieldData.package_list_show_member_tollfree.value} checked="checked"{/if}></td></tr>
+                        <tr>
+                            <th>Show Member Link:</th>
+                            <td>
+                                <input type="checkbox" name="package_list_show_member_link"{if $packagingSettings.fieldData.package_list_show_member_link.value} checked="checked"{/if}>
+                                Display URL as a link: <input type="checkbox" name="package_list_show_member_link_newtarget"{if $packagingSettings.fieldData.package_list_show_member_link_newtarget.value} checked="checked"{/if}>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>Show Offsite Packages Link</th>
+                            <td>
+                                <input type="checkbox" name="package_list_show_offsite_url"{if $packagingSettings.fieldData.package_list_show_offsite_url.value} checked="checked"{/if}>
+                                Open link in new tab: <input type="checkbox" name="package_list_show_offsite_url_newtarget"{if $packagingSettings.fieldData.package_list_show_offsite_url_newtarget.value} checked="checked"{/if}>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>Show Member Website Link</th>
+                            <td>
+                                <input type="checkbox" name="package_list_show_member_website_url"{if $packagingSettings.fieldData.package_list_show_member_website_url.value} checked="checked"{/if}>
+                                Open link in new tab: <input type="checkbox" name="package_list_show_member_website_url_newtarget"{if $packagingSettings.fieldData.package_list_show_member_website_url_newtarget.value} checked="checked"{/if}>
+                            </td>
+                        </tr>
+                        <tr><th>Show Member E-mail:</th><td><input type="checkbox" name="package_list_show_member_email"{if $packagingSettings.fieldData.package_list_show_member_email.value} checked="checked"{/if}></td></tr>
+                    </table>
+                </td>   
+            </tr>
+        </table>
+        
         <!-- Package Detail Settings -->
         <table id="glm-table-packaging-detail" class="glm-admin-table glm-settings-table glm-hidden">
             <tr>
                             <th>Show Offsite Packages Link</th>
                             <td>
                                 <input type="checkbox" name="package_detail_show_offsite_url"{if $packagingSettings.fieldData.package_detail_show_offsite_url.value} checked="checked"{/if}>
-                                Display URL as a link: <input type="checkbox" name="package_detail_show_offsite_url_newtarget"{if $packagingSettings.fieldData.package_detail_show_offsite_url_newtarget.value} checked="checked"{/if}>
+                                Open link in new tab: <input type="checkbox" name="package_detail_show_offsite_url_newtarget"{if $packagingSettings.fieldData.package_detail_show_offsite_url_newtarget.value} checked="checked"{/if}>
                             </td>
                         </tr>
                         <tr><th>Show Member E-mail:</th><td><input type="checkbox" name="package_detail_show_member_email"{if $packagingSettings.fieldData.package_detail_show_member_email.value} checked="checked"{/if}></td></tr>
                 </td>   
             </tr>
         </table>
+        
+        
         <input id="updateSettings" type="submit" value="Update Settings" class="">
     </form>
     
index d4d1818..d62400c 100644 (file)
@@ -6,7 +6,7 @@
 -->
 
 <!-- Package Detail Container -->    
-<div class="glm-member-package-detail-container">
+<div class="glm-member-package-detail-wrapper">
 
 {if $havePackage}
     
         <div class="glm-member-db-package small-12 medium-8 columns">
             <div class="glm-member-db-package-info">
                 <h3 class="glm-member-db-package-title">{$package.title}</h3>
-              {if $package.descr}
-                {$package.descr}
-              {else if $package.short_descr}
-                {$package.short_descr}
-              {/if}
+                <div class="glm-member-db-package-description">
+                {if $package.descr}
+                  {$package.descr}
+                {else if $package.short_descr}
+                  {$package.short_descr}
+                {/if}
+                </div>
                 <div class="details">
-                    <div><span class="title">Expires: </span><span class="data">{$package.expire_date.date}</span></div>
-                    <div><span class="title">Pricing: </span><span class="data">{$package.pricing}</span></div>
+                    <div><span class="title"><b>Expires:</b> </span><span class="data">{$package.expire_date.date}</span></div>
+                    <div><span class="title"><b>Pricing:</b> </span><span class="data">{$package.pricing}</span></div>
                 </div>
             </div>
         </div>
index a138dd3..27142b0 100644 (file)
 -->
 
 <!-- Container for entire list of packages -->
-<div class="glm-member-package-wrapper">
+<div class="glm-member-package-list-wrapper">
     
 {if $havePackages}
   
   <!-- If pacakges are listed by member, use this block -->
    
-  {if $byMember}
-      <h3>List of Packages</h3>
-      {foreach $members as $m}
-        <div class="glm-member-package-container">
+    {if $byMember}
+        <h3>List of Packages</h3>
+        <!-- /member -->
+        {foreach $members as $m}
 
-            <!-- 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}
-               <div class="glm-member-img-wrap"> 
-                <img src="{$glmPluginMediaUrl}/images/medium/{$m.logo}">
-               </div> 
-              {/if}
-                <h4 class="glm-member-title"><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">{$m.member_name}</a></h4>
-                <div class="address">
-                    <div class="addr1">{$m.addr1}</div>
-                  {if $m.addr2}
-                    <div class="addr2">{$m.addr2}</div>
-                  {/if}
-                    <div class="citystatezip">{if $m.city}{$m.city}, {/if}{if $m.state.name}{$m.state.name} {/if}{if $m.zip}{$m.zip}{/if}</div>
-                  {if $m.country.name}
-                    <div class="country">{$m.country.name}</div>
-                  {/if}
-                  {if $m.toll_free}
-                    <div class="phone">{$m.toll_free}</div>
-                  {/if}
-                  {if $m.phone}
-                    <div class="phone">{$m.phone}</div>
-                  {/if}
-                  {if $m.url}
-                    <div><a class="url" title="url" href={$m.url}>Website</a></div>
-                  {/if}
-                  {if $m.email}
-                    <div><a class="email" title="Email" href="mailto:{$m.email}">Email</a></div>
-                  {/if}
-                </div>
-            </div>
-        
-        {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}
-                   <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>
-                    {$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 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>
+                        {/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-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>
                     </div>
                 </div>
-            
             </div>
-        {/foreach} <!-- /package -->
-        
-        </div> 
-      {/foreach} <!-- /member -->
-  
+        {/foreach} {*$members*}
+    </div>
   <!-- If packages are listed by package, use this block -->
   {else}
   <h3>List of Packages</h3>