Version 1.0.44

This commit is contained in:
ultimatemember
2015-02-08 01:49:10 +02:00
parent 89ffec21f2
commit 1df7d344e3
10 changed files with 444 additions and 322 deletions
+25 -54
View File
@@ -81,55 +81,6 @@
padding-left: 4px;
}
/*
- Nav
*/
.um-admin-dash-nav {
float: left;
width: 202px;
min-height: 300px;
display: none !important;
}
.um-admin-dash-nav a {
font-family: Open Sans;
font-size: 14px;
position: relative;
display: block;
padding: 10px 4px 10px 14px;
border-width: 1px 0px;
border-style: solid;
border-bottom: 1px solid #E7E7E7;
border-top: 0px none;
font-weight: 700;
text-decoration: none;
transition: none 0s ease 0s;
background: transparent !important;
color: #555 !important;
}
.um-admin-dash-nav-title {
padding-left: 30px;
}
.um-admin-dash-nav a:hover {
background: #ddd !important;
}
.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;
top: 8px;
}
/*
- Main
*/
@@ -139,8 +90,6 @@
border-left: 1px solid #D8D8D8;
padding: 0 30px 30px 30px;
box-shadow: 0px 1px 0px #FFF inset;
min-height: 300px;
border-left: none;
margin-left: 0;
}
@@ -151,9 +100,10 @@
margin: 0 !important;
}
.um-admin-dash-content {
display: none;
display: block;
.um-admin-dash-main h4{
font-weight: 500;
padding: 30px 0 10px 0;
margin: 0 !important;
}
.um-admin-dash-review {
@@ -187,6 +137,20 @@
- Dashboard styles
*/
.um-admin-dash-four-col .um-admin-dash-col {
float: left;
width: 25%;
text-align: center;
}
.um-admin-dash-three-col {border-bottom: 1px solid #ddd;padding-bottom: 25px}
.um-admin-dash-three-col .um-admin-dash-col {
float: left;
width: 33%;
text-align: center;
}
.um-admin-dash-two-col .um-admin-dash-col {
display: inline-block;
width: 46%;
@@ -197,6 +161,13 @@
.um-admin-dash-col a:hover {text-decoration: underline}
.um-admin-dash-col a {text-decoration: none}
.um-admin-dash-num {
display: inline-block;
margin: 8px 0 0 0;
font-size: 28px;
font-weight: 300;
}
.um-admin-dash-item {
padding: 5px 0;
vertical-align: middle;
+2 -2
View File
@@ -95,13 +95,13 @@ body.um-admin-modal-open {
.um-admin a.button-primary,
.um-admin input.button-primary {
background: #3ba1da !important;
background: #3ba1da;
box-shadow: none !important;
border-radius: 2px;
color: #fff;
}
.um-admin a.button-primary:hover,
.um-admin input.button-primary:hover {background: #44b0ec !important;}
.um-admin input.button-primary:hover {background: #44b0ec;}
/*
- Form Inputs
+24 -29
View File
@@ -232,9 +232,7 @@ class UM_Admin_Enqueue {
if ( strstr( $screen_id, 'ultimatemember') || strstr( $screen_id, 'um_') || strstr($screen_id, 'user') || strstr($screen_id, 'profile') )return true;
if ( $screen_id == 'nav-menus' ) return true;
if ( isset( $post->post_type ) ) return true;
return false;
}
@@ -252,36 +250,33 @@ class UM_Admin_Enqueue {
*** @Enqueue scripts and styles
***/
function admin_enqueue_scripts(){
global $ultimatemember;
global $ultimatemember, $post;
if ( $this->is_UM_admin() ) {
$ultimatemember->styles->wp_enqueue_scripts();
$this->load_global_css();
$this->load_form();
$this->load_modal();
$this->load_dashboard();
$this->load_field();
$this->load_users_js();
$this->load_builder();
$this->load_redux_css();
$this->load_css();
$this->load_core_wp();
$this->load_ajax_js();
$this->load_custom_scripts();
$ultimatemember->styles->wp_enqueue_scripts();
$this->load_global_css();
$this->load_form();
$this->load_modal();
$this->load_dashboard();
$this->load_field();
$this->load_users_js();
$this->load_builder();
$this->load_redux_css();
$this->load_css();
$this->load_core_wp();
$this->load_ajax_js();
$this->load_custom_scripts();
} else if ( isset( $post->post_type ) ) {
$ultimatemember->styles->wp_enqueue_scripts();
$this->load_global_css();
$this->load_css();
$this->load_custom_scripts();
}
}
+7 -21
View File
@@ -7,35 +7,21 @@
<div class="um-admin-dash-head-logo">
<h2>Dashboard</h2>
<span><?php echo ultimatemember_version; ?></span>
</div>
<div class="um-admin-clear"></div>
</div><div class="um-admin-clear"></div>
</div>
<div class="um-admin-dash-body">
<div class="um-admin-dash-nav">
<a href="#" class="active" data-rel="overview"><span class="um-admin-dash-nav-title">Dashboard Overview</span></a>
</div>
<div class="um-admin-dash-main">
<?php $tabs = array('overview'); ?>
<div class="um-admin-dash-content">
<?php foreach( $tabs as $tab ) { ?>
<div class="um-admin-dash-content" id="<?php echo $tab; ?>">
<?php include_once um_path . 'admin/templates/dashboard/'. $tab . '.php'; ?>
<?php include_once um_path . 'admin/templates/dashboard/overview.php'; ?>
</div>
<?php } ?>
</div>
<div class="um-admin-clear"></div>
</div><div class="um-admin-clear"></div>
</div>