Merge remote-tracking branch 'origin/master'

OlenaKl
2 parents f0e0b86f e9398092
Showing 8 changed files with 96 additions and 27 deletions Show diff stats
backend/components/base/BaseController.php
backend/views/page/view.php
backend/views/team/_form.php
frontend/config/main.php
frontend/controllers/PageController.php
frontend/views/layouts/main.php
frontend/views/page/show.php
frontend/views/page/view.php
@@ -85,19 +85,19 @@ class BaseController extends Controller {
         if(!empty($old_img) && file_exists($_SERVER['DOCUMENT_ROOT'].$old_img)){
-            $rootDir = explode("/", $old_img);
-
-            $row = $_SERVER['DOCUMENT_ROOT'].'/'.$rootDir[1].'/'.$rootDir[2].'/';
-
-            $allFiles = scandir($row);
-
-            $allFiles = array_slice($allFiles, 2);
-
-            foreach($allFiles as $oldFile){
-
-                unlink($row.$oldFile);
-
-            }
+//            $rootDir = explode("/", $old_img);
+//
+//            $row = $_SERVER['DOCUMENT_ROOT'].'/'.$rootDir[1].'/'.$rootDir[2].'/';
+//
+//            $allFiles = scandir($row);
+//
+//            $allFiles = array_slice($allFiles, 2);
+//
+//            foreach($allFiles as $oldFile){
+//
+//                unlink($row.$oldFile);
+//
+//            }
         }
     }
@@ -31,7 +31,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'id',
             'name',
             'code',
-            'content:ntext',
+            'content:html',
             'sort',
             'title',
             'kwords',
@@ -19,7 +19,16 @@ use \common\models\TeamGroup;
     <?= $form->field($model, 'group_id')->dropDownList(ArrayHelper::map(TeamGroup::find()->all(), 'id', 'name'), ['prompt' => 'Выберие группу']) ?>
     <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
-    <?= $form->field($model, 'img')->textInput(['maxlength' => true]) ?>
+
+    <?= \backend\components\ImageUploader::widget([
+        'model'=> $model,
+        'field'=>'img',
+        'width'=>120,
+        'height'=>120,
+        'multi'=>false,
+        'gallery' =>$model->img,
+        'name' => 'Загрузить картинку'
+    ]); ?>
     <?= $form->field($model, 'phone')->textInput(['maxlength' => true]) ?>
@@ -41,9 +41,9 @@ return [
             'enablePrettyUrl' => true,
             'showScriptName' => false,
             'rules' => [
-                'news/<page:\d+>' => 'news/index',
+                'news/<translit:\d+>' => 'news/view',
                 'news' => 'news/index',
-                'page/<translit:[\w-]+>'=>'page/show',
+                'page/<translit:[\w-]+>'=>'page/view',
                 'goods/one-item/<translit:[\w-]+>'=>'goods/one-item',
                 'goods/view/<translit:[\w-]+>'=>'goods/view',
                 'stone/view/<translit:[\w-]+>'=>'stone/view',
+<?php
+namespace frontend\controllers;
+
+
+use common\models\Page;
+use Yii;
+use yii\data\ActiveDataProvider;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+
+
+/**
+ * Site controller
+ */
+class  PageController extends Controller
+{
+    public $layout = '/internal';
+
+    public function actionIndex()
+    {
+        $dataProvider = new ActiveDataProvider([
+            'query' => Page::find()->where(['is_active'=>1]),
+            'pagination' => [
+                'pageSize' => 16,
+            ],
+
+        ]);
+        return $this->render('index',[
+            'dataProvider' => $dataProvider
+        ]);
+    }
+
+    public function actionView($translit)
+    {
+
+        return $this->render('view', [
+            'model' => $this->findModel($translit),
+        ]);
+    }
+
+    protected function findModel($translit)
+    {
+
+        if (($model = Page::findOne(["code"=>$translit])) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
@@ -41,11 +41,11 @@ use yii\captcha\Captcha;
         echo Menu::widget([
             'items' => [
                 ['label' => 'О компании', 'url'=>Url::toRoute('/site/about')],
-                ['label' => 'Каталоги', 'url'=>'/page/FAQ'],
-                ['label' => 'Оптовикам','url'=>'/site/wholesalers'],
-                ['label' => 'Поставщикам','url'=>'/site/provider'],
-                ['label' => 'Оплата и доставка', 'url'=>Url::toRoute('/site/payment-delivery')],
-                ['label' => 'Контакты', 'url'=>Url::toRoute('/site/contacts')],
+                ['label' => 'Каталоги', 'url'=>'#'],//Url::toRoute('/page/FAQ')],
+                ['label' => 'Оптовикам','url'=>Url::toRoute(['/page/view','translit'=>'optovikam'])],
+                ['label' => 'Поставщикам','url'=>Url::toRoute(['/page/view','translit'=>'suppliers'])],
+                ['label' => 'Оплата и доставка', 'url'=>Url::toRoute(['/page/view','translit'=>'pay4delivery'])],
+                ['label' => 'Контакты', 'url'=>Url::toRoute(['/page/view','translit'=>'contacts'])],
             ],
         ]);
         ?>
-<?php
-$this->registerMetaTag(['description' => $page->descr,'keywords'=>$page->kwords]);
-$this->title = $page->title ? $page->title: $page->name;
-$this->params['breadcrumbs'][] = $this->title;
-echo $page->content;
 \ No newline at end of file
+<?php
+$this->registerMetaTag(['description' => $model->descr,'keywords'=>$model->kwords]);
+$this->title = $model->title ? $model->title: $model->name;
+$this->params['breadcrumbs'][] = $this->title;
+
+?>
+<div class="main-vin">
+
+    <p class="vin_article"><?=$this->title?></p>
+
+    <div class="choose_tovar">
+        <?= $model->content;?>
+    </div>
+
+</div>
 \ No newline at end of file