From e659b1fdfe9881d798ac9e195362a6b261293f5d Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Wed, 20 Sep 2017 13:32:08 -0400 Subject: [PATCH] renaming the plugin and all of the files to for sale renaming plugin from buy sell to for sale --- activate.php | 8 +- .../data/{dataBuySell.php => dataForSale.php} | 4 +- css/front.css | 2 +- css/front.css.map | 2 +- deactivate.php | 6 +- defines.php | 44 +++--- index.php | 120 +++++++------- models/admin/{buySell => forSale}/index.php | 8 +- models/front/buySell/detail.php | 0 models/front/buySell/list.php | 0 models/front/forSale/detail.php | 146 ++++++++++++++++++ models/front/forSale/list.php | 137 ++++++++++++++++ scss/front.scss | 72 +++------ setup/adminMenus.php | 16 +- .../create_database_V0.0.1.sql | 4 +- setup/databaseScripts/dbVersions.php | 2 +- setup/permissions.php | 4 +- setup/shortcodes.php | 23 +-- setup/validActions.php | 28 ++-- views/admin/{buySell => forSale}/edit.html | 36 +++-- views/admin/{buySell => forSale}/list.html | 1 + .../parts/image_input.html | 2 - views/front/buySell/list.html | 0 views/front/{buySell => forSale}/detail.html | 0 views/front/forSale/list.html | 48 ++++++ 25 files changed, 511 insertions(+), 202 deletions(-) rename classes/data/{dataBuySell.php => dataForSale.php} (98%) rename models/admin/{buySell => forSale}/index.php (97%) delete mode 100644 models/front/buySell/detail.php delete mode 100644 models/front/buySell/list.php create mode 100644 models/front/forSale/detail.php create mode 100644 models/front/forSale/list.php rename views/admin/{buySell => forSale}/edit.html (85%) rename views/admin/{buySell => forSale}/list.html (98%) rename views/admin/{buySell => forSale}/parts/image_input.html (98%) delete mode 100644 views/front/buySell/list.html rename views/front/{buySell => forSale}/detail.html (100%) create mode 100644 views/front/forSale/list.html diff --git a/activate.php b/activate.php index 1956814..05d3c19 100644 --- a/activate.php +++ b/activate.php @@ -7,7 +7,7 @@ * PHP version 5.5 * * @category glmWordPressPlugin - * @package glmMembersBuySell + * @package glmMembersForSale * @author Chuck Scott * @license http://www.gaslightmedia.com Gaslightmedia * @release activate.php,v 1.0 2014/10/31 19:31:47 cscott Exp $ @@ -26,7 +26,7 @@ if (!defined('ABSPATH')) { * Currently the only actions are to add role capability to display and modify * prototypes. */ -class glmMembersBuySellPluginActivate +class glmMembersForSalePluginActivate { /** @@ -68,10 +68,10 @@ class glmMembersBuySellPluginActivate $this->config = $config; // Set current plugin version - update_option('glmMembersBuySellPluginVersion', GLM_MEMBERS_BUY_SELL_PLUGIN_VERSION); + update_option('glmMembersForSalePluginVersion', GLM_MEMBERS_FOR_SALE_PLUGIN_VERSION); // Set Roles and Capabilities for this plugin - require_once GLM_MEMBERS_BUY_SELL_PLUGIN_SETUP_PATH.'/rolesAndCapabilities.php'; + require_once GLM_MEMBERS_FOR_SALE_PLUGIN_SETUP_PATH.'/rolesAndCapabilities.php'; } /* diff --git a/classes/data/dataBuySell.php b/classes/data/dataForSale.php similarity index 98% rename from classes/data/dataBuySell.php rename to classes/data/dataForSale.php index 9674ba7..fbc8fbb 100644 --- a/classes/data/dataBuySell.php +++ b/classes/data/dataForSale.php @@ -35,7 +35,7 @@ * @release SVN: $Id: dataMembers.php,v 1.0 2011/01/25 19:31:47 cscott * Exp $ */ -class GlmDataBuySell extends GlmDataAbstract +class GlmDataForSale extends GlmDataAbstract { /** @@ -112,7 +112,7 @@ class GlmDataBuySell extends GlmDataAbstract * Table Name */ - $this->table = GLM_MEMBERS_BUY_SELL_PLUGIN_DB_PREFIX . 'items'; + $this->table = GLM_MEMBERS_FOR_SALE_PLUGIN_DB_PREFIX . 'items'; // -- Conditions Table //CREATE TABLE {prefix}conditions ( diff --git a/css/front.css b/css/front.css index 16f0cb3..9691ea0 100644 --- a/css/front.css +++ b/css/front.css @@ -1,3 +1,3 @@ -.no-padding{padding:0}body .front-item-listings-wrapper{margin-top:20px}body .front-item-listings-wrapper .item-detail-wrapper .front-title{font-weight:bold;font-size:20px}body .front-item-listings-wrapper .item-detail-wrapper div{float:none !important;line-height:1.1;margin:8px 8px 8px 0}body .front-item-listings-wrapper span{font-weight:bold}body .front-item-listings-wrapper .front-item-list-row{margin-bottom:20px}body .front-item-listings-wrapper .front-item-list-row .item-title-list span{font-size:20px}body .front-item-listings-wrapper .item-title-search #item_title_dropdown{max-width:450px}body .front-item-listings-wrapper .item-title-search .item-title-button{height:39px}@media screen and (max-width: 641px){body .front-item-listings-wrapper .item-title-button{display:block;max-width:100px;margin:0 auto}body .front-item-listings-wrapper .front-item-search{margin-bottom:20px}}@media (min-width: 639px) and (max-width: 1025px){body .front-item-listings-wrapper .item-title-button{display:inline-block;margin:0 0 0 10px}}@media (min-width: 1023px){body .front-item-listings-wrapper .item-title-button{display:inline-block;margin:0 0 0 10px}} +.no-padding{padding:0}.front-item-list-wrapper span{font-weight:bold}.front-item-list-wrapper .front-list-item{padding:10px 0;border-bottom:1px solid lightgray}.front-item-list-wrapper div{line-height:1.1;padding:5px}.front-item-list-wrapper .front-list-topic{padding:5px;width:100px;text-align:center;color:white;border-radius:5px;margin-bottom:10px}.front-item-list-wrapper .item-wanted{background:green}.front-item-list-wrapper .item-sale{background:red} /*# sourceMappingURL=front.css.map */ diff --git a/css/front.css.map b/css/front.css.map index 4b05f66..928c7a6 100644 --- a/css/front.css.map +++ b/css/front.css.map @@ -1 +1 @@ -{"version":3,"file":"front.css","sources":["front.scss"],"sourcesContent":[".no-padding{\n padding: 0;\n}\n\nbody .front-item-listings-wrapper {\n .item-detail-wrapper{\n .front-title{\n font-weight: bold;\n font-size: 20px;\n }\n div{\n float: none !important;\n line-height: 1.1;\n margin: 8px 8px 8px 0;\n }\n }\n // .front-item-search{\n // max-width: 530px;\n // margin: 0 auto;\n // }\n margin-top: 20px;\n span{\n font-weight: bold;\n }\n \n .front-item-list-row{\n margin-bottom: 20px;\n .item-title-list{\n span{\n font-size: 20px;\n }\n }\n\n }\n .item-title-search{\n #item_title_dropdown{\n max-width: 450px;\n }\n .item-title-button{\n height: 39px;\n }\n }\n \n @media screen and (max-width: 641px){\n .item-title-button{\n display: block;\n max-width: 100px;\n margin: 0 auto;\n }\n .front-item-search{\n margin-bottom: 20px;\n }\n }\n @media (min-width: 639px) and (max-width: 1025px){\n .item-title-button{\n display: inline-block;\n margin: 0 0 0 10px;\n }\n }\n @media (min-width: 1023px){\n .item-title-button{\n display: inline-block;\n margin: 0 0 0 10px;\n } \n }\n}"],"names":[],"mappings":"AAAA,AAAA,WAAW,AAAA,CACP,OAAO,CAAE,CAAC,CACb,AAED,AAAK,IAAD,CAAC,4BAA4B,AAAC,CAgB9B,UAAU,CAAE,IAAI,CA6CnB,AA7DD,AAEQ,IAFJ,CAAC,4BAA4B,CAC7B,oBAAoB,CAChB,YAAY,AAAA,CACR,WAAW,CAAE,IAAI,CACjB,SAAS,CAAE,IAAI,CAClB,AALT,AAMO,IANH,CAAC,4BAA4B,CAC7B,oBAAoB,CAKjB,GAAG,AAAA,CACC,KAAK,CAAE,eAAe,CACtB,WAAW,CAAE,GAAG,CAChB,MAAM,CAAE,aAAa,CACxB,AAVR,AAiBI,IAjBA,CAAC,4BAA4B,CAiB7B,IAAI,AAAA,CACA,WAAW,CAAE,IAAI,CACpB,AAnBL,AAqBI,IArBA,CAAC,4BAA4B,CAqB7B,oBAAoB,AAAA,CAChB,aAAa,CAAE,IAAI,CAOtB,AA7BL,AAwBY,IAxBR,CAAC,4BAA4B,CAqB7B,oBAAoB,CAEhB,gBAAgB,CACZ,IAAI,AAAA,CACA,SAAS,CAAE,IAAI,CAClB,AA1Bb,AA+BQ,IA/BJ,CAAC,4BAA4B,CA8B7B,kBAAkB,CACd,oBAAoB,AAAA,CAChB,SAAS,CAAE,KAAK,CACnB,AAjCT,AAkCQ,IAlCJ,CAAC,4BAA4B,CA8B7B,kBAAkB,CAId,kBAAkB,AAAA,CACd,MAAM,CAAE,IAAI,CACf,AAGL,MAAM,CAAC,MAAM,MAAM,SAAS,EAAE,KAAK,EAvCvC,AAwCQ,IAxCJ,CAAC,4BAA4B,CAwCzB,kBAAkB,AAAA,CACd,OAAO,CAAE,KAAK,CACd,SAAS,CAAE,KAAK,CAChB,MAAM,CAAE,MAAM,CACjB,AA5CT,AA6CQ,IA7CJ,CAAC,4BAA4B,CA6CzB,kBAAkB,AAAA,CACd,aAAa,CAAE,IAAI,CACtB,CAEL,MAAM,EAAE,SAAS,EAAE,KAAK,OAAO,SAAS,EAAE,MAAM,EAjDpD,AAkDQ,IAlDJ,CAAC,4BAA4B,CAkDzB,kBAAkB,AAAA,CACd,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,UAAU,CACrB,CAEL,MAAM,EAAE,SAAS,EAAE,MAAM,EAvD7B,AAwDQ,IAxDJ,CAAC,4BAA4B,CAwDzB,kBAAkB,AAAA,CACd,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,UAAU,CACrB"} \ No newline at end of file +{"version":3,"file":"front.css","sources":["front.scss"],"sourcesContent":[".no-padding{\n padding: 0;\n}\n.front-item-list-wrapper{\n span{\n font-weight: bold;\n }\n .front-list-item{\n padding: 10px 0;\n border-bottom: 1px solid lightgray;\n }\n div{\n line-height: 1.1;\n padding: 5px;\n }\n .front-list-topic{\n padding: 5px;\n width: 100px;\n text-align: center;\n color: white;\n border-radius: 5px;\n margin-bottom: 10px;\n }\n .item-wanted{\n background: green;\n }\n .item-sale{\n background: red;\n }\n}"],"names":[],"mappings":"AAAA,AAAA,WAAW,AAAA,CACP,OAAO,CAAE,CAAC,CACb,AACD,AACI,wBADoB,CACpB,IAAI,AAAA,CACA,WAAW,CAAE,IAAI,CACpB,AAHL,AAII,wBAJoB,CAIpB,gBAAgB,AAAA,CACZ,OAAO,CAAE,MAAM,CACf,aAAa,CAAE,mBAAmB,CACrC,AAPL,AAQI,wBARoB,CAQpB,GAAG,AAAA,CACC,WAAW,CAAE,GAAG,CAChB,OAAO,CAAE,GAAG,CACf,AAXL,AAYI,wBAZoB,CAYpB,iBAAiB,AAAA,CACb,OAAO,CAAE,GAAG,CACZ,KAAK,CAAE,KAAK,CACZ,UAAU,CAAE,MAAM,CAClB,KAAK,CAAE,KAAK,CACZ,aAAa,CAAE,GAAG,CAClB,aAAa,CAAE,IAAI,CACtB,AAnBL,AAoBI,wBApBoB,CAoBpB,YAAY,AAAA,CACR,UAAU,CAAE,KAAK,CACpB,AAtBL,AAuBI,wBAvBoB,CAuBpB,UAAU,AAAA,CACN,UAAU,CAAE,GAAG,CAClB"} \ No newline at end of file diff --git a/deactivate.php b/deactivate.php index 93e8201..b63cad7 100644 --- a/deactivate.php +++ b/deactivate.php @@ -6,7 +6,7 @@ * PHP version 5.5 * * @category glmWordPressPlugin - * @package glmMembersBuySell + * @package glmMembersForSale * @author Chuck Scott * @license http://www.gaslightmedia.com Gaslightmedia * @release admin.php,v 1.0 2014/10/31 19:31:47 cscott Exp $ @@ -22,7 +22,7 @@ if (!defined('ABSPATH')) { * This class performs all necessary additional work when this * plugin is deactivated. */ -class glmMembersBuySellPluginDeactivate +class glmMembersForSalePluginDeactivate { /** @@ -55,7 +55,7 @@ class glmMembersBuySellPluginDeactivate $this->config = $config; // Delete our version from WordPress Options - delete_option('glmMembersBuySellPluginVersion'); + delete_option('glmMembersForSalePluginVersion'); } } diff --git a/defines.php b/defines.php index 203ee52..ac06c05 100644 --- a/defines.php +++ b/defines.php @@ -7,28 +7,28 @@ // NOTE: Plugin & Database versions are defined in "/glm-member-db.php". -define('GLM_MEMBERS_BUY_SELL_PLUGIN_NAME', 'GLM Members Database Buy Sell'); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_SHORT_NAME', 'Buy Sell'); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG', 'glm-member-db-buy-sell'); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_NAME', 'GLM Members Database For Sale'); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_SHORT_NAME', 'For Sale'); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG', 'glm-member-db-for-sale'); // Database table prefixes - change if using add-on tables global $wpdb; -define('GLM_MEMBERS_BUY_SELL_PLUGIN_DB_PREFIX', $wpdb->prefix.'glm_membersBuySell_'); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_ACTIVE_DB_OPTION', 'glmMembersBuySellDbVersion'); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_DB_PREFIX', $wpdb->prefix.'glm_membersForSale_'); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_ACTIVE_DB_OPTION', 'glmMembersForSaleDbVersion'); // Determine which system we're running on - If not provided, assume PRODUCTION $host = getenv('GLM_HOST_ID'); if (trim($host) == '') { $host = 'PRODUCTION'; } -define('GLM_MEMBERS_BUY_SELL_PLUGIN_HOST', $host); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_HOST', $host); // Determine current http/https protocol $pageProtocol = 'http'; if (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == '443') { $pageProtocol = 'https'; } -define('GLM_MEMBERS_BUY_SELL_PLUGIN_HTTP_PROTOCOL', $pageProtocol); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_HTTP_PROTOCOL', $pageProtocol); // Get various pieces of the URL $urlParts = parse_url(get_bloginfo('url')); @@ -40,25 +40,25 @@ $WPUploadDir = wp_upload_dir(); * Create a copy of the plugin slug that can be used as a variable prefix used to keep * global instances from clashing with instances in other plugins. */ -$vprefix = str_replace('-', '_', GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_PREFIX', $vprefix.'_'); +$vprefix = str_replace('-', '_', GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_PREFIX', $vprefix.'_'); // URLs -define('GLM_MEMBERS_BUY_SELL_SITE_BASE_URL', home_url('/') ); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_URL', plugin_dir_url(__FILE__)); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_ADMIN_URL', admin_url('admin.php')); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_BASE_URL', WP_PLUGIN_URL.'/'.GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_CURRENT_URL', $urlParts['scheme'].'://'.$urlParts['host'].$pageUri[0]); +define('GLM_MEMBERS_FOR_SALE_SITE_BASE_URL', home_url('/') ); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_URL', plugin_dir_url(__FILE__)); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_ADMIN_URL', admin_url('admin.php')); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_BASE_URL', WP_PLUGIN_URL.'/'.GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_CURRENT_URL', $urlParts['scheme'].'://'.$urlParts['host'].$pageUri[0]); // Directories -define('GLM_MEMBERS_BUY_SELL_PLUGIN_PATH', dirname(__FILE__)); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_SETUP_PATH', GLM_MEMBERS_BUY_SELL_PLUGIN_PATH.'/setup'); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_DB_SCRIPTS', GLM_MEMBERS_BUY_SELL_PLUGIN_SETUP_PATH.'/databaseScripts'); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_CLASS_PATH', GLM_MEMBERS_BUY_SELL_PLUGIN_PATH.'/classes'); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_CONFIG_PATH', GLM_MEMBERS_BUY_SELL_PLUGIN_PATH.'/config'); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_PATH', dirname(__FILE__)); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_SETUP_PATH', GLM_MEMBERS_FOR_SALE_PLUGIN_PATH.'/setup'); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_DB_SCRIPTS', GLM_MEMBERS_FOR_SALE_PLUGIN_SETUP_PATH.'/databaseScripts'); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_CLASS_PATH', GLM_MEMBERS_FOR_SALE_PLUGIN_PATH.'/classes'); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_CONFIG_PATH', GLM_MEMBERS_FOR_SALE_PLUGIN_PATH.'/config'); // Parameters related to the Main GLM Member DB plugin - Depending on what's going on these may already defined by the main plugin -$pluginsPath = str_replace(GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG, '', GLM_MEMBERS_BUY_SELL_PLUGIN_PATH); -define('GLM_MEMBERS_BUY_SELL_MAIN_PLUGIN_PATH', $pluginsPath.'/glm-member-db'); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_LIB_PATH', GLM_MEMBERS_BUY_SELL_MAIN_PLUGIN_PATH.'/lib'); +$pluginsPath = str_replace(GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG, '', GLM_MEMBERS_FOR_SALE_PLUGIN_PATH); +define('GLM_MEMBERS_FOR_SALE_MAIN_PLUGIN_PATH', $pluginsPath.'/glm-member-db'); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_LIB_PATH', GLM_MEMBERS_FOR_SALE_MAIN_PLUGIN_PATH.'/lib'); diff --git a/index.php b/index.php index 1623c0d..675a513 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,6 @@ * @license http://www.gaslightmedia.com Gaslightmedia * @version 0.0.1 @@ -37,15 +37,15 @@ * so that we're sure the other add-ons see an up to date * version from this plugin. */ -define('GLM_MEMBERS_BUY_SELL_PLUGIN_VERSION', '0.0.1'); -define('GLM_MEMBERS_BUY_SELL_PLUGIN_DB_VERSION', '0.0.1'); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_VERSION', '0.0.1'); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_DB_VERSION', '0.0.1'); // This is the minimum version of the GLM Members DB plugin require for this plugin. -define('GLM_MEMBERS_BUY_SELL_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.8.0'); +define('GLM_MEMBERS_FOR_SALE_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.8.0'); // Check if plugin version is not current in WordPress option and if needed updated it -if (GLM_MEMBERS_BUY_SELL_PLUGIN_VERSION != get_option('glmMembersBuySellPluginVersion')) { - update_option('glmMembersBuySellPluginVersion', GLM_MEMBERS_BUY_SELL_PLUGIN_VERSION); +if (GLM_MEMBERS_FOR_SALE_PLUGIN_VERSION != get_option('glmMembersForSalePluginVersion')) { + update_option('glmMembersForSalePluginVersion', GLM_MEMBERS_FOR_SALE_PLUGIN_VERSION); } /* @@ -91,7 +91,7 @@ include_once ABSPATH . 'wp-admin/includes/plugin.php'; */ // Check if database version should be defined and it isn't - This would be a plugin/add-on setup issue -if (is_file(GLM_MEMBERS_BUY_SELL_PLUGIN_PATH.'/setup/databaseScripts/dbVersions.php') && !defined('GLM_MEMBERS_BUY_SELL_PLUGIN_DB_VERSION')) { +if (is_file(GLM_MEMBERS_FOR_SALE_PLUGIN_PATH.'/setup/databaseScripts/dbVersions.php') && !defined('GLM_MEMBERS_FOR_SALE_PLUGIN_DB_VERSION')) { die('You have database scripts but have not defined a current database version at the top of index.php for this plugin/add-on!'); } @@ -100,99 +100,99 @@ if (is_file(GLM_MEMBERS_BUY_SELL_PLUGIN_PATH.'/setup/databaseScripts/dbVersions. */ // Check for main plugin and that it's active -function glmMembersBuySellPluginRequired() { +function glmMembersForSalePluginRequired() { echo '
-

