Packaging link views edited and added

diff --git a/models/front/hooked/detail.php b/models/front/hooked/detail.php
index 60bf860..e3773d6 100644 (file)
--- a/models/front/hooked/detail.php
+++ b/models/front/hooked/detail.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Gaslight Media Members Database
- * Front Package detail for Hooks and Filters
+ * Front Package member list for Hooks and Filters
  *
  * PHP version 5.5
  *
@@ -18,7 +18,7 @@ require_once(GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php');
 /*
  * This class performs the work for displaying members packages.
  */
-class GlmMembersFront_packaging_detailHook extends GlmDataPackages
+class GlmMembersFront_packaging_memberListHook extends GlmDataPackages
 {
 
     /**
@@ -59,7 +59,7 @@ class GlmMembersFront_packaging_detailHook extends GlmDataPackages
 
     }
 
-    public function getPackageDetail($id)
+    public function getPackageMemberList($id)
     {
 
         return ('123 we be here');

diff --git a/models/front/hooked/memberList.php b/models/front/hooked/memberList.php
new file mode 100644 (file)
index 0000000..60bf860
--- /dev/null
+++ b/models/front/hooked/memberList.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Gaslight Media Members Database
+ * Front Package detail for Hooks and Filters
+ *
+ * PHP version 5.5
+ *
+ * @category glmWordPressPlugin
+ * @package  glmMembersDatabase
+ * @author   Chuck Scott <cscott@gaslightmedia.com>
+ * @license  http://www.gaslightmedia.com Gaslightmedia
+ * @version  0.1
+ */
+
+// Load packages data abstract
+require_once(GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php');
+
+/*
+ * This class performs the work for displaying members packages.
+ */
+class GlmMembersFront_packaging_detailHook extends GlmDataPackages
+{
+
+    /**
+     * 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(false, false);
+
+    }
+
+    public function getPackageDetail($id)
+    {
+
+        return ('123 we be here');
+
+        /*
+         * Merge data returned from the model with the selected view
+         */
+
+    }
+
+}
+
+?>
\ No newline at end of file

diff --git a/models/front/packaging/list.php b/models/front/packaging/list.php
index 0b592e4..5100de1 100644 (file)
--- a/models/front/packaging/list.php
+++ b/models/front/packaging/list.php
@@ -231,7 +231,10 @@ class GlmMembersFront_packaging_list extends GlmDataPackages
             case 'member-list':
                 $view = 'listForMemberListing.html';
                 break;
-            case 'packages-link':
+            case 'list-packages-link':
+                $view = 'packagesLinkForMemberList.html';
+                break;
+            case 'detail-packages-link':
                 $view = 'packagesLinkForMemberDetail.html';
                 break;
             case 'detail-sidemenu';

diff --git a/setup/adminHooks.php b/setup/adminHooks.php
index 6860589..85608b0 100644 (file)
--- a/setup/adminHooks.php
+++ b/setup/adminHooks.php
@@ -28,7 +28,7 @@
 
 
 // Add content to member detail page
-add_filter('glm-member-db-admin-management-hoooksHelp', function($content) {
+add_filter('glm-member-db-admin-management-hooksHelp', function($content) {
 
         // Read in this plugin/addon hook help file
         $fname = GLM_MEMBERS_PACKAGING_PLUGIN_PATH.'/setup/hooksHelp.html';

diff --git a/setup/frontHooks.php b/setup/frontHooks.php
index c4bdd98..888dbb4 100644 (file)
--- a/setup/frontHooks.php
+++ b/setup/frontHooks.php
@@ -60,9 +60,19 @@ if (isset($this->config['addOns']['glm-member-db'])) {
         2
     );
 
+    // Add package link to member list page
+    add_filter('glm-member-db-front-members-list-linksBottom', function($content, $id) {
+            $packageData = do_shortcode('[glm-members-packaging-list member='.$id.', template="list-packages-link" order="title"]');
+            $content .= $packageData;
+            return $content;
+        },
+        10,
+        2
+    );
+
     // Add internal page content links to member detail page
     add_filter('glm-member-db-front-members-detail-linksBottom', function($content, $id) {
-            $packageData = do_shortcode('[glm-members-packaging-list member='.$id.', template="packages-link" order="title"]');
+            $packageData = do_shortcode('[glm-members-packaging-list member='.$id.', template="detail-packages-link" order="title"]');
             $content .= $packageData;
             return $content;
         },

diff --git a/setup/requiredPages.php b/setup/requiredPages.php
index 94af125..16895fb 100644 (file)
--- a/setup/requiredPages.php
+++ b/setup/requiredPages.php
@@ -34,6 +34,14 @@
  *                   for management purposes
  *
  * When in doubt just use '0'
+ * 
+ * The underscored_title field will be added to the default option prefix as
+ * defined in GLM Associate. This will currently result in an option as follows:
+ * 
+ *      "glm_members_database_option_".$reqPage['underscored_title']
+ * 
+ * so    glm_members_database_option_packaging_list_id
+ * and   glm_members_database_option_packaging_detail_id
  *
  */
 

diff --git a/setup/shortcodes.php b/setup/shortcodes.php
index 2b171f0..3e4011f 100644 (file)
--- a/setup/shortcodes.php
+++ b/setup/shortcodes.php
@@ -118,7 +118,8 @@ $glmMembersPackagingShortcodes = array(
 );
 
 $glmMembersPackagingShortcodesDescription = '
-
+<table id="glm-table-shortcodes-packaging" class="glm-admin-table glm-shortcodes-table glm-hidden">
+    <tr><th>Shortcode</th><th>Attribute</th><th>Description</th></tr>
     <tr>
         <th>[glm-members-packaging-list]</th>
         <td>&nbsp;</td>
@@ -215,5 +216,24 @@ $glmMembersPackagingShortcodesDescription = '
             </p>
         </td>
     </tr>
-
+    <tr>
+        <th>[glm-members-packaging-member-list]</th>
+        <td>&nbsp;</td>
+        <td width="50%">
+            <p>
+            Displays the packages of a specific member.
+            </p>
+        </td>
+    </tr>
+    <tr>
+        <td>&nbsp;</td>
+        <th>id="{member ID}"</th>
+        <td>
+            <p>
+            The "id" attribute is used to select the member for which to display the 
+            packages. This is a required attribute.
+            </p>
+        </td>
+    </tr>
+</table>
 ';
\ No newline at end of file

diff --git a/views/front/packaging/detail.html b/views/front/packaging/detail.html
index 3b37097..be15e14 100644 (file)
--- a/views/front/packaging/detail.html
+++ b/views/front/packaging/detail.html
@@ -44,7 +44,7 @@
                         <a href="http://www.facebook.com" target="_blank"><img src="{$baseUrl}/assets/facebook.png"></a>
                         <a href="http://www.twitter.com" target="_blank"><img src="{$baseUrl}/assets/twitter.png"></a>
                     </div>
-                </div>      
+                </div>
 
                 {if $package.member.logo && $settings.detail_show_logo}
                 <div class="glm-member-detail-featured-image-wrapper small-12 medium-6 columns">

diff --git a/views/front/packaging/packagesLinkForMemberDetail.html b/views/front/packaging/packagesLinkForMemberDetail.html
index a35bb7c..77784bb 100644 (file)
--- a/views/front/packaging/packagesLinkForMemberDetail.html
+++ b/views/front/packaging/packagesLinkForMemberDetail.html
@@ -1,3 +1,3 @@
 {if $settings.detail_show_packages && $packages}
-    <a href="#glm-member-detail-packages">Packages & Deals</a>
+    <a href="#glm-member-detail-packages" id="glm-member-detail-packages-link" class="link-open-detail-content-data">Packages & Deals</a>
 {/if}

diff --git a/views/front/packaging/packagesLinkForMemberList.html b/views/front/packaging/packagesLinkForMemberList.html
new file mode 100644 (file)
index 0000000..a04caea
--- /dev/null
+++ b/views/front/packaging/packagesLinkForMemberList.html
@@ -0,0 +1,7 @@
+
+{if $settings.list_show_packages_link}
+    {if $packages}
+       <a id="glm-member-list-packages-link">Packages & Deals</a>
+    {/if}
+    <p>packages: {$packages}</p>
+{/if}
\ No newline at end of file