temp

diff --git a/css/admin.css b/css/admin.css
index 5353c10..b73923b 100644 (file)
--- a/css/admin.css
+++ b/css/admin.css
@@ -87,6 +87,9 @@
 }
 
 /* Admin Forms */
+.glm-associate-admin-wrap {
+    max-width: 800px;
+}
 .glm-bad-input-area {
     background: #FFaBa9 !important;
 }
@@ -120,9 +123,15 @@
 
 /* Admin table additions */
 .glm-admin-table {
-    width: 95%;
+    max-width: 95%;
     margin-bottom: 5px;
 }
+.glm-admin-table-single {
+    width: 100%;
+}
+.glm-admin-table-header {
+    width: 80%;
+}
 .glm-admin-table-narrow {
     width: 10%;
     margin-bottom: 5px;
@@ -131,15 +140,16 @@
 .glm-admin-table-narrow th {
     text-align: left;
     vertical-align: top;
-    white-space: nowrap;
+/*    white-space: nowrap;*/
     padding-right: 1em;
     padding-bottom: .4em;
-    width: 1%;      /* used to keep header fields on a line with td's to be as narrow as they can be without breaking the text */
+/*    width: 1%;       used to keep header fields on a line with td's to be as narrow as they can be without breaking the text -- commented because we want to break the text*/
 }
 .glm-admin-table td {
     text-align: left;
     vertical-align: top;
     padding-bottom: .2em;
+    max-width: 50%;
 }
 .glm-admin-table thead th{
     font-size: 15px;
@@ -167,6 +177,10 @@
 .glm-admin-image-edit-table td {
     padding: 5px;
 }
+.glm-admin-export-button {
+    clear: both;
+    float: right;
+}
 #video-url-msg {
   display: block;
   font-size: 12px;

diff --git a/setup/adminMenus.php b/setup/adminMenus.php
index ab131c6..4f3d8e8 100644 (file)
--- a/setup/adminMenus.php
+++ b/setup/adminMenus.php
@@ -54,7 +54,7 @@ if (current_user_can('glm_members_members')) {
         'glm-members-admin-menu-members',
         function() {$this->controller('members', 'index');}
     );
-
+    
     // Add a sub-submenu for the "Member" "List" page
     add_submenu_page(
         'glm-members-admin-menu-members',

diff --git a/views/admin/error/header.html b/views/admin/error/header.html
index 378473b..54974c3 100644 (file)
--- a/views/admin/error/header.html
+++ b/views/admin/error/header.html
@@ -1,2 +1,2 @@
-<div class="wrap">
+<div class="wrap glm-associate-admin-wrap glm-associate-admin-error-wrap">
 

diff --git a/views/admin/management/header.html b/views/admin/management/header.html
index 99b0aec..f076300 100644 (file)
--- a/views/admin/management/header.html
+++ b/views/admin/management/header.html
@@ -1,4 +1,4 @@
-<div class="wrap">
+<div class="wrap glm-associate-admin-wrap glm-associate-admin-management-wrap">
 
     <h2>{$glmPluginName} Configuration</h2>
 

diff --git a/views/admin/member/header.html b/views/admin/member/header.html
index cfcdb41..373a486 100644 (file)
--- a/views/admin/member/header.html
+++ b/views/admin/member/header.html
@@ -6,7 +6,7 @@
   {assign var="memberInfo" value=false}
 {/if}
 
-<div class="wrap">
+<div class="wrap glm-associate-admin-wrap glm-associate-admin-member-wrap">
        
     <h2>
         {if $haveMember}

diff --git a/views/admin/member/index.html b/views/admin/member/index.html
index 14a0426..a1941b5 100644 (file)
--- a/views/admin/member/index.html
+++ b/views/admin/member/index.html
@@ -10,26 +10,21 @@
 
   {if $haveMember}
     <table class="glm-admin-table">
-        <tr><td><span class="glm-admin-table-large-bold-text">{$member.fieldData.name}</span></td></tr>
-        <tr>
-            <td>
-                <table class="glm-admin-table">
+<!--        <tr><td colspan="3"><span class="glm-admin-table-large-bold-text">{$member.fieldData.name}</span></td></tr>-->
+        
                     <tr>
                         <th>{$terms.term_member_cap} Slug:</th>
-                        <td class="glm-nowrap">{$member.fieldData.member_slug}</td>
+                        <td>{$member.fieldData.member_slug}</td>
                     </tr>
                     <tr><th>Date created:</th><td>{$member.fieldData.created.date}</td></tr>
                     <tr>
                         <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>{$terms.term_member_cap} Display & Access:</th>
-                        <td class="glm-nowrap">{$member.fieldData.access.name}</td>
+                        <td>{$member.fieldData.access.name}</td>
                     </tr>
                     <tr>
                         <th>{$terms.term_member_cap} Type:</th>
@@ -39,14 +34,19 @@
                         <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>
-                </table>
-            </td>
-            <td class="glm-right">
-{if apply_filters('glm_members_menu_members', true)}            
-                <span class="glm-right"><a href="{$thisUrl}?page={$thisPage}&glm_action=memberEdit&member={$memberID}" class="button button-primary glm-button glm-right">Edit {$terms.term_member_cap} Name and Status</a></span>
-{/if}
-            </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>
   {else}
         <h3>No {$terms.term_member} information available.</h3>

diff --git a/views/admin/members/header.html b/views/admin/members/header.html
index c70bcd4..6ace35a 100644 (file)
--- a/views/admin/members/header.html
+++ b/views/admin/members/header.html
@@ -1,4 +1,4 @@
-<div class="wrap">
+<div class="wrap glm-associate-admin-wrap glm-associate-admin-members-wrap">
     <h2>All {$terms.term_member_plur_cap}</h2>
     <h2 class="nav-tab-wrapper">
         <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">Dashboard</a>

diff --git a/views/admin/members/index.html b/views/admin/members/index.html
index 217ac2e..1ac1c86 100644 (file)
--- a/views/admin/members/index.html
+++ b/views/admin/members/index.html
@@ -3,7 +3,7 @@
 {if apply_filters('glm_members_permit_admin_members_index_add_member', true)}
     <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=memberEdit&option=add" class="button button-primary glm-button glm-right">Add A New {$terms.term_member_cap}</a>
 {/if}
-    <h2 class="glm-left">Main Dashboard</h2>
+    <h2 class="glm-left glm-admin-table-header">Main Dashboard</h2>
     
     <table class="glm-admin-table">
         <tr>

diff --git a/views/admin/members/list.html b/views/admin/members/list.html
index 739d15a..a0d6d0e 100644 (file)
--- a/views/admin/members/list.html
+++ b/views/admin/members/list.html
@@ -5,10 +5,11 @@
         <input type="hidden" name="prevStart" value="{$prevStart}">
         <input type="hidden" name="nextStart" value="{$nextStart}">
         <input type="hidden" name="limit" value="{$limit}">
-
+        
+        <h2 class="glm-admin-table-header">List&nbsp;of&nbsp;{$terms.term_member_plur_cap}</h2>
         <p class="glm-right">
 <!--                <th>{$terms.term_member_plur_cap} Found:</th><td><span style="margin-right: 2em;">{$memberCount}</span></td> -->
-                <b>Categories: </b>
+        <div>        <b>Categories: </b>
                 <select id="filterCategories" name="filterCategories[]" multiple="multiple" size="1">
     {foreach from=$categories item=v}
                         <option value="{$v.id}" data-parent="{$v.parent}"{if $v.selected} selected{/if}>
@@ -16,26 +17,31 @@
                         </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>
-        <h2>List&nbsp;of&nbsp;{$terms.term_member_plur_cap}</h2>
+        
         <br clear="all">
         
         <p><b>Total found:</b> {$memberCount}&nbsp;&nbsp;</p>
         
         <!-- 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}>
         {/if}    
         
-        <table class="wp-list-table striped glm-admin-table">
+        <table class="wp-list-table striped glm-admin-table-single">
             <thead>
                 <tr>
                     <th>ID</th>
@@ -58,13 +64,13 @@
                         {$m.id}
                         <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=memberInfo&member={$m.id}&memberInfo={$m.active_id}" class="button button-secondary glm-button-small" style="margin: 0 .2em 0 .2em;">Edit Active Profile</a>
                     </td>
-                    <td class="glm-nowrap">
+                    <td>
                         <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=index&member={$m.id}">{$m.name}</a>
                     </td>
-                    <td class="glm-nowrap">
+                    <td>
                         {$m.featured.name}
                     </td>
-                    <td class="glm-nowrap">
+                    <td>
                         {$m.access_short.name}
                     </td>
                     <td>

diff --git a/views/admin/settings/header.html b/views/admin/settings/header.html
index 88b5640..66b27e6 100644 (file)
--- a/views/admin/settings/header.html
+++ b/views/admin/settings/header.html
@@ -1,4 +1,4 @@
-<div class="wrap">
+<div class="wrap glm-associate-admin-wrap glm-associate-admin-settings-wrap">
 
     <h2>{$glmPluginName} Settings</h2>