The '.GLM_MEMBERS_BUY_SELL_PLUGIN_NAME.' add-on requires the base GLM Member DB plugin to be installed and active!

-

The '.GLM_MEMBERS_BUY_SELL_PLUGIN_NAME.' plugin has been de-activated.

+

The '.GLM_MEMBERS_FOR_SALE_PLUGIN_NAME.' add-on requires the base GLM Member DB plugin to be installed and active!

+

The '.GLM_MEMBERS_FOR_SALE_PLUGIN_NAME.' plugin has been de-activated.

'; } $plugin_name = 'glm-member-db/index.php'; $is_active = is_plugin_active($plugin_name); if ($is_active != '1') { - add_action( 'admin_notices', 'glmMembersBuySellPluginRequired' ); - deactivate_plugins('/'.GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG.'/index.php'); + add_action( 'admin_notices', 'glmMembersForSalePluginRequired' ); + deactivate_plugins('/'.GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG.'/index.php'); } // Check for Minimum DB version for main Member DB -function glmMembersBuySellMinVerRequired() { +function glmMembersForSaleMinVerRequired() { echo '
-

The '.GLM_MEMBERS_BUY_SELL_PLUGIN_NAME.' requires that the main GLM Member DB plugin version be no older than ' - .GLM_MEMBERS_BUY_SELL_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION.'!
- '.GLM_MEMBERS_BUY_SELL_MIN_VERSION_NOTE.'

