Commit 558a5e9e217c043e7dbfa7032ca5d3089a3df1ca
Merge branch 'master' of gitlab.artweb.com.ua:root/test_1
Showing
69 changed files
with
358 additions
and
188 deletions
Show diff stats
backend/views/accounts-vin/_form.php
| ... | ... | @@ -29,7 +29,7 @@ use yii\widgets\ActiveForm; |
| 29 | 29 | <?= $form->field($model, 'timestamp')->textInput() ?> |
| 30 | 30 | |
| 31 | 31 | <div class="form-group"> |
| 32 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 32 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 33 | 33 | </div> |
| 34 | 34 | |
| 35 | 35 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/accounts-vin/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\AccountsVin */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Accounts Vin'; | |
| 9 | +$this->title = 'Добавить Accounts Vin'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Accounts Vins', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/accounts-vin/index.php
| ... | ... | @@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 16 | 16 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 17 | 17 | |
| 18 | 18 | <p> |
| 19 | - <?= Html::a('Create Accounts Vin', ['create'], ['class' => 'btn btn-success']) ?> | |
| 19 | + <?= Html::a('Добавить Accounts Vin', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | 20 | </p> |
| 21 | 21 | |
| 22 | 22 | <?= GridView::widget([ | ... | ... |
backend/views/accounts/_form.php
| ... | ... | @@ -85,7 +85,7 @@ use kartik\date\DatePicker; |
| 85 | 85 | |
| 86 | 86 | |
| 87 | 87 | <div class="form-group"> |
| 88 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 88 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 89 | 89 | </div> |
| 90 | 90 | |
| 91 | 91 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/accounts/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\Accounts */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Accounts'; | |
| 9 | +$this->title = 'Добавить Accounts'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Accounts', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/accounts/index.php
| ... | ... | @@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 16 | 16 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 17 | 17 | |
| 18 | 18 | <p> |
| 19 | - <?= Html::a('Create Accounts', ['create'], ['class' => 'btn btn-success']) ?> | |
| 19 | + <?= Html::a('Добавить Accounts', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | 20 | </p> |
| 21 | 21 | |
| 22 | 22 | <?= GridView::widget([ | ... | ... |
backend/views/art-history/_form.php
| ... | ... | @@ -19,7 +19,7 @@ use yii\widgets\ActiveForm; |
| 19 | 19 | <?= $form->field($model, 'dt')->textInput(['maxlength' => true]) ?> |
| 20 | 20 | |
| 21 | 21 | <div class="form-group"> |
| 22 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 22 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 23 | 23 | </div> |
| 24 | 24 | |
| 25 | 25 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/art-history/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\ArtHistory */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Art History'; | |
| 9 | +$this->title = 'Добавить Art History'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Art Histories', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/art-history/index.php
| ... | ... | @@ -17,7 +17,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 17 | 17 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 18 | 18 | |
| 19 | 19 | <p> |
| 20 | - <?= Html::a('Create Art History', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | + <?= Html::a('Добавить Art History', ['create'], ['class' => 'btn btn-success']) ?> | |
| 21 | 21 | </p> |
| 22 | 22 | |
| 23 | 23 | <?= GridView::widget([ | ... | ... |
backend/views/brands-replace/_form.php
| ... | ... | @@ -21,7 +21,7 @@ use yii\widgets\ActiveForm; |
| 21 | 21 | <?= $form->field($model, 'timestamp')->textInput() ?> |
| 22 | 22 | |
| 23 | 23 | <div class="form-group"> |
| 24 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 24 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 25 | 25 | </div> |
| 26 | 26 | |
| 27 | 27 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/brands-replace/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\BrandsReplace */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Brands Replace'; | |
| 9 | +$this->title = 'Добавить Brands Replace'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Brands Replaces', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/brands-replace/index.php
| ... | ... | @@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 16 | 16 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 17 | 17 | |
| 18 | 18 | <p> |
| 19 | - <?= Html::a('Create Brands Replace', ['create'], ['class' => 'btn btn-success']) ?> | |
| 19 | + <?= Html::a('Добавить Brands Replace', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | 20 | </p> |
| 21 | 21 | |
| 22 | 22 | <?= GridView::widget([ | ... | ... |
backend/views/brands/_form.php
| ... | ... | @@ -29,7 +29,7 @@ use yii\widgets\ActiveForm; |
| 29 | 29 | <?= $form->field($model, 'timestamp')->textInput() ?> |
| 30 | 30 | |
| 31 | 31 | <div class="form-group"> |
| 32 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 32 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 33 | 33 | </div> |
| 34 | 34 | |
| 35 | 35 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/brands/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\Brands */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Brands'; | |
| 9 | +$this->title = 'Добавить Brands'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Brands', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/cat/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\Cat */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Cat'; | |
| 9 | +$this->title = 'Добавить Cat'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Cats', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/cat/index.php
| ... | ... | @@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 16 | 16 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 17 | 17 | |
| 18 | 18 | <p> |
| 19 | - <?= Html::a('Create Cat', ['create'], ['class' => 'btn btn-success']) ?> | |
| 19 | + <?= Html::a('Добавить Cat', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | 20 | </p> |
| 21 | 21 | |
| 22 | 22 | <?= GridView::widget([ | ... | ... |
backend/views/deliveries/index.php
| ... | ... | @@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 16 | 16 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 17 | 17 | |
| 18 | 18 | <p> |
| 19 | - <?= Html::a('Create Deliveries', ['create'], ['class' => 'btn btn-success']) ?> | |
| 19 | + <?= Html::a('Добавить Deliveries', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | 20 | </p> |
| 21 | 21 | |
| 22 | 22 | <?= GridView::widget([ | ... | ... |
backend/views/details-crosses/_form.php
| ... | ... | @@ -23,7 +23,7 @@ use yii\widgets\ActiveForm; |
| 23 | 23 | <?= $form->field($model, 'timestamp')->textInput() ?> |
| 24 | 24 | |
| 25 | 25 | <div class="form-group"> |
| 26 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 26 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 27 | 27 | </div> |
| 28 | 28 | |
| 29 | 29 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/details-crosses/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\DetailsCrosses */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Details Crosses'; | |
| 9 | +$this->title = 'Добавить Details Crosses'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Details Crosses', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/details/_form.php
| ... | ... | @@ -33,7 +33,7 @@ use yii\widgets\ActiveForm; |
| 33 | 33 | <?= $form->field($model, 'timestamp')->textInput() ?> |
| 34 | 34 | |
| 35 | 35 | <div class="form-group"> |
| 36 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 36 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 37 | 37 | </div> |
| 38 | 38 | |
| 39 | 39 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/details/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\Details */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Details'; | |
| 9 | +$this->title = 'Добавить Details'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Details', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/dic-statuses/_form.php
| ... | ... | @@ -23,7 +23,7 @@ use yii\widgets\ActiveForm; |
| 23 | 23 | <?= $form->field($model, 'if_mail')->textInput() ?> |
| 24 | 24 | |
| 25 | 25 | <div class="form-group"> |
| 26 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 26 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 27 | 27 | </div> |
| 28 | 28 | |
| 29 | 29 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/dic-statuses/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\DicStatuses */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Dic Statuses'; | |
| 9 | +$this->title = 'Добавить Dic Statuses'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Dic Statuses', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/dic-statuses/index.php
| ... | ... | @@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 16 | 16 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 17 | 17 | |
| 18 | 18 | <p> |
| 19 | - <?= Html::a('Create Dic Statuses', ['create'], ['class' => 'btn btn-success']) ?> | |
| 19 | + <?= Html::a('Добавить Dic Statuses', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | 20 | </p> |
| 21 | 21 | |
| 22 | 22 | <?= GridView::widget([ | ... | ... |
backend/views/emails/_form.php
| ... | ... | @@ -29,7 +29,7 @@ use yii\widgets\ActiveForm; |
| 29 | 29 | <?= $form->field($model, 'who_comment')->textInput(['maxlength' => true]) ?> |
| 30 | 30 | |
| 31 | 31 | <div class="form-group"> |
| 32 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 32 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 33 | 33 | </div> |
| 34 | 34 | |
| 35 | 35 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/emails/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\Emails */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Emails'; | |
| 9 | +$this->title = 'Добавить Emails'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Emails', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/emails/index.php
| ... | ... | @@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 16 | 16 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 17 | 17 | |
| 18 | 18 | <p> |
| 19 | - <?= Html::a('Create Emails', ['create'], ['class' => 'btn btn-success']) ?> | |
| 19 | + <?= Html::a('Добавить Emails', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | 20 | </p> |
| 21 | 21 | |
| 22 | 22 | <?= GridView::widget([ | ... | ... |
backend/views/importers/_form.php
| ... | ... | @@ -63,7 +63,7 @@ use common\models\Currency; |
| 63 | 63 | </div> |
| 64 | 64 | |
| 65 | 65 | <div class="form-group"> |
| 66 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 66 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 67 | 67 | </div> |
| 68 | 68 | |
| 69 | 69 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/importers/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model backend\models\Importers */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Importers'; | |
| 9 | +$this->title = 'Добавить Importers'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Importers', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/importers/index.php
| ... | ... | @@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 16 | 16 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 17 | 17 | |
| 18 | 18 | <p> |
| 19 | - <?= Html::a('Create Importers', ['create'], ['class' => 'btn btn-success']) ?> | |
| 19 | + <?= Html::a('Добавить Importers', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | 20 | </p> |
| 21 | 21 | |
| 22 | 22 | <?= GridView::widget([ | ... | ... |
backend/views/manufacturers/_form.php
| ... | ... | @@ -53,7 +53,7 @@ use yii\widgets\ActiveForm; |
| 53 | 53 | <?= $form->field($model, 'original_url')->textInput(['maxlength' => true]) ?> |
| 54 | 54 | |
| 55 | 55 | <div class="form-group"> |
| 56 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 56 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 57 | 57 | </div> |
| 58 | 58 | |
| 59 | 59 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/manufacturers/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\Manufacturers */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Manufacturers'; | |
| 9 | +$this->title = 'Добавить Manufacturers'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Manufacturers', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/margins-groups/_form.php
| ... | ... | @@ -21,7 +21,7 @@ use yii\helpers\ArrayHelper; |
| 21 | 21 | |
| 22 | 22 | |
| 23 | 23 | <div class="form-group"> |
| 24 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 24 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 25 | 25 | </div> |
| 26 | 26 | |
| 27 | 27 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/margins-groups/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\MarginsGroups */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Margins Groups'; | |
| 9 | +$this->title = 'Добавить Margins Groups'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Margins Groups', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/margins-groups/index.php
| ... | ... | @@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 16 | 16 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 17 | 17 | |
| 18 | 18 | <p> |
| 19 | - <?= Html::a('Create Margins Groups', ['create'], ['class' => 'btn btn-success']) ?> | |
| 19 | + <?= Html::a('Добавить Margins Groups', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | 20 | </p> |
| 21 | 21 | |
| 22 | 22 | <?= GridView::widget([ | ... | ... |
backend/views/margins-importers-import/_form.php
| ... | ... | @@ -20,7 +20,7 @@ use \yii\helpers\ArrayHelper; |
| 20 | 20 | |
| 21 | 21 | <?= $form->field($model, 'finish')->checkbox() ?> |
| 22 | 22 | <div class="form-group"> |
| 23 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 23 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 24 | 24 | </div> |
| 25 | 25 | |
| 26 | 26 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/margins-importers-import/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\MarginsImportersImport */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Margins Importers Import'; | |
| 9 | +$this->title = 'Добавить Margins Importers Import'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Margins Importers Imports', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/margins-importers-import/index.php
| ... | ... | @@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 16 | 16 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 17 | 17 | |
| 18 | 18 | <p> |
| 19 | - <?= Html::a('Create Margins Importers Import', ['create'], ['class' => 'btn btn-success']) ?> | |
| 19 | + <?= Html::a('Добавить Margins Importers Import', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | 20 | </p> |
| 21 | 21 | |
| 22 | 22 | <?= GridView::widget([ | ... | ... |
backend/views/margins-importers/_form.php
| ... | ... | @@ -19,7 +19,7 @@ use yii\helpers\ArrayHelper; |
| 19 | 19 | <?= $form->field($model, 'koef')->textInput() ?> |
| 20 | 20 | |
| 21 | 21 | <div class="form-group"> |
| 22 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 22 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 23 | 23 | </div> |
| 24 | 24 | |
| 25 | 25 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/margins-importers/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\MarginsImporters */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Margins Importers'; | |
| 9 | +$this->title = 'Добавить Margins Importers'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Margins Importers', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/margins-importers/index.php
| ... | ... | @@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 16 | 16 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 17 | 17 | |
| 18 | 18 | <p> |
| 19 | - <?= Html::a('Create Margins Importers', ['create'], ['class' => 'btn btn-success']) ?> | |
| 19 | + <?= Html::a('Добавить Margins Importers', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | 20 | </p> |
| 21 | 21 | |
| 22 | 22 | <?= GridView::widget([ | ... | ... |
backend/views/margins/_form.php
| ... | ... | @@ -17,7 +17,7 @@ use yii\widgets\ActiveForm; |
| 17 | 17 | <?= $form->field($model, 'koef')->textInput() ?> |
| 18 | 18 | |
| 19 | 19 | <div class="form-group"> |
| 20 | - <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 20 | + <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> | |
| 21 | 21 | </div> |
| 22 | 22 | |
| 23 | 23 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/margins/create.php
| ... | ... | @@ -6,7 +6,7 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\Margins */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Margins'; | |
| 9 | +$this->title = 'Добавить Margins'; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => 'Margins', 'url' => ['index']]; |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> | ... | ... |
backend/views/margins/index.php
| ... | ... | @@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 16 | 16 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 17 | 17 | |
| 18 | 18 | <p> |
| 19 | - <?= Html::a('Create Margins', ['create'], ['class' => 'btn btn-success']) ?> | |
| 19 | + <?= Html::a('Добавить Margins', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | 20 | </p> |
| 21 | 21 | |
| 22 | 22 | <?= GridView::widget([ | ... | ... |
backend/views/page/_form.php
| ... | ... | @@ -21,6 +21,7 @@ use mihaildev\elfinder\ElFinder; |
| 21 | 21 | 'editorOptions' => ElFinder::ckeditorOptions('elfinder',[ |
| 22 | 22 | 'preset' => 'full', //разработанны стандартные настройки basic, standard, full данную возможность не обязательно использовать |
| 23 | 23 | 'inline' => false, //по умолчанию false]), |
| 24 | + 'allowedContent' => true, | |
| 24 | 25 | 'filebrowserUploadUrl'=>Yii::$app->getUrlManager()->createUrl('page/images-upload') |
| 25 | 26 | ] |
| 26 | 27 | ) | ... | ... |
backend/views/page/_search.php
| ... | ... | @@ -34,8 +34,8 @@ use yii\widgets\ActiveForm; |
| 34 | 34 | <?php // echo $form->field($model, 'is_active') ?> |
| 35 | 35 | |
| 36 | 36 | <div class="form-group"> |
| 37 | - <?= Html::submitButton('Search', ['class' => 'btn btn-primary']) ?> | |
| 38 | - <?= Html::resetButton('Reset', ['class' => 'btn btn-default']) ?> | |
| 37 | + <?= Html::submitButton('Поиск', ['class' => 'btn btn-primary']) ?> | |
| 38 | + <?= Html::resetButton('Обновить', ['class' => 'btn btn-default']) ?> | |
| 39 | 39 | </div> |
| 40 | 40 | |
| 41 | 41 | <?php ActiveForm::end(); ?> | ... | ... |
backend/views/page/create.php
| ... | ... | @@ -6,8 +6,8 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $this yii\web\View */ |
| 7 | 7 | /* @var $model common\models\Page */ |
| 8 | 8 | |
| 9 | -$this->title = 'Create Page'; | |
| 10 | -$this->params['breadcrumbs'][] = ['label' => 'Pages', 'url' => ['index']]; | |
| 9 | +$this->title = 'Создать'; | |
| 10 | +$this->params['breadcrumbs'][] = ['label' => 'Текстовые страницы', 'url' => ['index']]; | |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> |
| 13 | 13 | <div class="page-create"> | ... | ... |
backend/views/page/index.php
| ... | ... | @@ -7,7 +7,7 @@ use yii\grid\GridView; |
| 7 | 7 | /* @var $searchModel common\models\PageSearch */ |
| 8 | 8 | /* @var $dataProvider yii\data\ActiveDataProvider */ |
| 9 | 9 | |
| 10 | -$this->title = 'Pages'; | |
| 10 | +$this->title = 'Текстовые страницы'; | |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> |
| 13 | 13 | <div class="page-index"> |
| ... | ... | @@ -16,7 +16,7 @@ $this->params['breadcrumbs'][] = $this->title; |
| 16 | 16 | <?php // echo $this->render('_search', ['model' => $searchModel]); ?> |
| 17 | 17 | |
| 18 | 18 | <p> |
| 19 | - <?= Html::a('Create Page', ['create'], ['class' => 'btn btn-success']) ?> | |
| 19 | + <?= Html::a('Добавить', ['create'], ['class' => 'btn btn-success']) ?> | |
| 20 | 20 | </p> |
| 21 | 21 | |
| 22 | 22 | <?= GridView::widget([ | ... | ... |
backend/views/page/update.php
| ... | ... | @@ -6,9 +6,9 @@ use yii\helpers\Html; |
| 6 | 6 | /* @var $model common\models\Page */ |
| 7 | 7 | |
| 8 | 8 | $this->title = 'Update Page: ' . ' ' . $model->name; |
| 9 | -$this->params['breadcrumbs'][] = ['label' => 'Pages', 'url' => ['index']]; | |
| 9 | +$this->params['breadcrumbs'][] = ['label' => 'Текстовые страницы', 'url' => ['index']]; | |
| 10 | 10 | $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]]; |
| 11 | -$this->params['breadcrumbs'][] = 'Update'; | |
| 11 | +$this->params['breadcrumbs'][] = 'Обновить'; | |
| 12 | 12 | ?> |
| 13 | 13 | <div class="page-update"> |
| 14 | 14 | ... | ... |
backend/views/page/view.php
| ... | ... | @@ -7,7 +7,7 @@ use yii\widgets\DetailView; |
| 7 | 7 | /* @var $model common\models\Page */ |
| 8 | 8 | |
| 9 | 9 | $this->title = $model->name; |
| 10 | -$this->params['breadcrumbs'][] = ['label' => 'Pages', 'url' => ['index']]; | |
| 10 | +$this->params['breadcrumbs'][] = ['label' => 'Текстовые страницы', 'url' => ['index']]; | |
| 11 | 11 | $this->params['breadcrumbs'][] = $this->title; |
| 12 | 12 | ?> |
| 13 | 13 | <div class="page-view"> |
| ... | ... | @@ -15,11 +15,11 @@ $this->params['breadcrumbs'][] = $this->title; |
| 15 | 15 | <h1><?= Html::encode($this->title) ?></h1> |
| 16 | 16 | |
| 17 | 17 | <p> |
| 18 | - <?= Html::a('Update', ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?> | |
| 19 | - <?= Html::a('Delete', ['delete', 'id' => $model->id], [ | |
| 18 | + <?= Html::a('Обновить', ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?> | |
| 19 | + <?= Html::a('Удалить', ['delete', 'id' => $model->id], [ | |
| 20 | 20 | 'class' => 'btn btn-danger', |
| 21 | 21 | 'data' => [ |
| 22 | - 'confirm' => 'Are you sure you want to delete this item?', | |
| 22 | + 'confirm' => 'Вы увереннны что хотите удалить этот элемент?', | |
| 23 | 23 | 'method' => 'post', |
| 24 | 24 | ], |
| 25 | 25 | ]) ?> | ... | ... |
common/models/News.php
common/models/Page.php
| ... | ... | @@ -33,7 +33,7 @@ class Page extends \yii\db\ActiveRecord |
| 33 | 33 | public function rules() |
| 34 | 34 | { |
| 35 | 35 | return [ |
| 36 | - [['name', 'code', 'content', 'title', 'kwords', 'descr'], 'required'], | |
| 36 | + [['name', 'code', 'content'], 'required'], | |
| 37 | 37 | [['content'], 'string'], |
| 38 | 38 | [['sort', 'is_active'], 'integer'], |
| 39 | 39 | [['name'], 'string', 'max' => 100], | ... | ... |
frontend/config/main.php
| ... | ... | @@ -41,9 +41,10 @@ return [ |
| 41 | 41 | 'enablePrettyUrl' => true, |
| 42 | 42 | 'showScriptName' => false, |
| 43 | 43 | 'rules' => [ |
| 44 | - 'news/<translit:\d+>' => 'news/view', | |
| 44 | + 'news/<translit:[\w-]+>' => 'news/view', | |
| 45 | 45 | 'news' => 'news/index', |
| 46 | 46 | 'page/<translit:[\w-]+>'=>'page/view', |
| 47 | + 'company/<translit:[\w-]+>'=>'page/about', | |
| 47 | 48 | 'goods/one-item/<translit:[\w-]+>'=>'goods/one-item', |
| 48 | 49 | 'goods/view/<translit:[\w-]+>'=>'goods/view', |
| 49 | 50 | 'stone/view/<translit:[\w-]+>'=>'stone/view', | ... | ... |
frontend/controllers/NewsController.php
| ... | ... | @@ -32,10 +32,15 @@ class NewsController extends Controller |
| 32 | 32 | |
| 33 | 33 | public function actionView($translit) |
| 34 | 34 | { |
| 35 | - $news_list = News::find()->where(['is_active'=>1])->limit(3)->all(); | |
| 35 | + | |
| 36 | + $activeNews = $this->findModel($translit); | |
| 37 | + $next_news = News::find()->where(['is_active'=>1])->andWhere('id > :id',[':id' => $activeNews->id])->one(); | |
| 38 | + $prev_news = News::find()->where(['is_active'=>1])->andWhere('id < :id',[':id' => $activeNews->id])->one(); | |
| 39 | + | |
| 36 | 40 | return $this->render('view', [ |
| 37 | - 'model' => $this->findModel($translit), | |
| 38 | - 'news_list' => $news_list | |
| 41 | + 'model' => $activeNews, | |
| 42 | + 'next_news' => $next_news instanceof News ? $next_news : '', | |
| 43 | + 'prev_news' => $prev_news instanceof News ? $prev_news : '' | |
| 39 | 44 | ]); |
| 40 | 45 | } |
| 41 | 46 | |
| ... | ... | @@ -79,4 +84,6 @@ class NewsController extends Controller |
| 79 | 84 | "descr"=> "Отказ от рассылки ИталАвто" |
| 80 | 85 | ); |
| 81 | 86 | } |
| 87 | + | |
| 88 | + | |
| 82 | 89 | } | ... | ... |
frontend/controllers/PageController.php
| ... | ... | @@ -38,6 +38,15 @@ class PageController extends Controller |
| 38 | 38 | ]); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | + | |
| 42 | + public function actionAbout($translit) | |
| 43 | + { | |
| 44 | + | |
| 45 | + return $this->render('about_view', [ | |
| 46 | + 'model' => $this->findModel($translit), | |
| 47 | + ]); | |
| 48 | + } | |
| 49 | + | |
| 41 | 50 | protected function findModel($translit) |
| 42 | 51 | { |
| 43 | 52 | ... | ... |
frontend/controllers/SiteController.php
| ... | ... | @@ -4,6 +4,7 @@ namespace frontend\controllers; |
| 4 | 4 | use common\models\Accounts; |
| 5 | 5 | use common\models\AccountsForm; |
| 6 | 6 | use common\models\News; |
| 7 | +use common\models\Slider; | |
| 7 | 8 | use common\models\Team; |
| 8 | 9 | use common\models\TeamGroup; |
| 9 | 10 | use Yii; |
| ... | ... | @@ -53,7 +54,7 @@ class SiteController extends Controller |
| 53 | 54 | $this->layout = '/outer'; |
| 54 | 55 | |
| 55 | 56 | $news_list = News::find()->where(['is_active'=>1])->limit(3)->all(); |
| 56 | - | |
| 57 | + $slider_list = Slider::find()->where(['is_active'=>1])->all(); | |
| 57 | 58 | if (Yii::$app->request->post()) { |
| 58 | 59 | |
| 59 | 60 | $post = Yii::$app->request->post(); |
| ... | ... | @@ -68,6 +69,7 @@ class SiteController extends Controller |
| 68 | 69 | |
| 69 | 70 | } |
| 70 | 71 | return $this->render('index',[ |
| 72 | + 'slider_list' => $slider_list, | |
| 71 | 73 | 'news_list' => $news_list |
| 72 | 74 | ]); |
| 73 | 75 | } |
| ... | ... | @@ -84,10 +86,15 @@ class SiteController extends Controller |
| 84 | 86 | } |
| 85 | 87 | |
| 86 | 88 | |
| 87 | - public function actionArticle() | |
| 89 | + public function actionTeam() | |
| 88 | 90 | { |
| 91 | + $teamGroups = TeamGroup::find()->all(); | |
| 92 | + | |
| 89 | 93 | $this->layout = '/internal'; |
| 90 | - return $this->render('article'); | |
| 94 | + return $this->render('team',[ | |
| 95 | + 'teamGroups' => $teamGroups, | |
| 96 | + ]); | |
| 97 | + | |
| 91 | 98 | } |
| 92 | 99 | |
| 93 | 100 | public function actionBc2Catalog() | ... | ... |
frontend/views/layouts/main.php
| ... | ... | @@ -40,7 +40,7 @@ use yii\captcha\Captcha; |
| 40 | 40 | <?php |
| 41 | 41 | echo Menu::widget([ |
| 42 | 42 | 'items' => [ |
| 43 | - ['label' => 'О компании', 'url'=>Url::toRoute('/site/about')], | |
| 43 | + ['label' => 'О компании', 'url'=>Url::toRoute(['/page/about','translit'=>'about'])], | |
| 44 | 44 | ['label' => 'Каталоги', 'url'=>'#'],//Url::toRoute('/page/FAQ')], |
| 45 | 45 | ['label' => 'Оптовикам','url'=>Url::toRoute(['/page/view','translit'=>'optovikam'])], |
| 46 | 46 | ['label' => 'Поставщикам','url'=>Url::toRoute(['/page/view','translit'=>'suppliers'])], |
| ... | ... | @@ -100,7 +100,7 @@ use yii\captcha\Captcha; |
| 100 | 100 | </div> |
| 101 | 101 | |
| 102 | 102 | <div class="contacts"> |
| 103 | - <img src="/images/logo.png"> | |
| 103 | + <?= Html::a(Html::img('/images/logo.png'),['/']) ?> | |
| 104 | 104 | <!-- Split button --> |
| 105 | 105 | |
| 106 | 106 | <!-- <select class='dropdown_contacts'> |
| ... | ... | @@ -164,9 +164,9 @@ use yii\captcha\Captcha; |
| 164 | 164 | <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data','id'=>'call_form'], 'action' => '/']); ?> |
| 165 | 165 | <fieldset> |
| 166 | 166 | <h3>Обратный звонок</h3> |
| 167 | - <?= $form->field(new Callback(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?><span class='star'>*</span> | |
| 167 | + <?= $form->field(new Callback(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?> | |
| 168 | 168 | |
| 169 | - <?= $form->field(new Callback(), 'phone_num')->textInput(['maxlength' => 45,'placeholder'=>'Телефон','class'=>'form-control telephone_registration'])->label(false) ?><span class='star1'>*</span> | |
| 169 | + <?= $form->field(new Callback(), 'phone_num')->textInput(['maxlength' => 45,'placeholder'=>'Телефон','class'=>'form-control telephone_registration'])->label(false) ?> | |
| 170 | 170 | |
| 171 | 171 | <button class="purple" type="submit" value="Submit">Запросить</button> |
| 172 | 172 | </fieldset> | ... | ... |
frontend/views/news/one_item.php
| ... | ... | @@ -4,8 +4,8 @@ use \yii\helpers\Html; |
| 4 | 4 | |
| 5 | 5 | |
| 6 | 6 | <div class="news"> |
| 7 | - <?= Html::a(Html::img($model->img),['news/view', 'translit' =>$model->code ]) ?> | |
| 7 | + <?= Html::a(Html::img($model->img),['/news/view', 'translit' =>$model->code ]) ?> | |
| 8 | 8 | <span class='date'><?= $model->date?></span><br> |
| 9 | - <?= Html::a("<p class='article'>".$model->name."</p>",['news/view', 'translit' =>$model->code ]) ?> | |
| 10 | - <?= Html::a("<p class='short_news'>".$model->brief."</p>",['news/view', 'translit' =>$model->code ]) ?> | |
| 9 | + <?= Html::a("<p class='article'>".$model->name."</p>",['/news/view', 'translit' =>$model->code ]) ?> | |
| 10 | + <?= Html::a("<p class='short_news'>".$model->pregStr($model->brief)."</p>",['/news/view', 'translit' =>$model->code ]) ?> | |
| 11 | 11 | </div> |
| 12 | 12 | \ No newline at end of file | ... | ... |
frontend/views/news/view.php
| ... | ... | @@ -19,12 +19,20 @@ $this->params['breadcrumbs'][] = $this->title; |
| 19 | 19 | </div> |
| 20 | 20 | <div class='long_line'></div> |
| 21 | 21 | <div class="go_news"> |
| 22 | - <?php foreach ($news_list as $one_news):?> | |
| 23 | - <div class="back_news"> | |
| 24 | - <?= Html::a("<p class='article'>".$one_news->name."</p>",['news/view', 'translit' =>$one_news->code ]) ?> | |
| 25 | - <?= Html::a("<p class='short_news'>".$one_news->brief."</p>",['news/view', 'translit' =>$one_news->code ]) ?> | |
| 26 | - </div> | |
| 27 | - <?php endforeach; ?> | |
| 22 | + <?php if($next_news):?> | |
| 23 | + <div class="back_news"> | |
| 24 | + <?= Html::a("<p class='article'>".$next_news->name."</p>",['/news/view', 'translit' =>$next_news->code ]) ?> | |
| 25 | + <?= Html::a("<p class='short_news'>".$next_news->brief."</p>",['/news/view', 'translit' =>$next_news->code ]) ?> | |
| 26 | + </div> | |
| 27 | + <?php endif; ?> | |
| 28 | + | |
| 29 | + <?php if($prev_news):?> | |
| 30 | + <div class="back_news"> | |
| 31 | + <?= Html::a("<p class='article'>".$prev_news->name."</p>",['/news/view', 'translit' =>$prev_news->code ]) ?> | |
| 32 | + <?= Html::a("<p class='short_news'>".$prev_news->brief."</p>",['/news/view', 'translit' =>$prev_news->code ]) ?> | |
| 33 | + </div> | |
| 34 | + <?php endif; ?> | |
| 35 | + | |
| 28 | 36 | </div> |
| 29 | 37 | </div> |
| 30 | 38 | <img src="/images/lonh_line.png" style="margin-top:-20px;opacity:0"> | ... | ... |
| 1 | +<?php | |
| 2 | +$this->registerCssFile('/css/about_company.css'); | |
| 3 | +use \yii\helpers\Url; | |
| 4 | +$this->registerMetaTag(['description' => $model->descr,'keywords'=>$model->kwords]); | |
| 5 | +$this->title = $model->title ? $model->title: $model->name; | |
| 6 | +$this->params['breadcrumbs'][] = $this->title; | |
| 7 | +?> | |
| 8 | + | |
| 9 | +<?php | |
| 10 | + | |
| 11 | + | |
| 12 | +?> | |
| 13 | +<div class="main-vin"> | |
| 14 | + <p class="vin_article"><?=$this->title?></p> | |
| 15 | + <div class='side_menu'> | |
| 16 | + <?php | |
| 17 | + echo \yii\widgets\Menu::widget([ | |
| 18 | + 'options' => ['class' => 'side_menu-list'], | |
| 19 | + 'items' => [ | |
| 20 | + ['label' => 'Миссия', 'url' => Url::toRoute(['/page/about','translit'=>'about'])], | |
| 21 | + ['label' => 'Команда', 'url' => Url::toRoute(['/site/team'])], | |
| 22 | + ], | |
| 23 | + ]); | |
| 24 | + ?> | |
| 25 | + | |
| 26 | + <div class="tab-content"> | |
| 27 | + <?= $model->content;?> | |
| 28 | + </div> | |
| 29 | + </div> | |
| 30 | + <img src="/images/lonh_line.png" class='long_line'> | |
| 31 | +</div> | |
| 0 | 32 | \ No newline at end of file | ... | ... |
frontend/views/page/view.php
frontend/views/site/about.php deleted
| 1 | -<?php | |
| 2 | -$this->registerCssFile('/css/about_company.css'); | |
| 3 | - | |
| 4 | -$this->title = "О компании"; | |
| 5 | -$this->params['breadcrumbs'][] = $this->title; | |
| 6 | -?> | |
| 7 | - | |
| 8 | - | |
| 9 | -<div class="main-vin"> | |
| 10 | - <p class="vin_article">О компании</p> | |
| 11 | -<div class='side_menu'> | |
| 12 | -<ul class="side_menu-list" role="tablist"> | |
| 13 | - <li class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">Миссия</a></li> | |
| 14 | - <li><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab">Команда</a></li> | |
| 15 | - <li><a href="#messages" aria-controls="messages" role="tab" data-toggle="tab">Контакты</a></li> | |
| 16 | - <li><a href="#settings" aria-controls="settings" role="tab" data-toggle="tab">Оплата и доставка</a></li> | |
| 17 | -</ul> | |
| 18 | - <div class="tab-content"> | |
| 19 | - <div role="tabpanel" class="tab-pane active" id="home"> | |
| 20 | - <p class="tab-content_header">Преимущества компании "Италавто"</p> | |
| 21 | - <p class="tab-content_article">Наша компания "Италавто" уже много лет занимается поставками автозапчастей для автомобилей итальянского производства. Наиболее распространённые бренды на Украине - различные модели Fiat (Фиат) и Iveco (Ивеко). Лёгкие и тяжёлые грузовые автомобили Ивеко экономичные и адаптированные для работы в Украине. Заслуженной популярностью пользуется микроавтобус Fiat Ducato (Дукато) класса "Газели", Fiat Punto (Пунто) и Fiat Grande Punto (Гранд Пунто) - очень красивые легковые автомобили элегантного дизайна. Fiat Tempra (Темпра) — семейный среднеразмерный автомобиль, выпуск которого компанией Фиат был приостановлен 1998 году, но до сих пор запчасти к Fiat Tempra пользуются повышенным спросом.<br><br><br> | |
| 22 | - | |
| 23 | - В наличии и под заказ на складах Киева и Харькова большой ассортимент оригинальных запчастей к различным маркам и моделям автомобилей итальянского производства. Мы надеемся, что сумеем помочь Вам в подборе необходимых запчастей хорошего качества непосредственно из Европы по оптимальной цене. На нашем сайте Вы можете заказать детали непосредственно из мастерских, где осуществляется разборка, и ремонт Fiat пройдёт намного лучше. Наша компания предоставляет нашим клиентам ряд очевидных преимуществ: максимальное удобство поиска и заказа, не выходя из дома или офиса - используйте для заказа формы интернет-магазина; возможность подбора автозапчастей и деталей он-лайн по коду, по каталогам либо запросом по коду; быструю доставку заказа в течение недели или двух в Киев и в течение дня - из Киева по регионам перевозчиками "Автолюкс", "Гюнсел", "Ин-Тайм", "Новая почта", "Ночной экспресс", "Евроэкспресс". Нашим интернет-магазином предусмотрена возможность просмотра ожидаемых поставок запчастей. Также на нашем сайте регулярно проводятся акции - распродажи запчастей. На запчасти для Iveco (Ивеко) и запчасти для Fiat (Фиат) оптовым покупателей специальные условия. | |
| 24 | - </p> | |
| 25 | -</div> | |
| 26 | - <div role="tabpanel" class="tab-pane" id="profile"> | |
| 27 | - <?php foreach ($teamGroups as $group): ?> | |
| 28 | - <?=$this->render('team_list_layout', [ | |
| 29 | - 'group' => $group | |
| 30 | - ]);?> | |
| 31 | - <?php endforeach; ?> | |
| 32 | - </div> | |
| 33 | - <?=$this->render('contacts_layout', [ | |
| 34 | - ]);?> | |
| 35 | - <?=$this->render('payment_delivery_layout', [ | |
| 36 | - ]);?> | |
| 37 | - </div> | |
| 38 | -</div> | |
| 39 | -<img src="/images/lonh_line.png" class='long_line'> | |
| 40 | -</div> | |
| 41 | 0 | \ No newline at end of file |
frontend/views/site/index.php
| ... | ... | @@ -509,30 +509,13 @@ use \yii\helpers\Html; |
| 509 | 509 | |
| 510 | 510 | <!-- Wrapper for slides --> |
| 511 | 511 | <div class="carousel-inner" role="listbox"> |
| 512 | - <div class="item"> | |
| 513 | - <img src="/images/car_carousel.png" alt="..."> | |
| 514 | - <div class="carousel-caption"> | |
| 515 | - <p>Все для ремонта автомобилей Land Rover | |
| 516 | - <br>lr-parts.com.ua</p> | |
| 517 | - <img src="/images/land_rover.png"> | |
| 518 | - </div> | |
| 519 | - </div> | |
| 520 | - <div class="item"> | |
| 521 | - <img src="/images/car_carousel.png" alt="..."> | |
| 522 | - <div class="carousel-caption"> | |
| 523 | - <p>Все для ремонта автомобилей Land Rover | |
| 524 | - <br>lr-parts.com.ua</p> | |
| 525 | - <img src="/images/land_rover.png"> | |
| 526 | - </div> | |
| 527 | - </div> | |
| 528 | - <div class="item active"> | |
| 529 | - <img src="/images/car_carousel.png" alt="..."> | |
| 530 | - <div class="carousel-caption"> | |
| 531 | - <p>Все для ремонта автомобилей Land Rover | |
| 532 | - <br>lr-parts.com.ua</p> | |
| 533 | - <img src="/images/land_rover.png"> | |
| 512 | + <?php $i = 0; foreach ($slider_list as $one_slid):?> | |
| 513 | + <div class="item <?=!$i++?'active':''?>"> | |
| 514 | + | |
| 515 | + <?= Html::a(Html::img($one_slid->img)) ?> | |
| 516 | + | |
| 534 | 517 | </div> |
| 535 | - </div> | |
| 518 | + <?php endforeach; ?> | |
| 536 | 519 | |
| 537 | 520 | </div> |
| 538 | 521 | |
| ... | ... | @@ -577,27 +560,33 @@ use \yii\helpers\Html; |
| 577 | 560 | </div> |
| 578 | 561 | <div class="news"> |
| 579 | 562 | <?= Html::a( 'Новости', Url::toRoute('news/index'),['class'=>'main_link_news'])?> |
| 580 | - <span><img src="/images/arrow_slider_back.png"></span> | |
| 581 | - <span class="number_of">1/</span> | |
| 582 | - <span class="general_number">5</span> | |
| 583 | - <span><img src="/images/arrow_slider_go.png"></span> | |
| 584 | - <?php foreach ($news_list as $one_news):?> | |
| 585 | - <div class="slider_tovars"> | |
| 586 | - <div class="tovar"> | |
| 587 | - <?= Html::img(\yii\helpers\Url::to($one_news->img)); ?> | |
| 588 | - <?= Html::a("<p class='article'>".$one_news->name."</p>",['news/view', 'translit' =>$one_news->code ]) ?> | |
| 589 | - </div> | |
| 590 | - </div> | |
| 591 | - <?php endforeach; ?> | |
| 563 | + | |
| 564 | + <span class="num"></span> | |
| 592 | 565 | <div class="slider_tovars"> |
| 593 | - <div class="tovar"> | |
| 594 | - <img src="/images/news.png"> | |
| 595 | - <p>На склад поступила очередная партия товара Metalcaucho. Готов к отгрузке.<br><br> | |
| 596 | 566 | |
| 597 | - Полный список товаров этой группы доступен по <br><a href="">ссылке</a></p> | |
| 567 | + <div id="carousel-example-generic1" class="carousel slide" data-ride="carousel"> | |
| 598 | 568 | |
| 599 | - </div> | |
| 569 | + <div class="carousel-inner" role="listbox"> | |
| 570 | + <?php $i = 0; foreach ($news_list as $one_news):?> | |
| 571 | + <div class="item tovar <?=!$i++?'active':''?>"> | |
| 572 | + <?= Html::a(Html::img($one_news->img),['news/view', 'translit' =>$one_news->code ]) ?> | |
| 573 | + <div class="carousel-caption"> | |
| 574 | + <?= Html::a("<p class='article'>".$one_news->name."</p>",['news/view', 'translit' =>$one_news->code ]) ?> | |
| 575 | + <?= Html::a("<p class='short_news'>".$one_news->pregStr($one_news->brief)."</p>",['news/view', 'translit' =>$one_news->code ]) ?> | |
| 576 | + </div> | |
| 577 | + </div> | |
| 578 | + <?php endforeach; ?> | |
| 600 | 579 | |
| 580 | + </div> | |
| 581 | + | |
| 582 | + <!-- Controls --> | |
| 583 | + <a class="left carousel-control" href="#carousel-example-generic1" role="button" data-slide="prev"> | |
| 584 | + <img src="/images/arrow_slider_back.png"> | |
| 585 | + </a> | |
| 586 | + <a class="right carousel-control" href="#carousel-example-generic1" role="button" data-slide="next"> | |
| 587 | + <img src="/images/arrow_slider_go.png"> | |
| 588 | + </a> | |
| 589 | + </div> | |
| 601 | 590 | |
| 602 | 591 | </div> |
| 603 | 592 | </div> | ... | ... |
| 1 | +<?php | |
| 2 | +$this->registerCssFile('/css/about_company.css'); | |
| 3 | +use \yii\helpers\Url; | |
| 4 | +$this->params['breadcrumbs'][] = "Команда"; | |
| 5 | +?> | |
| 6 | + | |
| 7 | +<?php | |
| 8 | + | |
| 9 | + | |
| 10 | +?> | |
| 11 | +<div class="main-vin"> | |
| 12 | + <p class="vin_article"><?=$this->title?></p> | |
| 13 | + <div class='side_menu'> | |
| 14 | + <?php | |
| 15 | + echo \yii\widgets\Menu::widget([ | |
| 16 | + 'options' => ['class' => 'side_menu-list'], | |
| 17 | + 'items' => [ | |
| 18 | + ['label' => 'Миссия', 'url' => Url::toRoute(['/page/about','translit'=>'about'])], | |
| 19 | + ['label' => 'Команда', 'url' => Url::toRoute(['/site/team'])], | |
| 20 | + ], | |
| 21 | + ]); | |
| 22 | + ?> | |
| 23 | + <div class="tab-content"> | |
| 24 | + <div id="profile"> | |
| 25 | + <?php foreach ($teamGroups as $group): ?> | |
| 26 | + <?=$this->render('team_list_layout', [ | |
| 27 | + 'group' => $group | |
| 28 | + ]);?> | |
| 29 | + <?php endforeach; ?> | |
| 30 | + </div> | |
| 31 | + </div> | |
| 32 | + </div> | |
| 33 | + <img src="/images/lonh_line.png" class='long_line'> | |
| 34 | +</div> | |
| 0 | 35 | \ No newline at end of file | ... | ... |
frontend/web/css/about_company.css
frontend/web/css/main.css
| ... | ... | @@ -142,7 +142,13 @@ li a{ |
| 142 | 142 | margin-bottom: 10px; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | -div.required:after {content: " *"; color: #fec831;} | |
| 145 | +div.required:after { content: " *"; | |
| 146 | + color: #fec831; | |
| 147 | + display: inline-block; | |
| 148 | + position: relative; | |
| 149 | + top: -31px; | |
| 150 | + left: 40px; | |
| 151 | +} | |
| 146 | 152 | |
| 147 | 153 | .registration_holder{ |
| 148 | 154 | padding-top: 32px; |
| ... | ... | @@ -181,4 +187,83 @@ div.required:after {content: " *"; color: #fec831;} |
| 181 | 187 | .vin{ |
| 182 | 188 | width: 960px; |
| 183 | 189 | margin: 20px auto; |
| 190 | +} | |
| 191 | + | |
| 192 | +#modal_form input { | |
| 193 | + background-color: #f5f5f5; | |
| 194 | + width: 334px; | |
| 195 | + height: 30px; | |
| 196 | + padding-left: 9px; | |
| 197 | + border-radius: 6px; | |
| 198 | + border: 1px solid #dfdfdf; | |
| 199 | + margin: 8px 114px 20px; | |
| 200 | +} | |
| 201 | + | |
| 202 | +#modal_form #email-error{ | |
| 203 | + position: absolute; | |
| 204 | + left: 121px; | |
| 205 | + top: 150px; | |
| 206 | +} | |
| 207 | + | |
| 208 | +#modal_form input[type="checkbox"] + label span, input[type="checkbox"]:checked + label span { | |
| 209 | + position: absolute; | |
| 210 | + left: 114px; | |
| 211 | + top: 224px; | |
| 212 | + -webkit-transition: background 0.4s linear; | |
| 213 | + -o-transition: background 0.4s linear; | |
| 214 | + -moz-transition: background 0.4s linear; | |
| 215 | + transition: background 0.4s linear; | |
| 216 | +} | |
| 217 | +#modal_form #password-error{ | |
| 218 | + position: absolute; | |
| 219 | + left: 124px; | |
| 220 | + top: 199px; | |
| 221 | +} | |
| 222 | + | |
| 223 | +.star1 { | |
| 224 | + color: #fec831; | |
| 225 | + position: absolute; | |
| 226 | + left: 104px; | |
| 227 | + top: 184px; | |
| 228 | +} | |
| 229 | + | |
| 230 | +.has-error .help-block, .has-error .control-label, .has-error .radio, .has-error .checkbox, .has-error .radio-inline, .has-error .checkbox-inline, .has-error.radio label, .has-error.checkbox label, .has-error.radio-inline label, .has-error.checkbox-inline label{ | |
| 231 | + position: absolute!important; | |
| 232 | + left: 135px!important; | |
| 233 | +} | |
| 234 | + | |
| 235 | +.back_news a:last-child strong span{ | |
| 236 | + font-size: 14px!important; | |
| 237 | + font-weight: 500; | |
| 238 | + display: block; | |
| 239 | + margin-left: 61px; | |
| 240 | + width: 240px; | |
| 241 | + | |
| 242 | +} | |
| 243 | + | |
| 244 | +.back_news:nth-child(2){ | |
| 245 | + background-image: url('/images/arrow_slider_go.png'); | |
| 246 | + background-repeat: no-repeat; | |
| 247 | + background-position: 100% 46%; | |
| 248 | +} | |
| 249 | +.back_news:nth-child(2){ | |
| 250 | + background-image: url('/images/arrow_slider_go.png'); | |
| 251 | + background-repeat: no-repeat; | |
| 252 | + background-position: 100% 46%; | |
| 253 | +} | |
| 254 | + | |
| 255 | +.back_news:hover{ | |
| 256 | + background-image: url('/images/arrow_slider_back.png'); | |
| 257 | + background-repeat: no-repeat; | |
| 258 | + background-position: 0% 46%; | |
| 259 | +} | |
| 260 | + | |
| 261 | +.back_news:nth-child(2):hover{ | |
| 262 | + background-image: url('/images/arrow_slider_go.png'); | |
| 263 | + background-repeat: no-repeat; | |
| 264 | + background-position: 100% 46%; | |
| 265 | +} | |
| 266 | + | |
| 267 | +.field-accountsform-company{ | |
| 268 | + display: none; | |
| 184 | 269 | } |
| 185 | 270 | \ No newline at end of file | ... | ... |
frontend/web/css/news_all.css
frontend/web/css/style.css
| ... | ... | @@ -309,9 +309,9 @@ |
| 309 | 309 | .searching_for_tovars:focus{ |
| 310 | 310 | outline: none |
| 311 | 311 | } |
| 312 | -.slider_tovars{ | |
| 313 | - width: 730px; | |
| 314 | - height: 315px; | |
| 312 | +#carousel-example-generic1{ | |
| 313 | + width: 220px; | |
| 314 | + height: 310px; | |
| 315 | 315 | } |
| 316 | 316 | .car a{ |
| 317 | 317 | color:#ffffff; |
| ... | ... | @@ -322,7 +322,35 @@ |
| 322 | 322 | |
| 323 | 323 | } |
| 324 | 324 | |
| 325 | +#carousel-example-generic1 .carousel-control.left{ | |
| 326 | + background-image: none!important; | |
| 327 | + height: 27px; | |
| 328 | + top: -35px; | |
| 329 | + left: 90px; | |
| 330 | +} | |
| 325 | 331 | |
| 332 | +#carousel-example-generic1 .right.carousel-control{ | |
| 333 | + background-image: none!important; | |
| 334 | + height: 27px; | |
| 335 | + top: -36px; | |
| 336 | + right: 42px; | |
| 337 | +} | |
| 338 | +#carousel-example-generic1 .carousel-caption { | |
| 339 | + position: static!important; | |
| 340 | + right: 15%; | |
| 341 | + bottom: 20px; | |
| 342 | + left: 15%; | |
| 343 | + z-index: 10; | |
| 344 | + padding-top:0!important; | |
| 345 | + padding-bottom: 0!important; | |
| 346 | + color: inherit!important; | |
| 347 | + text-shadow: none!important; | |
| 348 | + width: 179px; | |
| 349 | +} | |
| 350 | + | |
| 351 | +#carousel-example-generic1 .carousel-indicators{ | |
| 352 | + display: none | |
| 353 | +} | |
| 326 | 354 | .tovar a:hover{ |
| 327 | 355 | color:#a2b5da; |
| 328 | 356 | } |
| ... | ... | @@ -1917,8 +1945,10 @@ span:first-child .tovars{ |
| 1917 | 1945 | } |
| 1918 | 1946 | |
| 1919 | 1947 | .news .slider_tovars .tovar img{ |
| 1920 | - margin-left: -18px; | |
| 1948 | + margin-left: 13px; | |
| 1921 | 1949 | border:1px solid #dfdfdf; |
| 1950 | + width: 130px; | |
| 1951 | + height: 90px; | |
| 1922 | 1952 | } |
| 1923 | 1953 | .news img{ |
| 1924 | 1954 | margin-left: 0; |
| ... | ... | @@ -2512,27 +2542,29 @@ input[type="checkbox"]:checked + label span { |
| 2512 | 2542 | |
| 2513 | 2543 | |
| 2514 | 2544 | |
| 2515 | - .carousel-indicators { | |
| 2545 | + #carousel-example-generic.carousel-indicators { | |
| 2516 | 2546 | bottom: 0px; |
| 2517 | 2547 | } |
| 2518 | 2548 | |
| 2519 | - .carousel { | |
| 2549 | + #carousel-example-generic .carousel { | |
| 2520 | 2550 | position: relative; |
| 2521 | - height: 300px; | |
| 2522 | 2551 | } |
| 2523 | 2552 | |
| 2524 | - .carousel-inner > .item > img, .carousel-inner > .item > a > img { | |
| 2553 | + #carousel-example-generic .carousel-inner > .item > img, .carousel-inner > .item > a > img { | |
| 2525 | 2554 | line-height: 1; |
| 2526 | - height: 300px; | |
| 2555 | + max-height: 300px; | |
| 2556 | + margin: 0 auto; | |
| 2527 | 2557 | } |
| 2528 | - | |
| 2529 | - .carousel-control.left{ | |
| 2558 | + #carousel-example-generic .carousel-inner > .item{ | |
| 2559 | + height: auto!important; | |
| 2560 | + } | |
| 2561 | + #carousel-example-generic .carousel-control.left{ | |
| 2530 | 2562 | background-image: url('../images/arrow_back.png'); |
| 2531 | 2563 | background-repeat: no-repeat; |
| 2532 | 2564 | background-position: 82% 50%; |
| 2533 | 2565 | } |
| 2534 | 2566 | |
| 2535 | - .carousel-control.right { | |
| 2567 | + #carousel-example-generic .carousel-control.right { | |
| 2536 | 2568 | |
| 2537 | 2569 | background-image: url('../images/arrow_go.png'); |
| 2538 | 2570 | background-repeat: no-repeat; |
| ... | ... | @@ -2952,3 +2984,8 @@ input[type="checkbox"]:checked + label span { |
| 2952 | 2984 | margin-top: -1px; |
| 2953 | 2985 | } |
| 2954 | 2986 | |
| 2987 | +.num{ | |
| 2988 | + font-weight: 500; | |
| 2989 | + font-size: 22px; | |
| 2990 | + margin-left: 26px; | |
| 2991 | +} | |
| 2955 | 2992 | \ No newline at end of file | ... | ... |
frontend/web/js/script.js
| 1 | 1 | $(document).ready(function(){ |
| 2 | + var totalItems = $('#carousel-example-generic1 .item').length; | |
| 3 | + var currentIndex = $('#carousel-example-generic1 .active').index() + 1; | |
| 4 | + $('.num').html(''+currentIndex+'/'+totalItems+''); | |
| 5 | + $('#carousel-example-generic1').bind('slide.bs.carousel', function() { | |
| 6 | + currentIndex = $('#carousel-example-generic1 .active').index() + 1; | |
| 7 | + $('.num').html(''+currentIndex+'/'+totalItems+''); | |
| 8 | + }); | |
| 9 | + | |
| 2 | 10 | $('.phone_control, .phone_placeholder').click( |
| 3 | 11 | function(){ |
| 4 | 12 | $('.phone_placeholder').toggleClass('active_placeholder'); |
| ... | ... | @@ -44,14 +52,6 @@ $('.phone_control, .phone_placeholder').click( |
| 44 | 52 | |
| 45 | 53 | } |
| 46 | 54 | ); |
| 47 | - | |
| 48 | - // $('#catalog1').hover(function(){ | |
| 49 | - // $('.dropdown_menu_catalog').stop().slideDown(400); | |
| 50 | - // $('#by_name').removeClass('active_button'); | |
| 51 | - // $('#by_vin').removeClass('active_button'); | |
| 52 | - // $('#by_to').removeClass('active_button'); | |
| 53 | - // $('#by_articul').removeClass('active_button'); | |
| 54 | - // }); | |
| 55 | 55 | |
| 56 | 56 | var $class = 0; |
| 57 | 57 | // $('.choose_tovar .menu_item1').each(function(){ |
| ... | ... | @@ -782,16 +782,6 @@ $('.menu_block_center1').mouseleave(function(){ |
| 782 | 782 | }); |
| 783 | 783 | |
| 784 | 784 | $(document).ready(function(){ |
| 785 | - $(".side_menu-list").on("click","a", function (event) { | |
| 786 | - //отменяем стандартную обработку нажатия по ссылке | |
| 787 | - event.preventDefault(); | |
| 788 | - //забираем идентификатор бока с атрибута href | |
| 789 | - var id = $(this).attr('href'), | |
| 790 | - //узнаем высоту от начала страницы до блока на который ссылается якорь | |
| 791 | - top = $(id).offset().top; | |
| 792 | - //анимируем переход на расстояние - top за 1500 мс | |
| 793 | - $('body,html').animate({scrollTop: top}, 1000); | |
| 794 | - }); | |
| 795 | 785 | |
| 796 | 786 | $('.full_search').click(function(){ |
| 797 | 787 | event.preventDefault(); | ... | ... |