Merge pull request #1129 from phecho/master

Fixed dashboard icons

app/Http/Controllers/Dashboard/DashboardController.php

@@ -58,6 +58,7 @@ class DashboardController extends Controller
         $subscribers = $this->getSubscribers();
 
         return View::make('dashboard.index')
+            ->withPageTitle(trans('dashboard.dashboard'))
             ->withComponents($components)
             ->withIncidents($incidents)
             ->withSubscribers($subscribers);

app/Http/Controllers/Dashboard/SettingsController.php

@@ -44,10 +44,16 @@ class SettingsController extends Controller
                 'icon'   => 'ion-gear-b',
                 'active' => false,
             ],
-            'analytics' => [
+            'theme' => [
-                'title'  => trans('dashboard.settings.analytics.analytics'),
+                'title'  => trans('dashboard.settings.theme.theme'),
-                'url'    => route('dashboard.settings.analytics'),
+                'url'    => route('dashboard.settings.theme'),
-                'icon'   => 'ion-stats-bars',
+                'icon'   => 'ion-paintbrush',
+                'active' => false,
+            ],
+            'stylesheet' => [
+                'title'  => trans('dashboard.settings.stylesheet.stylesheet'),
+                'url'    => route('dashboard.settings.stylesheet'),
+                'icon'   => 'ion-paintbucket',
                 'active' => false,
             ],
             'localization' => [
@@ -62,16 +68,10 @@ class SettingsController extends Controller
                 'icon'   => 'ion-lock-combination',
                 'active' => false,
             ],
-            'theme' => [
+            'analytics' => [
-                'title'  => trans('dashboard.settings.theme.theme'),
+                'title'  => trans('dashboard.settings.analytics.analytics'),
-                'url'    => route('dashboard.settings.theme'),
+                'url'    => route('dashboard.settings.analytics'),
-                'icon'   => 'ion-paintbrush',
+                'icon'   => 'ion-stats-bars',
-                'active' => false,
-            ],
-            'stylesheet' => [
-                'title'  => trans('dashboard.settings.stylesheet.stylesheet'),
-                'url'    => route('dashboard.settings.stylesheet'),
-                'icon'   => 'ion-paintbucket',
                 'active' => false,
             ],
             'about' => [

resources/views/dashboard/subscribers/index.blade.php

@@ -6,7 +6,7 @@
             <i class="icon ion-navicon"></i>
         </div>
         <span class="uppercase">
-            <i class="icon icon ion-android-alert"></i> {{ trans('dashboard.subscribers.subscribers') }}
+            <i class="icon icon ion-email"></i> {{ trans('dashboard.subscribers.subscribers') }}
         </span>
         @if($current_user->isAdmin)
         <a class="btn btn-sm btn-success pull-right" href="{{ route('dashboard.subscribers.add') }}">

resources/views/dashboard/team/index.blade.php

@@ -6,7 +6,7 @@
             <i class="icon ion-navicon"></i>
         </div>
         <span class="uppercase">
-            <i class="icon icon ion-android-alert"></i> {{ trans('dashboard.team.team') }}
+            <i class="icon ion-ios-people"></i> {{ trans('dashboard.team.team') }}
         </span>
         @if($current_user->isAdmin)
         <div class="button-group pull-right">