-

The '.GLM_MEMBERS_BUY_SELL_PLUGIN_NAME.' plugin has been de-activated.

+

The '.GLM_MEMBERS_FOR_SALE_PLUGIN_NAME.' requires that the main GLM Member DB plugin version be no older than ' + .GLM_MEMBERS_FOR_SALE_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION.'!
+ '.GLM_MEMBERS_FOR_SALE_MIN_VERSION_NOTE.'

+

The '.GLM_MEMBERS_FOR_SALE_PLUGIN_NAME.' plugin has been de-activated.

'; } $glmMembersDatabasePluginVersion = get_option('glmMembersDatabasePluginVersion'); -if (version_compare($glmMembersDatabasePluginVersion, GLM_MEMBERS_BUY_SELL_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION) < 0) { - define('GLM_MEMBERS_BUY_SELL_MIN_VERSION_NOTE', "Members DB: $glmMembersDatabasePluginVersion, Buy Sell Requires: ".GLM_MEMBERS_BUY_SELL_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION); - add_action( 'admin_notices', 'glmMembersBuySellMinVerRequired'); - deactivate_plugins('/'.GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG.'/'.GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG.'.php'); +if (version_compare($glmMembersDatabasePluginVersion, GLM_MEMBERS_FOR_SALE_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION) < 0) { + define('GLM_MEMBERS_FOR_SALE_MIN_VERSION_NOTE', "Members DB: $glmMembersDatabasePluginVersion, Buy Sell Requires: ".GLM_MEMBERS_FOR_SALE_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION); + add_action( 'admin_notices', 'glmMembersForSaleMinVerRequired'); + deactivate_plugins('/'.GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG.'/'.GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG.'.php'); } /* * Register this add-on with the main GLM Member DB plugin and get information on all add-ons loaded. */ -require_once GLM_MEMBERS_BUY_SELL_PLUGIN_SETUP_PATH.'/validActions.php'; -require_once GLM_MEMBERS_BUY_SELL_PLUGIN_SETUP_PATH.'/shortcodes.php'; -if (is_file(GLM_MEMBERS_BUY_SELL_PLUGIN_DB_SCRIPTS.'/dbVersions.php')) { - require_once GLM_MEMBERS_BUY_SELL_PLUGIN_DB_SCRIPTS.'/dbVersions.php'; +require_once GLM_MEMBERS_FOR_SALE_PLUGIN_SETUP_PATH.'/validActions.php'; +require_once GLM_MEMBERS_FOR_SALE_PLUGIN_SETUP_PATH.'/shortcodes.php'; +if (is_file(GLM_MEMBERS_FOR_SALE_PLUGIN_DB_SCRIPTS.'/dbVersions.php')) { + require_once GLM_MEMBERS_FOR_SALE_PLUGIN_DB_SCRIPTS.'/dbVersions.php'; } // Load Add-On Management Settings data /* None - Need to figure out a smooth way to do this. -$glmMembersBuySellManagementSettings = $wpdb->get_row( "SELECT * FROM ".GLM_MEMBERS_BUY_SELL_PLUGIN_DB_PREFIX."management WHERE id = 1", ARRAY_A ); -unset($glmMembersBuySellManagementSettings['id']); +$glmMembersForSaleManagementSettings = $wpdb->get_row( "SELECT * FROM ".GLM_MEMBERS_FOR_SALE_PLUGIN_DB_PREFIX."management WHERE id = 1", ARRAY_A ); +unset($glmMembersForSaleManagementSettings['id']); */ -function glmMembersBuySellRegisterAddOn($addOns) { +function glmMembersForSaleRegisterAddOn($addOns) { // Add this add-on to the add-ons array - $addOns[GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG] = array( - 'dir' => GLM_MEMBERS_BUY_SELL_PLUGIN_PATH, - 'name' => GLM_MEMBERS_BUY_SELL_PLUGIN_NAME, - 'short_name' => GLM_MEMBERS_BUY_SELL_PLUGIN_SHORT_NAME, - 'slug' => GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG, - 'actions' => $GLOBALS['glmMembersBuySellAddOnValidActions'], + $addOns[GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG] = array( + 'dir' => GLM_MEMBERS_FOR_SALE_PLUGIN_PATH, + 'name' => GLM_MEMBERS_FOR_SALE_PLUGIN_NAME, + 'short_name' => GLM_MEMBERS_FOR_SALE_PLUGIN_SHORT_NAME, + 'slug' => GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG, + 'actions' => $GLOBALS['glmMembersForSaleAddOnValidActions'], 'config' => array( ), - 'shortcodes' => $GLOBALS['glmMembersBuySellShortcodes'], - 'shortcodesDescription' => $GLOBALS['glmMembersBuySellShortcodesDescription'] + 'shortcodes' => $GLOBALS['glmMembersForSaleShortcodes'], + 'shortcodesDescription' => $GLOBALS['glmMembersForSaleShortcodesDescription'] ); // If we have database tables for this plugin/addon, provide that data also - if (isset($GLOBALS['glmMembersBuySellDbVersions'])) { - $addOns[GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG]['database'] = array( - 'dbPrefix' => GLM_MEMBERS_BUY_SELL_PLUGIN_DB_PREFIX, - 'dbCurrentVersion' => GLM_MEMBERS_BUY_SELL_PLUGIN_DB_VERSION, - 'dbActiveVersionOption' => GLM_MEMBERS_BUY_SELL_PLUGIN_ACTIVE_DB_OPTION, - 'dbScriptPath' => GLM_MEMBERS_BUY_SELL_PLUGIN_DB_SCRIPTS, - 'dbVersions' => $GLOBALS['glmMembersBuySellDbVersions'] + if (isset($GLOBALS['glmMembersForSaleDbVersions'])) { + $addOns[GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG]['database'] = array( + 'dbPrefix' => GLM_MEMBERS_FOR_SALE_PLUGIN_DB_PREFIX, + 'dbCurrentVersion' => GLM_MEMBERS_FOR_SALE_PLUGIN_DB_VERSION, + 'dbActiveVersionOption' => GLM_MEMBERS_FOR_SALE_PLUGIN_ACTIVE_DB_OPTION, + 'dbScriptPath' => GLM_MEMBERS_FOR_SALE_PLUGIN_DB_SCRIPTS, + 'dbVersions' => $GLOBALS['glmMembersForSaleDbVersions'] ); } else { - $addOns[GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG]['database'] = false; + $addOns[GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG]['database'] = false; } // Return the array with our data added return $addOns; } -add_filter('glm-member-db-register-addon','glmMembersBuySellRegisterAddOn', 10, 1); +add_filter('glm-member-db-register-addon','glmMembersForSaleRegisterAddOn', 10, 1); /* * Plugin Update Support - uses Gaslight Media update server */ /* Not functional yet - Need to resolve JavaScript conflicts with this feature in other plugins -require GLM_MEMBERS_BUY_SELL_PLUGIN_LIB_PATH.'/opentools-update-checker/opentools-update-checker.php'; -${GLM_MEMBERS_BUY_SELL_PLUGIN_PREFIX."updateChecker"} = new OpenToolsPluginUpdateChecker( - 'http://www.gaslightmedia.com/update_server/?action=get_metadata&slug='.GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG, +require GLM_MEMBERS_FOR_SALE_PLUGIN_LIB_PATH.'/opentools-update-checker/opentools-update-checker.php'; +${GLM_MEMBERS_FOR_SALE_PLUGIN_PREFIX."updateChecker"} = new OpenToolsPluginUpdateChecker( + 'http://www.gaslightmedia.com/update_server/?action=get_metadata&slug='.GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG, __FILE__, - GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG + GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG ); -${GLM_MEMBERS_BUY_SELL_PLUGIN_PREFIX."updateChecker"}->declareCredentials(array( +${GLM_MEMBERS_FOR_SALE_PLUGIN_PREFIX."updateChecker"}->declareCredentials(array( 'license_key' => __('License Key:') )); */ @@ -204,26 +204,26 @@ ${GLM_MEMBERS_BUY_SELL_PLUGIN_PREFIX."updateChecker"}->declareCredentials(array( */ // Activate - function glmMembersBuySellPluginActivate () + function glmMembersForSalePluginActivate () { global $wpdb, $config; - require_once GLM_MEMBERS_BUY_SELL_PLUGIN_PATH . '/activate.php'; - new glmMembersBuySellPluginActivate($wpdb, $config); + require_once GLM_MEMBERS_FOR_SALE_PLUGIN_PATH . '/activate.php'; + new glmMembersForSalePluginActivate($wpdb, $config); } - register_activation_hook(__FILE__, 'glmMembersBuySellPluginActivate'); + register_activation_hook(__FILE__, 'glmMembersForSalePluginActivate'); // Deactivate - function glmMembersBuySellPluginDeactivate () + function glmMembersForSalePluginDeactivate () { global $wpdb, $config; - require_once GLM_MEMBERS_BUY_SELL_PLUGIN_PATH . '/deactivate.php'; - $x = new glmMembersBuySellPluginDeactivate($wpdb, $config); + require_once GLM_MEMBERS_FOR_SALE_PLUGIN_PATH . '/deactivate.php'; + $x = new glmMembersForSalePluginDeactivate($wpdb, $config); return false; } - register_deactivation_hook(__FILE__, 'glmMembersBuySellPluginDeactivate'); + register_deactivation_hook(__FILE__, 'glmMembersForSalePluginDeactivate'); /* * Hooks for testing capabilities provided by this add-on */ -require_once GLM_MEMBERS_BUY_SELL_PLUGIN_SETUP_PATH.'/permissions.php'; +require_once GLM_MEMBERS_FOR_SALE_PLUGIN_SETUP_PATH.'/permissions.php'; diff --git a/models/admin/buySell/index.php b/models/admin/forSale/index.php similarity index 97% rename from models/admin/buySell/index.php rename to models/admin/forSale/index.php index de65370..5d8e26a 100644 --- a/models/admin/buySell/index.php +++ b/models/admin/forSale/index.php @@ -14,10 +14,10 @@ */ // Load Contacts data abstract -require_once GLM_MEMBERS_BUY_SELL_PLUGIN_CLASS_PATH .'/data/dataBuySell.php'; +require_once GLM_MEMBERS_FOR_SALE_PLUGIN_CLASS_PATH .'/data/dataForSale.php'; require_once GLM_MEMBERS_PLUGIN_CLASS_PATH .'/data/dataMembers.php'; -class GlmMembersAdmin_buySell_index extends GlmDataBuySell +class GlmMembersAdmin_forSale_index extends GlmDataForSale { /** @@ -280,7 +280,7 @@ class GlmMembersAdmin_buySell_index extends GlmDataBuySell 'itemAddError' => $itemAddError, 'option' => $option, 'item' => $item, - 'assetsUrl' => GLM_MEMBERS_BUY_SELL_PLUGIN_URL . 'assets/', + 'assetsUrl' => GLM_MEMBERS_FOR_SALE_PLUGIN_URL . 'assets/', ); @@ -288,7 +288,7 @@ class GlmMembersAdmin_buySell_index extends GlmDataBuySell return array( 'status' => true, 'modelRedirect' => false, - 'view' => 'admin/buySell/'.$view_file.'.html', + 'view' => 'admin/forSale/'.$view_file.'.html', 'data' => $templateData ); } diff --git a/models/front/buySell/detail.php b/models/front/buySell/detail.php deleted file mode 100644 index e69de29..0000000 diff --git a/models/front/buySell/list.php b/models/front/buySell/list.php deleted file mode 100644 index e69de29..0000000 diff --git a/models/front/forSale/detail.php b/models/front/forSale/detail.php new file mode 100644 index 0000000..d1eff1a --- /dev/null +++ b/models/front/forSale/detail.php @@ -0,0 +1,146 @@ + + * @license http://www.gaslightmedia.com Gaslightmedia + * @release index.php,v 1.0 2014/10/31 19:31:47 cscott Exp $ + * @link http://dev.gaslightmedia.com/ + */ + +// Load Contacts data abstract +require_once GLM_MEMBERS_FOR_SALE_PLUGIN_CLASS_PATH.'/data/dataForSale.php'; + + +class GlmMembersFront_forSale_detail extends GlmDataForSale +{ + + /** + * WordPress Database Object + * + * @var $wpdb + * @access public + */ + public $wpdb; + /** + * Plugin Configuration Data + * + * @var $config + * @access public + */ + public $config; + /** + * Contact Info + * + * @var $contactInfo + * @access public + */ + public $contactInfo = false; + /** + * Member ID + * + * @var $memberID + * @access public + */ + public $memberID = false; + /** + * Contact ID + * + * @var $contactID + * @access public + */ + public $contactID = false; + public $item_id; + + /* + * Constructor + * + * This contructor performs the work for this model. This model returns + * an array containing the following. + * + * 'status' + * + * True if successfull and false if there was a fatal failure. + * + * 'view' + * + * A suggested view name that the contoller should use instead of the + * default view for this model or false to indicate that the default view + * should be used. + * + * 'data' + * + * Data that the model is returning for use in merging with the view to + * produce output. + * + * @wpdb object WordPress database object + * + * @return array Array containing status, suggested view, and any data + */ + public function __construct ($wpdb, $config) + { + + // Save WordPress Database object + $this->wpdb = $wpdb; + + // Save plugin configuration object + $this->config = $config; + + /* + * Run constructor for the Contacts data class + * + * Note, the third parameter is a flag that indicates to the Contacts + * data class that it should flag a group of fields as 'view_only'. + */ + parent::__construct(false, false, true); + + + } + + public function modelAction($actionData = false) + { + echo "ASF"; + $success_message = ""; + $option = false; + if (isset($_REQUEST['option']) && trim($_REQUEST['option']) != '') { + $option = $_REQUEST['option']; + } + // get the Item id for use in the edit, add and delete options + // Get obit ID if supplied + if (isset($_REQUEST['item'])) { + + // Make sure it's numeric + $this->item_id= ($_REQUEST['item'] - 0); + + if ($this->item_id <= 0) { + $this->item_id = false; + } + } + $where = "id = $this->item_id"; + + $item = $this->getList($where); + + foreach($item as $i){ + $item = $i; + } + // Compile template data + $templateData = array( + 'itemData' => $item, + 'siteBaseUrl' => GLM_MEMBERS_FOR_SALE_SITE_BASE_URL, + 'currentUrl' => GLM_MEMBERS_FOR_SALE_PLUGIN_CURRENT_URL, + ); + + // Return status, any suggested view, and any data to controller + return array( + 'status' => true, + 'modelRedirect' => false, + 'view' => 'front/forSale/detail.html', + 'data' => $templateData + ); + } +} diff --git a/models/front/forSale/list.php b/models/front/forSale/list.php new file mode 100644 index 0000000..22c99c7 --- /dev/null +++ b/models/front/forSale/list.php @@ -0,0 +1,137 @@ + + * @license http://www.gaslightmedia.com Gaslightmedia + * @release index.php,v 1.0 2014/10/31 19:31:47 cscott Exp $ + * @link http://dev.gaslightmedia.com/ + */ + +// Load Contacts data abstract +require_once GLM_MEMBERS_FOR_SALE_PLUGIN_CLASS_PATH.'/data/dataForSale.php'; + +class GlmMembersFront_forSale_list extends GlmDataForSale +{ + + /** + * WordPress Database Object + * + * @var $wpdb + * @access public + */ + public $wpdb; + /** + * Plugin Configuration Data + * + * @var $config + * @access public + */ + public $config; + /** + * Contact Info + * + * @var $contactInfo + * @access public + */ + public $contactInfo = false; + /** + * Member ID + * + * @var $memberID + * @access public + */ + public $memberID = false; + /** + * Contact ID + * + * @var $contactID + * @access public + */ + public $contactID = false; + + + /* + * Constructor + * + * This contructor performs the work for this model. This model returns + * an array containing the following. + * + * 'status' + * + * True if successfull and false if there was a fatal failure. + * + * 'view' + * + * A suggested view name that the contoller should use instead of the + * default view for this model or false to indicate that the default view + * should be used. + * + * 'data' + * + * Data that the model is returning for use in merging with the view to + * produce output. + * + * @wpdb object WordPress database object + * + * @return array Array containing status, suggested view, and any data + */ + public function __construct ($wpdb, $config) + { + + // Save WordPress Database object + $this->wpdb = $wpdb; + + // Save plugin configuration object + $this->config = $config; + + /* + * Run constructor for the Contacts data class + * + * Note, the third parameter is a flag that indicates to the Contacts + * data class that it should flag a group of fields as 'view_only'. + */ + parent::__construct(false, false, true); + + + } + + public function modelAction($actionData = false) + { + $where = ""; + + $success_message = ""; + $option = false; + if (isset($_REQUEST['option']) && trim($_REQUEST['option']) != '') { + $option = $_REQUEST['option']; + } + $where .= "CURDATE() <= DATE_ADD(post_date, INTERVAL item_expiration DAY) "; + + $item_data = $this->getList($where); + + + $view_file = 'list'; + + // Compile template data + $templateData = array( + 'itemData' => $item_data, + 'siteBaseUrl' => GLM_MEMBERS_FOR_SALE_SITE_BASE_URL, + 'currentUrl' => GLM_MEMBERS_FOR_SALE_PLUGIN_CURRENT_URL, + ); + + // Return status, any suggested view, and any data to controller + return array( + 'status' => true, + 'modelRedirect' => false, + 'view' => 'front/forSale/'.$view_file.'.html', + 'data' => $templateData + ); + + } + +} diff --git a/scss/front.scss b/scss/front.scss index 31b1485..b0898c1 100644 --- a/scss/front.scss +++ b/scss/front.scss @@ -1,66 +1,30 @@ .no-padding{ padding: 0; } - -body .front-item-listings-wrapper { - .item-detail-wrapper{ - .front-title{ - font-weight: bold; - font-size: 20px; - } - div{ - float: none !important; - line-height: 1.1; - margin: 8px 8px 8px 0; - } - } - // .front-item-search{ - // max-width: 530px; - // margin: 0 auto; - // } - margin-top: 20px; +.front-item-list-wrapper{ span{ font-weight: bold; } - - .front-item-list-row{ - margin-bottom: 20px; - .item-title-list{ - span{ - font-size: 20px; - } - } - + .front-list-item{ + padding: 10px 0; + border-bottom: 1px solid lightgray; } - .item-title-search{ - #item_title_dropdown{ - max-width: 450px; - } - .item-title-button{ - height: 39px; - } + div{ + line-height: 1.1; + padding: 5px; } - - @media screen and (max-width: 641px){ - .item-title-button{ - display: block; - max-width: 100px; - margin: 0 auto; - } - .front-item-search{ - margin-bottom: 20px; - } + .front-list-topic{ + padding: 5px; + width: 100px; + text-align: center; + color: white; + border-radius: 5px; + margin-bottom: 10px; } - @media (min-width: 639px) and (max-width: 1025px){ - .item-title-button{ - display: inline-block; - margin: 0 0 0 10px; - } + .item-wanted{ + background: green; } - @media (min-width: 1023px){ - .item-title-button{ - display: inline-block; - margin: 0 0 0 10px; - } + .item-sale{ + background: red; } } \ No newline at end of file diff --git a/setup/adminMenus.php b/setup/adminMenus.php index 14e5d55..a36caaf 100644 --- a/setup/adminMenus.php +++ b/setup/adminMenus.php @@ -52,19 +52,19 @@ if (isset($this->config['loggedInUser']) && isset($this->config['loggedInUser']['contactUser']) && $this->config['loggedInUser']['contactUser']) { add_submenu_page( $mainMenuSlug, - 'Buy Sell', - 'Buy Sell', + 'For Sale', + 'For Sale', 'glm_members_edit_my_entity', - 'glm-members-admin-menu-buy-sell-index', - function(){$this->controller('buySell');} + 'glm-members-admin-menu-for-sale-index', + function(){$this->controller('forSale');} ); } else { add_submenu_page( 'glm-members-admin-menu-members', - 'Buy Sell', - 'Buy Sell', + 'For Sale', + 'For Sale', 'edit_posts', - 'glm-members-admin-menu-buySell-index', - function(){$this->controller('buySell');} + 'glm-members-admin-menu-for-sale-index', + function(){$this->controller('forSale');} ); } diff --git a/setup/databaseScripts/create_database_V0.0.1.sql b/setup/databaseScripts/create_database_V0.0.1.sql index 7b500fa..fd297ce 100644 --- a/setup/databaseScripts/create_database_V0.0.1.sql +++ b/setup/databaseScripts/create_database_V0.0.1.sql @@ -1,4 +1,4 @@ --- Gaslight Media Members Database - Buy Sell +-- Gaslight Media Members Database - For Sale -- File Created: 12/02/15 15:27:15 -- Database Version: 0.0.1 -- Database Creation Script @@ -36,7 +36,7 @@ CREATE TABLE {prefix}items ( ---- --- Job Titles default entries in table +-- default entries in table INSERT INTO {prefix}items ( id,title,descr,topic,contact_email,contact_name,contact_phone,post_date,visible, terms,location,item_expiration,image_3,post,image_1, diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index f8e872f..373e2ef 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -33,6 +33,6 @@ **********************************************************************/ -$glmMembersBuySellDbVersions = array( +$glmMembersForSaleDbVersions = array( '0.0.1' => array('version' => '0.0.1', 'tables' => 1, 'date' => '09/15/2017'), ); diff --git a/setup/permissions.php b/setup/permissions.php index 2cd34cd..b814f09 100644 --- a/setup/permissions.php +++ b/setup/permissions.php @@ -51,14 +51,14 @@ * * $permit is a boolean set before this function call for passing on permissions. */ -add_filter('glm_members_permit_admin_members_buy_sell', +add_filter('glm_members_permit_admin_members_for_sale', function($permit) { return glmMembersUserCan('glm_members_edit_any_member', $permit); } ); // Logged in member user may edit an event only for their own entity -add_filter('glm_members_permit_admin_member_buy_sell', +add_filter('glm_members_permit_admin_member_for_sale', function($permit) { return glmMembersUserCan('glm_members_edit_my_member', $permit); } diff --git a/setup/shortcodes.php b/setup/shortcodes.php index 3002795..198c6f4 100644 --- a/setup/shortcodes.php +++ b/setup/shortcodes.php @@ -6,7 +6,7 @@ * PHP version 5.5 * * @category glmWordPressPlugin - * @package glmMembersBuySell + * @package glmMembersForSale * @author Chuck Scott * @license http://www.gaslightmedia.com Gaslightmedia * @release shortcodes.php,v 1.0 2014/10/31 19:31:47 cscott Exp $ @@ -86,28 +86,29 @@ * */ - $glmMembersBuySellShortcodes = array( - 'glm-members-buy-sell' => array( - 'plugin' => GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG, - 'menu' => 'Buy Sell', + $glmMembersForSaleShortcodes = array( + 'glm-members-for-sale-list' => array( + 'plugin' => GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG, + 'menu' => 'forSale', 'action' => 'list', 'table' => false, 'attributes' => array( - 'id' => true, - 'member_only' => true + 'id' => false, + 'member_only' => false ) ), - 'glm-members-buy-sell-detail' => array( - 'plugin' => GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG, - 'menu' => 'Buy Sell', + 'glm-members-for-sale-detail' => array( + 'plugin' => GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG, + 'menu' => 'forSale', 'action' => 'detail', 'table' => false, 'attributes' => array( 'id' => false, + 'member_only' => false ) ), ); -$glmMembersBuySellShortcodesDescription = ''; +$glmMembersForSaleShortcodesDescription = ''; diff --git a/setup/validActions.php b/setup/validActions.php index 2c04887..688ce03 100644 --- a/setup/validActions.php +++ b/setup/validActions.php @@ -6,7 +6,7 @@ * PHP version 5.5 * * @category glmWordPressPlugin - * @package glmMembersBuySell + * @package glmMembersForSale * @author Chuck Scott * @license http://www.gaslightmedia.com Gaslightmedia * @release admin.php,v 1.0 2014/10/31 19:31:47 cscott Exp $ @@ -31,23 +31,23 @@ * * EXAMPLE * - * $glmMembersBuySellAddOnValidActions = array( + * $glmMembersForSaleAddOnValidActions = array( * 'adminActions' => array( * 'members' => array( - * 'sample' => GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG, + * 'sample' => GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG, * ), * 'sample' => array( - * 'index' => GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG, - * 'more' => GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG, + * 'index' => GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG, + * 'more' => GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG, * ), * 'info' => array( - * 'index' => GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG + * 'index' => GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG * ) * ), * 'frontActions' => array( * 'sample' => array( - * 'list' => GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG, - * 'detail' => GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG + * 'list' => GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG, + * 'detail' => GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG * ) * ) * ); @@ -58,16 +58,16 @@ */ - $glmMembersBuySellAddOnValidActions = array( + $glmMembersForSaleAddOnValidActions = array( 'adminActions' => array( - 'buySell' => array( - 'index' => GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG, + 'forSale' => array( + 'index' => GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG, ), ), 'frontActions' => array( - 'buySell' => array( - 'list' => GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG, - 'detail' => GLM_MEMBERS_BUY_SELL_PLUGIN_SLUG, + 'forSale' => array( + 'list' => GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG, + 'detail' => GLM_MEMBERS_FOR_SALE_PLUGIN_SLUG, ), ) ); diff --git a/views/admin/buySell/edit.html b/views/admin/forSale/edit.html similarity index 85% rename from views/admin/buySell/edit.html rename to views/admin/forSale/edit.html index fe2c67f..009af91 100644 --- a/views/admin/buySell/edit.html +++ b/views/admin/forSale/edit.html @@ -29,9 +29,26 @@ {/if} -

