Merge branch 'develop' into feature/lauryAdminPolishing

diff --cc setup/frontHooks.php
Simple merge

diff --cc views/admin/management/index.html
index 9a2c22e,e6a3dff..f9726a7
--- 1/views/admin/management/index.html
--- 2/views/admin/management/index.html
+++ b/views/admin/management/index.html
@@@ -201,11 -215,11 +217,16 @@@
                          </tr>
                              <tr>
                              <th>Address Options:</th>
++<<<<<<< HEAD
 +                            <td>  
 +                                <table class="glm-admin-table glm-admin-inner-table">
++=======
+                             <td>
+                                 <table class="glm-admin-table">
++>>>>>>> develop
                                      <tr><th>Show Street:</th><td><input type="checkbox" name="list_show_street"{if $genSettings.fieldData.list_show_street.value} checked="checked"{/if}></td></tr>
                                      <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="list_show_citystatezip"{if $genSettings.fieldData.list_show_citystatezip.value} checked="checked"{/if}></td></tr>
-                                     <tr><th>Show Country:</th><td><input type="checkbox" name="list_show_country"{if $genSettings.fieldData.list_show_country.value} checked="checked"{/if}></td></tr>                      
+                                     <tr><th>Show Country:</th><td><input type="checkbox" name="list_show_country"{if $genSettings.fieldData.list_show_country.value} checked="checked"{/if}></td></tr>
                                  </table>
                              </td>
                          </tr>
@@@ -319,11 -333,11 +340,16 @@@
                          </tr>
                              <tr>
                              <th>Address Options:</th>
++<<<<<<< HEAD
 +                            <td>  
 +                                <table class="glm-admin-table glm-admin-inner-table">
++=======
+                             <td>
+                                 <table class="glm-admin-table">
++>>>>>>> develop
                                      <tr><th>Show Street:</th><td><input type="checkbox" name="detail_show_street"{if $genSettings.fieldData.detail_show_street.value} checked="checked"{/if}></td></tr>
                                      <tr><th>Show City, State, ZIP:</th><td><input type="checkbox" name="detail_show_citystatezip"{if $genSettings.fieldData.detail_show_citystatezip.value} checked="checked"{/if}></td></tr>
-                                     <tr><th>Show Country:</th><td><input type="checkbox" name="detail_show_country"{if $genSettings.fieldData.detail_show_country.value} checked="checked"{/if}></td></tr>                      
+                                     <tr><th>Show Country:</th><td><input type="checkbox" name="detail_show_country"{if $genSettings.fieldData.detail_show_country.value} checked="checked"{/if}></td></tr>
                                  </table>
                              </td>
                          </tr>
@@@ -351,9 -365,9 +377,9 @@@
                          <tr><th>Show Live Cam Feed:</th><td><input type="checkbox" name="detail_show_live_cam"{if $genSettings.fieldData.detail_show_live_cam.value} checked="checked"{/if}></td></tr>
                          <tr><th>Autoscroll Offset From Top (height of sticky nav):</th><td><input type="text" pattern="[0-9]{literal}{0,4}{/literal}" name="detail_top_offset_autoscroll" value="{$genSettings.fieldData.detail_top_offset_autoscroll}" class="glm-form-numeric-input" placeholder="0" maxlength="4">px</td></tr>
                      </table>
-                 </td>  
+                 </td>
                  <td>
 -                    <table class="glm-admin-table">
 +                    <table class="glm-admin-table glm-admin-inner-table">
                          <tr><td colspan="2"><h2>Member Detail Map Options</h2></td></tr>
                          <tr><th>Show Map:</th><td><input type="checkbox" name="detail_show_map"{if $genSettings.fieldData.detail_show_map.value} checked="checked"{/if}></td></tr>
                          <tr><th>Show Logo:</th><td><input type="checkbox" name="detail_map_show_logo"{if $genSettings.fieldData.detail_map_show_logo.value} checked="checked"{/if}></td></tr>

diff --cc views/admin/member/index.html
Simple merge

diff --cc views/admin/members/list.html
index f5a649c,4ad186d..104e696
--- 1/views/admin/members/list.html
--- 2/views/admin/members/list.html
+++ b/views/admin/members/list.html
@@@ -17,24 -16,19 +17,24 @@@
                          </option>
      {/foreach}
                  </select>
 -                <input type="submit" value="Submit" style="margin-right: 2em;">
 -                <b>Show Archived: </b><input type="checkbox" id="filterArchived" class="listFilter"{if $filterArchived} checked{/if} style="margin-right: 1em;">
 +                <input type="submit" value="Submit" style="margin-right: 2em;"></div>
 +        <div>
 +            <b>Text Search: </b><input  class="glmMembersSearch" type="text" name="text_search" id="autoTest">
 +        </div>
 +        <div>
 +            <b>Show Archived: </b><input type="checkbox" id="filterArchived" class="listFilter"{if $filterArchived} checked{/if} style="margin-right: 1em;">
                  <b>Featured Only: </b><input type="checkbox" id="filterFeatured" class="listFilter"{if $filterFeatured} checked{/if} style="margin-right: 1em;">
                  <b>Pending Only: </b><input type="checkbox" id="filterPending" class="listFilter"{if $filterPending} checked{/if} style="margin-right: 1em;">
 -                <b>Text Search: </b><input  class="glmMembersSearch" type="text" name="text_search" id="autoTest">
 +        </div>
 +                
         </p>
-         
+ 
          <p><b>Total found:</b> {$memberCount}&nbsp;&nbsp;</p>
  
-         <br clear="all">        
+         <br clear="all">
          <!-- Add Member Type Button and Dialog Box -->
 -        <div id="exportMembersButton" class="button button-secondary glm-right">Export {$terms.term_member_plur_cap}</div>
 -
 +        <div id="exportMembersButton" class="button button-secondary glm-admin-export-button">Export {$terms.term_member_plur_cap}</div>    
 +              
          {if $paging}
              <input type="Submit" name="pageSelect" value="Previous {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
              <input type="Submit" name="pageSelect" value="Next {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>