From f82c9c99131cd3e2c8a3a9f8ed83793640cd7b54 Mon Sep 17 00:00:00 2001 From: Egorka Date: Mon, 10 Sep 2018 17:25:33 +0300 Subject: [PATCH] Restructure widgets codes Forms languages --- .../form_builder/assets/FormBuilderAsset.php | 29 ++- .../components/form_builder/js/languages/en.lang | 92 +++++++ .../components/form_builder/js/languages/ru.lang | 92 +++++++ backend/views/menu/menu.php | 263 ++++++++++++--------- common/behaviors/WidgetContentBehavior.php | 37 +-- common/modules/banners/views/manage/place/view.php | 129 ++++++---- common/modules/forms/FormsModule.php | 104 ++++---- .../forms/controllers/manage/FormController.php | 143 ++++++----- common/modules/forms/urls/FormsUrlRule.php | 41 ++++ .../views/manage/form/_form/_form-builder.php | 12 +- common/modules/forms/views/manage/form/view.php | 177 ++++++++------ common/modules/pages/PagesModule.php | 92 +++---- .../modules/pages/controllers/PageController.php | 76 +++--- common/modules/pages/entities/Page.php | 90 +++---- common/modules/pages/urls/PageMainUrlRule.php | 84 ++++--- frontend/components/FrontendController.php | 41 ++-- 16 files changed, 939 insertions(+), 563 deletions(-) create mode 100644 backend/components/form_builder/js/languages/en.lang create mode 100644 backend/components/form_builder/js/languages/ru.lang create mode 100644 common/modules/forms/urls/FormsUrlRule.php diff --git a/backend/components/form_builder/assets/FormBuilderAsset.php b/backend/components/form_builder/assets/FormBuilderAsset.php index aa42d56..b004577 100644 --- a/backend/components/form_builder/assets/FormBuilderAsset.php +++ b/backend/components/form_builder/assets/FormBuilderAsset.php @@ -6,26 +6,25 @@ namespace backend\components\form_builder\assets; - use yii\jui\JuiAsset; use yii\web\AssetBundle; class FormBuilderAsset extends AssetBundle { - public $sourcePath = '@backend/components/form_builder'; + public $sourcePath = '@backend/components/form_builder'; - public $js = [ - 'js/form-builder.min.js', - 'js/form-render.min.js' - ]; + public $js = [ + 'js/form-builder.min.js', + 'js/form-render.min.js' + ]; - public $depends = [ - 'yii\web\YiiAsset', - 'yii\bootstrap\BootstrapPluginAsset', - JuiAsset::class, - ]; + public $depends = [ + 'yii\web\YiiAsset', + 'yii\bootstrap\BootstrapPluginAsset', + JuiAsset::class, + ]; - public $publishOptions = [ - 'forceCopy' => YII_ENV_DEV ? true : false, - ]; -} \ No newline at end of file + public $publishOptions = [ + 'forceCopy' => YII_ENV_DEV ? true : false, + ]; +} diff --git a/backend/components/form_builder/js/languages/en.lang b/backend/components/form_builder/js/languages/en.lang new file mode 100644 index 0000000..01e3118 --- /dev/null +++ b/backend/components/form_builder/js/languages/en.lang @@ -0,0 +1,92 @@ +addOption = Add option +allFieldsRemoved = Allfields deleted +allowSelect = Allow select +autocomplete = Autocomplete +button = Button +cannotBeEmpty = This field cannot be empty +checkboxGroup = Checkbox group +checkbox = Checkbox +checkboxes = Checkboxes +class = Class +clearAllMessage = Are you sure, clear all fields? +clear = Clear +close = Close +content = Content +copy = Copy +dateField = Date field +description = Hint +descriptionField = Description +devMode = Debug mode +editNames = Edit names +editorTitle = Form elements +editXML = Edit XML +fieldDeleteWarning: false +fieldVars = Variable fields +fieldNonEditable = Non editable field +fieldRemoveWarning = Are you sure, delete this field? +fileUpload = Upload +formUpdated = Form updated +getStarted = Drag field from right side here +header = Header +hide = Edit +hidden = Hidden field +label = Label +labelEmpty = Label cannot be empty +limitRole = Deny access for one/some roles: +mandatory = Required +maxlength = Max length +minOptionMessage = Select more then 1 options for this field +name = Name +no = No +off = Off +on = On +option = Option +optional = Optional +optionEmpty = Option must have a value +paragraph = Paragraph +placeholder = Placeholder +placeholder.value = Value +placeholder.label = Label +placeholder.text = Enter anything +placeholder.textarea = Enter a text +placeholder.email = Enter your EMAIL +placeholder.placeholder = Placeholder +placeholder.className = Class names divided by spaces +placeholder.password = Enter you password +preview = Preview +radioGroup = Radio group +radio = Radio +removeMessage = Delete element +remove = × +required = Required +richText = Text editor +roles = Roles +save = Save +selectOptions = Options +select = Select +selectColor = Select color +selectionsMessage = Multiselection enabled +size = Size +sizes = Sizes +sizes.xs = Very small +sizes.sm = Small +sizes.m = Default +sizes.lg = Big +style = Style +styles = Styles +styles.btn = Button style +styles.btn.default = Default +styles.btn.danger = Danger! +styles.btn.info = Info +styles.btn.primary = Primary +styles.btn.success = Success +styles.btn.warning = Warning +subtype = Type +text = Text field +textArea = Textarea +toggle = Toggle +value = Value +warning = Warning! +viewXML = </> +viewJSON = { } +yes = Yes diff --git a/backend/components/form_builder/js/languages/ru.lang b/backend/components/form_builder/js/languages/ru.lang new file mode 100644 index 0000000..e5fd106 --- /dev/null +++ b/backend/components/form_builder/js/languages/ru.lang @@ -0,0 +1,92 @@ +addOption = Добавить опцию +allFieldsRemoved = Все поля удалены +allowSelect = Позволить выбор +autocomplete = Автозаполнение +button = Кнопка +cannotBeEmpty = Данное поле не может быть пустым +checkboxGroup = Группа Чекбоксов +checkbox = Чекбокс +checkboxes = Чекбоксы +class = Класс +clearAllMessage = Вы уверены, что хотите очистить все поля? +clear = Очистить +close = Закрыть +content = Содержимое +copy = Копировать в буфер +dateField = Поле Дата +description = Подсказка +descriptionField = Описание +devMode = Режим отладки +editNames = Редактировать Имена +editorTitle = Элементы формы +editXML = Редактировать XML +fieldDeleteWarning: ложь +fieldVars = Переменные Поля +fieldNonEditable = Данное поле не является редактируемым +fieldRemoveWarning = Вы уверены, что хотите удалить данное поле? +fileUpload = Загрузка файла +formUpdated = Форма обновлена +getStarted = Перетащите поле из правой области в эту зону +header = Заголовок +hide = Редактировать +hidden = Скрытое поле ввода +label = Метка +labelEmpty = Метка поля не может быть пустой +limitRole = Ограниченный доступ к одной или нескольким из следующих ролей: +mandatory = Обязательно +maxlength = Максимальная длина +minOptionMessage = Данное поле требует указания хотя бы 2-х опций +name = Имя +no = Нет +off = Выкл. +on = Вкл. +option = Опция +optional = Опциональный +optionEmpty = Требуется значение опции +paragraph = Параграф +placeholder = Заглушка +placeholder.value = Значение +placeholder.label = Метка +placeholder.text = Введите что-нибудь +placeholder.textarea = Введите много текста +placeholder.email = Введите Ваш EMAIL +placeholder.placeholder = Заглушка +placeholder.className = Имена классов, разделенные пробелами +placeholder.password = Введите Ваш пароль +preview = Предосмотр +radioGroup = Группа радио-контролов +radio = Радио-контрол +removeMessage = Удалить элемент +remove = × +required = Требуется +richText = Редактор текста +roles = Доступ +save = Сохранить +selectOptions = Опции +select = Выбрать +selectColor = Выбрать цвет +selectionsMessage = Множественный выбор включен +size = Размер +sizes = Размеры +sizes.xs = Очень маленький +sizes.sm = Маленький +sizes.m = По умолчанию +sizes.lg = Большой +style = Стиль +styles = Стили +styles.btn = Стиль кнопки +styles.btn.default = По умолчанию +styles.btn.danger = Опасно! +styles.btn.info = Информация +styles.btn.primary = Главная +styles.btn.success = Удачный +styles.btn.warning = Предупреждение +subtype = Тип +text = Текстовое поле +textArea = Поле текста +toggle = Переключатель +value = Значение +warning = Внимание! +viewXML = </> +viewJSON = { } +yes = Да diff --git a/backend/views/menu/menu.php b/backend/views/menu/menu.php index 17d67d4..1d1e3dd 100644 --- a/backend/views/menu/menu.php +++ b/backend/views/menu/menu.php @@ -5,7 +5,6 @@ */ use kartik\form\ActiveForm; -use yii\helpers\ArrayHelper; use yii\helpers\Html; /** @@ -16,124 +15,156 @@ use yii\helpers\Html; * @var $creator array */ -$this->title = Yii::t('menu', 'Menu'); +$this->title = Yii::t('menu', 'Menu'); $this->params['breadcrumbs'][] = Html::encode(isset($menu->translation) ? $menu->translation->name : Yii::t('menu', 'Not set')); $this->params['breadcrumbs'][] = $this->title; + +$js2 = <<registerJs($js2, $this::POS_READY); + +$js = <<registerJs($js, $this::POS_HEAD); ?>
-
-
-
- -
-
- false, - 'method' => 'get', - 'id' => 'select_menu', - ]); ?> - - field($model, 'id')->dropDownList($menus, [ - //'prompt' => Yii::t('menu', 'Select menu...'), - 'value' => $menu->id, - 'onchange' => 'this.form.submit()', - ])->label(false) ?> - - -
-
- 'btn btn-success', - ]) ?> - - $menu->id], [ - 'class' => 'btn btn-primary', - ]) ?> - - $menu->id], [ - 'class' => 'btn btn-danger', - 'data' => [ - 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'), - 'method' => 'post', - ], - ]) ?> -
-
- -
-
- -
-
-
-
-
- -
- - - -
-
-

- - -

-
-
-
- -
-
-
- - - -
- -
-
-
-
-
-
-
- - $menu->id - ]) ?> - -
-
-
- -
-
-
-
- - ".$menu->id.", -]) ?>"); - ?> -

