From dc8dbe71376f484fc7e266d15cb7862df513b10c Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Tue, 5 Jul 2016 17:11:44 -0400 Subject: [PATCH] Packaging detail restyle, packaging settings added Management options now have packaging display settings for setting whether you want certain information to be displayed or not on the package detail pages. Also added an offsite url to be used for packages. The view file uses markup similar to the existing member detail view file. A new database script was made to add the new db entries and update as necessary. --- classes/data/dataManagement.php | 104 +++++++++++++ classes/data/dataPackages.php | 7 + css/front.css | 8 + index.php | 6 +- models/admin/management/packaging.php | 2 +- ..._V1.1.0.sql => create_database_V1.1.1.sql} | 16 +- setup/databaseScripts/dbVersions.php | 3 +- .../update_database_V1.1.1.sql | 62 ++++++++ views/admin/management/packaging.html | 130 ++++++++++++++-- views/admin/member/packaging.html | 10 +- views/front/packaging/detail.html | 146 ++++++++++++------ .../front/packaging/listForMemberListing.html | 2 +- 12 files changed, 423 insertions(+), 73 deletions(-) rename setup/databaseScripts/{create_database_V1.1.0.sql => create_database_V1.1.1.sql} (72%) create mode 100644 setup/databaseScripts/update_database_V1.1.1.sql diff --git a/classes/data/dataManagement.php b/classes/data/dataManagement.php index bcfc301..9e75473 100644 --- a/classes/data/dataManagement.php +++ b/classes/data/dataManagement.php @@ -121,6 +121,110 @@ class GlmDataPackagingManagement extends GlmDataAbstract 'type' => 'text', 'required' => true, 'use' => 'a' + ), + + // + 'package_detail_show_member_link' => array( + 'field' => 'package_detail_show_member_link', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + + // + 'package_detail_show_member_link_newtarget' => array( + 'field' => 'package_detail_show_member_link_newtarget', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + + // + 'package_detail_show_offsite_url' => array( + 'field' => 'package_detail_show_offsite_url', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + + // + 'package_detail_show_offsite_url_newtarget' => array( + 'field' => 'package_detail_show_offsite_url_newtarget', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + + // + 'package_detail_show_image' => array( + 'field' => 'package_detail_show_image', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + + // + 'package_detail_show_member_address' => array( + 'field' => 'package_detail_show_member_address', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + + // + 'package_detail_show_member_street' => array( + 'field' => 'package_detail_show_member_street', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + + // + 'package_detail_show_member_citystatezip' => array( + 'field' => 'package_detail_show_member_citystatezip', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + + // + 'package_detail_show_member_country' => array( + 'field' => 'package_detail_show_member_country', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + + // + 'package_detail_show_member_region' => array( + 'field' => 'package_detail_show_member_region', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + + // + 'package_detail_show_member_phone' => array( + 'field' => 'package_detail_show_member_phone', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + + // + 'package_detail_show_member_tollfree' => array( + 'field' => 'package_detail_show_member_tollfree', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + + // + 'package_detail_show_member_email' => array( + 'field' => 'package_detail_show_member_email', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' ) ); diff --git a/classes/data/dataPackages.php b/classes/data/dataPackages.php index 38f64ba..9eb0238 100644 --- a/classes/data/dataPackages.php +++ b/classes/data/dataPackages.php @@ -246,6 +246,13 @@ class GlmDataPackages extends GlmDataAbstract 'p_blank' => true, 'required' => true, 'use' => 'lged' + ), + + // Title + 'offsite_url' => array ( + 'field' => 'offsite_url', + 'type' => 'text', + 'use' => 'a' ) ); diff --git a/css/front.css b/css/front.css index b2b65da..fcb5b7a 100644 --- a/css/front.css +++ b/css/front.css @@ -55,6 +55,14 @@ div.member div.address { padding: 10px; width: 66%; } +#glm-package-detail-member-name h3 { + color: white; +} +#glm-member-packaging-front-container .glm-member-detail-logo-wrapper { + max-height: 200px; + overflow: hidden; + text-align: center; +} .glm-member-package-container .glm-member-db-package { overflow: hidden; clear: both; diff --git a/index.php b/index.php index 8052a07..f891616 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ * Plugin Name: GLM Members Database Packaging * Plugin URI: http://www.gaslightmedia.com/ * Description: Gaslight Media Members Database. - * Version: 1.1.5 + * Version: 1.1.6 * Author: Chuck Scott * Author URI: http://www.gaslightmedia.com/ * License: GPL2 @@ -37,8 +37,8 @@ * so that we're sure the other add-ons see an up to date * version from this plugin. */ -define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.1.5'); -define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.0'); +define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.1.6'); +define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.1'); // 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/models/admin/management/packaging.php b/models/admin/management/packaging.php index 351b3ce..941fb24 100644 --- a/models/admin/management/packaging.php +++ b/models/admin/management/packaging.php @@ -80,7 +80,7 @@ class GlmMembersAdmin_management_packaging extends GlmDataPackagingManagement public function modelAction($actionData = false) { - $packagingSettigns = false; + $packageSettings = false; $settingsUpdated = false; $settingsUpdateError = false; diff --git a/setup/databaseScripts/create_database_V1.1.0.sql b/setup/databaseScripts/create_database_V1.1.1.sql similarity index 72% rename from setup/databaseScripts/create_database_V1.1.0.sql rename to setup/databaseScripts/create_database_V1.1.1.sql index cf097c3..8dd31aa 100644 --- a/setup/databaseScripts/create_database_V1.1.0.sql +++ b/setup/databaseScripts/create_database_V1.1.1.sql @@ -1,6 +1,6 @@ -- Gaslight Media Members Database - Packaging -- File Created: 12/02/15 15:27:15 --- Database Version: 0.0.2 +-- Database Version: 1.1.1 -- Database Creation Script -- -- To permit each query below to be executed separately, @@ -12,6 +12,7 @@ CREATE TABLE {prefix}packages ( 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 @@ -56,6 +57,19 @@ 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_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) ); diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 6a74c96..0a419aa 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -15,6 +15,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.0' => array('version' => '1.1.0', 'tables' => 3), + '1.1.1' => array('version' => '1.1.1', 'tables' => 3) ); diff --git a/setup/databaseScripts/update_database_V1.1.1.sql b/setup/databaseScripts/update_database_V1.1.1.sql new file mode 100644 index 0000000..60736b2 --- /dev/null +++ b/setup/databaseScripts/update_database_V1.1.1.sql @@ -0,0 +1,62 @@ +-- Gaslight Media Members Database +-- File Created: 7/05/16 13:37:15 +-- Database Version: 1.1.1 +-- 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}packages ADD COLUMN offsite_url TINYTEXT NULL; + +---- + +ALTER TABLE {prefix}management ADD COLUMN package_detail_show_image BOOLEAN DEFAULT '1'; + +---- + +ALTER TABLE {prefix}management ADD COLUMN package_detail_show_offsite_url BOOLEAN DEFAULT '1'; + +---- + +ALTER TABLE {prefix}management ADD COLUMN package_detail_show_offsite_url_newtarget BOOLEAN DEFAULT '1'; + +---- + +ALTER TABLE {prefix}management ADD COLUMN package_detail_show_member_link BOOLEAN DEFAULT '1'; + +---- + +ALTER TABLE {prefix}management ADD COLUMN package_detail_show_member_link_newtarget BOOLEAN DEFAULT '1'; + +---- + +ALTER TABLE {prefix}management ADD COLUMN package_detail_show_member_address BOOLEAN DEFAULT '1'; + +---- + +ALTER TABLE {prefix}management ADD COLUMN package_detail_show_member_street BOOLEAN DEFAULT '1'; + +---- + +ALTER TABLE {prefix}management ADD COLUMN package_detail_show_member_citystatezip BOOLEAN DEFAULT '1'; + +---- + +ALTER TABLE {prefix}management ADD COLUMN package_detail_show_member_country BOOLEAN DEFAULT '1'; + +---- + +ALTER TABLE {prefix}management ADD COLUMN package_detail_show_member_region BOOLEAN DEFAULT '1'; + +---- + +ALTER TABLE {prefix}management ADD COLUMN package_detail_show_member_phone BOOLEAN DEFAULT '1'; + +---- + +ALTER TABLE {prefix}management ADD COLUMN package_detail_show_member_tollfree BOOLEAN DEFAULT '1'; + +---- + +ALTER TABLE {prefix}management ADD COLUMN package_detail_show_member_email BOOLEAN DEFAULT '1'; \ No newline at end of file diff --git a/views/admin/management/packaging.html b/views/admin/management/packaging.html index 8296a83..f017962 100644 --- a/views/admin/management/packaging.html +++ b/views/admin/management/packaging.html @@ -1,39 +1,139 @@ {include file='admin/management/header.html'} +
- - - +

