From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 10 Jan 2017 19:39:17 +0000 (-0500)
Subject: Update edit page Date Verbiage
X-Git-Tag: v1.2.5^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=392e92238d796551258ae535f29415ffa8873711;p=WP-Plugins%2Fglm-member-db-packaging.git

Update edit page Date Verbiage

Updating the text for the date fields on the edit page.
---

diff --git a/index.php b/index.php
index c80c8f1..b368545 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Members Database Packaging
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Members Database.
- * Version: 1.2.4
+ * Version: 1.2.5
  * Author: Gaslight Media
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -19,7 +19,7 @@
  * @package glmMembersDatabasePackagingAddOn
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 1.2.4
+ * @version 1.2.5
  */
 
 /*
@@ -37,7 +37,7 @@
  *  so that we're sure the other add-ons see an up to date
  *  version from this plugin.
  */
-define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.2.4');
+define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.2.5');
 define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.5');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
diff --git a/views/admin/member/packaging.html b/views/admin/member/packaging.html
index d2ceea1..3bf4333 100644
--- a/views/admin/member/packaging.html
+++ b/views/admin/member/packaging.html
@@ -2,19 +2,19 @@
 
 {if $packageDeleted}
     <h2><span class="glm-notice glm-flash-updated">Package Deleted:</span></h2>
-{/if}   
-{if $packageUpdated}<h2 class="glm-notice glm-flash-updated">Package Updated</h2>{/if}         
+{/if}
+{if $packageUpdated}<h2 class="glm-notice glm-flash-updated">Package Updated</h2>{/if}
 
 {if $option == 'edit' || $option == 'add'}
 
   {if apply_filters('glm_members_permit_admin_member_packaging_edit_package', true)}
 
         {if $packageError}<h2 class="glm-error glm-flash-updated glm-right">Error submitting package, see below...</h2>{/if}
-    
+
       {if $option == 'edit'}
         <h2>Edit 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">
             <center>
                 <p><a id="deletePackageCancel" class="button button-primary">Cancel</a></p>
@@ -23,7 +23,7 @@
             <div class="glm-item-container">
                 <p><center><span class="glm-error">WARNING:</span></center></p>
                 <p>
-                    <span class="glm-warning">Clicking the "Delete this Package" button above will 
+                    <span class="glm-warning">Clicking the "Delete this Package" button above will
                     delete all of the data and images associated with this package.
                     </span>
                 </p>
@@ -36,7 +36,7 @@
         <h2>Add new Package</h2>
       {/if}
         <a href="{$thisUrl}?page={$thisPage}&glm_action=packaging&member={$memberID}" class="button button-primary glm-button glm-right">Return to Package List</a>
-    
+
         <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="packaging">
             <input type="hidden" name="member" value="{$memberID}">
@@ -48,7 +48,7 @@
           {else}
             <input type="hidden" name="option" value="insert">
           {/if}
-    
+
             <table class="glm-admin-table">
                 <tr>
                     <th {if $packageInfo.fieldRequired.title}class="glm-required"{/if}>Title:</th>
@@ -57,23 +57,23 @@
                         {if $packageInfo.fieldFail.title}<p>{$packageInfo.fieldFail.title}</p>{/if}
                     </td>
                 </tr>
-            {if isset($packageInfo.fieldData.package_slug)}                
+            {if isset($packageInfo.fieldData.package_slug)}
                 <tr><th>Name for URLs:</th><td>{$packageInfo.fieldData.package_slug}</p></td></tr>
-            {/if}         
+            {/if}
                 <tr>
                     <th>Active:</th>
                     <td>
                         <input type="checkbox" name="active" {if $packageInfo.fieldData.active.value} checked{/if}>
                     </td>
                 </tr>
-                    
+
                 <tr>
                     <th {if $packageInfo.fieldRequired.offsite_url}class="glm-required"{/if}>Offsite Package Page URL:</th>
                     <td {if $packageInfo.fieldFail.offsite_url}class="glm-form-bad-input"{/if}>
                         <input type="text" name="offsite_url" value="{$packageInfo.fieldData.offsite_url}" class="glm-form-text-input-short">
                         {if $packageInfo.fieldFail.offsite_url}<p>{$packageInfo.fieldFail.offsite_url}</p>{/if}
                     </td>
