diff --git a/backend/components/base/BaseController.php b/backend/components/base/BaseController.php index 79258d5..8d6f7ec 100755 --- a/backend/components/base/BaseController.php +++ b/backend/components/base/BaseController.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); +// +// } } } diff --git a/backend/views/page/view.php b/backend/views/page/view.php index 8aaebd6..06584f1 100755 --- a/backend/views/page/view.php +++ b/backend/views/page/view.php @@ -31,7 +31,7 @@ $this->params['breadcrumbs'][] = $this->title; 'id', 'name', 'code', - 'content:ntext', + 'content:html', 'sort', 'title', 'kwords', diff --git a/backend/views/team/_form.php b/backend/views/team/_form.php index da62658..c44a0b2 100755 --- a/backend/views/team/_form.php +++ b/backend/views/team/_form.php @@ -19,7 +19,16 @@ use \common\models\TeamGroup; field($model, 'group_id')->dropDownList(ArrayHelper::map(TeamGroup::find()->all(), 'id', 'name'), ['prompt' => 'Выберие группу']) ?> field($model, 'name')->textInput(['maxlength' => true]) ?> - field($model, 'img')->textInput(['maxlength' => true]) ?> + + $model, + 'field'=>'img', + 'width'=>120, + 'height'=>120, + 'multi'=>false, + 'gallery' =>$model->img, + 'name' => 'Загрузить картинку' + ]); ?> field($model, 'phone')->textInput(['maxlength' => true]) ?> diff --git a/frontend/config/main.php b/frontend/config/main.php index 1d0e943..c9919ff 100755 --- a/frontend/config/main.php +++ b/frontend/config/main.php @@ -41,9 +41,9 @@ return [ 'enablePrettyUrl' => true, 'showScriptName' => false, 'rules' => [ - 'news/' => 'news/index', + 'news/' => 'news/view', 'news' => 'news/index', - 'page/'=>'page/show', + 'page/'=>'page/view', 'goods/one-item/'=>'goods/one-item', 'goods/view/'=>'goods/view', 'stone/view/'=>'stone/view', diff --git a/frontend/controllers/PageController.php b/frontend/controllers/PageController.php new file mode 100644 index 0000000..d0e52d4 --- /dev/null +++ b/frontend/controllers/PageController.php @@ -0,0 +1,50 @@ + 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.'); + } + } +} diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index c15e1cb..dcc8929 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -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'])], ], ]); ?> diff --git a/frontend/views/page/show.php b/frontend/views/page/show.php deleted file mode 100644 index ae7be64..0000000 --- a/frontend/views/page/show.php +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/frontend/views/page/view.php b/frontend/views/page/view.php new file mode 100644 index 0000000..13512c9 --- /dev/null +++ b/frontend/views/page/view.php @@ -0,0 +1,15 @@ +registerMetaTag(['description' => $model->descr,'keywords'=>$model->kwords]); +$this->title = $model->title ? $model->title: $model->name; +$this->params['breadcrumbs'][] = $this->title; + +?> +
+ +

title?>

+ +
+ content;?> +
+ +
\ No newline at end of file -- libgit2 0.21.4