diff --git a/backend/config/main.php b/backend/config/main.php index eb1490f..31570fc 100755 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -1,7 +1,7 @@ [], ], 'urlManagerFrontend' => [ - 'class' => UrlManager::className(), + 'class' => SeoUrlManager::className(), 'baseUrl' => '/', 'enablePrettyUrl' => true, 'showScriptName' => false, @@ -111,7 +111,7 @@ 'conditions' => [ [ 'in_menu' => 1 ], ], - 'url' => 'site/page', + 'url' => 'page/view', ], ], ], diff --git a/backend/controllers/SitemapController.php b/backend/controllers/SitemapController.php index 0ad1fa2..39e96fe 100755 --- a/backend/controllers/SitemapController.php +++ b/backend/controllers/SitemapController.php @@ -156,6 +156,7 @@ if (isset( $old_entity_models[ $entity_model->entity ] )) { $entity_model->status = $old_entity_models[ $entity_model->entity ]->status; $entity_model->priority = $old_entity_models[ $entity_model->entity ]->priority; + $entity_model->frequency = $old_entity_models[ $entity_model->entity ]->frequency; } } // ***** <<< End @@ -190,7 +191,7 @@ "[$count]url", [ 'options' => [ - 'class' => 'form-group col-xs-8 col-sm-9', + 'class' => 'form-group col-xs-5 col-sm-6', ], ] ) @@ -198,6 +199,27 @@ ->render(); $content .= $form->field( $model, + "[$count]frequency", + [ + 'options' => [ + 'class' => 'form-group col-xs-3 col-sm-3', + ], + ] + ) + ->dropDownList( + [ + 'always' => 'always', + 'hourly' => 'hourly', + 'daily' => 'daily', + 'weekly' => 'weekly', + 'monthly' => 'monthly', + 'yearly' => 'yearly', + 'never' => 'never', + ] + ) + ->render(); + $content .= $form->field( + $model, "[$count]priority", [ 'options' => [ diff --git a/backend/views/settings/_codes_tab.php b/backend/views/settings/_codes_tab.php new file mode 100644 index 0000000..a43789a --- /dev/null +++ b/backend/views/settings/_codes_tab.php @@ -0,0 +1,12 @@ +field($model, 'analytics_key') + ->textInput(); \ No newline at end of file diff --git a/backend/views/settings/_contact_tab.php b/backend/views/settings/_contact_tab.php new file mode 100644 index 0000000..e81acbe --- /dev/null +++ b/backend/views/settings/_contact_tab.php @@ -0,0 +1,34 @@ +field($model, 'phone') + ->textInput() + ->hint(\Yii::t('core', 'Contact phone for website')); + echo $form->field($model, 'phone2') + ->textInput() + ->hint(\Yii::t('core', 'Contact phone for website')); + echo $form->field($model, 'email') + ->textInput() + ->hint(\Yii::t('core', 'Contact email for website')); + echo $form->field($model, 'skype') + ->textInput(); + echo $form->field($model, 'house') + ->textInput(); + echo $form->field($model, 'street') + ->textInput(); + echo $form->field($model, 'office') + ->textInput(); + echo $form->field($model, 'city') + ->textInput(); + echo $form->field($model, 'lat') + ->textInput(); + echo $form->field($model, 'lon') + ->textInput(); + \ No newline at end of file diff --git a/backend/views/settings/_main_tab.php b/backend/views/settings/_main_tab.php new file mode 100644 index 0000000..da1a81e --- /dev/null +++ b/backend/views/settings/_main_tab.php @@ -0,0 +1,22 @@ +field($model, 'name') + ->textInput(); + echo $form->field($model, 'logo') + ->widget( + \noam148\imagemanager\components\ImageManagerInputWidget::className(), + [ + 'showPreview' => true, + 'showDeletePickedImageConfirm' => false, + ] + ); + echo $form->field($model, 'about') + ->textarea(); \ No newline at end of file diff --git a/backend/views/settings/_social_tab.php b/backend/views/settings/_social_tab.php new file mode 100644 index 0000000..80c161c --- /dev/null +++ b/backend/views/settings/_social_tab.php @@ -0,0 +1,20 @@ +field($model, 'facebook') + ->textInput(); + echo $form->field($model, 'vk') + ->textInput(); + echo $form->field($model, 'google') + ->textInput(); + echo $form->field($model, 'twitter') + ->textInput(); + echo $form->field($model, 'ok') + ->textInput(); \ No newline at end of file diff --git a/backend/views/settings/settings.php b/backend/views/settings/settings.php index 115796f..e2525df 100755 --- a/backend/views/settings/settings.php +++ b/backend/views/settings/settings.php @@ -8,6 +8,7 @@ use artbox\gentelella\widgets\XPanel; use yii\bootstrap\ActiveForm; use yii\bootstrap\Html; + use yii\bootstrap\Tabs; use yii\web\View; $this->title = 'Settings'; @@ -26,19 +27,57 @@ field($model, 'id') - ->textInput(); - - echo $form->field($model, 'name') - ->textInput(); - - echo $form->field($model, 'description') - ->textInput(); - echo $form->field($model, 'analytics_key') - ->textInput(); - + echo Tabs::widget( + [ + 'options' => [ + 'class' => 'bar_tabs', + ], + 'items' => [ + [ + 'label' => \Yii::t('core', 'Main'), + 'content' => $this->render( + '_main_tab', + [ + 'model' => $model, + 'form' => $form, + ] + ), + ], + [ + 'label' => \Yii::t('core', 'Contact'), + 'content' => $this->render( + '_contact_tab', + [ + 'model' => $model, + 'form' => $form, + ] + ), + ], + [ + 'label' => \Yii::t('core', 'Social'), + 'content' => $this->render( + '_social_tab', + [ + 'model' => $model, + 'form' => $form, + ] + ), + ], + [ + 'label' => \Yii::t('core', 'Codes'), + 'content' => $this->render( + '_codes_tab', + [ + 'model' => $model, + 'form' => $form, + ] + ), + ], + ], + ] + ); + echo Html::submitButton( 'Save', [ diff --git a/backend/views/sitemap/index.php b/backend/views/sitemap/index.php index 4ec692a..45bbae1 100644 --- a/backend/views/sitemap/index.php +++ b/backend/views/sitemap/index.php @@ -1,5 +1,6 @@ title = \Yii::t('core', 'Sitemap'); $this->params[ 'breadcrumbs' ][] = $this->title; + /** + * @var Sitemap $sitemap + */ + $sitemap = \Yii::$app->get('sitemap'); ?>