Merge remote-tracking branch 'origin/master'

Eugeny Galkovskiy
2 parents 8bdabac2 c2b847bb
Showing 2 changed files with 12 additions and 12 deletions Show diff stats
backend/controllers/SiteController.php
backend/views/layouts/menu_items.php
 <?php
     namespace backend\controllers;
-    
+
+    use artbox\core\models\LoginForm;
     use common\models\Settings;
     use Yii;
     use yii\web\Controller;
     use yii\filters\VerbFilter;
     use yii\filters\AccessControl;
-    use common\models\LoginForm;
-    
+
     /**
      * Site controller
      */
@@ -49,7 +49,7 @@
                 ],
             ];
         }
-        
+    
         /**
          * @inheritdoc
          */
@@ -61,7 +61,7 @@
                 ],
             ];
         }
-        
+    
         /**
          * Displays homepage.
          *
@@ -70,14 +70,14 @@
         public function actionIndex()
         {
             $settings = Settings::getInstance();
-            
+        
             if (empty( $settings->analytics_key )) {
                 return $this->render('instruction');
             } else {
                 return $this->render('index');
             }
         }
-        
+    
         /**
          * Login action.
          *
@@ -88,7 +88,7 @@
             if (!Yii::$app->user->isGuest) {
                 return $this->goHome();
             }
-            
+        
             $model = new LoginForm();
             if ($model->load(Yii::$app->request->post()) && $model->login()) {
                 return $this->goBack();
@@ -101,7 +101,7 @@
                 );
             }
         }
-        
+    
         /**
          * Logout action.
          *
@@ -110,7 +110,7 @@
         public function actionLogout()
         {
             Yii::$app->user->logout();
-            
+        
             return $this->goHome();
         }
     }
@@ -139,12 +139,12 @@
                     [
                         'label' => \Yii::t('catalog', 'Categories'),
                         'url'   => [ 'blog-category/index' ],
-                        'icon'  => 'file-text',
+                        'icon'  => 'book',
                     ],
                     [
                         'label' => \Yii::t('catalog', 'Tags'),
                         'url'   => [ 'blog-tag/index' ],
-                        'icon'  => 'file-text',
+                        'icon'  => 'tag',
                     ],
                 ],
             ],