-                </tr> 
+                </tr>
                 <tr>
                     <th {if $packageInfo.fieldRequired.short_descr}class="glm-required"{/if}>Short Description:</th>
                     <td {if $packageInfo.fieldFail.short_descr}class="glm-form-bad-input"{/if}>
@@ -84,7 +84,7 @@
                 <tr>
                     <th {if $packageInfo.fieldRequired.descr}class="glm-required"{/if}>Description:</th>
                     <td {if $packageInfo.fieldFail.descr}class="glm-form-bad-input"{/if}>
-                        {php} 
+                        {php}
                             wp_editor('{$packageInfo.fieldData.descr|escape:quotes}', 'glm_descr', array(
                                 'media_buttons' => false,
                                 // 'quicktags' => false,
@@ -120,22 +120,25 @@
                         {if $packageInfo.fieldFail.image}<p>{$packageInfo.fieldFail.image}</p>{/if}
                     </td>
                 </tr>
+                <tr><td colspan="2"><h4>The dates the Offer will appear on the website</h4></td></tr>
                 <tr>
-                    <th {if $packageInfo.fieldRequired.start_date}class="glm-required"{/if}>Start Date:</th>
+                    <th {if $packageInfo.fieldRequired.start_date}class="glm-required"{/if}>Start Date: The date the deal starts</th>
                     <td {if $packageInfo.fieldFail.start_date}class="glm-form-bad-input"{/if}>
                         <input type="text" name="start_date" value="{$packageInfo.fieldData.start_date.date}" class="glm-form-text-input-short glm-date-input" placeholder="Click for Calendar">
                         {if $packageInfo.fieldFail.start_date}<p>{$packageInfo.fieldFail.start_date}</p>{/if}
                     </td>
                 </tr>
                 <tr>
-                    <th {if $packageInfo.fieldRequired.end_date}class="glm-required"{/if}>End Date:</th>
+                    <th {if $packageInfo.fieldRequired.end_date}class="glm-required"{/if}>End Date: The date the deal ends</th>
                     <td {if $packageInfo.fieldFail.end_date}class="glm-form-bad-input"{/if}>
                         <input type="text" name="end_date" value="{$packageInfo.fieldData.end_date.date}" class="glm-form-text-input-short glm-date-input" placeholder="Click for Calendar">
                         {if $packageInfo.fieldFail.end_date}<p>{$packageInfo.fieldFail.end_date}</p>{/if}
                     </td>
                 </tr>
+                <tr><td colspan="2"><h4>The last date the Offer is valid</h4></td></tr>
                 <tr>
-                    <th {if $packageInfo.fieldRequired.expire_date}class="glm-required"{/if}>Expire Date:</th>
+                    <td {if $packageInfo.fieldRequired.expire_date}class="glm-required"{/if}>
+                        <b>Date Offer Expires:</b><br>The date the deal ends; This will display<br> on the front end as "Expires"</td>
                     <td {if $packageInfo.fieldFail.expire_date}class="glm-form-bad-input"{/if}>
                         <input type="text" name="expire_date" value="{$packageInfo.fieldData.expire_date.date}" class="glm-form-text-input-short glm-date-input" placeholder="Click for Calendar">
                         {if $packageInfo.fieldFail.expire_date}<p>{$packageInfo.fieldFail.expire_date}</p>{/if}
@@ -157,7 +160,7 @@
                 </tr>
             </table>
             <input type="submit" value="{if $havePackage}Update Package{else}Add New Package{/if}">
-        </form>    
+        </form>
 
   {else} <!-- Can just display -->
 
@@ -175,16 +178,16 @@
             <tr><th>Display Order:</th><td>{$packageInfo.fieldData.position}</td></tr>
         </table>
 
-  {/if}    
+  {/if}
 
 {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 {$terms.term_member_cap}&nbsp;</div>
   {/if}
-  
+
         <h2>{$terms.term_member_cap} Packages</h2>
-    
+
         <table class="wp-list-table striped glm-admin-table">
             <thead>
                 <tr>
@@ -221,15 +224,15 @@
 
     <script type="text/javascript">
         jQuery(document).ready(function($) {
-    
+
             // Add Package Button Action
             $('#addPackageButton').click( function() {
                 window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=packaging&option=add&member={$memberID}";
             });
-            
+
             // Date Input
             $('.glm-date-input').datepicker();
-    
+
     {if $havePackage}
             // Delete Package dialog
             $("#deletePackageDialog").dialog({
@@ -242,16 +245,16 @@
             });
             $('#deletePackageCancel').click( function() {
                 $("#deletePackageDialog").dialog("close");
-            });            
+            });
             $('#deletePackageSubmit').click( function() {
                 window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=packaging&member={$memberID}&option=delete&packageID={$packageInfo.fieldData.id}");
             });
     {/if}
-    
-            // Flash certain elements for a short time after display      
+
+            // Flash certain elements for a short time after display
             $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500);
 
         });
     </script>
