From caa599657d8f920e8e6ef24b7e30465416d9717c Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 16 Sep 2016 15:51:06 -0400 Subject: [PATCH] Working on styles for the dashboard items. Adding media queries for these containers to be full width when screen size is below 1200px. --- css/admin.css | 11 ++++++ models/admin/dashboard/index.php | 3 ++ views/admin/dashboard/index.html | 68 ++++++++++++++++++++++++++++---- 3 files changed, 74 insertions(+), 8 deletions(-) diff --git a/css/admin.css b/css/admin.css index d0843edc..139e7cf3 100644 --- a/css/admin.css +++ b/css/admin.css @@ -444,3 +444,14 @@ input[type=submit], input[type=file] { margin: 0; line-height: 1.4; } + +.glm-widget-container:nth-child(odd) { + clear: left; +} + +@media (max-width: 1200px) { + .glm-widget-container { + width: 90%; + float: none; + } +} diff --git a/models/admin/dashboard/index.php b/models/admin/dashboard/index.php index 458b0684..f7c76271 100644 --- a/models/admin/dashboard/index.php +++ b/models/admin/dashboard/index.php @@ -179,7 +179,10 @@ class GlmMembersAdmin_dashboard_index extends GlmDataMembers // Compile template data. $templateData = array( + 'lockedToMember' => $lockedToMember, 'member' => $actionData, + 'showArchived' => $showArchived, + 'statusTypeNumbers' => $this->config['status_numb'], 'memberID' => $memberID, 'haveInfoRecords' => $haveInfoRecords, 'memberInfoRecords' => $memberInfoRecords, diff --git a/views/admin/dashboard/index.html b/views/admin/dashboard/index.html index e6c55176..db574b58 100644 --- a/views/admin/dashboard/index.html +++ b/views/admin/dashboard/index.html @@ -1,16 +1,68 @@

- {$terms.term_member_cap} Profile + {$terms.term_member_cap} Profiles

- {if $haveInfoRecords} - {foreach $memberInfoRecords as $m} - {$m.status.name} Profile ({$m.reference_name}) - {/foreach} - {else} - Add New {$terms.term_member} Info - {/if} + + {if apply_filters('glm_members_permit_admin_member_index_view_member_info_version', true)} + {if apply_filters('glm_members_permit_admin_member_index_add_member_info_version', true)} + {/if} +

+

{$terms.term_member_cap} Profile Versions

+ +

+ Add New {$terms.term_member_cap} Information Version +

+
+

+
+ + + + + + + + + + + + + {if $haveInfoRecords} + {assign var="i" value="0"} + {foreach $memberInfoRecords as $m} + + {if $m.status.value == $statusTypeNumbers.Active || apply_filters('glm_members_permit_admin_member_index_list_inactive_info', true)} + {if $i++ is odd by 1} + + {else} + + {/if} + + + + + + + + + {/if} + {/foreach} + {else} + + {/if} + +
StatusReference NameCreatedLast Update
+ {$m.status.name} + {$m.reference_name}{$m.create_time.datetime}{$m.modify_time.datetime} + {if $m.bad_lat_lon}Bad Map Location{/if} + {if apply_filters('glm_members_permit_admin_member_index_clone_activate_info_version', true)} + Clone  + {if $m.status.name != 'Active'}Activate{/if} + {/if} +
Click here to start entering information for this {$terms.term_member}.
+ {/if}
-- 2.17.1