From 4d45a597f1d173f79402b22daf93f8d4fb5b142a Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Wed, 6 Jul 2016 13:26:33 -0400 Subject: [PATCH] Detail and list views updated, settings for list 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 | 161 ++++++++++++++++++ css/front.css | 52 +++++- index.php | 2 +- ..._V1.1.1.sql => create_database_V1.1.2.sql} | 27 ++- setup/databaseScripts/dbVersions.php | 3 +- .../update_database_V1.1.1.sql | 54 +++++- .../update_database_V1.1.2.sql | 90 ++++++++++ views/admin/management/packaging.html | 76 ++++++++- views/front/packaging/detail.html | 18 +- views/front/packaging/list.html | 148 +++++++++------- 10 files changed, 554 insertions(+), 77 deletions(-) rename setup/databaseScripts/{create_database_V1.1.1.sql => create_database_V1.1.2.sql} (71%) create mode 100644 setup/databaseScripts/update_database_V1.1.2.sql diff --git a/classes/data/dataManagement.php b/classes/data/dataManagement.php index 9e75473..6ec0830 100644 --- a/classes/data/dataManagement.php +++ b/classes/data/dataManagement.php @@ -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', diff --git a/css/front.css b/css/front.css index fcb5b7a..7bc965e 100644 --- a/css/front.css +++ b/css/front.css @@ -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 diff --git a/index.php b/index.php index f891616..dedb22d 100644 --- 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.2.sql similarity index 71% rename from setup/databaseScripts/create_database_V1.1.1.sql rename to setup/databaseScripts/create_database_V1.1.2.sql index 8dd31aa..c4165c3 100644 --- a/setup/databaseScripts/create_database_V1.1.1.sql +++ b/setup/databaseScripts/create_database_V1.1.2.sql @@ -1,6 +1,6 @@ -- Gaslight Media Members Database - Packaging -- File Created: 12/02/15 15:27:15 --- Database Version: 1.1.1 +-- Database Version: 1.1.2 -- Database Creation Script -- -- To permit each query below to be executed separately, @@ -57,7 +57,28 @@ CREATE TABLE {prefix}package_elements ( 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_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', @@ -69,7 +90,7 @@ CREATE TABLE {prefix}management ( 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', + package_detail_show_member_email BOOLEAN DEFAULT '1', PRIMARY KEY (id) ); diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 0a419aa..0410016 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -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) ); diff --git a/setup/databaseScripts/update_database_V1.1.1.sql b/setup/databaseScripts/update_database_V1.1.1.sql index 60736b2..9c385ea 100644 --- a/setup/databaseScripts/update_database_V1.1.1.sql +++ b/setup/databaseScripts/update_database_V1.1.1.sql @@ -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 index 0000000..eb8aa04 --- /dev/null +++ b/setup/databaseScripts/update_database_V1.1.2.sql @@ -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 diff --git a/views/admin/management/packaging.html b/views/admin/management/packaging.html index f017962..900c3f6 100644 --- a/views/admin/management/packaging.html +++ b/views/admin/management/packaging.html @@ -7,6 +7,7 @@

Packaging General + Package List Package Detail {if $settingsUpdated}Settings Updated{/if} {if $settingsUpdateError}Settings Update Error{/if} @@ -23,6 +24,77 @@ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Package List Display Options

Show Package Image:
Show Package Short Description:
Show Package Expire Date:
Show Package Pricing:
Show Member Image:
Show Member Short Description:
Show Link to Member Detail:
Show Link to Member Detail: + + Open link in new tab: +
Show Link to Member Detail: + + Open link in new tab: +
Show Member Address:
Address Options: + + + + + + +
Show Member Street:
Show Member Second Address:
Show Member City, State and Zip
Show Member Country:
Show Member Region
+
Show Member Phone Number:
Show Member Toll Free Number:
Show Member Link: + + Display URL as a link: +
Show Offsite Packages Link + + Open link in new tab: +
Show Member Website Link + + Open link in new tab: +
Show Member E-mail:
+
+ @@ -55,7 +127,7 @@ @@ -63,6 +135,8 @@
Show Offsite Packages Link - Display URL as a link: + Open link in new tab:
Show Member E-mail:
+ + diff --git a/views/front/packaging/detail.html b/views/front/packaging/detail.html index d4d1818..d62400c 100644 --- a/views/front/packaging/detail.html +++ b/views/front/packaging/detail.html @@ -6,7 +6,7 @@ --> -
+
{if $havePackage} @@ -109,14 +109,16 @@

{$package.title}

- {if $package.descr} - {$package.descr} - {else if $package.short_descr} - {$package.short_descr} - {/if} +
+ {if $package.descr} + {$package.descr} + {else if $package.short_descr} + {$package.short_descr} + {/if} +
-
Expires: {$package.expire_date.date}
-
Pricing: {$package.pricing}
+
Expires: {$package.expire_date.date}
+
Pricing: {$package.pricing}
diff --git a/views/front/packaging/list.html b/views/front/packaging/list.html index a138dd3..27142b0 100644 --- a/views/front/packaging/list.html +++ b/views/front/packaging/list.html @@ -6,75 +6,103 @@ --> -
+
{if $havePackages} - {if $byMember} -

List of Packages

- {foreach $members as $m} -
+ {if $byMember} +

List of Packages

+ + {foreach $members as $m} - -
- {if $m.logo} -
- -
- {/if} -

{$m.member_name}

-
-
{$m.addr1}
- {if $m.addr2} -
{$m.addr2}
- {/if} -
{if $m.city}{$m.city}, {/if}{if $m.state.name}{$m.state.name} {/if}{if $m.zip}{$m.zip}{/if}
- {if $m.country.name} -
{$m.country.name}
- {/if} - {if $m.toll_free} -
{$m.toll_free}
- {/if} - {if $m.phone} -
{$m.phone}
- {/if} - {if $m.url} - - {/if} - {if $m.email} - - {/if} -
-
- - {foreach $m.packages as $p} - -
- - -
- - {if $p.image} -
- -
- {/if} -

{$p.title}

- {$p.short_descr} -
-
Expires: {$p.expire_date.date}
-
Pricing: {$p.pricing}
+
+ + +
+ {if $m.logo && $settings.package_list_show_member_image} +
+
+ +
+
+ {/if} + +
+ + +

+ {if $settings.package_list_show_member_link} + {$m.member} + {else} + {$m.member} + {/if} +

+ {if $settings.package_list_show_member_address} +
+ {if $settings.package_list_show_member_street} + {if $m.addr1}{$m.addr1}
{/if} + {if $m.addr2 && $settings.package_list_show_member_second_address}{$m.addr2}
{/if} + {/if} + {if $settings.package_list_show_member_citystatezip} + {if $m.city}{$m.city}{if $m.state.value}, {/if}{/if}{if $m.state.value}{$m.state.value}{/if}{if $m.zip} {$m.zip}{/if} + {/if} + {if $m.country.name && $settings.package_list_show_member_country}
{$m.country.name}
{/if} +
+ {/if} + +
+ {if $m.phone && $settings.package_list_show_member_phone}Phone: {$m.phone} {/if} + {if $m.toll_free && $settings.package_list_show_member_tollfree}Toll Free: {$m.toll_free}{/if} +
+ {if $m.region && $settings.package_list_show_member_region}
Region: {$m.region}
{/if} + +
+ {if $m.url && $settings.package_list_show_member_website_url}Visit Website{/if} + {if $m.email && $settings.package_list_show_member_email}Email{/if} +
+ + +
+
+ {if $m.short_descr && $settings.package_list_show_member_short_descr} + {$m.short_descr|nl2br} More + {/if} +
+
+
+ {foreach $m.packages as $p} + +
+ + +
+ + {if $p.image && $settings.package_list_show_image} +
+ +
+ {/if} +

{$p.title}

+ {if $p.short_descr && $settings.package_list_show_short_descr}
{$p.short_descr}
{/if} +
+ {if $p.expire_date.date && $settings.package_list_show_expire_date} +
Expires: {$p.expire_date.date}
+ {/if} + {if $p.pricing && $settings.package_list_show_pricing} +
Pricing: {$p.pricing}
+ {/if} +
+
+
+ {/foreach} +
-
- {/foreach} - -
- {/foreach} - + {/foreach} {*$members*} +
{else}

List of Packages

-- 2.17.1