+ Packaging General + Package Detail + {if $settingsUpdated}Settings Updated{/if} + {if $settingsUpdateError}Settings Update Error{/if} +

+ +
- - + + + +
- {if $settingsUpdated}

Settings Updated

{/if} - {if $settingsUpdateError}Settings Update Error{/if} -

General Packaging Settings

-
Package Detail Page Permalink Name: + + {if $packagingSettings.fieldFail.canonical_package_page}

{$packagingSettings.fieldFail.canonical_package_page}

{/if} +
+ + + - - +
Package Detail Page Permalink Name: - - {if $packagingSettings.fieldFail.canonical_package_page}

{$packagingSettings.fieldFail.canonical_package_page}

{/if} - 		+ + + + + + + + + + + + + + + + + + + +

Package Detail Display Options

Show Package Image:
Show Member Address:
Address Options: + + + + + +
Show Member Street:
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 + + Display URL as a link: +
Show Member E-mail:
+
- +
+ {include file='admin/footer.html'} diff --git a/views/admin/member/packaging.html b/views/admin/member/packaging.html index 3df5024..d2ceea1 100644 --- a/views/admin/member/packaging.html +++ b/views/admin/member/packaging.html @@ -59,13 +59,21 @@ {if isset($packageInfo.fieldData.package_slug)} Name for URLs:{$packageInfo.fieldData.package_slug}

