diff --git a/e107_handlers/user_model.php b/e107_handlers/user_model.php index e7927a70a..e592747e7 100644 --- a/e107_handlers/user_model.php +++ b/e107_handlers/user_model.php @@ -391,6 +391,7 @@ class e_user_model extends e_admin_model 'Orbiter', 'PageBites', 'Peew', + 'petalbot', 'polybot', 'Pompos', 'PostPost', diff --git a/e107_plugins/user/e_dashboard.php b/e107_plugins/user/e_dashboard.php index 630b6cbba..e6cf88e51 100644 --- a/e107_plugins/user/e_dashboard.php +++ b/e107_plugins/user/e_dashboard.php @@ -24,10 +24,10 @@ class user_dashboard // plugin-folder + '_url' $tp = e107::getParser(); $config[] = array( - 0 => array( 'text' => $this->renderChart(), 'caption' => $tp->toGlyph('fa-signal').' '.LAN_STATS), + // 0 => array( 'text' => $this->renderChart(), 'caption' => $tp->toGlyph('fa-signal').' '.LAN_STATS), 1 => array('caption' =>$tp->toGlyph('fa-user').' '.LAN_ONLINE.' ('.$this->renderOnlineUsers('count').')', 'text'=>$this->renderOnlineUsers()), - 2 => array( 'text' => $this->registered('user_new_thismonth'), 'caption' => $this->title), + 2 => array( 'text' => $this->registered('newUsersThisMonth'), 'caption' => $this->title), ); return $config; @@ -42,7 +42,7 @@ class user_dashboard // plugin-folder + '_url' } else { - return $this->renderStats('demo'); + // return $this->renderStats('demo'); } } @@ -350,7 +350,7 @@ class user_dashboard // plugin-folder + '_url' // print_a($data); $options = array( - 'chartArea' =>array('left'=>'60', 'width'=>'90%', 'top'=>'25'), + 'chartArea' =>array('left'=>'60', 'width'=>'100%', 'top'=>'25'), 'legend' => array('position'=> 'none', 'alignment'=>'center', 'textStyle' => array('fontSize' => 14, 'color' => '#ccc')), 'vAxis' => array('title'=> UC_LAN_9, 'minValue'=>0, 'maxValue'=>10, 'titleFontSize'=>16, 'titleTextStyle'=>array('color' => '#ccc'), 'gridlines'=>array('color'=>'#696969', 'count'=>5), 'format'=>'', 'textStyle'=>array('color' => '#ccc') ), 'hAxis' => array('title'=>date('M Y', $month_start), 'slantedText'=>true, 'slantedTextAngle'=>60, 'ticks'=>$ticks, 'titleFontSize'=>14, 'titleTextStyle'=>array('color' => '#ccc'), 'gridlines' => array('color'=>'transparent'), 'textStyle'=>array('color' => '#ccc') ), @@ -480,7 +480,7 @@ class user_dashboard // plugin-folder + '_url' if($row['user_bot'] === true) { - return ""; + return ""; } foreach($types as $icon=>$b) diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css index 12020526e..2ca6ccfd0 100644 --- a/e107_themes/bootstrap3/admin_style.css +++ b/e107_themes/bootstrap3/admin_style.css @@ -1081,7 +1081,7 @@ i.e-welcome-32{ background-position: -814px -37px; width: 32px; height: 32px; } i.browsers { background: url(images/browsers.png) no-repeat top left; display:inline-block; - *margin-right: .3em; + margin-right: .3em; line-height: 14px; vertical-align: text-top;