-            
+
 {include file='admin/footer.html'}
diff --git a/views/admin/members/packaging.html b/views/admin/members/packaging.html
index eaa0021..35c143d 100644
--- a/views/admin/members/packaging.html
+++ b/views/admin/members/packaging.html
@@ -2,16 +2,16 @@
 
     {if $packageUpdated}<h2 class="glm-notice glm-flash-updated">Package Updated</h2>{/if}
     {if $packageError}<h2 class="glm-error glm-flash-updated">Error submitting package, see below...</h2>{/if}
-    
+
 {if $option == 'edit' || $option == 'add'}
-    
+
   {if apply_filters('glm_members_permit_admin_members_packaging_edit_package', true)}
 
-        
+
       {if $option == 'edit'}
         <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">
             <center>
                 <p><a id="deletePackageCancel" class="button button-primary">Cancel</a></p>
@@ -20,7 +20,7 @@
             <div class="glm-item-container">
                 <p><center><span class="glm-error">WARNING:</span></center></p>
                 <p>
-                    <span class="glm-warning">Clicking the "Delete this Package" button above will 
+                    <span class="glm-warning">Clicking the "Delete this Package" button above will
                     delete all of the data and images associated with this package.
                     </span>
                 </p>
@@ -33,8 +33,8 @@
         <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>
-        
-    
+
+
         <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="packaging">
             <input type="hidden" name="ref_type" value="0">
@@ -45,7 +45,7 @@
           {else}
             <input type="hidden" name="option" value="insert">
           {/if}
-    
+
             <table class="glm-admin-table">
                 <tr>
                     <th {if $packageInfo.fieldRequired.title}class="glm-required"{/if}>Title:</th>
@@ -63,7 +63,7 @@
                 <tr>
                 <th {if $packageInfo.fieldRequired.descr}class="glm-required"{/if}>Description:</th>
                 <td {if $packageInfo.fieldFail.descr}class="glm-form-bad-input"{/if}>
