From f1515ac3bfdab46f5dae0ac7e53afc8e6cf04d0d Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Sun, 6 Dec 2015 20:07:00 -0500
Subject: [PATCH] Fixed some issues that came up while building Packaging
 Add-On

---
 controllers/admin.php              |  4 ++++
 css/admin.css                      | 14 +++++++++++++-
 glm-member-db.php                  |  6 +++---
 js/imageUpload/imageUpload.js      | 10 +++++-----
 views/admin/member/header.html     |  2 +-
 views/admin/member/memberInfo.html | 12 ++++++------
 6 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/controllers/admin.php b/controllers/admin.php
index 529e5c90..67019c6b 100644
--- a/controllers/admin.php
+++ b/controllers/admin.php
@@ -275,6 +275,10 @@ class glmMembersAdmin extends GlmPluginSupport
         // jQuery UI Style
         wp_enqueue_style('wp-jquery-ui-dialog');
 
+        // Jquery DatePicker
+        wp_enqueue_script('jquery-ui-datepicker');
+        wp_enqueue_style('jquery-style', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css');
+
         wp_enqueue_media();
 
         // Scripts included with this plugin
diff --git a/css/admin.css b/css/admin.css
index 065639cd..c38319ed 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -245,6 +245,18 @@ td.glm-nowrap {
     margin: .4em .1em .4em .1em;
     background-color: #eee;
 }
+.glm-galleryContainerFlexible
+{
+    clear: both;
+    border: 1px #ccc solid;
+    padding: .2em;
+    margin: .4em .1em .4em .1em;
+    background-color: #eee;
+}
+.glm-galleryContainerContent
+{
+    width: 95%;
+}
 .glm-galleryImages
 {
  
@@ -253,7 +265,7 @@ td.glm-nowrap {
 .glm-imageGalleryContainer
 {
     border: 1px #ddd solid !important;
-    dragable
+    draggable
 }
 .glm-galleryImage
 {
diff --git a/glm-member-db.php b/glm-member-db.php
index 1d25db24..835c68e3 100644
--- a/glm-member-db.php
+++ b/glm-member-db.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Members Database
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Members Database.
- * Version: 1.0.46
+ * Version: 1.0.47
  * Author: Chuck Scott
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -19,7 +19,7 @@
  * @package glmMembersDatabase
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 1.0.46
+ * @version 1.0.47
  */
 
 /*
@@ -34,7 +34,7 @@
  *  version number of that release for the DB version.
  */
 
-define('GLM_MEMBERS_PLUGIN_VERSION', '1.0.46');
+define('GLM_MEMBERS_PLUGIN_VERSION', '1.0.47');
 define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.0.43');
 
 /*
diff --git a/js/imageUpload/imageUpload.js b/js/imageUpload/imageUpload.js
index e1c397f2..8a17cf2f 100644
--- a/js/imageUpload/imageUpload.js
+++ b/js/imageUpload/imageUpload.js
@@ -26,9 +26,9 @@ jQuery(document).ready(function($) {
     var imageDataTemplate;
     var galleryImages;
     var newImageAdded = false;
-    var enableDragable = true;
+    var enableDraggable = true;
 
-    // Setup Drag and Drop when Add and
+    // Setup Drag and Drop when Add 
     if (window.File && window.FileList && window.FileReader) {
 
         // is XHR2 available?
@@ -75,8 +75,8 @@ jQuery(document).ready(function($) {
         allowedTypes = drop.attr("data-allowedTypes");
 
         uploadStatusTemplate = drop.children('.glm-imageUploadStatusTemplate').html();
-        imageDataTemplate = drop.children('.glm-galleryImageDataTemplate').html();
-        galleryImages = drop.parent().parent().children('.glm-galleryImages');
+        imageDataTemplate = drop.children('.glm-galleryDataTemplate').html();
+        galleryImages = drop.parent().parent().children('.glm-galleryItems');
 
         // Change drop destination appearance only when dragging over a file.
         drop.on('dragenter', function(e){
@@ -406,7 +406,7 @@ jQuery(document).ready(function($) {
         });
 
         // Make images sortable and store the list of IDs in a hidden input field when order has changed.
-        if (enableDragable) {
+        if (enableDraggable) {
             $('.glm-galleryImages').sortable({
                 update: function(event, ui) {
                     var sortedIDs = $(this).sortable('toArray');
diff --git a/views/admin/member/header.html b/views/admin/member/header.html
index 1a2eee0a..4d8c2dc6 100644
--- a/views/admin/member/header.html
+++ b/views/admin/member/header.html
@@ -23,7 +23,7 @@
         <a href="{$thisURL}?page={$thisPage}&glm_action=memberInfo&member={$memberID}&memberInfo={$memberInfoID}" class="nav-tab{if $thisAction==memberInfo}-active{/if} {if !$memberID || !$memberInfoID}disabled{/if}">Member Info</a>
   {/if}
   {foreach $addOnTabs as $a}
-        <a href="{$thisURL}?page={$thisPage}&glm_action={$a.action}&member={$memberID}&memberInfo={$memberInfoID}" class="nav-tab{if $thisAction==$a.action}-active{/if}">{$a.text}</a>
+        <a href="{$thisURL}?page={$thisPage}&glm_action={$a.action}&member={$memberID}" class="nav-tab{if $thisAction==$a.action}-active{/if}">{$a.text}</a>
   {/foreach}        
 {/if}
 
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index e7bfde62..86f002db 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -1,7 +1,7 @@
 {include file='admin/member/header.html'}
 
     <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
-    <script type="text/javascript">var enableDragable = true;</script>
+    <script type="text/javascript">var enableDraggable = true;</script>
 
     {if $memberUpdated}<h2 class="glm-notice glm-flash-updated">Member Information Updated</h2>{/if}
     
@@ -491,7 +491,7 @@
                                                 <td><input id="galleryImage_caption_{ id }" type="text" name="galleryImage_caption[{ id }]" value="" class="glm-form-text-input-medium" disabled></td>
                                                 <td rowspan="2">
                                                     <table>
-                                                        <tr><th>Delete:</th><td><input type="checkbox" name="galleryImage_delete[{ id }]" disabled></td></tr>
+                                                        <tr><th>Delete:</th><td><input type="checkbox"z name="galleryImage_delete[{ id }]" disabled></td></tr>
                                                         <tr><th>Selected Image:</th><td><input type="radio" name="galleryImage_selected" value="{ id }"></td></tr>
                                                         <tr><th>Featured Image:</th><td><input type="checkbox" name="galleryImage_featured[{ id }]"></td></tr>
                                                         <tr><th colspan="2" class="glm-notice" style="font-size: 1.2em;">New Upload</th></tr>
@@ -508,7 +508,7 @@
                                         <img src="{$glmPluginMediaURL}/images/small/{ filename }">
                                     </div>
                                 </li>
-                                <div id="glm-galleryImageLarger_{ id }" class="glm-imageDialog"><img src="{$glmPluginMediaURL}/images/large/{ filename }"></div>
+                                <div id="glm-galleryImageLarger2_{ id }" class="glm-imageDialog"><img src="{$glmPluginMediaURL}/images/large/{ filename }"></div>
                                 <!-- End of template -->
                                 
                             </div>
@@ -555,7 +555,7 @@
                                          
             {/foreach}
         {/if}
-                    </div>
+                    </ul>
     {else}
                     <b>Note:</b> Images may only be added to member information records that have been created.
                     You are editing information to create a new record.
@@ -570,7 +570,7 @@
     </form>
     
 {else} <!-- No - glm_members_permit_admin_member_info_edit -->
-        <script type="text/javascript">var enableDragable = false;</script>
+        <script type="text/javascript">var enableDraggable = false;</script>
 
         <table class="glm-admin-table">
             
@@ -1023,7 +1023,7 @@
             var marker = new google.maps.Marker({  
                 map: map,  
                 position: location,  
-                draggable: enableDragable,
+                draggable: enableDraggable,
                 animation: google.maps.Animation.DROP,  
                 title: "This is your location"  
             });  
-- 
2.17.1