From 5c553900f66b0e7a225b9ddf782ea497d5d4f19d Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Fri, 22 Apr 2016 13:53:34 -0400
Subject: [PATCH] Now using member terms.

---
 defines.php                        |  2 +-
 views/admin/member/packaging.html  |  4 ++--
 views/admin/members/packaging.html | 20 ++++++++++----------
 views/admin/packaging/index.html   | 22 +++++++++++-----------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/defines.php b/defines.php
index 7ed4a52..7df9856 100644
--- a/defines.php
+++ b/defines.php
@@ -52,6 +52,6 @@ define('GLM_MEMBERS_PACKAGING_PLUGIN_CONFIG_PATH', GLM_MEMBERS_PACKAGING_PLUGIN_
 
 // 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_PACKAGING_PLUGIN_SLUG, '', GLM_MEMBERS_PACKAGING_PLUGIN_PATH);
-define('GLM_MEMBERS_PACKAGING_MAIN_PLUGIN_PATH', $pluginsPath.'/glm-member-db');
+define('GLM_MEMBERS_PACKAGING_MAIN_PLUGIN_PATH', $pluginsPath.'glm-member-db');
 define('GLM_MEMBERS_PACKAGING_PLUGIN_LIB_PATH', GLM_MEMBERS_PACKAGING_MAIN_PLUGIN_PATH.'/lib');
 
diff --git a/views/admin/member/packaging.html b/views/admin/member/packaging.html
index 03f6977..0a11ffb 100644
--- a/views/admin/member/packaging.html
+++ b/views/admin/member/packaging.html
@@ -171,10 +171,10 @@
 {else} <!-- option is not edit or add -->
         
   {if apply_filters('glm_members_permit_admin_member_packaging_add_package', true)}
-        <div id="addPackageButton" class="button button-primary glm-right">&nbsp;Add a New Package for this Member&nbsp;</div>
+        <div id="addPackageButton" class="button button-primary glm-right">&nbsp;Add a New Package for this {$terms.term_member_cap}&nbsp;</div>
   {/if}
   
-        <h2>Member Packages</h2>
+        <h2>{$terms.term_member_cap} Packages</h2>
     
         <table class="wp-list-table striped glm-admin-table">
             <thead>
diff --git a/views/admin/members/packaging.html b/views/admin/members/packaging.html
index 951076d..e1ca7b6 100644
--- a/views/admin/members/packaging.html
+++ b/views/admin/members/packaging.html
@@ -9,7 +9,7 @@
 
         
       {if $option == 'edit'}
-        <h2>Edit Multi-Member Package</h2>
+        <h2>Edit Multi-{$terms.term_member_cap} Package</h2>
         <a id="deletePackageButton" class="button button-primary glm-button glm-right">Delete this Package</a>
         
         <div id="deletePackageDialog" class="glm-dialog-box" title="Delete Package">
@@ -30,7 +30,7 @@
             </div>
         </div>
       {else}
-        <h2>Add new Multi-Member Package</h2>
+        <h2>Add new Multi-{$terms.term_member_cap} Package</h2>
       {/if}
         <a href="{$thisUrl}?page={$thisPage}&glm_action=packaging" class="button button-primary glm-button glm-right">Return to Package List</a>
         
@@ -149,7 +149,7 @@
                     <td class="glm-imageGalleryContainer">
     
                         
-                        Search to add a member: <input  id="glmMembersList" type="text" id="autoTest" style="margin-left: 2em;"><br>
+                        Search to add a {$terms.term_member}: <input  id="glmMembersList" type="text" id="autoTest" style="margin-left: 2em;"><br>
                                             
                         
                         <input type="hidden" id="galleryPositionOrder" name="galleryPositionOrder" 
@@ -161,7 +161,7 @@
                                 <input type="hidden" name="packageMember_{ id }" value="{ id }">
                                 <input type="hidden" name="position_{ id }" value="{ position }">
                                     <table class="glm-statusTable">
-                                        <tr><th>Package Member:</th><td>{ memberName }</td></tr>
+                                        <tr><th>Package {$terms.term_member_cap}:</th><td>{ memberName }</td></tr>
                                         <tr><th>Active:</th><td><input type="checkbox"></td></tr>
                                         <tr><th>Package Element Title:</th><td><input type="text" value=""></td></tr>
                                         <tr><th>Description:</th><td><input type="text" value=""></td></tr>
@@ -181,7 +181,7 @@
                                     <input type="hidden" name="position_{$i.id}" value="{$i.position}">
                                     <div class="glm-galleryImageData">
                                     <table class="glm-galleryContainerContent">
-                                        <tr><th>Package Member:</th><td>{$i.memberName}</td></tr>
+                                        <tr><th>Package {$terms.term_member_cap}:</th><td>{$i.memberName}</td></tr>
                                         <tr><th>Active:</th><td><input type="checkbox"></td></tr>
                                         <tr><th>Package Element Title:</th><td><input type="text"></td></tr>
                                         <tr><th>Description:</th><td><input type="text"></td></tr>
@@ -193,7 +193,7 @@
                                 </li>
                 {/foreach}
             {else}
-                                <li id="glmNoMembersSelected">No members have been added to this package yet.<br>Please select a member above.</li>
+                                <li id="glmNoMembersSelected">No {$terms.term_member_plur} have been added to this package yet.<br>Please select a {$terms.term_member} above.</li>
             {/if}
                             </ul>
                         </div>
@@ -226,15 +226,15 @@
 {else} <!-- option is not edit or add -->
     
   {if apply_filters('glm_members_permit_admin_members_packaging_add_package', true)}
-    <div id="addPackageButton" class="button button-primary glm-right" title='To create a member specific package, select that member from the "Member List" tab then select "Packaging" tab.'>&nbsp;&nbsp;Add a Multi-Member Package</div>
+    <div id="addPackageButton" class="button button-primary glm-right" title='To create a member specific package, select that member from the "Member List" tab then select "Packaging" tab.'>&nbsp;&nbsp;Add a Multi-{$terms.term_member_cap} Package</div>
   {/if}
       
     <!-- Package list selection form -->      
     <form class="glm-right" onSubmit="return false;">
        <span{if $haveFilter} class="glm-notice"{/if}><b>List Filters:</b>&nbsp;&nbsp;</span> 
        <input type="radio" name="filterPackageType" class="listFilter"{if $filterPackageType == 'all'} checked{/if} value="all">All&nbsp;&nbsp;
-       <input type="radio" name="filterPackageType" class="listFilter"{if $filterPackageType == 'member'} checked{/if} value="member">Member&nbsp;&nbsp;
-       <input type="radio" name="filterPackageType" class="listFilter"{if $filterPackageType == 'multi-member'} checked{/if} value="multi-member">Multi-Member&nbsp;&nbsp;
+       <input type="radio" name="filterPackageType" class="listFilter"{if $filterPackageType == 'member'} checked{/if} value="member">{$terms.term_member_cap}&nbsp;&nbsp;
+       <input type="radio" name="filterPackageType" class="listFilter"{if $filterPackageType == 'multi-member'} checked{/if} value="multi-member">Multi-{$terms.term_member_cap}&nbsp;&nbsp;
        Search: <input  id="glmPackageSearch" type="text" id="autoTest" title="Enter any portion of a package name then click on full name that shows below this input box.">&nbsp;&nbsp;
     </form>
     <br clear="all">
@@ -246,7 +246,7 @@
         <thead>
             <tr>
                 <th>Package</th>
-                <th>Member</th>
+                <th>{$terms.term_member_cap}</th>
                 <th>Start</th>
                 <th>End</th>
                 <th>Expire</th>
diff --git a/views/admin/packaging/index.html b/views/admin/packaging/index.html
index b13fd6d..8a46ba5 100644
--- a/views/admin/packaging/index.html
+++ b/views/admin/packaging/index.html
@@ -9,7 +9,7 @@
 
         
       {if $option == 'edit'}
-        <h2>Edit Multi-Member Package</h2>
+        <h2>Edit Multi-{$terms.term_member_cap} Package</h2>
         <a id="deletePackageButton" class="button button-primary glm-button glm-right">Delete this Package</a>
         
         <div id="deletePackageDialog" class="glm-dialog-box" title="Delete Package">
@@ -30,7 +30,7 @@
             </div>
         </div>
       {else}
-        <h2>Add new Multi-Member Package</h2>
+        <h2>Add new Multi-{$terms.term_member_cap} Package</h2>
       {/if}
         <a href="{$thisUrl}?page={$thisPage}&glm_action=packaging" class="button button-primary glm-button glm-right">Return to Package List</a>
         
@@ -145,11 +145,11 @@
     <!-- NOT COMPLETING PARTICIPATING MEMBERS AT THIS TIME -->
                 
                 <tr>
-                    <th>Participating Members</th>
+                    <th>Participating {$terms.term_member_cap}</th>
                     <td class="glm-imageGalleryContainer">
     
                         
-                        Search to add a member: <input  id="glmMembersList" type="text" id="autoTest" style="margin-left: 2em;"><br>
+                        Search to add a {$terms.term_member}: <input  id="glmMembersList" type="text" id="autoTest" style="margin-left: 2em;"><br>
                                             
                         
                         <input type="hidden" id="galleryPositionOrder" name="galleryPositionOrder" 
@@ -161,7 +161,7 @@
                                 <input type="hidden" name="packageMember_{ id }" value="{ id }">
                                 <input type="hidden" name="position_{ id }" value="{ position }">
                                     <table class="glm-statusTable">
-                                        <tr><th>Package Member:</th><td>{ memberName }</td></tr>
+                                        <tr><th>Package {$terms.term_member_cap}:</th><td>{ memberName }</td></tr>
                                         <tr><th>Active:</th><td><input type="checkbox"></td></tr>
                                         <tr><th>Package Element Title:</th><td><input type="text" value=""></td></tr>
                                         <tr><th>Description:</th><td><input type="text" value=""></td></tr>
@@ -181,7 +181,7 @@
                                     <input type="hidden" name="position_{$i.id}" value="{$i.position}">
                                     <div class="glm-galleryImageData">
                                     <table class="glm-galleryContainerContent">
-                                        <tr><th>Package Member:</th><td>{$i.memberName}</td></tr>
+                                        <tr><th>Package {$terms.term_member_cap}:</th><td>{$i.memberName}</td></tr>
                                         <tr><th>Active:</th><td><input type="checkbox"></td></tr>
                                         <tr><th>Package Element Title:</th><td><input type="text"></td></tr>
                                         <tr><th>Description:</th><td><input type="text"></td></tr>
@@ -193,7 +193,7 @@
                                 </li>
                 {/foreach}
             {else}
-                                <li id="glmNoMembersSelected">No members have been added to this package yet.<br>Please select a member above.</li>
+                                <li id="glmNoMembersSelected">No {$terms.term_member_plur} have been added to this package yet.<br>Please select a {$terms.term_member} above.</li>
             {/if}
                             </ul>
                         </div>
@@ -226,15 +226,15 @@
 {else} <!-- option is not edit or add -->
     
   {if apply_filters('glm_members_permit_admin_members_packaging_add_package', true)}
-    <div id="addPackageButton" class="button button-primary glm-right" title='To create a member specific package, select that member from the "Member List" tab then select "Packaging" tab.'>&nbsp;&nbsp;Add a Multi-Member Package</div>
+    <div id="addPackageButton" class="button button-primary glm-right" title='To create a {$terms.term_member} specific package, select that {$terms.term_member} from the "{$terms.term_member_cap} List" tab then select "Packaging" tab.'>&nbsp;&nbsp;Add a Multi-{$terms.term_member_cap} Package</div>
   {/if}
       
     <!-- Package list selection form -->      
     <form class="glm-right" onSubmit="return false;">
        <span{if $haveFilter} class="glm-notice"{/if}><b>List Filters:</b>&nbsp;&nbsp;</span> 
        <input type="radio" name="filterPackageType" class="listFilter"{if $filterPackageType == 'all'} checked{/if} value="all">All&nbsp;&nbsp;
-       <input type="radio" name="filterPackageType" class="listFilter"{if $filterPackageType == 'member'} checked{/if} value="member">Member&nbsp;&nbsp;
-       <input type="radio" name="filterPackageType" class="listFilter"{if $filterPackageType == 'multi-member'} checked{/if} value="multi-member">Multi-Member&nbsp;&nbsp;
+       <input type="radio" name="filterPackageType" class="listFilter"{if $filterPackageType == 'member'} checked{/if} value="member">{$terms.term_member_cap}&nbsp;&nbsp;
+       <input type="radio" name="filterPackageType" class="listFilter"{if $filterPackageType == 'multi-member'} checked{/if} value="multi-member">Multi-{$terms.term_member_cap}&nbsp;&nbsp;
        Search: <input  id="glmPackageSearch" type="text" id="autoTest" title="Enter any portion of a package name then click on full name that shows below this input box.">&nbsp;&nbsp;
     </form>
     <br clear="all">
@@ -246,7 +246,7 @@
         <thead>
             <tr>
                 <th>Package</th>
-                <th>Member</th>
+                <th>{$terms.term_member_cap}</th>
                 <th>Start</th>
                 <th>End</th>
                 <th>Expire</th>
-- 
2.17.1