-                    {php} 
+                    {php}
                         wp_editor('{$packageInfo.fieldData.descr|escape:quotes}', 'glm_descr', array(
                             'media_buttons' => false,
                             // 'quicktags' => false,
@@ -106,6 +106,7 @@
                     {if $packageInfo.fieldFail.image}<p>{$packageInfo.fieldFail.image}</p>{/if}
                 </td>
                 </tr>
+                <tr><td colspan="2"><h4>The dates the Offer will appear on the website</h4></td></tr>
                 <tr>
                     <th {if $packageInfo.fieldRequired.start_date}class="glm-required"{/if}>Start Date:</th>
                     <td {if $packageInfo.fieldFail.start_date}class="glm-form-bad-input"{/if}>
@@ -120,8 +121,10 @@
                         {if $packageInfo.fieldFail.end_date}<p>{$packageInfo.fieldFail.end_date}</p>{/if}
                     </td>
                 </tr>
+                <tr><td colspan="2"><h4>The last date the Offer is valid</h4></td></tr>
                 <tr>
-                    <th {if $packageInfo.fieldRequired.expire_date}class="glm-required"{/if}>Expire Date:</th>
+                    <td {if $packageInfo.fieldRequired.expire_date}class="glm-required"{/if}>
+                        <b>Date Offer Expires:</b><br>The date the deal ends; This will display<br> on the front end as "Expires"</td>
                     <td {if $packageInfo.fieldFail.expire_date}class="glm-form-bad-input"{/if}>
                         <input type="text" name="expire_date" value="{$packageInfo.fieldData.expire_date.date}" class="glm-form-text-input-short glm-date-input" placeholder="Click for Calendar">
                         {if $packageInfo.fieldFail.expire_date}<p>{$packageInfo.fieldFail.expire_date}</p>{/if}
@@ -141,20 +144,20 @@
                         {if $packageInfo.fieldFail.position}<p>{$packageInfo.fieldFail.position}</p>{/if}
                     </td>
                 </tr>
-                
+
     <!-- NOT COMPLETING PARTICIPATING MEMBERS AT THIS TIME -->
-                
+
                 <tr>
                     <th>Participating Members</th>
                     <td class="glm-imageGalleryContainer">
-    
-                        
+
+
                         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" 
+
+
+                        <input type="hidden" id="galleryPositionOrder" name="galleryPositionOrder"
                             value="{if $havePackageMembers}{foreach $gallery as $i name=ig}{if $i.title}{$i.id}{if not $smarty.foreach.ig.last},{/if}{/if}{/foreach}{/if}" />
-    
+
                         <!-- The contents of this div are read by imageUpload.js to use as a template for inserting a new image into the gallery area -->
                         <div id="glmGalleryItmeDataTemplate" class="glm-imageItemHidden">
                             <li id="packageMember_{ id }" class="glm-galleryContainerFlexible">
@@ -173,7 +176,7 @@
                         <!-- End of template -->
                         <div class="glm-imageGalleryContainer glm-item-container">
                             <ul id="glmPackageMembersList" class=".glm-galleryContainer">
-            {if $havePackageMembers}     
+            {if $havePackageMembers}
                                 <!-- Note that id in li is needed for sorting -->
                 {foreach $packageMembers as $i}
                                 <li id="packageMember_{$i.id}" class="glm-galleryContainerFlexible">
@@ -187,7 +190,7 @@
                                         <tr><th>Description:</th><td><input type="text"></td></tr>
                                         <tr><th>Short Description:</th><td><input type="text"></td></tr>
                                         <tr><th>Image:</th><td><input type="file"></td></tr>
-                                        
+
                                     </table>
                                     </div>
                                 </li>
@@ -199,14 +202,14 @@
                         </div>
                     </td>
                 </tr>
-    
-                
+
+
             </table>
             <input type="submit" value="{if $havePackage}Update Package{else}Add New Package{/if}">
         </form>
-        
+
   {else} <!-- Can just display -->
-          
+
         <table class="glm-admin-table">
             <tr><th>Title:</th><td>{$packageInfo.fieldData.title}</td></tr>
             <tr><th>Name for URLs:</th><td>{$packageInfo.fieldData.package_slug}</td></tr>
@@ -220,26 +223,26 @@
             <tr><th>Pricing Description:</th><td>{$packageInfo.fieldData.pricing}</td></tr>
             <tr><th>Display Order:</th><td>{$packageInfo.fieldData.position}</td></tr>
         </table>
-        
+
   {/if}
 
 {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-{$terms.term_member_cap} Package</div>
   {/if}
-      
-    <!-- Package list selection form -->      
+
+    <!-- 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> 
+       <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">{$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">
-      
-      
+
+
     <h2>Packages</h2>
 
     <table class="wp-list-table striped glm-admin-table">
@@ -287,16 +290,16 @@
 
     <script type="text/javascript">
         jQuery(document).ready(function($) {
-    
+
             // Add Package Button Action
             $('#addPackageButton').click( function() {
                 window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=packaging&option=add";
             });
-            
+
             // Date Input
             $('.glm-date-input').datepicker();
-            
-            // Flash certain elements for a short time after display      
+
+            // Flash certain elements for a short time after display
             $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500);
 
     {if $havePackage}
@@ -311,7 +314,7 @@
             });
             $('#deletePackageCancel').click( function() {
                 $("#deletePackageDialog").dialog("close");
-            });            
+            });
             $('#deletePackageSubmit').click( function() {
                 window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=packaging&option=delete&packageID={$packageInfo.fieldData.id}");
             });
