From 6b4a231832c32afd2d079e169adcb7650096635d Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 17 Sep 2018 16:56:30 -0400
Subject: [PATCH] Staff list default display adjusted

---
 css/front.css               |  23 ++++--
 models/front/staff/list.php |  24 +------
 views/front/staff/list.html | 138 +++++++-----------------------------
 3 files changed, 48 insertions(+), 137 deletions(-)

diff --git a/css/front.css b/css/front.css
index 2738dda..ca77b84 100644
--- a/css/front.css
+++ b/css/front.css
@@ -1,7 +1,15 @@
+/* List View Styles */
+.glm-staff-container {
+    /* Parent element */
+}
+.paging-container {
+    width: 100%;
+    overflow: hidden;
+}
 .glm-staff-block-wrapper {
     float: left;
     padding: 10px;
-    width: 33%;
+    width: 100%;
 }
 @media (min-width: 641px) and (max-width: 1024px) {
     .glm-staff-block-wrapper {
@@ -18,14 +26,21 @@
     }   
 }
 .glm-staff-block {
-    /* border: 1px solid grey; */
-    /* box-shadow: 1px 1px 1px 1px grey; */
+    border: 1px solid lightgrey;
     margin-bottom: 20px;
-    text-align: center;
     width: 100%;
+    border-radius: 3px;
+    padding: 20px;
+    max-width: 600px;
+    margin-left: auto;
+    margin-right: auto;
 }
 .glm-staff-name {
     font-weight: bold;
+    text-transform: none;
+    font-style: normal;
+    font-size: 24px;
+    text-decoration: none;
 }
 
 
diff --git a/models/front/staff/list.php b/models/front/staff/list.php
index 96449b0..ddbbaaa 100644
--- a/models/front/staff/list.php
+++ b/models/front/staff/list.php
@@ -111,22 +111,12 @@ class GlmMembersFront_staff_list extends GlmDatastaff
 
         $where                = '';
         $whereSep             = '';
-        $filterPending        = false;
-        $filterArchived       = false;
-        $filterFeatured       = false;
         $filterName           = false;
         $haveFilter           = false;
         $textSearch           = '';
-        $blankStart           = false;
-        $citySearchSelect     = false;
-        $membersFound         = false;
-        $catSearchSelected    = false;
-        $regionSearchSelected = false;
-        $mapItems             = false;
-        $multiSelectCats      = false;
+        $staffFound         = false;
         $filteredStaffFound = false;
         $list                 = false;
-        $citySearchSelected   = false;
 
         // Paging Parameters
         $textSearch    = '';
@@ -265,7 +255,7 @@ class GlmMembersFront_staff_list extends GlmDatastaff
         // If we have list entries - even if it's an empty list
         $success = true;
         $haveStaff = false;
