From cf89f5fceca1156f3124fde15052ac56acd22b05 Mon Sep 17 00:00:00 2001
From: phecho <phecho@phecho.com>
Date: Thu, 12 Nov 2015 00:10:08 +0800
Subject: [PATCH 1/2] Fixed dashboard icons

---
 app/Http/Controllers/Dashboard/DashboardController.php | 1 +
 resources/views/dashboard/subscribers/index.blade.php  | 2 +-
 resources/views/dashboard/team/index.blade.php         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Dashboard/DashboardController.php b/app/Http/Controllers/Dashboard/DashboardController.php
index ee841f8d..e9913236 100644
--- a/app/Http/Controllers/Dashboard/DashboardController.php
+++ b/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);
diff --git a/resources/views/dashboard/subscribers/index.blade.php b/resources/views/dashboard/subscribers/index.blade.php
index 7d036e80..b7b0fd0e 100644
--- a/resources/views/dashboard/subscribers/index.blade.php
+++ b/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') }}">
diff --git a/resources/views/dashboard/team/index.blade.php b/resources/views/dashboard/team/index.blade.php
index 960dfb4e..86a05ab0 100644
--- a/resources/views/dashboard/team/index.blade.php
+++ b/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">

From d93ecc85e392f2c2f8b5b9a3bb2a267f8c6d0c59 Mon Sep 17 00:00:00 2001
From: phecho <phecho@phecho.com>
Date: Thu, 12 Nov 2015 00:22:40 +0800
Subject: [PATCH 2/2] Adjusted the subMenu order of Settings

---
 .../Dashboard/SettingsController.php          | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/Dashboard/SettingsController.php b/app/Http/Controllers/Dashboard/SettingsController.php
index 1945275e..633c1a84 100644
--- a/app/Http/Controllers/Dashboard/SettingsController.php
+++ b/app/Http/Controllers/Dashboard/SettingsController.php
@@ -44,10 +44,16 @@ class SettingsController extends Controller
                 'icon'   => 'ion-gear-b',
                 'active' => false,
             ],
-            'analytics' => [
-                'title'  => trans('dashboard.settings.analytics.analytics'),
-                'url'    => route('dashboard.settings.analytics'),
-                'icon'   => 'ion-stats-bars',
+            'theme' => [
+                'title'  => trans('dashboard.settings.theme.theme'),
+                'url'    => route('dashboard.settings.theme'),
+                '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' => [
-                'title'  => trans('dashboard.settings.theme.theme'),
-                'url'    => route('dashboard.settings.theme'),
-                'icon'   => 'ion-paintbrush',
-                'active' => false,
-            ],
-            'stylesheet' => [
-                'title'  => trans('dashboard.settings.stylesheet.stylesheet'),
-                'url'    => route('dashboard.settings.stylesheet'),
-                'icon'   => 'ion-paintbucket',
+            'analytics' => [
+                'title'  => trans('dashboard.settings.analytics.analytics'),
+                'url'    => route('dashboard.settings.analytics'),
+                'icon'   => 'ion-stats-bars',
                 'active' => false,
             ],
             'about' => [