-
- - ".$menu->id.", -]) ?]"); - ?> -

-
-
-
-
- - -
+
+
+
+ +
+
+ false, + 'method' => 'get', + 'id' => 'select_menu', + ]); ?> + + field($model, 'id')->dropDownList($menus, [ + //'prompt' => Yii::t('menu', 'Select menu...'), + 'value' => $menu->id, + 'onchange' => 'this.form.submit()', + ])->label(false) ?> + + +
+
+ 'btn btn-success', + ]) ?> + + $menu->id], [ + 'class' => 'btn btn-primary', + ]) ?> + + $menu->id], [ + 'class' => 'btn btn-danger', + 'data' => [ + 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'), + 'method' => 'post', + ], + ]) ?> +
+
+ +
+
+ +
+
+
+
+
+ +
+ + + +
+
+

+ + +

+
+
+
+ +
+
+
+ + + +
+ +
+
+
+
+
+
+
+ + $menu->id + ]) ?> + +
+
+
+ +
+
+
+
+ + " . $menu->id . ']) ?>'; + ?> +

+
+ 'form-control', + 'id' => 'code_template', + ]) ?> + + + +
+ + " . $menu->id . ']) ?]'; + ?> +

+
+ 'form-control', + 'id' => 'code_editor', + ]) ?> + + + +
+ +
+
+
+ + +
diff --git a/common/behaviors/WidgetContentBehavior.php b/common/behaviors/WidgetContentBehavior.php index d66fd3d..2f16515 100644 --- a/common/behaviors/WidgetContentBehavior.php +++ b/common/behaviors/WidgetContentBehavior.php @@ -11,20 +11,23 @@ use yii\base\Behavior; class WidgetContentBehavior extends Behavior { - /** - * Parse Widgets [?= ... ?] - * @param $text - * - * @return string - */ - public function content($text): string - { - $content = preg_replace_callback('/\[\?= (.*)\((.*)\) \?\]/m', function ($m) { - $array = []; - $string = Html::decode( $m[2] ); - eval( "\$array = $string;" ); - return $m[1]( $array ); - }, $text); - return $content; - } -} \ No newline at end of file + /** + * Parse Widgets #?= ... ?# + * + * @param $text + * + * @return string + */ + public function content($text): string + { + $content = preg_replace_callback('/\[\?= (.*)\((.*)\) \?\]/m', function ($m) { + $array = []; + $string = Html::decode($m[2]); + eval("\$array = $string;"); + + return $m[1]($array); + }, $text); + + return $content; + } +} diff --git a/common/modules/banners/views/manage/place/view.php b/common/modules/banners/views/manage/place/view.php index 17efd1c..94b1253 100644 --- a/common/modules/banners/views/manage/place/view.php +++ b/common/modules/banners/views/manage/place/view.php @@ -8,69 +8,104 @@ use common\modules\banners\helpers\BannerHelper; /* @var $this yii\web\View */ /* @var $place \common\modules\banners\entities\BannerPlace */ -$this->title = $place->title; +$this->title = $place->title; $this->params['breadcrumbs'][] = ['label' => Yii::t('banners', 'Places'), 'url' => ['index']]; $this->params['breadcrumbs'][] = $this->title; + +$js2 = <<registerJs($js2, $this::POS_READY); + +$js = <<registerJs($js, $this::POS_HEAD); ?>

