From f07cc0f76f03c6eeb5d6074e3949c76da4403e46 Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Tue, 27 Jun 2017 22:51:14 +0800
Subject: [PATCH] Add extra links in user-menu for admins

---
 plugins                                |  2 +-
 resources/assets/src/styles/index.scss | 15 ++++++++
 resources/views/admin/master.tpl       | 26 +-------------
 resources/views/index.tpl              | 27 +--------------
 resources/views/skinlib/master.tpl     | 27 +--------------
 resources/views/user/master.tpl        | 26 +-------------
 resources/views/vendor/user-menu.tpl   | 48 ++++++++++++++++++++++++++
 7 files changed, 68 insertions(+), 103 deletions(-)
 create mode 100644 resources/views/vendor/user-menu.tpl

diff --git a/plugins b/plugins
index b98f3662..1125d087 160000
--- a/plugins
+++ b/plugins
@@ -1 +1 @@
-Subproject commit b98f3662789cc9e28b68c700dae1cf354ef9a2a9
+Subproject commit 1125d0876374343c1e4885d670f693d98618cf6e
diff --git a/resources/assets/src/styles/index.scss b/resources/assets/src/styles/index.scss
index 55221464..a3ced8df 100644
--- a/resources/assets/src/styles/index.scss
+++ b/resources/assets/src/styles/index.scss
@@ -83,7 +83,22 @@ body {
                         color: #f6f6f6;
                     }
                 }
+            }
 
