Устранен баг после восстановления #1

Yarik
1 parent b6558af1
Showing 4 changed files with 5 additions and 8 deletions Show diff stats
backend/views/layouts/left.php
common/modules/blog/controllers/DefaultController.php
common/translation/ru/app.php
frontend/models/Option.php
@@ -30,7 +30,7 @@
             [
                 'options' => ['class' => 'sidebar-menu'],
                 'items' => [
-                    ['label' => 'Страница', 'icon' => 'fa fa-file-code-o', 'url' => ['/page/']], 
+                    ['label' => Yii::t('app', 'Pages'), 'icon' => 'fa fa-file-code-o', 'url' => ['/page/']],
                     ['label' => 'Каталог', 'icon' => 'fa fa-file-code-o', 'url' => ['/catalog/']],
                     ['label' => 'Меню', 'icon' => 'fa fa-file-code-o', 'url' => ['/menu/']],
         			['label' => 'Заявки', 'icon' => 'fa fa-file-code-o', 'url' => ['/site/requests/']],
@@ -7,6 +7,6 @@ class DefaultController extends Controller
 {
 	public function actionIndex()
 	{
-		echo "hello";
+		return $this->render('index');
 	}
 }
@@ -22,5 +22,6 @@ return [
     'name' => 'Название',
     'one_name' => 'Имя',
     'message' => 'Сообщение',
-    'Feedback' => 'Обратная связь'
+    'Feedback' => 'Обратная связь',
+    'Pages' => 'Страницы',
 ];
 \ No newline at end of file
@@ -126,13 +126,9 @@ class Option extends \yii\db\ActiveRecord
             'success' => false
         );
     }
-    
-<<<<<<< 1fd2bdb43fc5cfdcf100cac8b72e67fd81e7f0fa
-    public static function create($post, $modeldb, $model_id, $fields) {
-=======
+
     public static function create($post, $modeldb, $model_id, $fields, $multiple) {
     	$multiple = boolval($multiple);
->>>>>>> 0e0edb85a79343e4d020ff05378179e2323b21bd
         $model = new Option();
         $modellang = new OptionLang();
         if(!empty($post['Option'])) {