+

Item Postings

+
+
+ Topic +
+ +
+ +
+
+
@@ -42,7 +59,8 @@
- {if !$lockedToMember} + {if !$lockedToMember && $memberList} +
Member @@ -51,11 +69,7 @@ +
@@ -114,7 +128,7 @@ Contact Email
- +
@@ -123,11 +137,11 @@ Contact Phone
- +

- {include file='admin/buySell/parts/image_input.html'} + {include file='admin/forSale/parts/image_input.html'}
diff --git a/views/admin/buySell/list.html b/views/admin/forSale/list.html similarity index 98% rename from views/admin/buySell/list.html rename to views/admin/forSale/list.html index f00bf5c..1c683ef 100644 --- a/views/admin/buySell/list.html +++ b/views/admin/forSale/list.html @@ -16,6 +16,7 @@
Item Post Date
Post For
+ {foreach $itemData as $item=>$data}
diff --git a/views/admin/buySell/parts/image_input.html b/views/admin/forSale/parts/image_input.html similarity index 98% rename from views/admin/buySell/parts/image_input.html rename to views/admin/forSale/parts/image_input.html index 8173ba9..26fbffd 100644 --- a/views/admin/buySell/parts/image_input.html +++ b/views/admin/forSale/parts/image_input.html @@ -17,7 +17,6 @@ Image 2:
- {if $item.fieldData.image_2} {/if} @@ -32,7 +31,6 @@ Image 3:
- {if $item.fieldData.image_3} {/if} diff --git a/views/front/buySell/list.html b/views/front/buySell/list.html deleted file mode 100644 index e69de29..0000000 diff --git a/views/front/buySell/detail.html b/views/front/forSale/detail.html similarity index 100% rename from views/front/buySell/detail.html rename to views/front/forSale/detail.html diff --git a/views/front/forSale/list.html b/views/front/forSale/list.html new file mode 100644 index 0000000..2bd0717 --- /dev/null +++ b/views/front/forSale/list.html @@ -0,0 +1,48 @@ + +
+ {if !empty($itemData)} + {foreach $itemData as $item=>$data} +
+ +
+
+ + {$data.title} +
+
+ Company: + {$data.company} +
+
+ Description: + {$data.descr} +
+
+ Contact: + {$data.contact_name} +
+
+ Contact Phone: + {$data.contact_phone} +
+ +
+
+ {if $data.topic.value == 1} +
Wanted
+ {else} +
For Sale
+ {/if} + {if $data.image_1} + + {/if} + Item Details +
+
+ {/foreach} + {else} + No Items Found + {/if} +
\ No newline at end of file -- 2.17.1