- 'btn btn-default']) ?> + 'btn btn-default']) ?> $place->id], ['class' => 'btn btn-primary']) ?> $place->id], [ 'class' => 'btn btn-danger', - 'data' => [ + 'data' => [ 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'), - 'method' => 'post', + 'method' => 'post', ], ]) ?>

-
-
+
+
+ +
+
+ $place, + 'attributes' => [ + 'id', + 'title', + 'width', + 'height', + [ + 'attribute' => 'active', + 'format' => 'raw', + 'value' => function (BannerPlace $place) { + return BannerHelper::statusLabel($place->active); + } + ], + ], + ]) ?> +
+
+
-
-
- $place, - 'attributes' => [ - 'id', - 'title', - 'width', - 'height', - [ - 'attribute' => 'active', - 'format' => 'raw', - 'value' => function(BannerPlace $place) { - return BannerHelper::statusLabel($place->active); - } - ], - ], - ]) ?> -
-
-
+
+
+
+
-
-
-
-
+ " . $place->id . ']) ?>'; + ?> +

+
+ 'form-control', + 'id' => 'code_template', + ]) ?> + + + +
- ".$place->id."]) ?>"); - ?> -

-
+ " . $place->id . ']) ?]'; + ?> +

+
+ 'form-control', + 'id' => 'code_editor', + ]) ?> + + + +
- ".$place->id."]) ?]"); - ?> -

