From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 29 Sep 2016 13:19:15 +0000 (-0400)
Subject: Merge branch 'feature/memberDashboard' into feature/lauryAdminPolishing
X-Git-Tag: v2.9.15^2~15^2~44
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4c442949697fe5e6116462d206b3596092383b1b;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'feature/memberDashboard' into feature/lauryAdminPolishing
---

4c442949697fe5e6116462d206b3596092383b1b
diff --cc css/admin.css
index cd16c180,139e7cf3..2c02dd5f
--- a/css/admin.css
+++ b/css/admin.css
@@@ -139,13 -129,13 +139,20 @@@
      width: 10%;
      margin-bottom: 5px;
  }
++.glm-admin-table.glm-admin-inner-table {
++    border: 1px solid lightgrey;
++    border-radius: 3px;
++    width: 100%;
++    padding: 10px;
++}
  .glm-admin-table th,
  .glm-admin-table-narrow th {
      text-align: left;
      vertical-align: top;
 -    white-space: nowrap;
 +/*    white-space: nowrap;*/
      padding-right: 1em;
      padding-bottom: .4em;
++    max-width: 250px;
  }
  .glm-admin-table td {
      text-align: left;
@@@ -366,6 -351,6 +373,64 @@@ td.glm-nowrap 
  .nav-tab:hover {
      cursor: pointer;
  }
++.glm-associate-admin-wrap > .nav-tab-wrapper > .nav-tab {
++    padding: 5px 10px;
++    font-size: 13px;
++    margin-left: 5px;
++    margin-bottom: 4px;
++}
++#glm-admin-content-container > form > .nav-tab-wrapper > .nav-tab {
++    padding: 2px 10px;
++    font-size: 12px;
++    margin-left: 2px;
++    margin-bottom: 2px;
++}
++.nav-tab-wrapper .nav-tab {
++    background-color: rgb(61,132,208);
++    color: white;
++    font-weight: normal;
++    border: 1px solid darkblue;
++    border-radius: 3px;
++    letter-spacing: 1px;
++}
++.nav-tab-wrapper .nav-tab:hover {
++    background-color: rgb(41, 112, 214);
++    border: 1px inset darkblue;
++}
++.nav-tab-wrapper .nav-tab.nav-tab-active {
++    background-color: rgb(255, 155, 6);
++    color: #373737;
++    font-weight: normal;
++    text-shadow: 1px 0px 0 black;
++    border: 1px inset orange;    
++}
++.nav-tab-wrapper .nav-tab.nav-tab-active:hover {
++    background-color: rgb(250, 140, 6);
++    color: black;
++}
++
++#glm-admin-content-container .button-primary {
++    background-color: rgb(61,132,208);
++    color: white;
++    text-shadow: none;
++    border: 1px solid darkblue;
++    box-shadow: 0px 1px 0px darkblue;
++}
++#glm-admin-content-container .button-primary:hover {
++    box-shadow: 0px -1px 0px darkblue;
++}
++#updateSettings {
++    border: 1px solid darkorange;
++    border-radius: 3px;
++    display: block;
++    float: none;
++    margin: 20px auto;
++    padding: 5px 10px;
++}
++#updateSettings:focus,
++#updateSettings:hover {
++    background-color: #ffe4c7;
++}
  input[type=submit], input[type=file] {
      cursor: pointer;
  }
