From: Laury GvR Date: Fri, 19 Aug 2016 13:21:02 +0000 (-0400) Subject: Added package link text for member list as setting X-Git-Tag: v1.1.12^2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=304c29ccdc75fc252f586f96a886bd6697c5e263;p=WP-Plugins%2Fglm-member-db-packaging.git Added package link text for member list as setting The member list now uses a setting in the admin management for packaging, to decide what term to show in the link list of the grid view on the front end. --- diff --git a/classes/data/dataManagement.php b/classes/data/dataManagement.php index 6ec0830..b68151a 100644 --- a/classes/data/dataManagement.php +++ b/classes/data/dataManagement.php @@ -123,6 +123,14 @@ class GlmDataPackagingManagement extends GlmDataAbstract 'use' => 'a' ), + // Canonical Page Slug + 'package_link_text_member_list' => array ( + 'field' => 'package_link_text_member_list', + 'type' => 'text', + 'required' => false, + 'use' => 'a' + ), + // 'package_list_show_member_image' => array( 'field' => 'package_list_show_member_image', diff --git a/index.php b/index.php index ead861b..9dc2773 100644 --- a/index.php +++ b/index.php @@ -38,7 +38,7 @@ * version from this plugin. */ define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.1.10'); -define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.2'); +define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.3'); // 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.2.sql b/setup/databaseScripts/create_database_V1.1.2.sql deleted file mode 100644 index c4165c3..0000000 --- a/setup/databaseScripts/create_database_V1.1.2.sql +++ /dev/null @@ -1,105 +0,0 @@ --- 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' ) -; - diff --git a/setup/databaseScripts/create_database_V1.1.3.sql b/setup/databaseScripts/create_database_V1.1.3.sql new file mode 100644 index 0000000..5f3d5cb --- /dev/null +++ b/setup/databaseScripts/create_database_V1.1.3.sql @@ -0,0 +1,106 @@ +-- Gaslight Media Members Database - Packaging +-- File Created: 12/02/15 15:27:15 +-- Database Version: 1.1.3 +-- 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, -- 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' ) +; + diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 0410016..f0fd85e 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -17,6 +17,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.2' => array('version' => '1.1.2', 'tables' => 3) + '1.1.2' => array('version' => '1.1.2', 'tables' => 3), + '1.1.3' => array('version' => '1.1.3', 'tables' => 3) ); diff --git a/setup/databaseScripts/update_database_V1.1.3.sql b/setup/databaseScripts/update_database_V1.1.3.sql new file mode 100644 index 0000000..1fa834d --- /dev/null +++ b/setup/databaseScripts/update_database_V1.1.3.sql @@ -0,0 +1,10 @@ +-- Gaslight Media Members Database +-- File Created: 7/06/16 09:08:33 +-- Database Version: 1.1.3 +-- 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_link_text_member_list TINYTEXT DEFAULT NULL; \ No newline at end of file diff --git a/views/admin/management/packaging.html b/views/admin/management/packaging.html index 900c3f6..079521a 100644 --- a/views/admin/management/packaging.html +++ b/views/admin/management/packaging.html @@ -22,6 +22,14 @@ {if $packagingSettings.fieldFail.canonical_package_page}

{$packagingSettings.fieldFail.canonical_package_page}

{/if} + + Package Link Text for Member List: + + + {if $packagingSettings.fieldFail.package_link_text_member_list}

{$packagingSettings.fieldFail.package_link_text_member_list}

{/if} + + + diff --git a/views/front/packaging/packagesLinkForMemberList.html b/views/front/packaging/packagesLinkForMemberList.html index ffb2a67..34e57e6 100644 --- a/views/front/packaging/packagesLinkForMemberList.html +++ b/views/front/packaging/packagesLinkForMemberList.html @@ -1,7 +1,13 @@ {if $havePackages && $packages && $settings.list_show_packages_link} {foreach $packages as $p} {if $p@iteration == 1} - Packages & Deals + + {if $settings.package_link_text_member_list} + {$settings.package_link_text_member_list} + {else} + Packages + {/if} + {/if} {/foreach} {/if} \ No newline at end of file