diff --git a/backend/config/main.php b/backend/config/main.php index b5b0bd8..dc79482 100755 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -13,19 +13,27 @@ return [ 'layout' => 'admin', 'controllerNamespace' => 'backend\controllers', 'bootstrap' => ['log'], -// 'as AccessBehavior' => [ -// 'class' => AccessBehavior::className(), -// 'rules' => -// ['permit/access' => -// [ -// [ -// 'actions' => ['role', 'permission','add-role', 'update-role','add-permission', 'update-permission' ], -// 'allow' => true, -// ] -// ] -// ], -// -// ], + 'as AccessBehavior' => [ + 'class' => AccessBehavior::className(), + 'rules' => + [ + 'permit/access' => + [ + [ + 'actions' => ['role', 'permission','add-role', 'update-role','add-permission', 'update-permission' ], + 'allow' => true, + ] + ], + 'site' => + [ + [ + 'actions' => ['login', 'error' ], + 'allow' => true, + ] + + ] + ] + ], 'modules' => [ 'permit' => [ 'class' => 'developeruz\db_rbac\Yii2DbRbac', diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php index e400884..8544e48 100755 --- a/backend/controllers/SiteController.php +++ b/backend/controllers/SiteController.php @@ -10,6 +10,7 @@ use common\modules\product\models\ProductVariant; use common\modules\product\models\ProductVariantType; use Yii; use yii\filters\AccessControl; +use yii\helpers\Url; use yii\web\Controller; use backend\models\LoginForm; use yii\filters\VerbFilter; @@ -82,7 +83,7 @@ class SiteController extends Controller $model = new LoginForm(); if ($model->load(Yii::$app->request->post()) && $model->login()) { - return $this->goBack(); + return $this->redirect(Url::to('/admin/site/index')); } else { return $this->render('login', [ 'model' => $model, diff --git a/backend/views/layouts/header.php b/backend/views/layouts/header.php index 865b9b3..696e292 100755 --- a/backend/views/layouts/header.php +++ b/backend/views/layouts/header.php @@ -1,3 +1,17 @@ +
\ No newline at end of file diff --git a/backend/views/seo/_form.php b/backend/views/seo/_form.php index 58413b3..7e03a52 100755 --- a/backend/views/seo/_form.php +++ b/backend/views/seo/_form.php @@ -2,7 +2,8 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; - +use mihaildev\ckeditor\CKEditor; +use mihaildev\elfinder\ElFinder; /* @var $this yii\web\View */ /* @var $model common\models\Seo */ /* @var $form yii\widgets\ActiveForm */ @@ -19,8 +20,15 @@ use yii\widgets\ActiveForm; field($model, 'description')->textInput(['maxlength' => true]) ?> field($model, 'h1')->textInput(['maxlength' => true]) ?> - - field($model, 'seo_text')->textarea(['rows' => 6]) ?> + field($model, 'seo_text')->widget(CKEditor::className(), + [ + 'editorOptions' => ElFinder::ckeditorOptions('elfinder',[ + 'preset' => 'full', //разработанны стандартные настройки basic, standard, full данную возможность не обязательно использовать + 'inline' => false, //по умолчанию false]), + 'filebrowserUploadUrl'=>Yii::$app->getUrlManager()->createUrl('file/uploader/images-upload') + ] + ) + ]) ?>
isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index d3fbf18..c8c7ae0 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -11,6 +11,7 @@ use common\models\Subscribe; use yii\widgets\ActiveForm; use common\modules\product\models\Category; + use frontend\widgets\Seo; AppAsset::register ($this); $this->registerJs (" @@ -70,7 +71,8 @@ - <?= Html::encode ($this->title) ?> + <?= Seo::widget([ 'row'=>'title'])?> + 'description'])?> head () ?> diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php index 079c2b7..5a666e2 100755 --- a/frontend/views/site/index.php +++ b/frontend/views/site/index.php @@ -4,10 +4,11 @@ use yii\helpers\Html; use yii\web\View; use frontend\widgets\BannerWidget; use yii\helpers\Url; - -// $this->title = $text->meta_title; -// $this->registerMetaTag (['name' => 'description', 'content' => $text->meta_description]); -// $this->registerMetaTag (['name' => 'keywords', 'content' => $text->meta_keywords]); +use frontend\widgets\Seo; +$this->params['seo']['seo_text'] = 'TEST SEO TEXT'; +$this->params['seo']['h1'] = 'TEST H1'; +$this->params['seo']['description'] = 'TEST DESCRIPTION'; +$this->params['seo']['fields']['name'] = 'TEST NAME FROM FIELD'; $this->registerJsFile ( Yii::$app->request->baseUrl . '/js/slides.min.jquery.js', ['position' => View::POS_HEAD, 'depends' => ['yii\web\JqueryAsset']]); @@ -65,7 +66,7 @@ echo '
'; 'HOME_CENTER']);?>
- body ?> + 'seo_text'])?>
diff --git a/frontend/widgets/BannerWidget.php b/frontend/widgets/BannerWidget.php index b6f391f..dbbbc7f 100755 --- a/frontend/widgets/BannerWidget.php +++ b/frontend/widgets/BannerWidget.php @@ -21,7 +21,7 @@ class BannerWidget extends Widget public function run () { // слайдер - $banner = Banner::find()->where([Banner::tableName().'.title'=>$this->title])->one(); + $banner = Banner::find()->where([Banner::tableName().'.title'=>$this->title, Banner::tableName().'.status' => '1'] )->one(); if (! empty ($banner)) { // html diff --git a/frontend/widgets/Seo.php b/frontend/widgets/Seo.php index f683633..50e4c29 100755 --- a/frontend/widgets/Seo.php +++ b/frontend/widgets/Seo.php @@ -100,7 +100,7 @@ class Seo extends Widget } } $str = str_replace('{project_name}', $this->project_name, $str); - return Html::encode($str); + return $str; } protected function findSeoByUrl() -- libgit2 0.21.4