Merge branch 'release/3.0.1'

alfredleo · Jan 22, 2019 · 3663314 · 3663314
2 parents b2b3747 + e619bf6
commit 3663314
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 22 deletions.
diff --git a/backend/modules/system/controllers/SettingsController.php b/backend/modules/system/controllers/SettingsController.php
@@ -46,6 +46,10 @@ public function actionIndex()
                     'label' => Yii::t('backend', 'Backend sidebar collapsed'),
                     'type' => FormModel::TYPE_CHECKBOX,
                 ],
+                'backend.sidebar-mini' => [
+                    'label' => Yii::t('backend', 'Mini Backend Sidebar on Collapse'),
+                    'type' => FormModel::TYPE_CHECKBOX,
+                ],
             ],
         ]);
 

diff --git a/backend/views/layouts/base.php b/backend/views/layouts/base.php
@@ -30,6 +30,7 @@
         Yii::$app->keyStorage->get('backend.layout-fixed') ? 'fixed' : null,
         Yii::$app->keyStorage->get('backend.layout-boxed') ? 'layout-boxed' : null,
         Yii::$app->keyStorage->get('backend.layout-collapsed-sidebar') ? 'sidebar-collapse' : null,
+        Yii::$app->keyStorage->get('backend.sidebar-mini') ? 'sidebar-mini' : null,
     ])
 ])?>
     <?php $this->beginBody() ?>

diff --git a/backend/views/layouts/common.php b/backend/views/layouts/common.php
@@ -31,7 +31,7 @@
         <!-- Header Navbar: style can be found in header.less -->
         <nav class="navbar navbar-static-top" role="navigation">
             <!-- Sidebar toggle button-->
-            <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
+            <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
                 <span class="sr-only"><?php echo Yii::t('backend', 'Toggle navigation') ?></span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
@@ -121,8 +121,7 @@ class="img-circle" alt="User Image"/>
             <!-- Sidebar user panel -->
             <div class="user-panel">
                 <div class="pull-left image">
-                    <img src="<?php echo Yii::$app->user->identity->userProfile->getAvatar($this->assetManager->getAssetUrl($bundle, 'img/anonymous.jpg')) ?>"
-                         class="img-circle"/>
+                    <img src="<?php echo Yii::$app->user->identity->userProfile->getAvatar($this->assetManager->getAssetUrl($bundle, 'img/anonymous.jpg')) ?>" class="img-circle" />
                 </div>
                 <div class="pull-left info">
                     <p><?php echo Yii::t('backend', 'Hello, {username}', ['username' => Yii::$app->user->identity->getPublicIdentity()]) ?></p>
@@ -134,7 +133,7 @@ class="img-circle"/>
             </div>
             <!-- sidebar menu: : style can be found in sidebar.less -->
             <?php echo Menu::widget([
-                'options' => ['class' => 'sidebar-menu'],
+                'options' => ['class' => 'sidebar-menu tree', 'data' => ['widget' => 'tree']],
                 'linkTemplate' => '<a href="{url}">{icon}<span>{label}</span>{right-icon}{badge}</a>',
                 'submenuTemplate' => "\n<ul class=\"treeview-menu\">\n{items}\n</ul>\n",
                 'activateParents' => true,
@@ -310,7 +309,7 @@ class="img-circle"/>
     </aside>
 
     <!-- Right side column. Contains the navbar and content of the page -->
-    <aside class="content-wrapper">
+    <div class="content-wrapper">
         <!-- Content Header (Page header) -->
         <section class="content-header">
             <h1>
@@ -336,7 +335,12 @@ class="img-circle"/>
             <?php endif; ?>
             <?php echo $content ?>
         </section><!-- /.content -->
-    </aside><!-- /.right-side -->
+    </div><!-- /.right-side -->
+
+    <footer class="main-footer">
+        <strong>&copy; My Company <?php echo date('Y') ?></strong>
+        <div class="pull-right"><?php echo Yii::powered() ?></div>
+  </footer>
 </div><!-- ./wrapper -->
 
 <?php $this->endContent(); ?>
diff --git a/backend/web/js/app.js b/backend/web/js/app.js
@@ -1,13 +1,2 @@
 $(function() {
-    "use strict";
-
-    //Make the dashboard widgets sortable Using jquery UI
-    $(".connectedSortable").sortable({
-        placeholder: "sort-highlight",
-        connectWith: ".connectedSortable",
-        handle: ".box-header, .nav-tabs",
-        forcePlaceholderSize: true,
-        zIndex: 999999
-    }).disableSelection();
-    $(".connectedSortable .box-header, .connectedSortable .nav-tabs-custom").css("cursor", "move");
-})
+});
diff --git a/common/assets/AdminLte.php b/common/assets/AdminLte.php
@@ -31,15 +31,15 @@ class AdminLte extends AssetBundle
      * @var array
      */
     public $css = [
+        '//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic',
         'css/AdminLTE.min.css',
-        'css/skins/_all-skins.min.css'
+        'css/skins/_all-skins.min.css',
     ];
     /**
      * @var array
      */
     public $depends = [
         JqueryAsset::class,
-        JuiAsset::class,
         BootstrapPluginAsset::class,
         FontAwesome::class,
         JquerySlimScroll::class

diff --git a/common/config/web.php b/common/config/web.php
@@ -17,13 +17,13 @@
     $config['bootstrap'][] = 'debug';
     $config['modules']['debug'] = [
         'class' => yii\debug\Module::class,
-        'allowedIPs' => ['127.0.0.1', '::1', '192.168.33.1', '172.17.42.1', '172.17.0.1', '192.168.99.1'],
+        'allowedIPs' => ['127.0.0.1', '::1', '192.168.33.1', '172.17.42.1', '172.17.0.1', '192.168.99.1', '172.30.0.1'],
     ];
 }
 
 if (YII_ENV_DEV) {
     $config['modules']['gii'] = [
-        'allowedIPs' => ['127.0.0.1', '::1', '192.168.33.1', '172.17.42.1', '172.17.0.1', '192.168.99.1'],
+        'allowedIPs' => ['127.0.0.1', '::1', '192.168.33.1', '172.17.42.1', '172.17.0.1', '192.168.99.1', '172.30.0.1'],
     ];
 }