From: Laury GvR Date: Thu, 10 Nov 2016 16:18:28 +0000 (-0500) Subject: Added option for package lists to link to detail X-Git-Tag: v1.2.1^2~2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a3cfc4d5607ce8fbc7824f300568806addfa9b2c;p=WP-Plugins%2Fglm-member-db-packaging.git Added option for package lists to link to detail Added an option for package names on package lists to link to package detail pages. --- diff --git a/classes/data/dataManagement.php b/classes/data/dataManagement.php index d060bf7..92f3b65 100644 --- a/classes/data/dataManagement.php +++ b/classes/data/dataManagement.php @@ -300,6 +300,22 @@ class GlmDataPackagingManagement extends GlmDataAbstract 'use' => 'a' ), + // + 'package_list_show_member_website_url_newtarget' => array( + 'field' => 'package_list_show_member_website_url_newtarget', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + + // + 'package_list_show_package_detail_link' => array( + 'field' => 'package_list_show_package_detail_link', + 'type' => 'checkbox', + 'default' => true, + 'use' => 'a' + ), + // 'package_detail_show_member_link' => array( 'field' => 'package_detail_show_member_link', diff --git a/index.php b/index.php index 0afda6d..fbe282c 100644 --- a/index.php +++ b/index.php @@ -38,7 +38,7 @@ * version from this plugin. */ define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.2.0'); -define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.4'); +define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.5'); // 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.4.sql b/setup/databaseScripts/create_database_V1.1.4.sql deleted file mode 100644 index 0ebe833..0000000 --- a/setup/databaseScripts/create_database_V1.1.4.sql +++ /dev/null @@ -1,107 +0,0 @@ --- Gaslight Media Members Database - Packaging --- File Created: 12/02/15 15:27:15 --- Database Version: 1.1.4 --- 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_link_text_member_list TINYTEXT NULL, - package_link_text_member_detail TINYTEXT NULL, - 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' ) -; - diff --git a/setup/databaseScripts/create_database_V1.1.5.sql b/setup/databaseScripts/create_database_V1.1.5.sql new file mode 100644 index 0000000..d5fecf6 --- /dev/null +++ b/setup/databaseScripts/create_database_V1.1.5.sql @@ -0,0 +1,108 @@ +-- Gaslight Media Members Database - Packaging +-- File Created: 12/02/15 15:27:15 +-- Database Version: 1.1.4 +-- 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_link_text_member_list TINYTEXT NULL, + package_link_text_member_detail TINYTEXT NULL, + 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_list_show_package_detail_link 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' ) +; + diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 60292a0..4e1e7e8 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -19,6 +19,7 @@ $glmMembersPackagingDbVersions = array( '1.1.1' => array('version' => '1.1.1', 'tables' => 3), '1.1.2' => array('version' => '1.1.2', 'tables' => 3), '1.1.3' => array('version' => '1.1.3', 'tables' => 3), - '1.1.4' => array('version' => '1.1.4', 'tables' => 3) + '1.1.4' => array('version' => '1.1.4', 'tables' => 3), + '1.1.5' => array('version' => '1.1.5', 'tables' => 3) ); diff --git a/setup/databaseScripts/update_database_V1.1.5.sql b/setup/databaseScripts/update_database_V1.1.5.sql new file mode 100644 index 0000000..ad2c7e3 --- /dev/null +++ b/setup/databaseScripts/update_database_V1.1.5.sql @@ -0,0 +1,10 @@ +-- Gaslight Media Members Database +-- File Created: 7/06/16 09:08:33 +-- Database Version: 1.1.4 +-- 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_package_detail_link TINYTEXT DEFAULT NULL; \ No newline at end of file diff --git a/setup/hooksHelp.html b/setup/hooksHelp.html index f0d92b6..742fb11 100644 --- a/setup/hooksHelp.html +++ b/setup/hooksHelp.html @@ -8,48 +8,36 @@ glm_members_permit_admin_members_packages_tab Filter - - Returns boolean answer to "Is current user permitted to see multi-member packaging tab?" - + Returns boolean answer to "Is current user permitted to see multi-member packaging tab?" glm_members_permit_admin_members_packaging_add_package Filter - - Returns boolean answer to "Is current user permitted to add a new multi-member package?" - + Returns boolean answer to "Is current user permitted to add a new multi-member package?" glm_members_permit_admin_members_packaging_edit_package Filter - - Returns boolean answer to "Is current user permitted to edit a multi-member package?" - + Returns boolean answer to "Is current user permitted to edit a multi-member package?" glm_members_permit_admin_member_packages_tab Filter - - Returns boolean answer to "Is current user permitted to see the member packaging tab?" - + Returns boolean answer to "Is current user permitted to see the member packaging tab?" glm_members_permit_admin_member_packaging_add_package Filter - - Returns boolean answer to "Is current user permitted to add a new Member package?" - + Returns boolean answer to "Is current user permitted to add a new Member package?" glm_members_permit_admin_member_packaging_edit_package Filter - - Returns boolean answer to "Is current user permitted to edit a member package?" - + Returns boolean answer to "Is current user permitted to edit a member package?" diff --git a/views/admin/management/packaging.html b/views/admin/management/packaging.html index 2b27667..c75458e 100644 --- a/views/admin/management/packaging.html +++ b/views/admin/management/packaging.html @@ -105,7 +105,18 @@ Open link in new tab: - Show Member E-mail: + + Show Member E-mail: + + + + + + Package Name Links to Package Detail: + + + + diff --git a/views/front/packaging/list.html b/views/front/packaging/list.html index 79da261..ae2088f 100644 --- a/views/front/packaging/list.html +++ b/views/front/packaging/list.html @@ -84,10 +84,20 @@ {if $p.image && $settings.package_list_show_image}
- +
{/if} -

{$p.title}

+

+ {if $settings.package_list_show_package_detail_link} + + {$p.title} + + {else} + + {$p.title} + + {/if} +

{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} @@ -132,7 +142,17 @@
{if $p.image}
{/if} -

{$p.title}

+

+ {if $settings.package_list_show_package_detail_link} + + {$p.title} + + {else} + + {$p.title} + + {/if} +

{if $p.descr}{$p.descr|nl2br}{else if $p.short_descr}{$p.short_descr}{/if}
Expires: {$p.expire_date.date}
diff --git a/views/front/packaging/listForMemberListing.html b/views/front/packaging/listForMemberListing.html index 8d9bb2f..9975b4a 100644 --- a/views/front/packaging/listForMemberListing.html +++ b/views/front/packaging/listForMemberListing.html @@ -8,12 +8,22 @@
- {if $p.image} -
- -
- {/if} -

{$p.title}

+ {if $p.image} +
+ +
+ {/if} +

+ {if $settings.package_list_show_package_detail_link} + + {$p.title} + + {else} + + {$p.title} + + {/if} +

{$p.short_descr}
Expires: {$p.expire_date.date}