- {/if} + {/if} Active: + + + Offsite Package Page URL: + + + {if $packageInfo.fieldFail.offsite_url}

{$packageInfo.fieldFail.offsite_url}

{/if} + + Short Description: diff --git a/views/front/packaging/detail.html b/views/front/packaging/detail.html index 4b8e188..d4d1818 100644 --- a/views/front/packaging/detail.html +++ b/views/front/packaging/detail.html @@ -1,8 +1,5 @@ {include file='front/packaging/header.html'} -
- + {if $havePackage} -
- -
-
- -

- {$package.member.member_name} -

- {if $settings.detail_show_address} - {apply_filters('glm-member-db-front-members-detail-addressTop', '', $package.member.id)} - {if $settings.detail_show_street} - {if $package.member.addr1}
{$package.member.addr1}
{/if} - {if $package.member.addr2}
{$package.member.addr2}
{/if} - {/if} - {if $settings.detail_show_citystatezip} - {if $package.member.city}{$package.member.city}{if $package.member.state.name}, {/if}{/if}{if $package.member.state.name}{$package.member.state.name}{/if}{if $package.member.zip} {$package.member.zip}{/if} - {/if} - {if $package.member.country.name && $settings.detail_show_country}
{$package.member.country.name}
{/if} - {apply_filters('glm-member-db-front-members-detail-addressBottom', '', $package.member.id)} - {/if} + + + + +
+ + Back to listing +
+ +
+ + + +
+ {if $package.image} +
+ +
+ {else if $package.member.logo} + + {/if} +
+ + + {if $settings.package_detail_show_offsite_url && $package.offsite_url} + Find More Packages + {/if} +
+ +
+ {if $package.member.member && $settings.package_detail_show_member_link} +

{$package.member.member}

 + {else} +

{$package.member.member}

+ {/if} +
+ {if $settings.package_detail_show_member_address} +
+ + Address + {apply_filters('glm-member-db-front-members-detail-addressTop', '', $package.member.id)} + {if $settings.package_detail_show_member_street} + {if $package.member.addr1}
{$package.member.addr1}
{/if} + {if $package.member.addr2}
{$package.member.addr2}
{/if} + {/if} + {if $settings.package_detail_show_member_citystatezip} +
+ {if $package.member.city} + {$package.member.city} + {if $package.member.state.value}, {/if} + {/if} + {if $package.member.state.value} + {$package.member.state.value} + {/if} + {if $package.member.zip} + {$package.member.zip} + {/if} +
+ {/if} + {if $package.member.country.name && $settings.package_detail_show_member_country} +
{$package.member.country.name}
+ {/if} + {apply_filters('glm-member-db-front-members-detail-addressBottom', '', $package.member.id)} +
+ {/if} {apply_filters('glm-member-db-front-members-detail-otherDetailTop', '', $package.member.id)} - {if $package.member.phone && $settings.detail_show_phone}
Phone: {$package.member.phone}
{/if} - {if $package.member.toll_free && $settings.detail_show_tollfree}
Toll Free: {$package.member.toll_free}
{/if} - {if $package.member.region && $settings.detail_show_region}

Region: {$package.member.region}

{/if} -
+ {if $package.member.region && $settings.package_detail_show_member_region} +
+ Region: {$package.member.region} +
+ {/if} +
+ {if $package.member.phone && $settings.package_detail_show_member_phone} +
+ Local +
{$package.member.phone}
+
+ {/if} + {if $package.member.toll_free && $settings.package_detail_show_member_tollfree} +
+ Toll Free +
{$package.member.toll_free}
+
+ {/if} +
{apply_filters('glm-member-db-front-members-detail-otherDetailBottom', '', $package.member.id)} -
- - - - + +
- - {if $package.member.logo && $settings.detail_show_logo} -
- - -
- {/if} +
- -
+ +
- - {if $package.image} -
- -
- {/if} -

{$package.title}

+

{$package.title}

{if $package.descr} {$package.descr} {else if $package.short_descr} @@ -74,8 +120,8 @@
+
- {else} (Sorry, no information available on the selected package.) {/if} diff --git a/views/front/packaging/listForMemberListing.html b/views/front/packaging/listForMemberListing.html index c285890..8d9bb2f 100644 --- a/views/front/packaging/listForMemberListing.html +++ b/views/front/packaging/listForMemberListing.html @@ -1,4 +1,4 @@ -{if $havePackages} +{if $havePackages && $settings.list_show_packages}
{foreach $packages as $p} -- 2.17.1