From 2182929e391dc375d6c117ce1814e091643d9f51 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 25 Oct 2017 12:54:08 -0400
Subject: [PATCH] Contacts mgmt tabs standardized, custom-fields-friendly

---
 models/admin/management/contacts.php      | 42 ++++++++++++++++-------
 views/admin/management/contactHeader.html |  6 ++++
 views/admin/management/contacts.html      |  1 +
 views/admin/management/custom.html        |  6 ++++
 4 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 views/admin/management/contactHeader.html
 create mode 100644 views/admin/management/custom.html

diff --git a/models/admin/management/contacts.php b/models/admin/management/contacts.php
index 95df0ec..10594bc 100644
--- a/models/admin/management/contacts.php
+++ b/models/admin/management/contacts.php
@@ -107,18 +107,28 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
      */
     public function modelAction($actionData = false)
     {
-
-        $option = 'importSetup';
-        $importResult = array(
-            'status' => false,
-            'exceptionTable' => false
+        
+        $option             = 'importSetup';
+        $importResult       = array(
+                                'status' => false,
+                                'exceptionTable' => false
         );
-        $errorMsg = false;
-        $db_host = false;
-        $db_name = false;
-        $db_user = false;
-        $db_password = false;
+        $errorMsg           = false;
+        $db_host            = false;
+        $db_name            = false;
+        $db_user            = false;
+        $db_password        = false;
+        $content            = '';
+        $thisOption         = '';
+        $requestedView      = 'contacts.html';
 
+        $templateData = array(
+            'thisOption'     => '',
+        );
+        
+        if ($actionData) {
+            $templateData = $actionData;
+        }
 
         if (isset($_REQUEST['option'])) {
             $option = $_REQUEST['option'];
@@ -209,6 +219,12 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
 
                 break;
 
+            case 'customfields':
+                $requestedView = 'custom.html';
+                $content = apply_filters( 'glm-members-customfields-edit', '', GLM_MEMBERS_CONTACTS_PLUGIN_SLUG );
+                $thisOption = $option;
+                break;
+
             case 'importSetup':
             default:
 
@@ -225,6 +241,8 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
             'db_name'           => $db_name,
             'db_user'           => $db_user,
             'db_password'       => $db_password,
+            'content'           => $content,
+            'thisOption'        => $thisOption
         );
 
         // Return status, suggested view, and data to controller
@@ -232,12 +250,12 @@ class GlmMembersAdmin_management_contacts extends GlmDataContacts
             'status'           => true,
             'menuItemRedirect' => false,
             'modelRedirect'    => false,
-            'view'             => 'admin/management/contacts.html',
+            'view'             => 'admin/management/'.$requestedView,
             'data'             => $templateData
         );
 
 
-    }
+    } 
 
 
     /**
diff --git a/views/admin/management/contactHeader.html b/views/admin/management/contactHeader.html
new file mode 100644
index 0000000..ec30c65
--- /dev/null
+++ b/views/admin/management/contactHeader.html
@@ -0,0 +1,6 @@
+<h2 class="nav-tab-wrapper">
+    <a href="{$thisUrl}?page={$thisPage}&glm_action=contacts" class="nav-tab{if $thisOption == ''} nav-tab-active{/if}">Contact Options</a>
+    {if apply_filters( 'glm-members-customfields-active', false )}
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=contacts&option=customfields" class="nav-tab{if $thisOption == 'customfields'} nav-tab-active{/if}">Custom Fields</a>
+    {/if}
+</h2>
\ No newline at end of file
diff --git a/views/admin/management/contacts.html b/views/admin/management/contacts.html
index 0317a16..f02f013 100644
--- a/views/admin/management/contacts.html
+++ b/views/admin/management/contacts.html
@@ -1,4 +1,5 @@
 {include file='admin/management/header.html'}
+{include file='admin/management/contactHeader.html'}
 
 {if $errorMsg != false}
     <div style="border: 1px black solid; padding: 1em; margin-top: 2em; width: auto;">
diff --git a/views/admin/management/custom.html b/views/admin/management/custom.html
new file mode 100644
index 0000000..7ac63b0
--- /dev/null
+++ b/views/admin/management/custom.html
@@ -0,0 +1,6 @@
+{include file='admin/management/header.html'}
+{include file='admin/management/contactHeader.html'}
+
+{$content}
+
+{include file='admin/footer.html'}
-- 
2.17.1