diff --cc setup/frontHooks.php
index 79f9bb54,79f9bb54..e163ab73
--- a/setup/frontHooks.php
+++ b/setup/frontHooks.php
@@@ -270,4 -270,4 +270,43 @@@ add_filter('glm_associate_config', func
  });
  add_filter('glm_associate_terms', function() {
      return $this->config['terms'];
--});
++});
++add_filter('glm_associate_member', function( $attribute ) {
++    global $wpdb;
++    $result = $wpdb->get_var( "SELECT $attribute FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX . "members WHERE member_slug = '".$GLOBALS['glmDetailSlug']."'" );
++    return $result;
++});
++
++function get_member_name( $id = 0 ) {
++    global $wpdb;
++    if ( $id ) {
++        return $wpdb->get_var( "SELECT name FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX . "members WHERE id = $id" );
++    }
++    return $wpdb->get_var( "SELECT name FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX . "members WHERE member_slug = '".$GLOBALS['glmDetailSlug']."'" );   
++}
++function get_member_data( $field = false ) {
++    if ( $field ) {
++        global $wpdb;
++        $field = $wpdb->get_var( "SELECT $field FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX . "members WHERE member_slug = '".$GLOBALS['glmDetailSlug']."'" );
++    }
++    return $field;
++}
++function is_member( $id = false ) {
++    global $wpdb;
++    if ( $id ) {
++        $result = $wpdb->get_var( "SELECT id FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX . "members WHERE id = $id" );
++    } else {
++        $result = $wpdb->get_var( "SELECT id FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX . "members WHERE member_slug = '".$GLOBALS['glmDetailSlug']."'" );
++    }
++    if ($result) {
++        return true;
++    }
++    return false;
++}
++// Getting the current admin theme colors as set by Wordpress. 
++// This will be useful for styling our menu when we figure out how best to use 
++// the available data. ~L
++// 
++//$admin_colors;
++//add_action('admin_head', function(){global $_wp_admin_css_colors; $admin_colors = $_wp_admin_css_colors;});
++//$admin_colors[get_user_option('admin_color')]['colors'];
diff --cc views/admin/management/index.html
index 9ebdb464,9ebdb464..78e69dd3
--- a/views/admin/management/index.html
+++ b/views/admin/management/index.html
@@@ -12,6 -12,6 +12,8 @@@
              <a id="glm-settings-detail" data-show-table="glm-table-detail" class="glm-settings-tab nav-tab">Member Detail Options</a>
              <a id="glm-settings-required-page" data-show-table="glm-table-required-page" class="glm-settings-tab nav-tab">Required Pages</a>
              <a id="glm-settings-members-only" data-show-table="glm-table-members-only" class="glm-settings-tab nav-tab">Members Only</a>
++        </h2>
++        <h2>
              {if $settingsUpdated}<span class="glm-notice glm-flash-updated glm-right">Settings Updated</span>{/if}
              {if $settingsUpdateError}<span class="glm-error glm-flash-updated glm-right">Settings Update Error</span>{/if}
          </h2>
@@@ -160,7 -160,7 +162,7 @@@
          <table id="glm-table-list" class="glm-admin-table glm-settings-table glm-hidden">
              <tr>
                  <td>
--                    <table class="glm-admin-table">
++                    <table class="glm-admin-table glm-admin-inner-table">
                          <tr><td colspan="2"><h2>Member List Display Options</h2></td></tr>
                          <tr><th>Show Member List:</th><td><input type="checkbox" name="list_show_list"{if $genSettings.fieldData.list_show_list.value} checked="checked"{/if}></td></tr>
                          <tr><th>Show Member Name as Link to Detail:</th><td><input type="checkbox" name="list_show_detail_link"{if $genSettings.fieldData.list_show_detail_link.value} checked="checked"{/if}></td></tr>
@@@ -183,7 -183,7 +185,7 @@@
                              <tr>
                              <th>Address Options:</th>
                              <td>  
--                                <table class="glm-admin-table">
++                                <table class="glm-admin-table glm-admin-inner-table">
                                      <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>                      
@@@ -211,7 -211,7 +213,7 @@@
                      </table>
                  </td>
                  <td>
--                    <table class="glm-admin-table">
++                    <table class="glm-admin-table glm-admin-inner-table">
                          <tr><td colspan="2"><h2>Member List Map Options</h2></td></tr>
                          <tr><th>Show Map:</th><td><input type="checkbox" name="list_show_map"{if $genSettings.fieldData.list_show_map.value} checked="checked"{/if}></td></tr>
                          <tr><th>Show Member Name as Link to Detail:</th><td><input type="checkbox" name="list_map_show_detaillink"{if $genSettings.fieldData.list_map_show_detaillink.value} checked="checked"{/if}></td></tr>
@@@ -255,7 -255,7 +257,7 @@@
              </tr>
              <tr>
                  <td>
--                    <table class="glm-admin-table">
++                    <table class="glm-admin-table glm-admin-inner-table">
                          <tr><td colspan="2"><h2>Member List Search Form Options</h2></td></tr>
                          <th>Show Search Form:</th><td><input type="checkbox" name="list_show_search"{if $genSettings.fieldData.list_show_search.value} checked="checked"{/if}></td><tr><th>Text Search:</th><td><input type="checkbox" name="list_show_search_text"{if $genSettings.fieldData.list_show_search_text.value} checked="checked"{/if}></td></tr>
                          <tr><th>Category Search:</th><td><input type="checkbox" name="list_show_search_category"{if $genSettings.fieldData.list_show_search_category.value} checked="checked"{/if}></td></tr>
@@@ -274,7 -274,7 +276,7 @@@
          <table id="glm-table-detail" class="glm-admin-table glm-settings-table glm-hidden">
              <tr>
                  <td>
--                    <table class="glm-admin-table">
++                    <table class="glm-admin-table glm-admin-inner-table">
                          <tr><td colspan="2"><h2>Member Detail Display Options</h2></td></tr>
                          <tr><th>Show Member Logo:</th><td><input type="checkbox" name="detail_show_logo"{if $genSettings.fieldData.detail_show_logo.value} checked="checked"{/if}></td></tr>
                         <tr>
@@@ -293,7 -293,7 +295,7 @@@
                              <tr>
                              <th>Address Options:</th>
                              <td>  
--                                <table class="glm-admin-table">
++                                <table class="glm-admin-table glm-admin-inner-table">
                                      <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>                      
@@@ -326,7 -326,7 +328,7 @@@
                      </table>
                  </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
index f6496d14,8630a90f..fa678aab
--- a/views/admin/member/index.html
+++ b/views/admin/member/index.html
@@@ -25,31 -19,14 +24,34 @@@
                          <th>URL CLick Counts</th>
                          <td><b>Today:</b> {$clickThroughCounts.day}&nbsp;&nbsp;&nbsp;<a data-type="daysClicks" class="dialog-button" href=""><img src="{$assetsUrl}/graph.png"></a></td>
                      </tr>
-                     
+                 </table>
+             </td>
+             <td>
+                 <table class="glm-admin-table">
                      <tr>
 -                        <th>&nbsp;&nbsp;Detail Page View Counts</th>
 +                        <th>{$terms.term_member_cap} Display & Access:</th>
 +                        <td>{$member.fieldData.access.name}</td>
 +                    </tr>
 +                    <tr>
 +                        <th>{$terms.term_member_cap} Type:</th>
 +                        <td>{$member.fieldData.member_type.name}</td>
 +                    </tr>            
 +                    <tr>
 +                        <th>Detail Page View Counts</th>
                          <td><b>Today:</b> {$detailViewCounts.day}&nbsp;&nbsp;&nbsp;<a data-type="daysViews" class="dialog-button" href=""><img src="{$assetsUrl}/graph.png"></a></td>
                      </tr>
 +                    <tr>
 +                        
 +                        <td>
 +                        {if apply_filters('glm_members_menu_members', true)}            
 +                            <span>
 +                                <a href="{$thisUrl}?page={$thisPage}&glm_action=memberEdit&member={$memberID}" class="button button-primary glm-button">
 +                                    Edit {$terms.term_member_cap} Name and Status
 +                                </a>
 +                            </span>
 +                        {/if}
 +                        </td>
 +                    </tr>
                  </table>
              </td>
          </tr>