-        if (!$blankStart && $list !== false) {
+        if ( $list !== false) {
 
             $success = true;
 
@@ -293,7 +283,7 @@ class GlmMembersFront_staff_list extends GlmDatastaff
         
 
         
-        // Compile template data
+        // Compile template datas
         $templateData = array(
             'list'         => $list,
             'staffData'    => $list,
@@ -301,19 +291,11 @@ class GlmMembersFront_staff_list extends GlmDatastaff
             'haveStaff'          => $haveStaff,
             'staff'              => $list,
             'staffFound'         => $staffFound,
-            'mapItems'             => $mapItems,
             'haveFilter'           => $haveFilter,
-            'filterArchived'       => $filterArchived,
-            'filterFeatured'       => $filterFeatured,
-            'filterPending'        => $filterPending,
             'filterName'           => stripslashes($filterName),
             'textSearch'           => $textSearch,
-            'catSearchSelected'    => $catSearchSelected,
-            'citySearchSelected'   => $citySearchSelected,
-            'regionSearchSelected' => $regionSearchSelected,
             'alphaList'            => $alphaList,
             'alphaSelected'        => $alphaSelected,
-            'blankStart'           => $blankStart,
             'view'                 => $view,
 
             // Paging parameters
diff --git a/views/front/staff/list.html b/views/front/staff/list.html
index 069ce97..9d4e29f 100644
--- a/views/front/staff/list.html
+++ b/views/front/staff/list.html
@@ -18,7 +18,7 @@
                     <br>
                 {/if}
                 <br>
-                showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
+                showing {$start} through {$lastDisplayed} of {$filteredStaffFound}
             {/if}
         </div>
         
@@ -33,22 +33,40 @@
                             {$staffVal.lname}
                         </span>
                     </div>
+
+                    <span class="glm-staff-email">
+                        <a href="mailto:{$staffVal.email}">{$staffVal.email}</a>
+                    </span>
+
+                    <br>
                     
                     <div class="glm-staff-location">
+                        <span class="glm-staff-extension-title glm-staff-title">
+                            Ext:
+                        </span>
                         <span class="glm-staff-extension">
                             {$staffVal.extension}
                         </span>
-                        <span class="glm-staff-building">
-                            {$staffVal.building}
+
+                        <br>
+
+                        <span class="glm-staff-department-title glm-staff-title">
+                            Department:
                         </span>
                         <span class="glm-staff-department">
                             {$staffVal.department}
                         </span>
+
+                        <br>
+
+                        <span class="glm-staff-building-title glm-staff-title">
+                            Building:
+                        </span>
+                        <span class="glm-staff-building">
+                            {$staffVal.building}
+                        </span>
                     </div>
 
-                    <span class="glm-staff-email">
-                        <a data-id="{$staffVal.id}" href="#" data-reveal-id="emailModal">Email</a>
-                    </span>
                 </div>
             </div>
         {/foreach}
@@ -63,115 +81,11 @@
                     <br>
                 {/if}
                 <br>
-                showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
+                showing {$start} through {$lastDisplayed} of {$filteredStaffFound}
             </div>
         {/if}
     {else}
         Sorry, no staff members found.
     {/if}
 
-</div>
-<div id="emailModal" class="reveal-modal" data-reveal aria-labelledby="modalTitle" aria-hidden="true" role="dialog">
-    
-    <div class="row modal-form-wrapper">
-        <div id="modal-handle"><h2> Send A Message</h2></div>
-        <div id="modal-errors"></div>
-        <div id="modal-instructions"></div>
-        <form action="">
-            <div class="modal-email-label">Your Name &nbsp;<span class="required-field">(required)</span></div>
-            <input class="modal-email-field modal-required" type="text" id="sender-name" name="Your Name" required>
-            <div class="modal-email-label">Your Email Address&nbsp;<span class="required-field">(required)</span></div>
-            <input class="modal-email-field modal-required" type="text" id="sender-email" name="Your Email Address" required>
-            <div class="modal-email-label">Your Phone Number </div>
-            <input class="modal-email-field" type="text" id="sender-phone" name="Your Phone Number">
-            <div class="modal-email-label">Email Subject &nbsp;<span class="required-field">(required)</span></div>
-            <input class="modal-email-field modal-required" type="text" id="email-subject" name="Email Subject" required>
-            <div class="modal-email-label">Email Message</div>
-            <textarea rows="5" class="modal-email-field" type="text" id="email-message" name="Email Message"></textarea>
-            <input class="button" type="button" value="Send" name="submit" id="modal-submit">
-        </form>
-    </div>
-    <a class="close-reveal-modal" aria-label="Close">&#215;</a>
-</div>
-<script>
-    jQuery(function($){
-        var id;
-        var requiredFields = ['Your Name', 'Email Address', 'Email Subject'];
-        function validateEmail(email) {
-            {literal} var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; {/literal}
-                return re.test(String(email).toLowerCase());
-        }
-        let data = {
-            action      : 'glm_members_admin_ajax',
-            glm_action  : 'staffEmail'
-        }
-       $('.glm-staff-email > a').on("click", function(e){  
-            id = $(this).data('id');
-            data.staff_id = id;
-            data.getName = true;
-            $.ajax({
-                type: 'POST',
-                url: '{$ajaxUrl}',
-                data: data,
-                beforeSend: function(){
-                    
-                },
-                complete: function(){
-                    
-                },
-                cache: false,
-                success: function (response){
-                    var fullName = JSON.parse(response);
-                    var firstName = fullName.ajaxData['fname'];
-                    var lastName = fullName.ajaxData['lname'];
-                    var printName = firstName + " " + lastName;
-
-                    $('<span class="message-instructions">To send a message directly to <span class="modal-message-name">' + printName +  ' </span> please fill out the form below and click "Send" when complete.</span>').appendTo( $("#modal-instructions"));
-
-                    $(".modal-form-wrapper").fadeIn("fast");
-                }
-            })
-        })
-
-        $("#modal-submit").on("click", function(e){
-            var fields = $(".modal-form-wrapper").find(".modal-email-field").serializeArray();
-            $("#modal-errors").empty();
-            var badFields = false;
-
-            $.each(fields, function(i, field) {
-                if( requiredFields.indexOf(field.name) > -1){
-                    if(field.name === "Your Email Address"){
-                        // if( !validateEmail(field.value) || !field.value ){
-                        //     badFields = true;
-                        //     $('<div class="required-fail">' + field.name + ' is not valid </div>').appendTo( $("#modal-errors") );
-                        // }
-                    }
-                    if (!field.value){
-                        $('<div class="required-fail">' + field.name + ' is required </div>').appendTo( $("#modal-errors") );
-                        badFields = true;
-                    }
-                }
-            }); 
-            data.message = fields;
-            data.getName = false;
-            if(!badFields){
-                $.ajax({
-                    type: 'POST',
-                    url: '{$ajaxUrl}',
-                    data: data,
-                    beforeSend: function(){
-                        
-                    },
-                    complete: function(){
-                        
-                    },
-                    cache: false,
-                    success: function (response){
-
-                    }
-                })
-            }
-        });
-    });
-
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
-- 
2.17.1