Merge branch 'master' of gitlab.artweb.com.ua:root/test_1

Mihail
2 parents ad2e91f7 d17f076f
Showing 69 changed files with 358 additions and 188 deletions Show diff stats
backend/views/accounts-vin/_form.php
backend/views/accounts-vin/create.php
backend/views/accounts-vin/index.php
backend/views/accounts/_form.php
backend/views/accounts/create.php
backend/views/accounts/index.php
backend/views/art-history/_form.php
backend/views/art-history/create.php
backend/views/art-history/index.php
backend/views/brands-replace/_form.php
backend/views/brands-replace/create.php
backend/views/brands-replace/index.php
backend/views/brands/_form.php
backend/views/brands/create.php
backend/views/cat/create.php
backend/views/cat/index.php
backend/views/deliveries/index.php
backend/views/details-crosses/_form.php
backend/views/details-crosses/create.php
backend/views/details/_form.php
@@ -29,7 +29,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'timestamp')->textInput() ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\AccountsVin */
-$this->title = 'Create Accounts Vin';
+$this->title = 'Добавить Accounts Vin';
 $this->params['breadcrumbs'][] = ['label' => 'Accounts Vins', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Accounts Vin', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить Accounts Vin', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -85,7 +85,7 @@ use kartik\date\DatePicker;
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\Accounts */
-$this->title = 'Create Accounts';
+$this->title = 'Добавить Accounts';
 $this->params['breadcrumbs'][] = ['label' => 'Accounts', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Accounts', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить Accounts', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -19,7 +19,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'dt')->textInput(['maxlength' => true]) ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\ArtHistory */
-$this->title = 'Create Art History';
+$this->title = 'Добавить Art History';
 $this->params['breadcrumbs'][] = ['label' => 'Art Histories', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -17,7 +17,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Art History', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить Art History', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -21,7 +21,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'timestamp')->textInput() ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\BrandsReplace */
-$this->title = 'Create Brands Replace';
+$this->title = 'Добавить Brands Replace';
 $this->params['breadcrumbs'][] = ['label' => 'Brands Replaces', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Brands Replace', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить Brands Replace', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -29,7 +29,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'timestamp')->textInput() ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\Brands */
-$this->title = 'Create Brands';
+$this->title = 'Добавить Brands';
 $this->params['breadcrumbs'][] = ['label' => 'Brands', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\Cat */
-$this->title = 'Create Cat';
+$this->title = 'Добавить Cat';
 $this->params['breadcrumbs'][] = ['label' => 'Cats', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Cat', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить Cat', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Deliveries', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить Deliveries', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -23,7 +23,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'timestamp')->textInput() ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\DetailsCrosses */
-$this->title = 'Create Details Crosses';
+$this->title = 'Добавить Details Crosses';
 $this->params['breadcrumbs'][] = ['label' => 'Details Crosses', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -33,7 +33,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'timestamp')->textInput() ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\Details */
-$this->title = 'Create Details';
+$this->title = 'Добавить Details';
 $this->params['breadcrumbs'][] = ['label' => 'Details', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -23,7 +23,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'if_mail')->textInput() ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\DicStatuses */
-$this->title = 'Create Dic Statuses';
+$this->title = 'Добавить Dic Statuses';
 $this->params['breadcrumbs'][] = ['label' => 'Dic Statuses', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Dic Statuses', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить Dic Statuses', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -29,7 +29,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'who_comment')->textInput(['maxlength' => true]) ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\Emails */
-$this->title = 'Create Emails';
+$this->title = 'Добавить Emails';
 $this->params['breadcrumbs'][] = ['label' => 'Emails', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Emails', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить Emails', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -63,7 +63,7 @@ use common\models\Currency;
     </div>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model backend\models\Importers */
-$this->title = 'Create Importers';
+$this->title = 'Добавить Importers';
 $this->params['breadcrumbs'][] = ['label' => 'Importers', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Importers', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить Importers', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -53,7 +53,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'original_url')->textInput(['maxlength' => true]) ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\Manufacturers */
-$this->title = 'Create Manufacturers';
+$this->title = 'Добавить Manufacturers';
 $this->params['breadcrumbs'][] = ['label' => 'Manufacturers', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -21,7 +21,7 @@ use yii\helpers\ArrayHelper;
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\MarginsGroups */
-$this->title = 'Create Margins Groups';
+$this->title = 'Добавить Margins Groups';
 $this->params['breadcrumbs'][] = ['label' => 'Margins Groups', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Margins Groups', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить Margins Groups', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -20,7 +20,7 @@ use \yii\helpers\ArrayHelper;
     <?= $form->field($model, 'finish')->checkbox() ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\MarginsImportersImport */
-$this->title = 'Create Margins Importers Import';
+$this->title = 'Добавить Margins Importers Import';
 $this->params['breadcrumbs'][] = ['label' => 'Margins Importers Imports', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Margins Importers Import', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить Margins Importers Import', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -19,7 +19,7 @@ use yii\helpers\ArrayHelper;
     <?= $form->field($model, 'koef')->textInput() ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\MarginsImporters */
-$this->title = 'Create Margins Importers';
+$this->title = 'Добавить Margins Importers';
 $this->params['breadcrumbs'][] = ['label' => 'Margins Importers', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Margins Importers', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить Margins Importers', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -17,7 +17,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'koef')->textInput() ?>
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton($model->isNewRecord ? 'Добавить' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,7 +6,7 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\Margins */
-$this->title = 'Create Margins';
+$this->title = 'Добавить Margins';
 $this->params['breadcrumbs'][] = ['label' => 'Margins', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Margins', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить Margins', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -21,6 +21,7 @@ use mihaildev\elfinder\ElFinder;
         'editorOptions' => ElFinder::ckeditorOptions('elfinder',[
                 'preset' => 'full', //разработанны стандартные настройки basic, standard, full данную возможность не обязательно использовать
                 'inline' => false, //по умолчанию false]),
+                'allowedContent' => true,
                 'filebrowserUploadUrl'=>Yii::$app->getUrlManager()->createUrl('page/images-upload')
             ]
         )
@@ -34,8 +34,8 @@ use yii\widgets\ActiveForm;
     <?php // echo $form->field($model, 'is_active') ?>
     <div class="form-group">
-        <?= Html::submitButton('Search', ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton('Reset', ['class' => 'btn btn-default']) ?>
+        <?= Html::submitButton('Поиск', ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton('Обновить', ['class' => 'btn btn-default']) ?>
     </div>
     <?php ActiveForm::end(); ?>
@@ -6,8 +6,8 @@ use yii\helpers\Html;
 /* @var $this yii\web\View */
 /* @var $model common\models\Page */
-$this->title = 'Create Page';
-$this->params['breadcrumbs'][] = ['label' => 'Pages', 'url' => ['index']];
+$this->title = 'Создать';
+$this->params['breadcrumbs'][] = ['label' => 'Текстовые страницы', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="page-create">
@@ -7,7 +7,7 @@ use yii\grid\GridView;
 /* @var $searchModel common\models\PageSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
-$this->title = 'Pages';
+$this->title = 'Текстовые страницы';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="page-index">
@@ -16,7 +16,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
     <p>
-        <?= Html::a('Create Page', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?= GridView::widget([
@@ -6,9 +6,9 @@ use yii\helpers\Html;
 /* @var $model common\models\Page */
 $this->title = 'Update Page: ' . ' ' . $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Pages', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => 'Текстовые страницы', 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
-$this->params['breadcrumbs'][] = 'Update';
+$this->params['breadcrumbs'][] = 'Обновить';
 ?>
 <div class="page-update">
@@ -7,7 +7,7 @@ use yii\widgets\DetailView;
 /* @var $model common\models\Page */
 $this->title = $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Pages', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => 'Текстовые страницы', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="page-view">
@@ -15,11 +15,11 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     <h1><?= Html::encode($this->title) ?></h1>
     <p>
-        <?= Html::a('Update', ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
-        <?= Html::a('Delete', ['delete', 'id' => $model->id], [
+        <?= Html::a('Обновить', ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a('Удалить', ['delete', 'id' => $model->id], [
             'class' => 'btn btn-danger',
             'data' => [
-                'confirm' => 'Are you sure you want to delete this item?',
+                'confirm' => 'Вы увереннны что хотите удалить этот элемент?',
                 'method' => 'post',
             ],
         ]) ?>
@@ -107,4 +107,9 @@ class News extends \yii\db\ActiveRecord
             'price_list' => 'Прайс лист',
         ];
     }
+
+    public function pregStr($str){
+        $vowels = array("<strong>", "</strong>");
+        return str_replace($vowels, "", $str);
+    }
 }
@@ -33,7 +33,7 @@ class Page extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['name', 'code', 'content', 'title', 'kwords', 'descr'], 'required'],
+            [['name', 'code', 'content'], 'required'],
             [['content'], 'string'],
             [['sort', 'is_active'], 'integer'],
             [['name'], 'string', 'max' => 100],
@@ -41,9 +41,10 @@ return [
             'enablePrettyUrl' => true,
             'showScriptName' => false,
             'rules' => [
-                'news/<translit:\d+>' => 'news/view',
+                'news/<translit:[\w-]+>' => 'news/view',
                 'news' => 'news/index',
                 'page/<translit:[\w-]+>'=>'page/view',
+                'company/<translit:[\w-]+>'=>'page/about',
                 'goods/one-item/<translit:[\w-]+>'=>'goods/one-item',
                 'goods/view/<translit:[\w-]+>'=>'goods/view',
                 'stone/view/<translit:[\w-]+>'=>'stone/view',
@@ -32,10 +32,15 @@ class NewsController extends Controller
     public function actionView($translit)
     {
-        $news_list = News::find()->where(['is_active'=>1])->limit(3)->all();
+
+        $activeNews = $this->findModel($translit);
+        $next_news = News::find()->where(['is_active'=>1])->andWhere('id > :id',[':id' => $activeNews->id])->one();
+        $prev_news = News::find()->where(['is_active'=>1])->andWhere('id < :id',[':id' => $activeNews->id])->one();
+
         return $this->render('view', [
-            'model' => $this->findModel($translit),
-            'news_list' => $news_list
+            'model' => $activeNews,
+            'next_news' => $next_news instanceof News ? $next_news : '',
+            'prev_news' => $prev_news instanceof News ? $prev_news : ''
         ]);
     }
@@ -79,4 +84,6 @@ class NewsController extends Controller
             "descr"=> "Отказ от рассылки ИталАвто"
         );
     }
+
+
 }
@@ -38,6 +38,15 @@ class  PageController extends Controller
         ]);
     }
+
+    public function actionAbout($translit)
+    {
+
+        return $this->render('about_view', [
+            'model' => $this->findModel($translit),
+        ]);
+    }
+
     protected function findModel($translit)
     {
@@ -4,6 +4,7 @@ namespace frontend\controllers;
 use common\models\Accounts;
 use common\models\AccountsForm;
 use common\models\News;
+use common\models\Slider;
 use common\models\Team;
 use common\models\TeamGroup;
 use Yii;
@@ -53,7 +54,7 @@ class SiteController extends Controller
         $this->layout = '/outer';
         $news_list = News::find()->where(['is_active'=>1])->limit(3)->all();
-
+        $slider_list = Slider::find()->where(['is_active'=>1])->all();
         if (Yii::$app->request->post()) {
             $post = Yii::$app->request->post();
@@ -68,6 +69,7 @@ class SiteController extends Controller
         }
         return $this->render('index',[
+            'slider_list' => $slider_list,
             'news_list' => $news_list
         ]);
     }
@@ -84,10 +86,15 @@ class SiteController extends Controller
     }
-    public function actionArticle()
+    public function actionTeam()
     {
+        $teamGroups = TeamGroup::find()->all();
+
         $this->layout = '/internal';
-        return $this->render('article');
+        return $this->render('team',[
+            'teamGroups' => $teamGroups,
+        ]);
+
     }
     public function actionBc2Catalog()
@@ -40,7 +40,7 @@ use yii\captcha\Captcha;
         <?php
         echo Menu::widget([
             'items' => [
-                ['label' => 'О компании', 'url'=>Url::toRoute('/site/about')],
+                ['label' => 'О компании', 'url'=>Url::toRoute(['/page/about','translit'=>'about'])],
                 ['label' => 'Каталоги', 'url'=>'#'],//Url::toRoute('/page/FAQ')],
                 ['label' => 'Оптовикам','url'=>Url::toRoute(['/page/view','translit'=>'optovikam'])],
                 ['label' => 'Поставщикам','url'=>Url::toRoute(['/page/view','translit'=>'suppliers'])],
@@ -100,7 +100,7 @@ use yii\captcha\Captcha;
 </div>
 <div class="contacts">
-    <img src="/images/logo.png">
+    <?=  Html::a(Html::img('/images/logo.png'),['/'])  ?>
     <!-- Split button -->
     <!-- <select class='dropdown_contacts'>
@@ -164,9 +164,9 @@ use yii\captcha\Captcha;
                         <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data','id'=>'call_form'], 'action' => '/']); ?>
                         <fieldset>
                             <h3>Обратный звонок</h3>
-                            <?= $form->field(new Callback(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?><span class='star'>*</span>
+                            <?= $form->field(new Callback(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?>
-                            <?= $form->field(new Callback(), 'phone_num')->textInput(['maxlength' => 45,'placeholder'=>'Телефон','class'=>'form-control telephone_registration'])->label(false) ?><span class='star1'>*</span>
+                            <?= $form->field(new Callback(), 'phone_num')->textInput(['maxlength' => 45,'placeholder'=>'Телефон','class'=>'form-control telephone_registration'])->label(false) ?>
                             <button class="purple" type="submit" value="Submit">Запросить</button>
                         </fieldset>
@@ -4,8 +4,8 @@ use \yii\helpers\Html;
 <div class="news">
-    <?=  Html::a(Html::img($model->img),['news/view', 'translit' =>$model->code ])  ?>
+    <?=  Html::a(Html::img($model->img),['/news/view', 'translit' =>$model->code ])  ?>
     <span class='date'><?= $model->date?></span><br>
-    <?=  Html::a("<p class='article'>".$model->name."</p>",['news/view', 'translit' =>$model->code ])  ?>
-    <?=  Html::a("<p class='short_news'>".$model->brief."</p>",['news/view', 'translit' =>$model->code ])  ?>
+    <?=  Html::a("<p class='article'>".$model->name."</p>",['/news/view', 'translit' =>$model->code ])  ?>
+    <?=  Html::a("<p class='short_news'>".$model->pregStr($model->brief)."</p>",['/news/view', 'translit' =>$model->code ])  ?>
 </div>
 \ No newline at end of file
@@ -19,12 +19,20 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     </div>
     <div class='long_line'></div>
     <div class="go_news">
-    <?php foreach ($news_list as $one_news):?>
-            <div class="back_news">
-                <?=  Html::a("<p class='article'>".$one_news->name."</p>",['news/view', 'translit' =>$one_news->code ])  ?>
-                <?=  Html::a("<p class='short_news'>".$one_news->brief."</p>",['news/view', 'translit' =>$one_news->code ])  ?>
-            </div>
-    <?php endforeach; ?>
+        <?php if($next_news):?>
+        <div class="back_news">
+            <?=  Html::a("<p class='article'>".$next_news->name."</p>",['/news/view', 'translit' =>$next_news->code ])  ?>
+            <?=  Html::a("<p class='short_news'>".$next_news->brief."</p>",['/news/view', 'translit' =>$next_news->code ])  ?>
+        </div>
+        <?php endif; ?>
+
+        <?php if($prev_news):?>
+        <div class="back_news">
+            <?=  Html::a("<p class='article'>".$prev_news->name."</p>",['/news/view', 'translit' =>$prev_news->code ])  ?>
+            <?=  Html::a("<p class='short_news'>".$prev_news->brief."</p>",['/news/view', 'translit' =>$prev_news->code ])  ?>
+        </div>
+        <?php endif; ?>
+
     </div>
     </div>
     <img src="/images/lonh_line.png" style="margin-top:-20px;opacity:0">
+<?php
+$this->registerCssFile('/css/about_company.css');
+use \yii\helpers\Url;
+$this->registerMetaTag(['description' => $model->descr,'keywords'=>$model->kwords]);
+$this->title = $model->title ? $model->title: $model->name;
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+<?php
+
+
+?>
+<div class="main-vin">
+    <p class="vin_article"><?=$this->title?></p>
+    <div class='side_menu'>
+        <?php
+        echo \yii\widgets\Menu::widget([
+            'options' => ['class' => 'side_menu-list'],
+            'items' => [
+                ['label' => 'Миссия', 'url' => Url::toRoute(['/page/about','translit'=>'about'])],
+                ['label' => 'Команда', 'url' => Url::toRoute(['/site/team'])],
+            ],
+        ]);
+        ?>
+
+        <div class="tab-content">
+            <?= $model->content;?>
+        </div>
+    </div>
+    <img src="/images/lonh_line.png" class='long_line'>
+</div>
 \ No newline at end of file
 <?php
+$this->registerCssFile('/css/about_company.css');
 $this->registerMetaTag(['description' => $model->descr,'keywords'=>$model->kwords]);
 $this->title = $model->title ? $model->title: $model->name;
 $this->params['breadcrumbs'][] = $this->title;
-<?php
-$this->registerCssFile('/css/about_company.css');
-
-$this->title = "О компании";
-$this->params['breadcrumbs'][] = $this->title;
-?>
-
-
-<div class="main-vin">
-    <p class="vin_article">О компании</p>
-<div class='side_menu'>
-<ul class="side_menu-list" role="tablist">
-	<li class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">Миссия</a></li>
-	<li><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab">Команда</a></li>
-	<li><a href="#messages" aria-controls="messages" role="tab" data-toggle="tab">Контакты</a></li>
-	<li><a href="#settings" aria-controls="settings" role="tab" data-toggle="tab">Оплата и доставка</a></li>	
-</ul>
-  <div class="tab-content">
-    <div role="tabpanel" class="tab-pane active" id="home">
-   	 <p class="tab-content_header">Преимущества компании "Италавто"</p>
-    	<p class="tab-content_article">Наша компания "Италавто" уже много лет занимается поставками автозапчастей для автомобилей итальянского производства. Наиболее распространённые бренды на Украине - различные модели Fiat (Фиат) и Iveco (Ивеко). Лёгкие и тяжёлые грузовые автомобили Ивеко экономичные и адаптированные для работы в Украине. Заслуженной популярностью пользуется микроавтобус Fiat Ducato (Дукато) класса "Газели", Fiat Punto (Пунто) и Fiat Grande Punto (Гранд Пунто) - очень красивые легковые автомобили элегантного дизайна. Fiat Tempra (Темпра) — семейный среднеразмерный автомобиль, выпуск которого компанией Фиат был приостановлен 1998 году, но до сих пор запчасти к Fiat Tempra пользуются повышенным спросом.<br><br><br>
- 
-		В наличии и под заказ на складах Киева и Харькова большой ассортимент оригинальных запчастей к различным маркам и моделям автомобилей итальянского производства. Мы надеемся, что сумеем помочь Вам в подборе необходимых запчастей хорошего качества непосредственно из Европы по оптимальной цене. На нашем сайте Вы можете заказать детали непосредственно из мастерских, где осуществляется разборка, и ремонт Fiat пройдёт намного лучше. Наша  компания предоставляет нашим клиентам ряд очевидных преимуществ: максимальное удобство поиска и заказа, не выходя из дома или офиса - используйте для заказа формы интернет-магазина; возможность подбора автозапчастей и деталей он-лайн по коду, по каталогам либо запросом по коду; быструю доставку заказа в течение недели или двух в Киев и в течение дня - из Киева по регионам перевозчиками "Автолюкс", "Гюнсел", "Ин-Тайм", "Новая почта", "Ночной экспресс", "Евроэкспресс". Нашим интернет-магазином предусмотрена возможность просмотра ожидаемых поставок запчастей. Также на нашем сайте регулярно проводятся акции - распродажи запчастей. На запчасти для Iveco (Ивеко) и запчасти для Fiat (Фиат) оптовым покупателей специальные условия.
-		</p>
-</div>
-    <div role="tabpanel" class="tab-pane" id="profile">
-        <?php foreach ($teamGroups as $group): ?>
-            <?=$this->render('team_list_layout', [
-                'group' => $group
-            ]);?>
-        <?php endforeach; ?>
-    </div>
-      <?=$this->render('contacts_layout', [
-      ]);?>
-      <?=$this->render('payment_delivery_layout', [
-      ]);?>
-  </div>
-</div>
-<img src="/images/lonh_line.png" class='long_line'>	
-</div>
 \ No newline at end of file
@@ -509,30 +509,13 @@ use \yii\helpers\Html;
     <!-- Wrapper for slides -->
     <div class="carousel-inner" role="listbox">
-        <div class="item">
-            <img src="/images/car_carousel.png" alt="...">
-            <div class="carousel-caption">
-                <p>Все для ремонта автомобилей Land Rover
-                    <br>lr-parts.com.ua</p>
-                <img src="/images/land_rover.png">
-            </div>
-        </div>
-        <div class="item">
-            <img src="/images/car_carousel.png" alt="...">
-            <div class="carousel-caption">
-                <p>Все для ремонта автомобилей Land Rover
-                    <br>lr-parts.com.ua</p>
-                <img src="/images/land_rover.png">
-            </div>
-        </div>
-        <div class="item active">
-            <img src="/images/car_carousel.png" alt="...">
-            <div class="carousel-caption">
-                <p>Все для ремонта автомобилей Land Rover
-                    <br>lr-parts.com.ua</p>
-                <img src="/images/land_rover.png">
+        <?php $i = 0; foreach ($slider_list as $one_slid):?>
+            <div class="item <?=!$i++?'active':''?>">
+
+                <?=  Html::a(Html::img($one_slid->img))  ?>
+
             </div>
-        </div>
+        <?php endforeach; ?>
     </div>
@@ -577,27 +560,33 @@ use \yii\helpers\Html;
     </div>
     <div class="news">
         <?= Html::a( 'Новости', Url::toRoute('news/index'),['class'=>'main_link_news'])?>
-        <span><img src="/images/arrow_slider_back.png"></span>
-        <span class="number_of">1/</span>
-        <span class="general_number">5</span>
-        <span><img src="/images/arrow_slider_go.png"></span>
-        <?php foreach ($news_list as $one_news):?>
-            <div class="slider_tovars">
-                <div class="tovar">
-                    <?= Html::img(\yii\helpers\Url::to($one_news->img)); ?>
-                    <?=  Html::a("<p class='article'>".$one_news->name."</p>",['news/view', 'translit' =>$one_news->code ])  ?>
-                </div>
-            </div>
-        <?php endforeach; ?>
+
+        <span class="num"></span>
         <div class="slider_tovars">
-            <div class="tovar">
-                <img src="/images/news.png">
-                <p>На склад поступила очередная партия товара Metalcaucho. Готов к отгрузке.<br><br>
-                    Полный список товаров этой группы  доступен по <br><a href="">ссылке</a></p>
+            <div id="carousel-example-generic1" class="carousel slide" data-ride="carousel">
-            </div>
+                <div class="carousel-inner" role="listbox">
+                <?php $i = 0; foreach ($news_list as $one_news):?>
+                    <div class="item tovar <?=!$i++?'active':''?>">
+                        <?=  Html::a(Html::img($one_news->img),['news/view', 'translit' =>$one_news->code ])  ?>
+                        <div class="carousel-caption">
+                            <?=  Html::a("<p class='article'>".$one_news->name."</p>",['news/view', 'translit' =>$one_news->code ])  ?>
+                            <?=  Html::a("<p class='short_news'>".$one_news->pregStr($one_news->brief)."</p>",['news/view', 'translit' =>$one_news->code ])  ?>
+                        </div>
+                    </div>
+                <?php endforeach; ?>
+                </div>
+
+                <!-- Controls -->
+                <a class="left carousel-control" href="#carousel-example-generic1" role="button" data-slide="prev">
+                    <img src="/images/arrow_slider_back.png">
+                </a>
+                <a class="right carousel-control" href="#carousel-example-generic1" role="button" data-slide="next">
+                    <img src="/images/arrow_slider_go.png">
+                </a>
+            </div>
         </div>
     </div>
+<?php
+$this->registerCssFile('/css/about_company.css');
+use \yii\helpers\Url;
+$this->params['breadcrumbs'][] = "Команда";
+?>
+
+<?php
+
+
+?>
+<div class="main-vin">
+    <p class="vin_article"><?=$this->title?></p>
+    <div class='side_menu'>
+        <?php
+        echo \yii\widgets\Menu::widget([
+            'options' => ['class' => 'side_menu-list'],
+            'items' => [
+                ['label' => 'Миссия', 'url' => Url::toRoute(['/page/about','translit'=>'about'])],
+                ['label' => 'Команда', 'url' => Url::toRoute(['/site/team'])],
+            ],
+        ]);
+        ?>
+        <div class="tab-content">
+            <div id="profile">
+                <?php foreach ($teamGroups as $group): ?>
+                    <?=$this->render('team_list_layout', [
+                        'group' => $group
+                    ]);?>
+                <?php endforeach; ?>
+            </div>
+        </div>
+    </div>
+    <img src="/images/lonh_line.png" class='long_line'>
+</div>
 \ No newline at end of file
@@ -70,6 +70,10 @@
 	padding-left: 9px;
 }
+
+.personal_photo img{
+    border-radius: 50%;
+}
 .personal_name{
 	font-size: 18px;
 	height: 27px;
@@ -142,7 +142,13 @@ li a{
     margin-bottom: 10px;
 }
-div.required:after {content: " *"; color: #fec831;}
+div.required:after {    content: " *";
+    color: #fec831;
+    display: inline-block;
+    position: relative;
+    top: -31px;
+    left: 40px;
+}
 .registration_holder{
     padding-top: 32px;
@@ -181,4 +187,83 @@ div.required:after {content: &quot; *&quot;; color: #fec831;}
 .vin{
     width: 960px;
     margin: 20px auto;
+}
+
+#modal_form input {
+    background-color: #f5f5f5;
+    width: 334px;
+    height: 30px;
+    padding-left: 9px;
+    border-radius: 6px;
+    border: 1px solid #dfdfdf;
+    margin: 8px 114px 20px;
+}
+
+#modal_form #email-error{
+    position: absolute;
+    left: 121px;
+    top: 150px;
+}
+
+#modal_form input[type="checkbox"] + label span, input[type="checkbox"]:checked + label span {
+    position: absolute;
+    left: 114px;
+    top: 224px;
+    -webkit-transition: background 0.4s linear;
+    -o-transition: background 0.4s linear;
+    -moz-transition: background 0.4s linear;
+    transition: background 0.4s linear;
+}
+#modal_form #password-error{
+    position: absolute;
+    left: 124px;
+    top: 199px;
+}
+
+.star1 {
+    color: #fec831;
+    position: absolute;
+    left: 104px;
+    top: 184px;
+}
+
+.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{
+    position: absolute!important;
+    left: 135px!important;
+}
+
+.back_news a:last-child strong span{
+    font-size: 14px!important;
+    font-weight: 500;
+    display: block;
+    margin-left: 61px;
+    width: 240px;
+
+}
+
+.back_news:nth-child(2){
+    background-image: url('/images/arrow_slider_go.png');
+    background-repeat: no-repeat;
+    background-position: 100% 46%;
+}
+.back_news:nth-child(2){
+    background-image: url('/images/arrow_slider_go.png');
+    background-repeat: no-repeat;
+    background-position: 100% 46%;
+}
+
+.back_news:hover{
+    background-image: url('/images/arrow_slider_back.png');
+    background-repeat: no-repeat;
+    background-position: 0% 46%;
+}
+
+.back_news:nth-child(2):hover{
+    background-image: url('/images/arrow_slider_go.png');
+    background-repeat: no-repeat;
+    background-position: 100% 46%;
+}
+
+.field-accountsform-company{
+    display: none;
 }
 \ No newline at end of file
@@ -27,3 +27,4 @@ p, a, label, span{
 }
+
@@ -309,9 +309,9 @@
 .searching_for_tovars:focus{
     outline: none
 }
-.slider_tovars{
-    width: 730px;
-    height: 315px;
+#carousel-example-generic1{
+    width: 220px;
+    height: 310px;
 }
 .car a{
     color:#ffffff;
@@ -322,7 +322,35 @@
 }
+#carousel-example-generic1 .carousel-control.left{
+    background-image: none!important;
+    height: 27px;
+    top: -35px;
+    left: 90px;
+}
+#carousel-example-generic1 .right.carousel-control{
+    background-image: none!important;
+    height: 27px;
+    top: -36px;
+    right: 42px;
+}
+#carousel-example-generic1 .carousel-caption {
+    position: static!important;
+    right: 15%;
+    bottom: 20px;
+    left: 15%;
+    z-index: 10;
+    padding-top:0!important;
+    padding-bottom: 0!important;
+    color: inherit!important;
+    text-shadow: none!important;
+    width: 179px;
+}
+
+#carousel-example-generic1 .carousel-indicators{
+    display: none
+}
 .tovar a:hover{
     color:#a2b5da;
 }
@@ -1917,8 +1945,10 @@ span:first-child .tovars{
 }
 .news .slider_tovars .tovar img{
-    margin-left: -18px;
+    margin-left: 13px;
     border:1px solid #dfdfdf;
+    width: 130px;
+    height: 90px;
 }
 .news img{
     margin-left: 0;
@@ -2512,27 +2542,29 @@ input[type=&quot;checkbox&quot;]:checked + label span {
-    .carousel-indicators {
+    #carousel-example-generic.carousel-indicators {
         bottom: 0px;
     }
-    .carousel {
+    #carousel-example-generic .carousel {
         position: relative;
-        height: 300px;
     }
-    .carousel-inner > .item > img, .carousel-inner > .item > a > img {
+    #carousel-example-generic .carousel-inner > .item > img, .carousel-inner > .item > a > img {
         line-height: 1;
-        height: 300px;
+        max-height: 300px;
+        margin: 0 auto;
     }
-
-    .carousel-control.left{
+    #carousel-example-generic .carousel-inner > .item{
+        height: auto!important;
+    }
+    #carousel-example-generic .carousel-control.left{
         background-image: url('../images/arrow_back.png');
         background-repeat: no-repeat;
         background-position: 82% 50%;
     }
-    .carousel-control.right {
+   #carousel-example-generic .carousel-control.right {
         background-image: url('../images/arrow_go.png');
         background-repeat: no-repeat;
@@ -2952,3 +2984,8 @@ input[type=&quot;checkbox&quot;]:checked + label span {
     margin-top: -1px;
 }
+.num{
+    font-weight: 500;
+    font-size: 22px;
+    margin-left: 26px;
+}
 \ No newline at end of file
 $(document).ready(function(){
+    var totalItems = $('#carousel-example-generic1 .item').length;
+    var currentIndex = $('#carousel-example-generic1 .active').index() + 1;
+    $('.num').html(''+currentIndex+'/'+totalItems+'');
+    $('#carousel-example-generic1').bind('slide.bs.carousel', function() {
+        currentIndex = $('#carousel-example-generic1 .active').index() + 1;
+        $('.num').html(''+currentIndex+'/'+totalItems+'');
+    });
+
 $('.phone_control, .phone_placeholder').click(
 	function(){
 		$('.phone_placeholder').toggleClass('active_placeholder');
@@ -44,14 +52,6 @@ $(&#39;.phone_control, .phone_placeholder&#39;).click(
 		}
 	);
-	
-	// $('#catalog1').hover(function(){
-	// 	$('.dropdown_menu_catalog').stop().slideDown(400);
-	// 	$('#by_name').removeClass('active_button');
-	// 	$('#by_vin').removeClass('active_button');
-	// 	$('#by_to').removeClass('active_button');
-	// 	$('#by_articul').removeClass('active_button');
-	// });
 	var $class = 0;
 	// $('.choose_tovar .menu_item1').each(function(){
@@ -782,16 +782,6 @@ $(&#39;.menu_block_center1&#39;).mouseleave(function(){
 });
 $(document).ready(function(){
-    $(".side_menu-list").on("click","a", function (event) {
-        //отменяем стандартную обработку нажатия по ссылке
-        event.preventDefault();
-        //забираем идентификатор бока с атрибута href
-        var id  = $(this).attr('href'),
-        //узнаем высоту от начала страницы до блока на который ссылается якорь
-            top = $(id).offset().top;
-        //анимируем переход на расстояние - top за 1500 мс
-        $('body,html').animate({scrollTop: top}, 1000);
-    });
   $('.full_search').click(function(){
   	event.preventDefault();