- custom sections

- update LTE
joylazari · Oct 8, 2015 · 45eb952 · 45eb952
1 parent 3a72d23
commit 45eb952
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 50 deletions.
diff --git a/src/Adminlte.php b/src/Adminlte.php
@@ -6,7 +6,6 @@
 
 /**
  * Class Adminlte
- *
  * @author  Joy Lazari <joy.lazari@gmail.com>
  * @package GionniValeriana\laravelAdminlte
  */

diff --git a/src/AdminlteServiceProvider.php b/src/AdminlteServiceProvider.php
@@ -6,30 +6,27 @@
 
 /**
  * Class AdminlteServiceProvider
- *
  * @author  Joy Lazari <joy.lazari@gmail.com>
  * @package GionniValeriana\laravelAdminlte
  */
 class AdminlteServiceProvider extends ServiceProvider {
 
     /**
      * Register the service provider.
-     *
      * @return void
      */
     public function register() {
         $this->app->bindShared('GionniValeriana\laravelAdminlte\Adminlte', function ($app) {
             return app('\GionniValeriana\laravelAdminlte\Adminlte');
-        }
-        );
+        });
         $this->app->singleton('adminlte', 'GionniValeriana\laravelAdminlte\Adminlte');
     }
 
     public function boot() {
         $this->loadViewsFrom(__DIR__ . '/views', 'adminlte');
 
         $this->publishes([
-            base_path().'/vendor/almasaeed2010/adminlte/' => public_path('packages/GionniValeriana/adminlte/'),
+            base_path() . '/vendor/almasaeed2010/adminlte/' => public_path('packages/GionniValeriana/adminlte/'),
         ], 'assets');
     }
 

diff --git a/src/MenuItem.php b/src/MenuItem.php
@@ -7,7 +7,6 @@
 
 /**
  * Class MenuItem
- *
  * @author  Joy Lazari <joy.lazari@gmail.com>
  * @package GionniValeriana\laravelAdminlte
  */
@@ -19,8 +18,8 @@ class MenuItem {
     protected $menuItem;
 
     public function __construct(BaseMenuItem $menuItem) {
-        $this->menuItem    = $menuItem;
-        $admin             = Admin::instance();
+        $this->menuItem = $menuItem;
+        $admin = Admin::instance();
         $this->htmlBuilder = $admin->htmlBuilder;
     }
 
@@ -33,35 +32,35 @@ public function render($level = 1) {
             $content = $this->htmlBuilder->tag('i', [
                     'class' => [
                         'fa',
-                        'fa-fw',
                         $this->menuItem->getIcon()
                     ]
-                ]
-            );
-            $content .= ' ' . $this->menuItem->getLabel() . $this->htmlBuilder->tag('span', ['class' => 'fa arrow']);
+                ]);
+            $content .= ' ' . $this->htmlBuilder->tag('span', [], $this->menuItem->getLabel()) . $this->htmlBuilder->tag('i', ['class' => 'fa fa-angle-left pull-right']);
             $content = $this->htmlBuilder->tag('a', ['href' => '#'], $content);
 
             $subitemsContent = '';
             foreach ($this->menuItem->getItems() as $item) {
                 $subitemsContent .= $item->render($level);
             }
             $content .= $this->htmlBuilder->tag('ul', ['class' => 'treeview-menu'], $subitemsContent);
-        } else {
+
+            $attr = ['class' => ['treeview']];
+        }
+        else {
+            $attr = [];
             $content = $this->renderSingleItem();
         }
-        return $this->htmlBuilder->tag('li', [], $content);
+        return $this->htmlBuilder->tag('li', $attr, $content);
     }
 
     protected function renderSingleItem() {
         $content = $this->htmlBuilder->tag('i', [
                 'class' => [
                     'fa',
-                    'fa-fw',
                     $this->menuItem->getIcon()
                 ]
-            ]
-        );
-        $content .= ' ' . $this->menuItem->getLabel();
+            ]);
+        $content .= ' ' . $this->htmlBuilder->tag('span', [], $this->menuItem->getLabel());
         return $this->htmlBuilder->tag('a', ['href' => $this->menuItem->getUrl()], $content);
     }
 

