10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-13 11:46:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

Started work on dashboard

Browse Source
This commit is contained in:
ultimatemember
2014-12-31 00:20:26 +02:00
parent 6532493931
commit 0d42da554e
5 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/assets/css/um-admin-dashboard.css
+32 -26
View File
@@ -4,13 +4,8 @@
.um-admin-dash-container {
box-sizing: border-box;
border-radius: 3px;
margin: 18px 20px 20px 2px !important;
background-color: #F5F5F5;
background-repeat: repeat-x;
background-image: -moz-linear-gradient(center top , #F2F2F2 0px, #F5F5F5 100%);
border: 1px solid #DEDEDE;
box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.04);
background: none !important;
overflow: hidden;
}
@@ -21,9 +16,7 @@
.um-admin-dash-head {
background: #3ba1da;
border-radius: 3px 3px 0 0;
padding: 0 0 0 20px;
border-bottom: 3px solid #3ba1da;
}
.um-admin-dash-nav {
@@ -38,7 +31,6 @@
}
.um-admin-dash-main {
background: none repeat scroll 0% 0% #FCFCFC;
margin-left: 201px;
border-left: 1px solid #D8D8D8;
padding: 10px 20px;
@@ -46,11 +38,10 @@
}
.um-admin-dash-foot {
background: none repeat scroll 0% 0% #EEE;
height: 60px;
border-radius: 0 0 3px 3px;
border-top: 1px solid #E7E7E7;
z-index: 9999;
border-radius: 0;
background: none !important;
padding: 10px 0;
border-top: 1px solid #D8D8D8;
}
/*
@@ -91,20 +82,19 @@
.um-admin-dash-nav a {
font-family: Open Sans;
font-size: 13px;
font-size: 14px;
position: relative;
display: block;
padding: 10px 4px 10px 14px;
background: none repeat scroll 0px 0px transparent;
border-width: 1px 0px;
border-style: solid;
border-bottom: 1px solid #E7E7E7;
border-top: 0px none;
opacity: 0.7;
color: #555;
font-weight: 700;
text-decoration: none;
transition: none 0s ease 0s;
background: transparent !important;
color: #555 !important;
}
.um-admin-dash-nav-title {
@@ -112,16 +102,19 @@
}
.um-admin-dash-nav a:hover {
color: #777;
opacity: 1;
background: none repeat scroll 0px 0px #e5e5e5;
background: #ddd !important;
}
.um-admin-dash-nav a i{
.um-admin-dash-nav a.active,
.um-admin-dash-nav a.active:hover {
color: #3ba1da !important;
background: transparent !important;
}
.um-admin-dash-nav a i {
vertical-align: middle;
font-size: 1.35em;
position: absolute;
color: #555;
}
/*
@@ -148,9 +141,22 @@
*/
.um-admin-dash-main h3{
color: #888;
font-weight: 500;
border-bottom: 1px solid #eee;
padding: 0 0 10px 0;
margin-bottom: 0 !important;
}
}
.um-admin-dash-share {
margin-top: 11px !important;
float: left;
line-height: 28px;
font-size: 15px;
}
.um-admin-dash-share a {
margin: 0 15px 0 0 !important;
text-decoration: none !important;
color: #777 !important;
font-size: 22px !important;
}
.um-admin-dash-share a:hover {color: #3ba1da !important}
admin/core/lib/ReduxFramework/ReduxCore/framework.php
+1 -1
View File
@@ -3721,7 +3721,7 @@
unset( $link['link'] );
}
echo '<a href="' . $link['url'] . '" title="' . $link['title'] . '" target="_blank">';
echo '<a href="' . $link['url'] . '" title="' . $link['title'] . '" target="_blank" class="um-admin-tipsy-n">';
if ( isset( $link['icon'] ) && ! empty( $link['icon'] ) ) {
echo '<i class="' . $link['icon'] . '"></i>';
admin/templates/about.php
+1 -1
View File
@@ -76,7 +76,7 @@
<div class="alignright">
<?php global $reduxConfig; foreach ( $reduxConfig->args['share_icons'] as $k => $arr ) { ?><a href="<?php echo $arr['url']; ?>" class="um-about-icon um-admin-tipsy-n" title="<?php echo $arr['title']; ?>"><i class="<?php echo $arr['icon']; ?>"></i></a><?php } ?>
<?php global $reduxConfig; foreach ( $reduxConfig->args['share_icons'] as $k => $arr ) { ?><a href="<?php echo $arr['url']; ?>" class="um-about-icon um-admin-tipsy-n" title="<?php echo $arr['title']; ?>" target="_blank"><i class="<?php echo $arr['icon']; ?>"></i></a><?php } ?>
</div>
admin/templates/dashboard.php
+6 -7
View File
@@ -21,12 +21,7 @@ global $ultimatemember;
<div class="um-admin-dash-nav">
<a href="#"><i class="um-icon-dashboard"></i><span class="um-admin-dash-nav-title">Dashboard Overview</span></a>
<a href="#"><i class="um-icon-analytics-chart-graph"></i><span class="um-admin-dash-nav-title">Analytics</span></a>
<a href="#"><i class="um-icon-user-6"></i><span class="um-admin-dash-nav-title">New Users</span><span class="um-admin-dash-count">12</span></a>
<a href="#"><i class="um-icon-files-2"></i><span class="um-admin-dash-nav-title">User Reports</span><span class="um-admin-dash-count red">4</span></a>
<a href="#"><i class="um-icon-denied-block"></i><span class="um-admin-dash-nav-title">Quick Delete/Ban</span></a>
<a href="#"><i class="um-icon-download-4"></i><span class="um-admin-dash-nav-title">Updates Available</span><span class="um-admin-dash-count">1</span></a>
<a href="#" class="active"><i class="um-icon-home-3"></i><span class="um-admin-dash-nav-title">Dashboard Overview</span></a>
</div>
@@ -42,7 +37,11 @@ global $ultimatemember;
</div>
<div class="um-admin-dash-foot">
<div class="um-admin-dash-share">
<?php global $reduxConfig; foreach ( $reduxConfig->args['share_icons'] as $k => $arr ) { ?><a href="<?php echo $arr['url']; ?>" class="um-about-icon um-admin-tipsy-n" title="<?php echo $arr['title']; ?>" target="_blank"><i class="<?php echo $arr['icon']; ?>"></i></a><?php } ?>
</div><div class="clear"></div>
</div>
</div>
core/um-chart.php
+7 -7
View File
@@ -19,9 +19,9 @@ class UM_Chart {
'y_label' => null,
'vertical_max_lines' => 6,
'colors' => '#3ba1da',
'backgroundcolor' => '#fcfcfc',
'basetextcolor' => '#999',
'basebordercolor' => '#eee',
'backgroundcolor' => 'transparent',
'basetextcolor' => '#666',
'basebordercolor' => '#bbb',
'days' => 30
);
@@ -103,12 +103,12 @@ class UM_Chart {
baselineColor: '<?php echo $basebordercolor; ?>',
gridlineColor: '<?php echo $basebordercolor; ?>',
gridlines: {color: 'transparent', count: vgrid_count},
textStyle: {color: '<?php echo $basetextcolor; ?>', fontSize: 11 },
textStyle: {color: '<?php echo $basetextcolor; ?>', fontSize: 12 },
format: '#',
viewWindow: {min: min_data, max: max_data + 10}
},
hAxis:{
textStyle: {color: '<?php echo $basetextcolor; ?>', fontSize: 11, italic: true },
textStyle: {color: '<?php echo $basetextcolor; ?>', fontSize: 12, italic: true },
showTextEvery: hgrid_count,
maxAlternation: 1,
maxTextLines: 1
@@ -119,13 +119,13 @@ class UM_Chart {
textStyle: {color: '<?php echo $basetextcolor; ?>', fontSize: 13}
},
tooltip: {
textStyle: {color: '<?php echo $basetextcolor; ?>', fontSize: 11}
textStyle: {color: '<?php echo $basetextcolor; ?>', fontSize: 12}
},
chartArea: {
top:50,left:30,width: '95%', 'height' : ( vgrid_count * 50 ) - 100,
backgroundColor: {
stroke: '<?php echo $basebordercolor; ?>',
strokeWidth: 2
strokeWidth: 1
}
},
width: '100%',