wait #4050 @0.25

diff --git a/public/packages/fluidbook/toolbox/css/style.less b/public/packages/fluidbook/toolbox/css/style.less
index a350352599e8e6f06487aa79a868a94870055f5a..fe5df37d59068c38a1362a988b44392dcb8b0a0f 100644 (file)
--- a/public/packages/fluidbook/toolbox/css/style.less
+++ b/public/packages/fluidbook/toolbox/css/style.less
@@ -230,6 +230,10 @@ a, a.btn-link {
 
 }
 
+.pace .pace-progress{
+    background: @sidebar-active;
+}
+
 .table-striped tbody tr:nth-of-type(2n) {
     background-color: transparent;
 }

diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
index 1277000ade9ba769e7ec8b2cb495ac7898cb6b84..fabec1f53218e7d20478e8f20dcf68cd496aa981 100644 (file)
--- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
+++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
@@ -1,6 +1,6 @@
 <!-- This file is used to store sidebar items, starting with Backpack\Base 0.9.0 -->
 <li class="nav-item"><a class="nav-link" href="{{ backpack_url('dashboard') }}"><i
-        class='nav-icon la la-dashboard'></i>{{ trans('backpack::base.dashboard') }}
+            class='nav-icon la la-dashboard'></i>{{ trans('backpack::base.dashboard') }}
     </a></li>
 
 @canany(['toolbox:quiz','toolbox:quiz:translate'])
@@ -20,13 +20,13 @@
 @endcanany
 
 @can('fluidbook:admin')
-<li class='nav-item nav-dropdown open'><a class='nav-link nav-dropdown-toggle' href='#'><i
-            class="nav-icon la"><img src="/images/icons/icon-fluidbook.svg"/></i>Fluidbook</a>
-    <ul class='nav-dropdown-items'>
-        <li class="nav-item"><a class="nav-link" href="{{ backpack_url('signature') }}"><i
-                    class="la la-signature nav-icon"></i> Signatures</a></li>
-    </ul>
-</li>
+    <li class='nav-item nav-dropdown open'><a class='nav-link nav-dropdown-toggle' href='#'><i
+                class="nav-icon la"><img src="/images/icons/icon-fluidbook.svg"/></i>Fluidbook</a>
+        <ul class='nav-dropdown-items'>
+            <li class="nav-item"><a class="nav-link" href="{{ backpack_url('signature') }}"><i
+                        class="la la-signature nav-icon"></i> Signatures</a></li>
+        </ul>
+    </li>
 @endcan
 
 
@@ -43,7 +43,29 @@
         </ul>
     </li>
 @endcan
-@can('toolbox:manageusers')
-    <li class="nav-item"><a class="nav-link" target="extranet" href="https://dev.extranet.cubedesigners.com/users"><i
-                class="la la-lock nav-icon"></i>Authentication</a></li>
+
+@can('manageusers')
+    <li class='nav-item nav-dropdown'><a class='nav-link nav-dropdown-toggle' href='#'><i
+                class='nav-icon la la-group'></i>Clients</a>
+        <ul class='nav-dropdown-items'>
+            <li class='nav-item'><a class='nav-link' href='{{ backpack_url('users') }}'><i
+                        class='nav-icon la la-user'></i><span>Users</span></a></li>
+            <li class='nav-item'><a class='nav-link' href='{{ backpack_url('company') }}'><i
+                        class='nav-icon la la-building'></i>
+                    <span>Companies</span></a></li>
+        </ul>
+    </li>
 @endcan
+@can('managerolesandpersmissions')
+    <li class='nav-item nav-dropdown'><a class='nav-link nav-dropdown-toggle' href='#'><i
+                class='nav-icon la la-lock'></i>Authentication</a>
+        <ul class='nav-dropdown-items'>
+            <li class='nav-item'><a class='nav-link' href='{{ backpack_url('role') }}'><i
+                        class='nav-icon la la-group'></i>
+                    <span>Roles</span></a></li>
+            <li class='nav-item'><a class='nav-link' href='{{ backpack_url('permission') }}'><i
+                        class='nav-icon la la-key'></i><span>Permissions</span></a></li>
+        </ul>
+    </li>
+@endcan
+

diff --git a/resources/views/vendor/backpack/crud/buttons/user/loginas.blade.php b/resources/views/vendor/backpack/crud/buttons/user/loginas.blade.php
new file mode 100644 (file)
index 0000000..77d6ee4
--- /dev/null
+++ b/resources/views/vendor/backpack/crud/buttons/user/loginas.blade.php
@@ -0,0 +1,2 @@
+<a class="btn btn-sm btn-link" href="{{$crud->route}}/{{$entry->getKey()}}/loginas" data-toggle="tooltip"
+   title="Login as"><i class="la la-key"></i> Login as</a>