+            .user-menu li {
+                a.btn {
+                    border: 1px solid #ddd;
+                    color: #5e5e5e;
+                }
+
+                a:hover {
+                    background-color: transparent;
+                }
+
+                a.btn:hover {
+                    background-color: #e7e7e7;
+                    border-color: #adadad;
+                }
             }
 
             .navbar-custom-menu .navbar-nav > li {
diff --git a/resources/views/admin/master.tpl b/resources/views/admin/master.tpl
index 68eda708..e96356ba 100644
--- a/resources/views/admin/master.tpl
+++ b/resources/views/admin/master.tpl
@@ -40,31 +40,7 @@
                     <ul class="nav navbar-nav">
                         @include('vendor.language')
 
-                        <!-- User Account Menu -->
-                        <li class="dropdown user user-menu">
-                            <!-- Menu Toggle Button -->
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                <i class="fa fa-user"></i>
-                                <!-- hidden-xs hides the username on small devices so only the image appears. -->
-                                <span class="hidden-xs nickname">{{ bs_nickname($user) }}</span>
-                            </a>
-                            <ul class="dropdown-menu">
-                                <!-- The user image in the menu -->
-                                <li class="user-header">
-                                    <img src="{{ avatar($user, 128) }}" alt="User Image">
-                                    <p>{{ $user->email }}</p>
-                                </li>
-                                <!-- Menu Footer-->
-                                <li class="user-footer">
-                                    <div class="pull-left">
-                                        <a href="{{ url('user/profile') }}" class="btn btn-default btn-flat">{{ trans('general.profile') }}</a>
-                                    </div>
-                                    <div class="pull-right">
-                                        <button id="logout-button" class="btn btn-default btn-flat">{{ trans('general.logout') }}</button>
-                                    </div>
-                                </li>
-                            </ul>
-                        </li>
+                        @include('vendor.user-menu')
                     </ul>
                 </div>
             </nav>
diff --git a/resources/views/index.tpl b/resources/views/index.tpl
index 8b7ad75b..928b1231 100644
--- a/resources/views/index.tpl
+++ b/resources/views/index.tpl
@@ -38,32 +38,7 @@
                             @include('vendor.language')
 
                             @if (!is_null($user))
-                            <!-- User Account Menu -->
-                            <li class="dropdown user user-menu">
-                                <!-- Menu Toggle Button -->
-                                <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                    <!-- The user image in the navbar-->
-                                    <img src="{{ avatar($user, 25) }}" class="user-image" alt="User Image">
-                                    <!-- hidden-xs hides the username on small devices so only the image appears. -->
-                                    <span class="hidden-xs nickname">{{ bs_nickname($user) }}</span>
-                                </a>
-                                <ul class="dropdown-menu">
-                                    <!-- The user image in the menu -->
-                                    <li class="user-header">
-                                        <img src="{{ avatar($user, 128) }}" alt="User Image">
-                                        <p>{{ $user->email }}</p>
-                                    </li>
-                                    <!-- Menu Footer-->
-                                    <li class="user-footer">
-                                        <div class="pull-left">
-                                            <a href="{{ url('user') }}" class="btn btn-default btn-flat">{{ trans('general.user-center') }}</a>
-                                        </div>
-                                        <div class="pull-right">
-                                            <button id="logout-button" class="btn btn-default btn-flat">{{ trans('general.logout') }}</button>
-                                        </div>
-                                    </li>
-                                </ul>
-                            </li>
+                                @include('vendor.user-menu')
                             @else {{-- Anonymous User --}}
                             <!-- User Account Menu -->
                             <li class="dropdown user user-menu">
diff --git a/resources/views/skinlib/master.tpl b/resources/views/skinlib/master.tpl
index 1f8534fc..93ef6d89 100644
--- a/resources/views/skinlib/master.tpl
+++ b/resources/views/skinlib/master.tpl
@@ -80,32 +80,7 @@
                             @include('vendor.language')
 
                             @if (!is_null($user))
-                            <!-- User Account Menu -->
-                            <li class="dropdown user user-menu">
-                                <!-- Menu Toggle Button -->
-                                <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                    <!-- The user image in the navbar-->
-                                    <img src="{{ avatar($user, 25) }}" class="user-image" alt="User Image">
-                                    <!-- hidden-xs hides the username on small devices so only the image appears. -->
-                                    <span class="hidden-xs nickname">{{ bs_nickname($user) }}</span>
-                                </a>
-                                <ul class="dropdown-menu">
-                                    <!-- The user image in the menu -->
-                                    <li class="user-header">
-                                        <img src="{{ avatar($user, 128) }}" alt="User Image">
-                                        <p>{{ $user->email }}</p>
-                                    </li>
-                                    <!-- Menu Footer-->
-                                    <li class="user-footer">
-                                        <div class="pull-left">
-                                            <a href="{{ url('user') }}" class="btn btn-default btn-flat">{{ trans('general.user-center') }}</a>
-                                        </div>
-                                        <div class="pull-right">
-                                            <button id="logout-button" class="btn btn-default btn-flat">{{ trans('general.logout') }}</button>
-                                        </div>
-                                    </li>
-                                </ul>
-                            </li>
+                                @include('vendor.user-menu')
                             @else {{-- Anonymous User --}}
                             <!-- User Account Menu -->
                             <li class="dropdown user user-menu">
diff --git a/resources/views/user/master.tpl b/resources/views/user/master.tpl
index 326a34f1..fc5fe622 100644
--- a/resources/views/user/master.tpl
+++ b/resources/views/user/master.tpl
@@ -38,31 +38,7 @@
                     <ul class="nav navbar-nav">
                         @include('vendor.language')
 
-                        <!-- User Account Menu -->
-                        <li class="dropdown user user-menu">
-                            <!-- Menu Toggle Button -->
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                <i class="fa fa-user"></i>
-                                <!-- hidden-xs hides the username on small devices so only the image appears. -->
-                                <span class="hidden-xs nickname">{{ bs_nickname($user) }}</span>
-                            </a>
-                            <ul class="dropdown-menu">
-                                <!-- The user image in the menu -->
-                                <li class="user-header">
-                                    <img src="{{ avatar($user, 128) }}" alt="User Image">
-                                    <p>{{ $user->email }}</p>
-                                </li>
-                                <!-- Menu Footer-->
-                                <li class="user-footer">
-                                    <div class="pull-left">
-                                        <a href="{{ url('user/profile') }}" class="btn btn-default btn-flat">{{ trans('general.profile') }}</a>
-                                    </div>
-                                    <div class="pull-right">
-                                        <button id="logout-button" class="btn btn-default btn-flat">{{ trans('general.logout') }}</button>
-                                    </div>
-                                </li>
-                            </ul>
-                        </li>
+                        @include('vendor.user-menu')
                     </ul>
                 </div>
             </nav>
diff --git a/resources/views/vendor/user-menu.tpl b/resources/views/vendor/user-menu.tpl
new file mode 100644
index 00000000..4871f5ed
--- /dev/null
+++ b/resources/views/vendor/user-menu.tpl
@@ -0,0 +1,48 @@
+<!-- User Account Menu -->
+<li class="dropdown user user-menu">
+    <!-- Menu Toggle Button -->
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+        @if (app('request')->is('skinlib*') || app('request')->is('/'))
+        <!-- The user image in the navbar-->
+        <img src="{{ avatar($user, 25) }}" class="user-image" alt="User Image">
+        @else
+        <i class="fa fa-user"></i>
+        @endif
+
+        <!-- hidden-xs hides the username on small devices so only the image appears. -->
+        <span class="hidden-xs nickname">{{ bs_nickname($user) }}</span>
+    </a>
+    <ul class="dropdown-menu">
+        <!-- The user image in the menu -->
+        <li class="user-header">
+            <img src="{{ avatar($user, 128) }}" alt="User Image">
+            <p>{{ $user->email }}</p>
+        </li>
+        @if ($user->isAdmin())
+        <!-- Menu Body -->
+        <li class="user-body">
+            <div class="row">
+                <div class="col-xs-4 text-center">
+                    <a href="{{ url('admin') }}">管理面板</a>
+                </div>
+                <div class="col-xs-4 text-center">
+                    <a href="{{ url('admin/users') }}">用户管理</a>
+                </div>
+                <div class="col-xs-4 text-center">
+                    <a href="{{ url('admin/options') }}">站点配置</a>
+                </div>
+            </div>
+        </li>
+        <style>li.user-header { height: initial !important; }</style>
+        @endif
+        <!-- Menu Footer-->
+        <li class="user-footer">
+            <div class="pull-left">
+                <a href="{{ url('user') }}" class="btn btn-default btn-flat">{{ trans('general.user-center') }}</a>
+            </div>
+            <div class="pull-right">
+                <button id="logout-button" class="btn btn-default btn-flat">{{ trans('general.logout') }}</button>
+            </div>
+        </li>
+    </ul>
+</li>