From 916b88edd3f70bf03943e02eef92f0ff717f3bfd Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 14 Nov 2018 14:22:28 -0500
Subject: [PATCH] Manage DB revamp: Custom fields, files, adv/simple divide,
 search layout

- Retrieving custom fields into searchform.
- Changed searchform layout.
- Added advanced/simple division with a toggler.
- Moved non-common files into a new directory.
- Merged existing changes
---
 models/admin/manageDashboard/members.php      |  2 +-
 models/admin/members/list.php                 |  2 +-
 views/admin/common/components/modal.html      |  1 -
 .../adminSearch/searchHeader.html             | 52 ++++++++++++++++++-
 .../components/category.html                  |  0
 .../components/checkbox.html                  |  0
 .../components/count.html                     |  0
 .../components/dateSearch.html                |  0
 .../components/dropdown.html                  |  0
 .../manageDashboard/components/modal.html     |  1 +
 .../components/textSearch.html                |  0
 .../{common => }/manageDashboard/index.html   | 15 ------
 .../{common => }/manageDashboard/list.html    |  0
 13 files changed, 53 insertions(+), 20 deletions(-)
 delete mode 100644 views/admin/common/components/modal.html
 rename views/admin/{common => manageDashboard}/components/category.html (100%)
 rename views/admin/{common => manageDashboard}/components/checkbox.html (100%)
 rename views/admin/{common => manageDashboard}/components/count.html (100%)
 rename views/admin/{common => manageDashboard}/components/dateSearch.html (100%)
 rename views/admin/{common => manageDashboard}/components/dropdown.html (100%)
 create mode 100644 views/admin/manageDashboard/components/modal.html
 rename views/admin/{common => manageDashboard}/components/textSearch.html (100%)
 rename views/admin/{common => }/manageDashboard/index.html (91%)
 rename views/admin/{common => }/manageDashboard/list.html (100%)

diff --git a/models/admin/manageDashboard/members.php b/models/admin/manageDashboard/members.php
index 8f2cbe5b..f603da0c 100644
--- a/models/admin/manageDashboard/members.php
+++ b/models/admin/manageDashboard/members.php
@@ -441,7 +441,7 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
             'status'           => $success,
             'menuItemRedirect' => false,
             'modelRedirect'    => false,
-            'view'             => "admin/common/manageDashboard/$view.html",
+            'view'             => "admin/manageDashboard/$view.html",
             'data'             => $templateData
         );
 
diff --git a/models/admin/members/list.php b/models/admin/members/list.php
index 186b75bb..713b1ccd 100755
--- a/models/admin/members/list.php
+++ b/models/admin/members/list.php
@@ -402,7 +402,7 @@ class GlmMembersAdmin_members_list extends GlmDataMembers
             'status'           => $success,
             'menuItemRedirect' => false,
             'modelRedirect'    => false,
-            'view'             => 'admin/common/manageDashboard/list.html',
+            'view'             => 'admin/manageDashboard/list.html',
             'data'             => $templateData
         );
 
diff --git a/views/admin/common/components/modal.html b/views/admin/common/components/modal.html
deleted file mode 100644
index ba271e69..00000000
--- a/views/admin/common/components/modal.html
+++ /dev/null
@@ -1 +0,0 @@
-modal template
\ No newline at end of file
diff --git a/views/admin/manageDashboard/adminSearch/searchHeader.html b/views/admin/manageDashboard/adminSearch/searchHeader.html
index 7873714d..4185abf7 100644
--- a/views/admin/manageDashboard/adminSearch/searchHeader.html
+++ b/views/admin/manageDashboard/adminSearch/searchHeader.html
@@ -1,3 +1,51 @@
 <div id="glm-admin-search-header">
