From: Laury GvR Date: Wed, 14 Nov 2018 19:22:28 +0000 (-0500) Subject: Manage DB revamp: Custom fields, files, adv/simple divide, search layout X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=916b88edd3f70bf03943e02eef92f0ff717f3bfd;p=WP-Plugins%2Fglm-member-db.git 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 --- 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/category.html b/views/admin/common/components/category.html deleted file mode 100644 index 9ff0e8d1..00000000 --- a/views/admin/common/components/category.html +++ /dev/null @@ -1,10 +0,0 @@ -
- Categories: - -
diff --git a/views/admin/common/components/checkbox.html b/views/admin/common/components/checkbox.html deleted file mode 100644 index a32f09c1..00000000 --- a/views/admin/common/components/checkbox.html +++ /dev/null @@ -1,8 +0,0 @@ -
Checkboxes
- - - - diff --git a/views/admin/common/components/count.html b/views/admin/common/components/count.html deleted file mode 100644 index a86b5c36..00000000 --- a/views/admin/common/components/count.html +++ /dev/null @@ -1 +0,0 @@ -

Total found: {$memberCount}  

\ No newline at end of file diff --git a/views/admin/common/components/dateSearch.html b/views/admin/common/components/dateSearch.html deleted file mode 100644 index 4b442252..00000000 --- a/views/admin/common/components/dateSearch.html +++ /dev/null @@ -1,23 +0,0 @@ -
-
Search By Date
- - - -
- \ No newline at end of file diff --git a/views/admin/common/components/dropdown.html b/views/admin/common/components/dropdown.html deleted file mode 100644 index 63e954d4..00000000 --- a/views/admin/common/components/dropdown.html +++ /dev/null @@ -1,10 +0,0 @@ - -
- {$terms.term_member_cap} Types - -
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/common/components/textSearch.html b/views/admin/common/components/textSearch.html deleted file mode 100644 index 25c95057..00000000 --- a/views/admin/common/components/textSearch.html +++ /dev/null @@ -1,7 +0,0 @@ -
- - -
\ No newline at end of file diff --git a/views/admin/common/manageDashboard/index.html b/views/admin/common/manageDashboard/index.html deleted file mode 100644 index e03f87ed..00000000 --- a/views/admin/common/manageDashboard/index.html +++ /dev/null @@ -1,182 +0,0 @@ - -
- {include file='admin/manageDashboard/adminSearch/searchHeader.html'} -
- {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} -
-
-
- - Name - Events - Packages - Featured - -
-
- - Loading ... - -
-
-
- - -{include file='admin/footer.html'} \ No newline at end of file diff --git a/views/admin/common/manageDashboard/list.html b/views/admin/common/manageDashboard/list.html deleted file mode 100644 index d41a9bfe..00000000 --- a/views/admin/common/manageDashboard/list.html +++ /dev/null @@ -1,15 +0,0 @@ -
- {if $haveMembers} - {foreach $members as $member} -
- - {$member.name} - 0 - 0 - {$member.featured.name} -
- {/foreach} - {else} -
No Members
- {/if} -
\ 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 @@
- Search Fields pulled from file -
\ No newline at end of file +
+
+ + + + + +
+ {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} +
+
+
Advanced Search
+
+
+
+
+
+ +
+ + +
+ +
+
+ \ No newline at end of file diff --git a/views/admin/manageDashboard/components/category.html b/views/admin/manageDashboard/components/category.html new file mode 100644 index 00000000..9ff0e8d1 --- /dev/null +++ b/views/admin/manageDashboard/components/category.html @@ -0,0 +1,10 @@ +
+ Categories: + +
diff --git a/views/admin/manageDashboard/components/checkbox.html b/views/admin/manageDashboard/components/checkbox.html new file mode 100644 index 00000000..a32f09c1 --- /dev/null +++ b/views/admin/manageDashboard/components/checkbox.html @@ -0,0 +1,8 @@ +
Checkboxes
+ + + + diff --git a/views/admin/manageDashboard/components/count.html b/views/admin/manageDashboard/components/count.html new file mode 100644 index 00000000..a86b5c36 --- /dev/null +++ b/views/admin/manageDashboard/components/count.html @@ -0,0 +1 @@ +

Total found: {$memberCount}  

\ No newline at end of file diff --git a/views/admin/manageDashboard/components/dateSearch.html b/views/admin/manageDashboard/components/dateSearch.html new file mode 100644 index 00000000..4b442252 --- /dev/null +++ b/views/admin/manageDashboard/components/dateSearch.html @@ -0,0 +1,23 @@ +
+
Search By Date
+ + + +
+ \ No newline at end of file diff --git a/views/admin/manageDashboard/components/dropdown.html b/views/admin/manageDashboard/components/dropdown.html new file mode 100644 index 00000000..63e954d4 --- /dev/null +++ b/views/admin/manageDashboard/components/dropdown.html @@ -0,0 +1,10 @@ + +
+ {$terms.term_member_cap} Types + +
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/manageDashboard/components/textSearch.html b/views/admin/manageDashboard/components/textSearch.html new file mode 100644 index 00000000..25c95057 --- /dev/null +++ b/views/admin/manageDashboard/components/textSearch.html @@ -0,0 +1,7 @@ +
+ + +
\ No newline at end of file diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html new file mode 100644 index 00000000..a12b1280 --- /dev/null +++ b/views/admin/manageDashboard/index.html @@ -0,0 +1,167 @@ + +
+ {include file='admin/manageDashboard/adminSearch/searchHeader.html'} +
+
+ + Name + Events + Packages + Featured + +
+
+ + Loading ... + +
+
+
+ + +{include file='admin/footer.html'} \ No newline at end of file diff --git a/views/admin/manageDashboard/list.html b/views/admin/manageDashboard/list.html new file mode 100644 index 00000000..d41a9bfe --- /dev/null +++ b/views/admin/manageDashboard/list.html @@ -0,0 +1,15 @@ +
+ {if $haveMembers} + {foreach $members as $member} +
+ + {$member.name} + 0 + 0 + {$member.featured.name} +
+ {/foreach} + {else} +
No Members
+ {/if} +
\ No newline at end of file