-
-
-
-
-
+
+
+
+
diff --git a/common/modules/forms/FormsModule.php b/common/modules/forms/FormsModule.php index c378936..8ae6b91 100644 --- a/common/modules/forms/FormsModule.php +++ b/common/modules/forms/FormsModule.php @@ -2,12 +2,10 @@ namespace common\modules\forms; -use common\modules\forms\entities\Form; use common\modules\forms\entities\FormMessage; +use common\modules\forms\urls\FormsUrlRule; use core\components\modules\ModuleInterface; use yii\helpers\ArrayHelper; -use yii\helpers\Html; - /** * blog module definition class @@ -29,56 +27,60 @@ class FormsModule extends \yii\base\Module implements ModuleInterface // custom initialization code goes here } - public function bootstrap($app) - { - // add migration path - $app->controllerMap['migrate']['migrationPath'][] = '@common/modules/forms/migrations'; + public function bootstrap($app) + { + // add migration path + $app->controllerMap['migrate']['migrationPath'][] = '@common/modules/forms/migrations'; + + // prepare rules + //$app->getUrlManager()->addRules([ + // 'forms/manage/form/view/' => 'forms/manage/form/view', + //]); - // prepare rules - $app->getUrlManager()->addRules([ - 'forms/manage/form/view/' => 'forms/manage/form/view', - ]); + $app->getUrlManager()->addRules([ + ['class' => FormsUrlRule::class], + ]); - // add languages - $app->getI18n()->translations = ArrayHelper::merge($app->getI18n()->translations, [ - 'forms' => [ - 'class' => 'yii\i18n\PhpMessageSource', - 'basePath' => '@common/modules/forms/messages', - ], - ]); + // add languages + $app->getI18n()->translations = ArrayHelper::merge($app->getI18n()->translations, [ + 'forms' => [ + 'class' => 'yii\i18n\PhpMessageSource', + 'basePath' => '@common/modules/forms/messages', + ], + ]); - // add menu items - if (basename($app->getBasePath()) === 'backend') { - $app->params['adminMenu'][] = [ - 'label' => \Yii::t( 'forms', 'Forms' ), - 'icon' => 'address-card-o', - 'items' => [ - [ - 'label' => \Yii::t( 'forms', 'Forms' ), - 'icon' => 'caret-right', - 'url' => [ '/forms/manage/form/index' ] - ], - [ - 'label' => \Yii::t( 'forms', 'Messages' ), - 'icon' => 'caret-right', - 'url' => [ '/forms/manage/form-message/index' ] - ], - ], - 'visible' => \Yii::$app->user->can( 'admin' ) || \Yii::$app->user->can( 'FormsManagement' ), - ]; - } + // add menu items + if (basename($app->getBasePath()) === 'backend') { + $app->params['adminMenu'][] = [ + 'label' => \Yii::t('forms', 'Forms'), + 'icon' => 'address-card-o', + 'items' => [ + [ + 'label' => \Yii::t('forms', 'Forms'), + 'icon' => 'caret-right', + 'url' => ['/forms/manage/form/index'] + ], + [ + 'label' => \Yii::t('forms', 'Messages'), + 'icon' => 'caret-right', + 'url' => ['/forms/manage/form-message/index'] + ], + ], + 'visible' => \Yii::$app->user->can('admin') || \Yii::$app->user->can('FormsManagement'), + ]; + } - // prepare notifications - $new_messages_count = \Yii::$app->moduleManager->isTableExist('{{%forms}}') ? FormMessage::find()->unread()->count() : 0; - if ($new_messages_count > 0) { - $app->params['notifications'][] = [ - 'icon' => 'address-card-o', - 'color' => 'yellow', - 'message' => 'New forms messages: {count}', - 'message_file' => 'forms', - 'url' => '/forms/manage/form-message/index', - 'count' => $new_messages_count, - ]; - } - } + // prepare notifications + $new_messages_count = \Yii::$app->moduleManager->isTableExist('{{%forms}}') ? FormMessage::find()->unread()->count() : 0; + if ($new_messages_count > 0) { + $app->params['notifications'][] = [ + 'icon' => 'address-card-o', + 'color' => 'yellow', + 'message' => 'New forms messages: {count}', + 'message_file' => 'forms', + 'url' => '/forms/manage/form-message/index', + 'count' => $new_messages_count, + ]; + } + } } diff --git a/common/modules/forms/controllers/manage/FormController.php b/common/modules/forms/controllers/manage/FormController.php index f9966cc..a6c78db 100644 --- a/common/modules/forms/controllers/manage/FormController.php +++ b/common/modules/forms/controllers/manage/FormController.php @@ -7,7 +7,6 @@ use common\modules\forms\forms\FormSearch; use common\modules\forms\entities\Form; use common\modules\pages\entities\Page; use common\modules\forms\forms\FormForm; -use yii\helpers\Json; use yii\web\NotFoundHttpException; use yii\filters\AccessControl; use yii\filters\VerbFilter; @@ -17,32 +16,32 @@ use Yii; class FormController extends Controller { - private $service; + private $_service; public function __construct($id, $module, FormManageService $service, $config = []) { parent::__construct($id, $module, $config); - $this->service = $service; + $this->_service = $service; } public function behaviors(): array { return [ - 'access' => [ - 'class' => AccessControl::class, - 'rules' => [ - [ - 'allow' => true, - 'roles' => ['FormsManagement'], - ], - [ // all the action are accessible to admin - 'allow' => true, - 'roles' => ['admin'], - ], - ], - ], - 'verbs' => [ - 'class' => VerbFilter::class, + 'access' => [ + 'class' => AccessControl::class, + 'rules' => [ + [ + 'allow' => true, + 'roles' => ['FormsManagement'], + ], + [ // all the action are accessible to admin + 'allow' => true, + 'roles' => ['admin'], + ], + ], + ], + 'verbs' => [ + 'class' => VerbFilter::class, 'actions' => [ 'delete' => ['POST'], ], @@ -55,21 +54,21 @@ class FormController extends Controller */ public function actionIndex() { - $searchModel = new FormSearch(); + $searchModel = new FormSearch(); $dataProvider = $searchModel->search(Yii::$app->request->queryParams); return $this->render('index', [ - 'searchModel' => $searchModel, + 'searchModel' => $searchModel, 'dataProvider' => $dataProvider, ]); } - /** - * @param $id - * - * @return string - * @throws NotFoundHttpException - */ + /** + * @param $id + * + * @return string + * @throws NotFoundHttpException + */ public function actionView($id) { return $this->render('view', [ @@ -85,7 +84,8 @@ class FormController extends Controller $form = new FormForm(); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $form = $this->service->create($form); + $form = $this->_service->create($form); + return $this->redirect(['view', 'id' => $form->id]); } catch (\DomainException $e) { Yii::$app->errorHandler->logException($e); @@ -98,12 +98,12 @@ class FormController extends Controller ]); } - /** - * @param $id - * - * @return string|\yii\web\Response - * @throws NotFoundHttpException - */ + /** + * @param $id + * + * @return string|\yii\web\Response + * @throws NotFoundHttpException + */ public function actionUpdate($id) { $form_model = $this->findModel($id); @@ -111,7 +111,8 @@ class FormController extends Controller $form = new FormForm($form_model); if ($form->load(Yii::$app->request->post()) && $form->validate()) { try { - $this->service->edit($form_model->id, $form); + $this->_service->edit($form_model->id, $form); + return $this->redirect(['view', 'id' => $form_model->id]); } catch (\DomainException $e) { Yii::$app->errorHandler->logException($e); @@ -120,48 +121,82 @@ class FormController extends Controller } return $this->render('update', [ - 'model' => $form, + 'model' => $form, 'form_model' => $form_model, ]); } /** * @param integer $id + * * @return mixed */ public function actionDelete($id) { try { - $this->service->remove($id); + $this->_service->remove($id); } catch (\DomainException $e) { Yii::$app->errorHandler->logException($e); Yii::$app->session->setFlash('error', $e->getMessage()); } + return $this->redirect(['index']); } - public function actionPageSearch($q = null, $id = null) - { - \Yii::$app->response->format = Response::FORMAT_JSON; - $out = ['results' => ['id' => '', 'text' => '']]; - if (!is_null($q)) { - $data = Page::find()->select('id, title as text')->andWhere(['tree' => 1])->andWhere(['like', 'title', $q])->limit(20)->asArray()->all(); - $out['results'] = array_values($data); - } - elseif ($id > 0) { - $tag_name = Page::findOne($id)->title; - $out['results'] = ['id' => $tag_name, 'text' => $tag_name]; - } - else { - $data = Page::find()->select('id, title as text')->andWhere(['tree' => 1])->orderBy(['id' => SORT_DESC])->limit(20)->asArray()->all(); - $out['results'] = array_values($data); - } - return $out; - } + public function actionPageSearch($q = null, $id = null) + { + \Yii::$app->response->format = Response::FORMAT_JSON; + $out = ['results' => ['id' => '', 'text' => '']]; + if (!is_null($q)) { + $data = []; + $pages = Page::find() + ->with('translation') + ->leftJoin('{{%pages_lng}}', '`pages_lng`.`page_id` = `pages`.`id`') + ->andWhere(['like', 'pages_lng.title', $q]) + ->limit(20) + ->all(); + foreach ($pages as $page) { + $data[] = [ + 'id' => $page->id, + 'text' => isset($page->translation) ? $page->translation->title : null, + ]; + } + $out['results'] = array_values($data); + } elseif ($id > 0) { + $tag_name = Page::findOne($id)->translation->title; + $out['results'] = ['id' => $tag_name, 'text' => $tag_name]; + } else { + /*$data = []; + $pages = Page::find() + ->with('translation') + ->leftJoin('{{%pages_lng}}', '`pages_lng`.`page_id` = `pages`.`id`') + ->limit(20) + ->all(); + foreach ($pages as $page) { + $data[] = [ + 'id' => $page->id, + 'text' => isset($page->translation) ? $page->translation->title : null, + ]; + }*/ + + $data = []; + $pages = Page::find()->typePublic()->orderBy(['id' => SORT_DESC])->limit(20)->all(); + foreach ($pages as $page) { + $data[] = [ + 'id' => $page->id, + 'text' => isset($page->translation) ? $page->translation->title : null, + ]; + } + $out['results'] = array_values($data); + } + + return $out; + } /** * @param integer $id + * * @return Form the loaded model * @throws NotFoundHttpException if the model cannot be found */ diff --git a/common/modules/forms/urls/FormsUrlRule.php b/common/modules/forms/urls/FormsUrlRule.php new file mode 100644 index 0000000..8286a9c --- /dev/null +++ b/common/modules/forms/urls/FormsUrlRule.php @@ -0,0 +1,41 @@ +_repository = $repository; + } + + public function parseRequest($manager, $request) + { + $uri = ltrim(LanguageHelper::processLangInUrl($request->pathInfo), '/'); + if ($uri == $this->prefix) { + $id = Yii::$app->request->get('id'); + $form = $this->_repository->get($id); + + if ($form) { + return [$uri, ['id' => $id]]; + } + } + return false; + } + + public function createUrl($manager, $route, $params) + { + return false; + } +} diff --git a/common/modules/forms/views/manage/form/_form/_form-builder.php b/common/modules/forms/views/manage/form/_form/_form-builder.php index bb6ee49..ae9b7a7 100644 --- a/common/modules/forms/views/manage/form/_form/_form-builder.php +++ b/common/modules/forms/views/manage/form/_form/_form-builder.php @@ -10,11 +10,14 @@ use \yii\helpers\Json; * @var $this \yii\web\View * @var $model \common\modules\forms\forms\FormForm */ -\backend\components\form_builder\assets\FormBuilderAsset::register($this); +$bundle = \backend\components\form_builder\assets\FormBuilderAsset::register($this); $lng = str_replace('_', '-', Yii::$app->language); +$lng_file = $bundle->baseUrl . '/js/languages/'; + $data = $model->data ? Json::encode($model->data, JSON_UNESCAPED_UNICODE) : '[]'; -$js = <<registerCss($css); ?>
-
+
diff --git a/common/modules/forms/views/manage/form/view.php b/common/modules/forms/views/manage/form/view.php index 9c17ab4..cb16d31 100644 --- a/common/modules/forms/views/manage/form/view.php +++ b/common/modules/forms/views/manage/form/view.php @@ -8,90 +8,125 @@ use common\modules\forms\helpers\FormHelper; /* @var $this yii\web\View */ /* @var $form Form */ -$this->title = $form->name; +$this->title = $form->name; $this->params['breadcrumbs'][] = ['label' => Yii::t('forms', 'Forms'), 'url' => ['index']]; $this->params['breadcrumbs'][] = $this->title; + +$js2 = <<registerJs($js2, $this::POS_READY); + +$js = <<registerJs($js, $this::POS_HEAD); ?>