@@ -325,9 +328,9 @@
 
                  // Get type of package filter selected
                  filter = $(this).val();
-                
+
                  window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=packaging&filterPackageType=" + filter;
-                
+
                 return false;
             });
 
@@ -336,7 +339,7 @@
              * label: What will be searched
              * value: What will be displayed when selected
              * id: Package id added so we can go to the member while showing what was selected
-             * Also note that autocomplete does not properly render HTML codes, so we 
+             * Also note that autocomplete does not properly render HTML codes, so we
              * "unescape" them for HTML in Smarty.
              */
             var availableTags = [
@@ -361,8 +364,8 @@
                      }
                  }
              });
-             
+
         });
     </script>
-            
+
 {include file='admin/footer.html'}
diff --git a/views/admin/packaging/index.html b/views/admin/packaging/index.html
index 56b471a..b826c47 100644
--- a/views/admin/packaging/index.html
+++ b/views/admin/packaging/index.html
@@ -119,22 +119,25 @@
                     {if $packageInfo.fieldFail.image}<p>{$packageInfo.fieldFail.image}</p>{/if}
                 </td>
                 </tr>
+                <tr><td colspan="2"><h4>The dates the Offer will appear on the website</h4></td></tr>
                 <tr>
-                    <th {if $packageInfo.fieldRequired.start_date}class="glm-required"{/if}>Start Date:</th>
+                    <th {if $packageInfo.fieldRequired.start_date}class="glm-required"{/if}>Start Date: The date the deal starts</th>
                     <td {if $packageInfo.fieldFail.start_date}class="glm-form-bad-input"{/if}>
                         <input type="text" name="start_date" value="{$packageInfo.fieldData.start_date.date}" class="glm-form-text-input-short glm-date-input" placeholder="Click for Calendar">
                         {if $packageInfo.fieldFail.start_date}<p>{$packageInfo.fieldFail.start_date}</p>{/if}
                     </td>
                 </tr>
+                <tr><td colspan="2"><h4>The last date the Offer is valid</h4></td></tr>
                 <tr>
-                    <th {if $packageInfo.fieldRequired.end_date}class="glm-required"{/if}>End Date:</th>
+                    <th {if $packageInfo.fieldRequired.end_date}class="glm-required"{/if}>End Date: The date the deal ends</th>
                     <td {if $packageInfo.fieldFail.end_date}class="glm-form-bad-input"{/if}>
                         <input type="text" name="end_date" value="{$packageInfo.fieldData.end_date.date}" class="glm-form-text-input-short glm-date-input" placeholder="Click for Calendar">
                         {if $packageInfo.fieldFail.end_date}<p>{$packageInfo.fieldFail.end_date}</p>{/if}
                     </td>
                 </tr>
                 <tr>
-                    <th {if $packageInfo.fieldRequired.expire_date}class="glm-required"{/if}>Expire Date:</th>
+                    <td {if $packageInfo.fieldRequired.expire_date}class="glm-required"{/if}>
+                        <b>Date Offer Expires:</b><br>The date the deal ends; This will display<br> on the front end as "Expires"</td>
                     <td {if $packageInfo.fieldFail.expire_date}class="glm-form-bad-input"{/if}>
                         <input type="text" name="expire_date" value="{$packageInfo.fieldData.expire_date.date}" class="glm-form-text-input-short glm-date-input" placeholder="Click for Calendar">
                         {if $packageInfo.fieldFail.expire_date}<p>{$packageInfo.fieldFail.expire_date}</p>{/if}