-    Search Fields pulled from file
-</div>
\ No newline at end of file
+    <div id="glm-manage-member-dashboard-searchForm" class="row">
+        <form action="{$thisUrl}?page={$thisPage}" method="post" id="searchForm">
+            <input type="hidden" name="glm_action" value="list">
+            <input type="hidden" name="prevStart" value="{$prevStart}">
+            <input type="hidden" name="nextStart" value="{$nextStart}">
+            <input type="hidden" name="limit" value="{$limit}">
+            <input type="hidden" name="savedAlpha" value="{$alphaSelected}">
+            <div id="searchForm-simple">
+                {foreach $searchFields.components as $component}
+                    
+                    {if isset($component.template)}
+                        
+                        {if "{$smarty.current_dir}/../components/{$component.template}.html"|is_file}
+                            {include file="../components/{$component.template}.html"}
+                        {else}
+                            Failed loading {$smarty.current_dir}/../components/{$component.template}.html
+                        {/if}
+                        
+                    {/if}
+        
+                {/foreach}
+            </div>
+            <div id="advanced-search-toggle" data-toggles="#searchForm-advanced" class="data-toggler">
+                <div id="advanced-search-toggle-button" class="button">Advanced Search</div>
+            </div>
+            <div id="searchForm-advanced" class="hidden">
+                CUSTOM FIELDS: 
+                {apply_filters('glm-member-db-custom-filter-search', '', 'glm-member-db' )}
+            </div<>
+            <input type="submit" value="Submit" style="margin-right: 2em;">
+        </form>
+    </div>
+</div>
+<div id="glm-admin-search-subheader">
+    <div id="glm-manage-dashboard-quickSearchForm" class="row">
+
+        <form action="{$thisUrl}?page={$thisPage}" method="post" id="quickSarchForm">
+            <input type="submit" value="Pending Members{if $pendingMembersCount}: {$pendingMembersCount}{/if}"" style="margin-right: 2em;">
+            <input type="submit" value="Bad Map Location Data{if $badMapLocationCount}: {$badMapLocationCount}{/if}"" style="margin-right: 2em;">
+        </form>
+        
+    </div>
+</div>
+<script>
+    jQuery(function($){
+        $('.data-toggler').on("click", function() {
+            $($(this).attr("data-toggles")).toggleClass("hidden");
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/views/admin/common/components/category.html b/views/admin/manageDashboard/components/category.html
similarity index 100%
rename from views/admin/common/components/category.html
rename to views/admin/manageDashboard/components/category.html
diff --git a/views/admin/common/components/checkbox.html b/views/admin/manageDashboard/components/checkbox.html
similarity index 100%
rename from views/admin/common/components/checkbox.html
rename to views/admin/manageDashboard/components/checkbox.html
diff --git a/views/admin/common/components/count.html b/views/admin/manageDashboard/components/count.html
similarity index 100%
rename from views/admin/common/components/count.html
rename to views/admin/manageDashboard/components/count.html
diff --git a/views/admin/common/components/dateSearch.html b/views/admin/manageDashboard/components/dateSearch.html
similarity index 100%
rename from views/admin/common/components/dateSearch.html
rename to views/admin/manageDashboard/components/dateSearch.html
diff --git a/views/admin/common/components/dropdown.html b/views/admin/manageDashboard/components/dropdown.html
similarity index 100%
rename from views/admin/common/components/dropdown.html
rename to views/admin/manageDashboard/components/dropdown.html
diff --git a/views/admin/manageDashboard/components/modal.html b/views/admin/manageDashboard/components/modal.html
new file mode 100644
index 00000000..6463cefb
--- /dev/null
+++ b/views/admin/manageDashboard/components/modal.html
@@ -0,0 +1 @@
+[modal template loaded]
\ No newline at end of file
diff --git a/views/admin/common/components/textSearch.html b/views/admin/manageDashboard/components/textSearch.html
similarity index 100%
rename from views/admin/common/components/textSearch.html
rename to views/admin/manageDashboard/components/textSearch.html
diff --git a/views/admin/common/manageDashboard/index.html b/views/admin/manageDashboard/index.html
similarity index 91%
rename from views/admin/common/manageDashboard/index.html
rename to views/admin/manageDashboard/index.html
index e03f87ed..a12b1280 100644
--- a/views/admin/common/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -1,21 +1,6 @@
 
 <div id="glm-manage-member-dashboard">
     {include file='admin/manageDashboard/adminSearch/searchHeader.html'}
-    <div id="glm-manage-member-dashboard-searchForm" class="row">
-        {foreach $searchFields.components as $component}
-            
-            {if isset($component.template)}
-               
-                {if "{$smarty.current_dir}/../components/{$component.template}.html"|is_file}
-                    {include file="../components/{$component.template}.html"}
-                {else}
-                    Failed loading {$smarty.current_dir}/../components/{$component.template}.html
-                {/if}
-               
-            {/if}
-
-        {/foreach}
-    </div>
     <div id="glm-admin-member-list" class="row admin-member-list">
         <div id="glm-admin-list-columns">
             <span class="member-record-header" id="member-record-image"></span>
diff --git a/views/admin/common/manageDashboard/list.html b/views/admin/manageDashboard/list.html
similarity index 100%
rename from views/admin/common/manageDashboard/list.html
rename to views/admin/manageDashboard/list.html
-- 
2.17.1