- 'btn btn-default']) ?> + 'btn btn-default']) ?> $form->id], ['class' => 'btn btn-primary']) ?> $form->id], [ 'class' => 'btn btn-danger', - 'data' => [ + 'data' => [ 'confirm' => Yii::t('buttons', 'Are you sure you want to delete this item?'), - 'method' => 'post', + 'method' => 'post', ], ]) ?>

-
-
- -
-
-
- $form, - 'attributes' => [ - 'id', - 'name', - 'subject', - 'from', - 'reply', - 'return', - [ - 'attribute' => 'status', - 'format' => 'raw', - 'value' => function(Form $form) { - return FormHelper::statusLabel($form->status); - } - ], - 'captcha', - 'complete_page_id' - ], - ]) ?> -
-
- -
-
-
- formatter->asHtml($form->complete_text, [ - 'Attr.AllowedRel' => array('nofollow'), - 'HTML.SafeObject' => true, - 'Output.FlashCompat' => true, - 'HTML.SafeIframe' => true, - 'URI.SafeIframeRegexp'=>'%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/)%', - ]) ?> -
-
- -
- -
-
-
-
- - ".$form->id."]) ?>"); - ?> -

-
- - ".$form->id."]) ?]"); - ?> -

-
-
-
-
- -
+
+
+ +
+
+
+ $form, + 'attributes' => [ + 'id', + 'name', + 'subject', + 'from', + 'reply', + 'return', + [ + 'attribute' => 'status', + 'format' => 'raw', + 'value' => function (Form $form) { + return FormHelper::statusLabel($form->status); + } + ], + 'captcha', + 'complete_page_id' + ], + ]) ?> +
+
+ +
+
+
+ formatter->asHtml($form->complete_text, [ + 'Attr.AllowedRel' => ['nofollow'], + 'HTML.SafeObject' => true, + 'Output.FlashCompat' => true, + 'HTML.SafeIframe' => true, + 'URI.SafeIframeRegexp' => '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/)%', + ]) ?> +
+
+ +
+ +
+
+
+
+ + " . $form->id . ']) ?>'; + ?> +