diff --git a/src/views/_layout/base.blade.php b/src/views/_layout/base.blade.php
@@ -25,7 +25,7 @@
     <![endif]-->
 
   </head>
-  <body class="skin-red fixed">
+  <body class="{{ $adminBody or 'skin-red' }}">
     @yield('content')
 
   @foreach (\SleepingOwl\Admin\AssetManager\AssetManager::scripts() as $script)

diff --git a/src/views/_layout/inner.blade.php b/src/views/_layout/inner.blade.php
@@ -3,7 +3,10 @@
 @section('content')
 	<div class="wrapper">
         <header class="main-header">
-            <a class="navbar-brand logo" href="{{ Admin::instance()->router->routeHome() }}">{{{ $adminTitle }}}</a>
+            <a class="navbar-brand logo" href="{{ Admin::instance()->router->routeHome() }}">
+              <span class="logo-lg">{!! $adminTitleLg or $adminTitle !!}</span>
+              <span class="logo-mini">{!! $adminTitleMini or preg_replace('~[^A-Z]~', '', $adminTitle) !!}</span>
+            </a>
             <nav class="navbar navbar-static-top" role="navigation">
                 <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
                     <span class="sr-only">Toggle navigation</span>

diff --git a/src/views/_partials/aside.blade.php b/src/views/_partials/aside.blade.php
@@ -1,35 +1,35 @@
 <aside class="main-sidebar">
-    <!-- sidebar: style can be found in sidebar.less -->
-    <section class="sidebar">
-        <!-- Sidebar user panel -->
-        <div class="user-panel">
-            <div class="pull-left image">
-                <img src="/img/photo.jpg" class="img-circle" alt="User Image"/>
-            </div>
-            <div class="pull-left info">
-                <p>{{ $user->name ?: 'admin' }}</p>
+  <!-- sidebar: style can be found in sidebar.less -->
+  <section class="sidebar">
+    <!-- Sidebar user panel -->
+    <div class="user-panel">
+      <div class="pull-left image">
+        <img src="/img/photo.jpg" class="img-circle" alt="User Image"/>
+      </div>
+      <div class="pull-left info">
+        <p>{{ $user->name ?: 'admin' }}</p>
 
-                <a href="#"><i class="fa fa-circle text-success"></i> Online</a>
-            </div>
-        </div>
-        <!-- search form -->
-        <form action="#" method="get" class="sidebar-form">
-            <div class="input-group">
-                <input type="text" name="q" class="form-control" placeholder="Search..."/>
+        <a href="#"><i class="fa fa-circle text-success"></i> Online</a>
+      </div>
+    </div>
+    <!-- search form -->
+    <form action="#" method="get" class="sidebar-form">
+      <div class="input-group">
+        <input type="text" name="q" class="form-control" placeholder="{{ $search_placeholder or 'Search...' }}" {{ $search_custom or null }}>
               <span class="input-group-btn">
-                <button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i>
+                <button type="submit" name="search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i>
                 </button>
               </span>
-            </div>
-        </form>
-        <!-- /.search form -->
-        <!-- sidebar menu: : style can be found in sidebar.less -->
-        <ul class="sidebar-menu">
-            <li class="header">MENU</li>
-            @foreach ($menu as $item)
-                {!! Adminlte::render($item) !!}
-            @endforeach
-        </ul>
-    </section>
-    <!-- /.sidebar -->
+      </div>
+    </form>
+    <!-- /.search form -->
+    <!-- sidebar menu: : style can be found in sidebar.less -->
+    <ul class="sidebar-menu">
+      <li class="header">MENU</li>
+      @foreach ($menu as $item)
+        {!! Adminlte::render($item) !!}
+      @endforeach
+    </ul>
+  </section>
+  <!-- /.sidebar -->
 </aside>