Merge branch 'master' of http://github.com/jeroennoten/Laravel-AdminLTE

jeroennoten · Apr 19, 2016 · ab19fbf · ab19fbf
2 parents 4d7eca2 + f65941d
commit ab19fbf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git 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
@@ -3,9 +3,11 @@
 @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>
+            @elseif (isset($item['submenu']))
                 <i class="fa fa-angle-left pull-right"></i>
             @endif
         </a>