+
+ 'form-control', + 'id' => 'code_template', + ]) ?> + + + +
+ + " . $form->id . ']) ?]'; + ?> +

+
+ 'form-control', + 'id' => 'code_editor', + ]) ?> + + + +
+ +
+
+
+ +
diff --git a/common/modules/pages/PagesModule.php b/common/modules/pages/PagesModule.php index 9dabea5..6861e65 100644 --- a/common/modules/pages/PagesModule.php +++ b/common/modules/pages/PagesModule.php @@ -6,7 +6,6 @@ use common\modules\pages\widgets\MenuItemCreatorWidget; use core\components\modules\ModuleInterface; use yii\helpers\ArrayHelper; - /** * page module definition class */ @@ -27,57 +26,58 @@ class PagesModule extends \yii\base\Module implements ModuleInterface // custom initialization code goes here } - public function bootstrap($app) - { - // add migration path - $app->controllerMap['migrate']['migrationPath'][] = '@common/modules/pages/migrations'; + public function bootstrap($app) + { + // add migration path + $app->controllerMap['migrate']['migrationPath'][] = '@common/modules/pages/migrations'; - // add search rules - $app->params['search_rules'][] = " + // add search rules + $app->params['search_rules'][] = " SELECT title, content, CONCAT('/pages/manage/page/view/', page_id) AS url FROM {{pages_lng}} "; - $app->getUrlManager()->addRules([ - ['class' => 'common\modules\pages\urls\PageMainUrlRule'], - ]); + $app->getUrlManager()->addRules([ + ['class' => 'common\modules\pages\urls\PageMainUrlRule'], + ]); + + $app->getUrlManager()->addRules([ + 'pages/manage/page/view/' => 'pages/manage/page/view', + ]); - $app->getUrlManager()->addRules([ - 'pages/manage/page/view/' => 'pages/manage/page/view', - ]); + // add languages + $app->getI18n()->translations = ArrayHelper::merge($app->getI18n()->translations, [ + 'pages' => [ + 'class' => 'yii\i18n\PhpMessageSource', + 'basePath' => '@common/modules/pages/messages', + ], + 'page_public' => [ + 'class' => 'yii\i18n\PhpMessageSource', + 'basePath' => '@common/modules/pages/messages', + ], + ]); - // add languages - $app->getI18n()->translations = ArrayHelper::merge($app->getI18n()->translations, [ - 'pages' => [ - 'class' => 'yii\i18n\PhpMessageSource', - 'basePath' => '@common/modules/pages/messages', - ], - 'page_public' => [ - 'class' => 'yii\i18n\PhpMessageSource', - 'basePath' => '@common/modules/pages/messages', - ], - ]); + // add menu items + if (basename($app->getBasePath()) === 'backend') { + $app->params['adminMenu'][] = [ + 'label' => \Yii::t('pages', 'Pages'), + 'icon' => 'file-o', + 'url' => ['/pages/manage/page/index'], + 'visible' => \Yii::$app->user->can('admin') || \Yii::$app->user->can('PagesManagement') + ]; + } + } - // add menu items - if (basename($app->getBasePath()) === 'backend') { - $app->params['adminMenu'][] = [ - 'label' => \Yii::t( 'pages', 'Pages' ), - 'icon' => 'file-o', - 'url' => [ '/pages/manage/page/index' ], - 'visible' => \Yii::$app->user->can( 'admin' ) || \Yii::$app->user->can( 'PagesManagement' ) - ]; - } - } + public static function getMenuItemCreator($menu_id): array + { + $widgets = []; + $widgets[] = [ + 'id' => 'pages', + 'title' => \Yii::t('pages', 'Pages'), + 'content' => MenuItemCreatorWidget::widget([ + 'menu_id' => $menu_id, + ]), + ]; - public static function getMenuItemCreator($menu_id): array - { - $widgets = []; - $widgets[] = [ - 'id' => 'pages', - 'title' => \Yii::t('pages', 'Pages'), - 'content' => MenuItemCreatorWidget::widget([ - 'menu_id' => $menu_id, - ]), - ]; - return $widgets; - } + return $widgets; + } } diff --git a/common/modules/pages/controllers/PageController.php b/common/modules/pages/controllers/PageController.php index ba4afa1..e299b62 100644 --- a/common/modules/pages/controllers/PageController.php +++ b/common/modules/pages/controllers/PageController.php @@ -7,53 +7,53 @@ use frontend\components\FrontendController; use yii\web\NotFoundHttpException; use yii\filters\AccessControl; - class PageController extends FrontendController { - private $pages; + private $_pages; - public $layout = 'page'; + public $layout = 'page'; public function __construct($id, $module, PageReadRepository $pages, $config = []) { parent::__construct($id, $module, $config); - $this->pages = $pages; + $this->_pages = $pages; } - public function behaviors(): array - { - return [ - 'access' => [ - 'class' => AccessControl::class, - 'rules' => [ - [ - 'actions' => ['view'], - 'allow' => true, - 'roles' => ['Pages'], - ], - [ - 'actions' => ['preview'], - 'allow' => true, - 'roles' => ['PagesManagement'], - ], - [ // all the action are accessible to admin - 'allow' => true, - 'roles' => ['admin'], - ], - ], - ], - ]; - } + public function behaviors(): array + { + return [ + 'access' => [ + 'class' => AccessControl::class, + 'rules' => [ + [ + 'actions' => ['view'], + 'allow' => true, + 'roles' => ['Pages'], + ], + [ + 'actions' => ['preview'], + 'allow' => true, + 'roles' => ['PagesManagement'], + ], + [ // all the action are accessible to admin + 'allow' => true, + 'roles' => ['admin'], + ], + ], + ], + ]; + } /** * @param $id + * * @return mixed * @throws NotFoundHttpException * @internal param string $slug */ public function actionView($id) { - if (!$page = $this->pages->find($id)) { + if (!$page = $this->_pages->find($id)) { throw new NotFoundHttpException('The requested page does not exist.'); } @@ -62,14 +62,14 @@ class PageController extends FrontendController ]); } - public function actionPreview($id, $language = '') - { - if (!$page = $this->pages->findPreview($id, $language)) { - throw new NotFoundHttpException('The requested page does not exist.'); - } + public function actionPreview($id, $language = '') + { + if (!$page = $this->_pages->findPreview($id, $language)) { + throw new NotFoundHttpException('The requested page does not exist.'); + } - return $this->render('view', [ - 'page' => $page, - ]); - } + return $this->render('view', [ + 'page' => $page, + ]); + } } diff --git a/common/modules/pages/entities/Page.php b/common/modules/pages/entities/Page.php index 06142b7..2a626c0 100644 --- a/common/modules/pages/entities/Page.php +++ b/common/modules/pages/entities/Page.php @@ -27,8 +27,8 @@ use Yii; * @method ActiveRecord findTranslation(string $language) * @method void saveTranslations($translations) * - * @property ActiveRecord[] translations - * @property ActiveRecord[] translation + * @property ActiveRecord[] $translations + * @property ActiveRecord[] $translation * * @property Page $parent * @property Page[] $parents @@ -39,19 +39,20 @@ use Yii; */ class Page extends ActiveRecord { - const TYPE_PUBLIC = 0; - const TYPE_REVISION = 1; - const TYPE_PREVIEW = 2; + const TYPE_PUBLIC = 0; + const TYPE_REVISION = 1; + const TYPE_PREVIEW = 2; - public $_form; + public $_form; public static function create($form, $slug, $type = Page::TYPE_PUBLIC): self { - $page = new static(); + $page = new static(); $page->slug = $slug; $page->type = $type; $page->_form = $form; + return $page; } @@ -65,7 +66,7 @@ class Page extends ActiveRecord public function getSeoTitle(): string { - return $this->translation->meta_title ?: $this->translation->title; + return $this->translation->meta_title ?: $this->translation->title; } public static function tableName(): string @@ -76,30 +77,30 @@ class Page extends ActiveRecord public function behaviors(): array { return [ - [ - 'class' => NestedSetsBehavior::class, - 'treeAttribute' => 'tree', - ], - TimestampBehavior::class, - WidgetContentBehavior::class, - [ - 'class' => LanguageBehavior::class, - 'virtualClassName' => 'PagesVirtualTranslate', - 'translatedLanguages' => \Yii::$app->params['translatedLanguages'], - 'relativeField' => 'page_id', - 'tableName' => "{{%pages_lng}}", - 'attributes' => ['title', 'content', 'meta_title', 'meta_description', 'meta_keywords'], - 'defaultLanguage' => \Yii::$app->params['defaultLanguage'], - //'defaultLanguage' => basename(Yii::$app->getBasePath()) === 'backend' ? Yii::$app->language : Yii::$app->params['defaultLanguage'], - ], - [ - //'class' => SluggableBehavior::class, - 'class' => SluggableRelationBehavior::class, - 'attribute' => 'title', - 'relation' => 'translation', - //'ensureUnique' => true, - //'preserveNonEmptyValues' => true, - ], + [ + 'class' => NestedSetsBehavior::class, + 'treeAttribute' => 'tree', + ], + TimestampBehavior::class, + WidgetContentBehavior::class, + [ + 'class' => LanguageBehavior::class, + 'virtualClassName' => 'PagesVirtualTranslate', + 'translatedLanguages' => \Yii::$app->params['translatedLanguages'], + 'relativeField' => 'page_id', + 'tableName' => '{{%pages_lng}}', + 'attributes' => ['title', 'content', 'meta_title', 'meta_description', 'meta_keywords'], + 'defaultLanguage' => \Yii::$app->params['defaultLanguage'], + //'defaultLanguage' => basename(Yii::$app->getBasePath()) === 'backend' ? Yii::$app->language : Yii::$app->params['defaultLanguage'], + ], + [ + //'class' => SluggableBehavior::class, + 'class' => SluggableRelationBehavior::class, + 'attribute' => 'title', + 'relation' => 'translation', + //'ensureUnique' => true, + //'preserveNonEmptyValues' => true, + ], ]; } @@ -110,17 +111,18 @@ class Page extends ActiveRecord ]; } - public function attributeLabels() { - return [ - 'title' => Yii::t('pages', 'Title'), - 'slug' => Yii::t('pages', 'Slug'), - 'id' => Yii::t('pages', 'ID'), - 'content' => Yii::t('pages', 'Content'), - ]; + public function attributeLabels() + { + return [ + 'title' => Yii::t('pages', 'Title'), + 'slug' => Yii::t('pages', 'Slug'), + 'id' => Yii::t('pages', 'ID'), + 'content' => Yii::t('pages', 'Content'), + ]; } - public static function find(): PageQuery - { - return new PageQuery(static::class); - } -} \ No newline at end of file + public static function find(): PageQuery + { + return new PageQuery(static::class); + } +} diff --git a/common/modules/pages/urls/PageMainUrlRule.php b/common/modules/pages/urls/PageMainUrlRule.php index 7aab4c9..4c65a9e 100644 --- a/common/modules/pages/urls/PageMainUrlRule.php +++ b/common/modules/pages/urls/PageMainUrlRule.php @@ -14,8 +14,8 @@ use yii; class PageMainUrlRule extends BaseObject implements UrlRuleInterface { - //public $prefix = 'pages/page'; - public $prefix = ''; + //public $prefix = 'pages/page'; + public $prefix = ''; private $repository; private $cache; @@ -24,64 +24,70 @@ class PageMainUrlRule extends BaseObject implements UrlRuleInterface { parent::__construct($config); $this->repository = $repository; - $this->cache = $cache; + $this->cache = $cache; } - public function parseRequest($manager, $request) + public function parseRequest($manager, $request) { - $uri = ltrim(LanguageHelper::processLangInUrl($request->pathInfo), '/'); - //if (preg_match('#^' . $this->prefix . '(.*[a-z])$#is', $request->pathInfo, $matches)) { - //if (preg_match('#^' . $this->prefix . '([0-9a-z_\-]*)$#is', $request->pathInfo, $matches)) { - if (preg_match('#^' . $this->prefix . '([0-9a-z_\-]*)$#is', $uri, $matches)) { - $path = $matches['1']; - - $result = $this->cache->getOrSet( [ 'page_main_route', 'path' => $path ], function () use ( $path ) { - if ( ! $post = $this->repository->findBySlug($this->getPathSlug( $path ) ) ) { - return [ 'id' => null, 'path' => null ]; - } - return [ 'id' => $post->id, 'path' => $post->slug ]; - }, null, new TagDependency(['tags' => ['pages']]) ); - - if ( empty( $result['id'] ) ) { - return false; - } - - if ( $path != $result['path'] ) { - throw new UrlNormalizerRedirectException( [ 'pages/page/view', 'id' => $result['id'] ], 301 ); - } - - return ['pages/page/view', ['id' => $result['id']]]; - } - return false; + $uri = ltrim(LanguageHelper::processLangInUrl($request->pathInfo), '/'); + //if (preg_match('#^' . $this->prefix . '(.*[a-z])$#is', $request->pathInfo, $matches)) { + //if (preg_match('#^' . $this->prefix . '([0-9a-z_\-]*)$#is', $request->pathInfo, $matches)) { + if (preg_match('#^' . $this->prefix . '([0-9a-z_\-]*)$#is', $uri, $matches)) { + $path = $matches['1']; + + $result = $this->cache->getOrSet(['page_main_route', 'path' => $path], function () use ($path) { + if (!$post = $this->repository->findBySlug($this->getPathSlug($path))) { + return ['id' => null, 'path' => null]; + } + + return ['id' => $post->id, 'path' => $post->slug]; + }, null, new TagDependency(['tags' => ['pages']])); + + if (empty($result['id'])) { + return false; + } + + if ($path != $result['path']) { + throw new UrlNormalizerRedirectException(['pages/page/view', 'id' => $result['id']], 301); + } + + return ['pages/page/view', ['id' => $result['id']]]; + } + + return false; } public function createUrl($manager, $route, $params) { if ($route == 'pages/page/view') { - if (empty($params['id'])) { - throw new InvalidArgumentException('Empty id.'); - } - $id = $params['id']; + if (empty($params['id'])) { + throw new InvalidArgumentException('Empty id.'); + } + $id = $params['id']; $url = $this->cache->getOrSet(['page_main_route', 'id' => $id], function () use ($id) { if (!$page = $this->repository->find($id)) { return null; } + return $page->slug; }, null, new TagDependency(['tags' => ['pages']])); if (!$url) { - return '#'; + return '#'; //throw new InvalidArgumentException('Undefined id.'); } - return LanguageHelper::addLangToUrl($url, isset($params['language']) ? $params['language'] : null); + + return LanguageHelper::addLangToUrl($url, isset($params['language']) ? $params['language'] : null); } + return false; } - private function getPathSlug($path): string - { - $chunks = explode('/', $path); - return end($chunks); - } + private function getPathSlug($path): string + { + $chunks = explode('/', $path); + + return end($chunks); + } } \ No newline at end of file diff --git a/frontend/components/FrontendController.php b/frontend/components/FrontendController.php index 3de08fc..09c9a6f 100644 --- a/frontend/components/FrontendController.php +++ b/frontend/components/FrontendController.php @@ -6,33 +6,32 @@ namespace frontend\components; - -use yii\web\Cookie; use yii\base\Theme; use yii\web\Controller; use Yii; class FrontendController extends Controller { - public function init() { - parent::init(); + public function init() + { + parent::init(); - // language - $languages = ['ru', 'en']; - $language = Yii::$app->request->get('language'); - Yii::$app->language = $language && in_array($language, $languages) ? $language : Yii::$app->language; + // language + $languages = \Yii::$app->params['translatedLanguages']; + $language = Yii::$app->request->get('language'); + Yii::$app->language = $language && in_array($language, $languages) ? $language : Yii::$app->language; - // themes - $theme = isset(Yii::$app->params['settings']['design']['theme']) ? Yii::$app->params['settings']['design']['theme'] : 'start'; - Yii::$app->view->theme = new Theme([ - 'basePath' => '@webroot/themes/' . $theme, - 'baseUrl' => '@web/themes/' . $theme, - 'pathMap' => [ - '@common/modules' => '@webroot/themes/' . $theme . '/modules', - '@frontend/views' => '@webroot/themes/' . $theme, - '@frontend/widgets' => '@webroot/themes/' . $theme . '/widgets', - ], + // themes + $theme = isset(Yii::$app->params['settings']['design']['theme']) ? Yii::$app->params['settings']['design']['theme'] : 'start'; + Yii::$app->view->theme = new Theme([ + 'basePath' => '@webroot/themes/' . $theme, + 'baseUrl' => '@web/themes/' . $theme, + 'pathMap' => [ + '@common/modules' => '@webroot/themes/' . $theme . '/modules', + '@frontend/views' => '@webroot/themes/' . $theme, + '@frontend/widgets' => '@webroot/themes/' . $theme . '/widgets', + ], - ]); - } -} \ No newline at end of file + ]); + } +}