From e146d670cbee34cf061c13af4677b020efdd7fae Mon Sep 17 00:00:00 2001
From: Clifford James van den Bos <clifford.james@me.com>
Date: Sat, 2 Apr 2016 20:15:37 +0200
Subject: [PATCH 1/3] Add icon colors and labels

---
 config/adminlte.php                          | 17 ++++++++++++++++-
 resources/views/partials/menu-item.blade.php |  7 +++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/config/adminlte.php b/config/adminlte.php
index 1c63f8e4..186e0b38 100644
--- a/config/adminlte.php
+++ b/config/adminlte.php
@@ -82,7 +82,9 @@
         [
             'text' => 'Pages',
             'url' => 'admin/pages',
-            'icon' => 'file'
+            'icon' => 'file',
+            'label' => 4,
+            'label-color' => 'success',
         ],
         'ACCOUNT SETTINGS',
         [
@@ -133,6 +135,19 @@
                 ],
             ],
         ],
+        'LABELS',
+        [
+            'text' => 'Important',
+            'icon-color' => 'red',
+        ],
+        [
+            'text' => 'Warning',
+            'icon-color' => 'yellow',
+        ],
+        [
+            'text' => 'Information',
+            'icon-color' => 'aqua',
+        ],
     ],
 
 ];
diff --git a/resources/views/partials/menu-item.blade.php b/resources/views/partials/menu-item.blade.php
index 2e77d438..5d2a4b1b 100644
--- a/resources/views/partials/menu-item.blade.php
+++ b/resources/views/partials/menu-item.blade.php
@@ -3,9 +3,12 @@
 @else
     <li {{ isset($item['submenu']) ? 'class="treeview"' : '' }}>
         <a href="{{ isset($item['url']) ? url($item['url']) : '#' }}">
-            <i class="fa fa-fw fa-{{ $item['icon'] or 'circle-o' }}"></i>
+            <i class="fa fa-fw fa-{{ $item['icon'] or 'circle-o' }} {{ isset($item['icon-color']) ? 'text-' . $item['icon-color'] : '' }}"></i>
             <span>{{ $item['text'] }}</span>
-            @if (isset($item['submenu']))
+            @if (isset($item['label']))
+                <span class="label label-{{ $item['label-color'] or 'primary' }} pull-right">{{ $item['label'] }}</span>
+            @endif
+            @if (isset($item['submenu']) && !isset($item['label']))
                 <i class="fa fa-angle-left pull-right"></i>
             @endif
         </a>

From eb638c5c232f61e4fd06c52bfa3962866f0dbced Mon Sep 17 00:00:00 2001
From: Clifford James van den Bos <clifford.james@me.com>
Date: Mon, 4 Apr 2016 20:25:15 +0200
Subject: [PATCH 2/3] Change dashes to underscores in config

---
 config/adminlte.php                          | 8 ++++----
 resources/views/partials/menu-item.blade.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/adminlte.php b/config/adminlte.php
index 186e0b38..286145b7 100644
--- a/config/adminlte.php
+++ b/config/adminlte.php
@@ -84,7 +84,7 @@
             'url' => 'admin/pages',
             'icon' => 'file',
             'label' => 4,
-            'label-color' => 'success',
+            'label_color' => 'success',
         ],
         'ACCOUNT SETTINGS',
         [
@@ -138,15 +138,15 @@
         'LABELS',
         [
             'text' => 'Important',
-            'icon-color' => 'red',
+            'icon_color' => 'red',
         ],
         [
             'text' => 'Warning',
-            'icon-color' => 'yellow',
+            'icon_color' => 'yellow',
         ],
         [
             'text' => 'Information',
-            'icon-color' => 'aqua',
+            'icon_color' => 'aqua',
         ],
     ],
 
diff --git a/resources/views/partials/menu-item.blade.php b/resources/views/partials/menu-item.blade.php
index 5d2a4b1b..27cec538 100644
--- a/resources/views/partials/menu-item.blade.php
+++ b/resources/views/partials/menu-item.blade.php
@@ -3,10 +3,10 @@
 @else
     <li {{ isset($item['submenu']) ? 'class="treeview"' : '' }}>
         <a href="{{ isset($item['url']) ? url($item['url']) : '#' }}">
-            <i class="fa fa-fw fa-{{ $item['icon'] or 'circle-o' }} {{ isset($item['icon-color']) ? 'text-' . $item['icon-color'] : '' }}"></i>
+            <i class="fa fa-fw fa-{{ $item['icon'] or 'circle-o' }} {{ isset($item['icon_color']) ? 'text-' . $item['icon_color'] : '' }}"></i>
             <span>{{ $item['text'] }}</span>
             @if (isset($item['label']))
-                <span class="label label-{{ $item['label-color'] or 'primary' }} pull-right">{{ $item['label'] }}</span>
+                <span class="label label-{{ $item['label_color'] or 'primary' }} pull-right">{{ $item['label'] }}</span>
             @endif
             @if (isset($item['submenu']) && !isset($item['label']))
                 <i class="fa fa-angle-left pull-right"></i>

From 07aced1a932413ee26c967a643fb37cb05b24823 Mon Sep 17 00:00:00 2001
From: Clifford James van den Bos <clifford.james@me.com>
Date: Mon, 4 Apr 2016 20:35:36 +0200
Subject: [PATCH 3/3] Clean up if statement in menu item partial view

---
 resources/views/partials/menu-item.blade.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/views/partials/menu-item.blade.php b/resources/views/partials/menu-item.blade.php
index 27cec538..c61d30e7 100644
--- a/resources/views/partials/menu-item.blade.php
+++ b/resources/views/partials/menu-item.blade.php
@@ -7,8 +7,7 @@
             <span>{{ $item['text'] }}</span>
             @if (isset($item['label']))
                 <span class="label label-{{ $item['label_color'] or 'primary' }} pull-right">{{ $item['label'] }}</span>
-            @endif
-            @if (isset($item['submenu']) && !isset($item['label']))
+            @elseif (isset($item['submenu']))
                 <i class="fa fa-angle-left pull-right"></i>
             @endif
         </a>