From: Chuck Scott Date: Thu, 15 Jan 2015 00:33:44 +0000 (-0500) Subject: Minor modifications to tabs. X-Git-Tag: v1.0.0~84 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=96198e61baee65b54f271a3957018fcb8c99e5b2;p=WP-Plugins%2Fglm-member-db.git Minor modifications to tabs. --- diff --git a/controllers/admin.php b/controllers/admin.php index 5f3f4f01..706f18f6 100644 --- a/controllers/admin.php +++ b/controllers/admin.php @@ -28,6 +28,7 @@ $GLOBALS['glmMembersAdminValidActions'] = array( 'members' => array( 'index', // member list + 'list', 'reports', 'other' ), diff --git a/index.php b/index.php index 3d6ded53..4bfcf0e0 100644 --- a/index.php +++ b/index.php @@ -48,7 +48,7 @@ // Debug Options define('GLM_MEMBERS_PLUGIN_ADMIN_DEBUG', true); -define('GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE', false); +define('GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE', true); // Plugin Versions define('GLM_MEMBERS_PLUGIN_VERSION', 0.1); diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php index 9412e288..678284af 100755 --- a/lib/GlmDataAbstract/DataAbstract.php +++ b/lib/GlmDataAbstract/DataAbstract.php @@ -2536,7 +2536,7 @@ abstract class GlmDataAbstract */ public function getStats($where = 'true') { - $sql = "SELECT count(DISTINCT id) + $sql = "SELECT count(DISTINCT id) as count FROM $this->table WHERE $where;"; @@ -2544,7 +2544,7 @@ abstract class GlmDataAbstract glmMembersAdmin::addNotice("
".print_r($sql,1)."
", "DataAbstract - getStats() query"); } - $stats = $this->wpdb->get_results($sql, ARRAY_A); + $stats = $this->wpdb->get_row($sql, ARRAY_A); return $stats['count']; diff --git a/misc/smarty/templates_c/081a36d97cdf30d438a1e104c26a275acc180da0.file.index.html.php b/misc/smarty/templates_c/081a36d97cdf30d438a1e104c26a275acc180da0.file.index.html.php index 23b62f9d..95bcae6f 100644 --- a/misc/smarty/templates_c/081a36d97cdf30d438a1e104c26a275acc180da0.file.index.html.php +++ b/misc/smarty/templates_c/081a36d97cdf30d438a1e104c26a275acc180da0.file.index.html.php @@ -1,4 +1,4 @@ - decodeProperties(array ( @@ -7,7 +7,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( '081a36d97cdf30d438a1e104c26a275acc180da0' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/members/index.html', - 1 => 1421259050, + 1 => 1421281939, 2 => 'file', ), ), @@ -19,62 +19,23 @@ $_valid = $_smarty_tpl->decodeProperties(array ( 'unifunc' => 'content_54b42f25390269_82355360', 'variables' => array ( - 'haveMembers' => 0, - 'members' => 0, - 'i' => 0, - 'thisURL' => 0, - 'm' => 0, + 'numbMembers' => 0, ), 'has_nocache_code' => false, ),false); /*/%%SmartyHeaderCode%%*/?> getSubTemplate ('admin/members/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> -

List of Members

+

Members Dashboard

+ +

Status and notices go here

+ + + -
Number of Members Listed: tpl_vars['numbMembers']->value;?> +
- - - - - - - - - - - - - -tpl_vars['haveMembers']->value) {?> - tpl_vars["i"] = new Smarty_variable("0", null, 0);?> - tpl_vars['m'] = new Smarty_Variable; $_smarty_tpl->tpl_vars['m']->_loop = false; - $_from = $_smarty_tpl->tpl_vars['members']->value; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array');} -foreach ($_from as $_smarty_tpl->tpl_vars['m']->key => $_smarty_tpl->tpl_vars['m']->value) { -$_smarty_tpl->tpl_vars['m']->_loop = true; -?> - tpl_vars['i']->value++ / 1)) {?> - - - - - - - - - - - -
Member Name 
Member Name 
- tpl_vars['m']->value['name'];?> - - - (nothing here yet) -
(no members listed)
- + getSubTemplate ('admin/footer.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> diff --git a/misc/smarty/templates_c/15f83071407dddb0b3c23ae1a70b66cefbd681db.file.header.html.php b/misc/smarty/templates_c/15f83071407dddb0b3c23ae1a70b66cefbd681db.file.header.html.php index a4c3b877..76a16384 100644 --- a/misc/smarty/templates_c/15f83071407dddb0b3c23ae1a70b66cefbd681db.file.header.html.php +++ b/misc/smarty/templates_c/15f83071407dddb0b3c23ae1a70b66cefbd681db.file.header.html.php @@ -1,4 +1,4 @@ - decodeProperties(array ( @@ -7,7 +7,7 @@ $_valid = $_smarty_tpl->decodeProperties(array ( '15f83071407dddb0b3c23ae1a70b66cefbd681db' => array ( 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/members/header.html', - 1 => 1421271213, + 1 => 1421281076, 2 => 'file', ), ), @@ -30,13 +30,16 @@ $_valid = $_smarty_tpl->decodeProperties(array (

List of Members +&glm_action=index" class="nav-tabtpl_vars['thisAction']->value=='index') {?>-active">Dashboard Reports +&glm_action=list" class="nav-tabtpl_vars['thisAction']->value=='list') {?>-active">List of Members Or Something - perahps mailing stuff? +&glm_action=index" class="nav-tabtpl_vars['thisAction']->value=='add') {?>-active">Reports + Or Something - perahps mailing stuff?

diff --git a/misc/smarty/templates_c/4c287ca0e4946b3d644e61950c851e98e8906d49.file.list.html.php b/misc/smarty/templates_c/4c287ca0e4946b3d644e61950c851e98e8906d49.file.list.html.php new file mode 100644 index 00000000..3ac806c0 --- /dev/null +++ b/misc/smarty/templates_c/4c287ca0e4946b3d644e61950c851e98e8906d49.file.list.html.php @@ -0,0 +1,80 @@ + +decodeProperties(array ( + 'file_dependency' => + array ( + '4c287ca0e4946b3d644e61950c851e98e8906d49' => + array ( + 0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/members/list.html', + 1 => 1421259050, + 2 => 'file', + ), + ), + 'nocache_hash' => '46596749754b706fe3a62d3-72547374', + 'function' => + array ( + ), + 'variables' => + array ( + 'haveMembers' => 0, + 'members' => 0, + 'i' => 0, + 'thisURL' => 0, + 'm' => 0, + ), + 'has_nocache_code' => false, + 'version' => 'Smarty-3.1.21-dev', + 'unifunc' => 'content_54b706fe3c2516_38940524', +),false); /*/%%SmartyHeaderCode%%*/?> +getSubTemplate ('admin/members/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> + + +

List of Members

+ + + + + + + + + + + + + + + +tpl_vars['haveMembers']->value) {?> + tpl_vars["i"] = new Smarty_variable("0", null, 0);?> + tpl_vars['m'] = new Smarty_Variable; $_smarty_tpl->tpl_vars['m']->_loop = false; + $_from = $_smarty_tpl->tpl_vars['members']->value; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array');} +foreach ($_from as $_smarty_tpl->tpl_vars['m']->key => $_smarty_tpl->tpl_vars['m']->value) { +$_smarty_tpl->tpl_vars['m']->_loop = true; +?> + tpl_vars['i']->value++ / 1)) {?> + + + + + + + + + + + + +
Member Name 
Member Name 
+ tpl_vars['m']->value['name'];?> + + + (nothing here yet) +
(no members listed)
+ +getSubTemplate ('admin/footer.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> + + diff --git a/models/admin/members/index.php b/models/admin/members/index.php index c7718f96..c27ea00b 100644 --- a/models/admin/members/index.php +++ b/models/admin/members/index.php @@ -2,7 +2,7 @@ /** * Gaslight Media Members Database - * Admin List Members + * Admin Members Dashboard * * PHP version 5.5 * @@ -98,10 +98,12 @@ class GlmMembersAdmin_members_index extends GlmDataMembers */ public function modelAction () { + $success = true; // Get a current list of members - $list = $this->getList(); + $stats = $this->getStats(); +/* if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { glmMembersAdmin::addNotice("
".print_r($list,1)."
", 'Member Data'); } @@ -121,12 +123,11 @@ class GlmMembersAdmin_members_index extends GlmDataMembers // Determine if current user can add, edit, delete member data $canEdit = current_user_can('glm_members_edit'); +*/ // Compile template data $templateData = array( - 'haveMembers' => $haveMembers, - 'members' => $list, - 'canEdit' => $canEdit + 'numbMembers' => $stats ); // Return status, suggested view, and data to controller diff --git a/models/admin/members/list.php b/models/admin/members/list.php new file mode 100644 index 00000000..82495e0a --- /dev/null +++ b/models/admin/members/list.php @@ -0,0 +1,146 @@ + + * @license http://www.gaslightmedia.com Gaslightmedia + * @version 0.1 + */ + +// Load Members data abstract +require_once(GLM_MEMBERS_PLUGIN_CLASS_DIR.'/data/dataMembers.php'); + +/* + * This class performs the work for the default action of the "Members" menu + * option, which is to display the members dashboard. + * + */ +class GlmMembersAdmin_members_list extends GlmDataMembers +{ + + /** + * WordPress Database Object + * + * @var $wpdb + * @access public + */ + public $wpdb; + /** + * Plugin Configuration Data + * + * @var $config + * @access public + */ + public $config; + + /* + * Constructor + * + * This contructor sets up this model. At this time that only includes + * storing away the WordPress data object. + * + * @return object Class object + * + */ + public function __construct ($wpdb, $config) + { + + // Save WordPress Database object + $this->wpdb = $wpdb; + + // Save plugin configuration object + $this->config = $config; + + // Run constructor for members data class + parent::__construct($this->wpdb, $this->config); + + } + + /* + * Perform Model Action + * + * This method does the work for this model and returns any resulting data + * + * @return array Status and data array + * + * 'status' + * + * True if successfull and false if there was a fatal failure. + * + * 'menuItemRedirect' + * + * If not false, provides a menu item the controller should + * execute after this one. Normally if this is used, there would also be a + * modelRedirect value supplied as well. + * + * 'modelRedirect' + * + * If not false, provides an action the controller should execute after + * this one. + * + * '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. + * + */ + public function modelAction () + { + + // Get a current list of members + $list = $this->getList(); + + if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG_VERBOSE) { + glmMembersAdmin::addNotice("
".print_r($list,1)."
", 'Member Data'); + } + + // If we have list entries - even if it's an empty list + $success = true; + $haveMembers = false; + if ($list !== false) { + + $success = true; + + // If we have any entries + if (count($list) > 0) { + $haveMembers = true; + } + } + + // Determine if current user can add, edit, delete member data + $canEdit = current_user_can('glm_members_edit'); + + // Compile template data + $templateData = array( + 'haveMembers' => $haveMembers, + 'members' => $list, + 'canEdit' => $canEdit + ); + + // Return status, suggested view, and data to controller + return array( + 'status' => $success, + 'menuItemRedirect' => false, + 'modelRedirect' => false, + 'view' => 'admin/members/list.html', + 'data' => $templateData + ); + + } + + +} + +?> \ No newline at end of file diff --git a/views/admin/members/header.html b/views/admin/members/header.html index eaaccdfa..6337c5fd 100644 --- a/views/admin/members/header.html +++ b/views/admin/members/header.html @@ -1,9 +1,10 @@

Your Members

- List of Members - Reports - Or Something - perahps mailing stuff? + Dashboard + List of Members + Reports + Or Something - perahps mailing stuff?

\ No newline at end of file diff --git a/views/admin/members/index.html b/views/admin/members/index.html index 941e6f0f..650507d5 100644 --- a/views/admin/members/index.html +++ b/views/admin/members/index.html @@ -1,41 +1,12 @@ {include file='admin/members/header.html'} -

List of Members

+

Members Dashboard

+ +

Status and notices go here

+ + + -
Number of Members Listed: {$numbMembers}
- - - - - - - - - - - - - -{if $haveMembers} - {assign var="i" value="0"} - {foreach $members as $m} - {if $i++ is odd by 1} - - {else} - - {/if} - - - - {/foreach} -{else} - -{/if} -
Member Name 
Member Name 
- {$m.name} - - (nothing here yet) -
(no members listed)
- + {include file='admin/footer.html'} diff --git a/views/admin/members/list.html b/views/admin/members/list.html new file mode 100644 index 00000000..941e6f0f --- /dev/null +++ b/views/admin/members/list.html @@ -0,0 +1,41 @@ +{include file='admin/members/header.html'} + +

List of Members

+ + + + + + + + + + + + + + + +{if $haveMembers} + {assign var="i" value="0"} + {foreach $members as $m} + {if $i++ is odd by 1} + + {else} + + {/if} + + + + {/foreach} +{else} + +{/if} + +
Member Name 
Member Name 
+ {$m.name} + + (nothing here yet) +
(no members listed)
+ +{include file='admin/footer.html'}