Administrator / test_1

Commit 97dbfb3f239f1e3bcb960275bd53ea808dd1666c

Authored by Administrator
1 parent 166dd085

upload project

Showing 34 changed files with 301 additions and 115 deletions   Show diff stats
Inline Side-by-side
backend/controllers/AccountsVinController.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -13,7 +13,7 @@ use yii\filters\VerbFilter;
13 13 * AccountsVinController implements the CRUD actions for AccountsVin model.
14 14 */
15 15 class AccountsVinController extends Controller
16   -{
  16 +{ public $layout = "/column";
17 17 public function behaviors()
18 18 {
19 19 return [
... ...
backend/controllers/CheckPriceController.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -8,7 +8,6 @@ use yii\filters\AccessControl;
8 8 use backend\components\base\BaseController;
9 9 use yii\filters\VerbFilter;
10 10 use backend\models\Details;
11   -use common\models\DetailsCurrency;
12 11 use backend\models\ImportersFiles;
13 12 use backend\models\Importers;
14 13 use yii\base\ErrorException;
... ... @@ -62,7 +61,7 @@ class CheckPriceController extends BaseController
62 61  
63 62 public function actionIndex()
64 63 {
65   -
  64 + //$query = (new Query())->select('*')->from('{{%importer_files}}')->where(['not', ['time_end' => null]])->orderBy(['upload_time' => SORT_DESC]);
66 65 $query = Importers::find()->where(['active' => true])->orderBy(['price_date_update' => SORT_DESC]);
67 66 $provider = new ActiveDataProvider([
68 67 'query' => $query,
... ... @@ -80,12 +79,11 @@ class CheckPriceController extends BaseController
80 79 public function actionView ($id, $date_update)
81 80 {
82 81  
83   - $query = DetailsCurrency::find()->where(['IMPORT_ID' => $id, 'timestamp' => $date_update])->limit(20);
  82 + $query = Details::find()->where(['IMPORT_ID' => $id, 'timestamp' => $date_update])->limit(20);
84 83  
85   - $importer = Importers::findOne( $id );
  84 + $importer = Importers::findOne($id)->name;
86 85 $date = Yii::$app->formatter->asDate( $date_update, 'yyyy-MM-dd' );
87 86  
88   -
89 87 $provider = new ActiveDataProvider([
90 88 'query' => $query,
91 89 'pagination' => false,
... ...
backend/controllers/DeliveriesController.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -14,6 +14,8 @@ use yii\filters\VerbFilter;
14 14 */
15 15 class DeliveriesController extends Controller
16 16 {
  17 +
  18 + public $layout = "/column";
17 19 public function behaviors()
18 20 {
19 21 return [
... ...
backend/controllers/DicStatusesController.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -14,6 +14,7 @@ use yii\filters\VerbFilter;
14 14 */
15 15 class DicStatusesController extends Controller
16 16 {
  17 + public $layout = "/column";
17 18 public function behaviors()
18 19 {
19 20 return [
... ...
backend/controllers/ManufacturersController.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -14,6 +14,8 @@ use yii\filters\VerbFilter;
14 14 */
15 15 class ManufacturersController extends Controller
16 16 {
  17 +
  18 + public $layout = "/column";
17 19 public function behaviors()
18 20 {
19 21 return [
... ...
backend/models/Currency.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -15,6 +15,13 @@ use Yii;
15 15 */
16 16 class Currency extends \yii\db\ActiveRecord
17 17 {
  18 + /**
  19 + * @inheritdoc
  20 + */
  21 + public static function tableName()
  22 + {
  23 + return 'w_currency';
  24 + }
18 25  
19 26 /**
20 27 * @inheritdoc
... ...
backend/models/Importers.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -5,7 +5,6 @@ namespace backend\models;
5 5 use common\components\CustomVarDamp;
6 6 use Yii;
7 7 use backend\components\base\BaseActiveRecord;
8   -use backend\models\Currency;
9 8  
10 9 /**
11 10 *
... ... @@ -90,15 +89,6 @@ class Importers extends BaseActiveRecord
90 89 ];
91 90 }
92 91  
93   - public function getCurrency ()
94   - {
95   - return $this->hasOne(Currency::className(), ['id' => 'currency_id'])->one()->name;
96   - }
97   -
98   - public function getCurrencyRate ()
99   - {
100   - return $this->hasOne(Currency::className(), ['id' => 'currency_id'])->one()->rate;
101   - }
102 92  
103 93 public function getKeys ()
104 94 {
... ...
backend/views/art-history/index.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -26,15 +26,17 @@ $this->params['breadcrumbs'][] = $this->title;
26 26 'filterModel' => $searchModel,
27 27 'columns' => [
28 28 ['class' => 'yii\grid\SerialColumn'],
29   - 'user_id',
30 29 [
31 30 'attribute' => 'name',
32 31 'value' => 'name',
33 32  
34 33 ],
35 34 'art',
36   - 'dt',
37   - ['class' => 'yii\grid\ActionColumn'],
  35 + [
  36 + 'attribute' => 'dt',
  37 + 'value' => 'date',
  38 +
  39 + ]
38 40 ],
39 41 ]); ?>
40 42  
... ...
backend/views/check-price/view.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -8,29 +8,24 @@ use yii\bootstrap\Modal;
8 8 /* @var $this yii\web\View */
9 9 /* @var $searchModel backend\models\CatalogSearch */
10 10 /* @var $dataProvider yii\data\ActiveDataProvider */
11   -$this->title = 'ะŸั€ะฐะนั ' . Html::encode("{$importer->name} ะพั‚ {$date}");
  11 +$this->title = 'ะŸั€ะฐะนั ' . Html::encode( "{$importer} ะพั‚ {$date}" );
12 12 $this->params['breadcrumbs'][] = $this->title;
13 13  
14 14 ?>
15   - <div class="catalog-index">
16   -
17   - <h1><?= Html::encode($this->title) ?></h1>
18   -
19   - <?= GridView::widget( ['dataProvider' => $dataProvider,
20   - 'columns' => [
21   - ['attribute' => 'FULL_ARTICLE'],
22   - ['attribute' => 'ARTICLE'],
23   - ['attribute' => 'BRAND'],
24   - ['attribute' => 'DESCR'],
25   - ['attribute' => 'BOX'],
26   - ['attribute' => 'ADD_BOX'],
27   - ['attribute' => 'GROUP'],
28   - ['attribute' => 'name'],
29   - ['attribute' => 'PRICE'],
30   - ]
31   - ] ); ?>
32   -
33   - </div>
  15 +<div class="catalog-index">
  16 +
  17 + <h1><?= Html::encode($this->title) ?></h1>
  18 +
  19 + <?= GridView::widget( ['dataProvider' => $dataProvider,
  20 +
  21 + ] );
  22 +
  23 +
  24 + ?>
  25 +
  26 +
  27 +
  28 +</div>
34 29 <?php
35 30  
36 31 ?>
37 32 \ No newline at end of file
... ...
backend/views/dic_statuses/_form.php renamed to backend/views/dic-statuses/_form.php
  Show/Hide comments   View file @97dbfb3
backend/views/dic_statuses/_search.php renamed to backend/views/dic-statuses/_search.php
  Show/Hide comments   View file @97dbfb3
backend/views/dic_statuses/create.php renamed to backend/views/dic-statuses/create.php
  Show/Hide comments   View file @97dbfb3
backend/views/dic_statuses/index.php renamed to backend/views/dic-statuses/index.php
  Show/Hide comments   View file @97dbfb3
backend/views/dic_statuses/update.php renamed to backend/views/dic-statuses/update.php
  Show/Hide comments   View file @97dbfb3
backend/views/dic_statuses/view.php renamed to backend/views/dic-statuses/view.php
  Show/Hide comments   View file @97dbfb3
common/components/parsers/CustomCsvParser.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -16,7 +16,7 @@ use yii\base\ErrorException;
16 16  
17 17 class CustomCsvParser extends \yii\multiparser\CsvParser {
18 18  
19   - public $last_line = 100;
  19 + public $last_line = 10;
20 20 //public $hasHeaderRow = true;
21 21 // public $keys = ['first','second', 'third', 'forth', 'fifth'];
22 22 // public function setupConverter()
... ...
common/models/ArtHistory.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -15,7 +15,7 @@ use Yii;
15 15 class ArtHistory extends \yii\db\ActiveRecord
16 16 {
17 17  
18   - public $name;
  18 +
19 19 /**
20 20 * @inheritdoc
21 21 */
... ... @@ -32,7 +32,7 @@ class ArtHistory extends \yii\db\ActiveRecord
32 32 return [
33 33 [['user_id', 'art', 'dt'], 'required'],
34 34 [['user_id'], 'integer'],
35   - [['art','name'], 'string', 'max' => 100],
  35 + [['art'], 'string', 'max' => 100],
36 36 [['dt'], 'string', 'max' => 15],
37 37 [['user_id', 'art'], 'unique', 'targetAttribute' => ['user_id', 'art'], 'message' => 'The combination of User ID and Art has already been taken.']
38 38 ];
... ... @@ -53,12 +53,23 @@ class ArtHistory extends \yii\db\ActiveRecord
53 53 }
54 54  
55 55  
56   -// public function getAccounts()
57   -// {
58   -// return $this->hasOne(Accounts::className(), ['id' => 'user_id']);
59   -// }
  56 + public function getAccounts()
  57 + {
  58 + return $this->hasOne(Accounts::className(), ['id' => 'user_id']);
  59 + }
60 60  
61 61 public function getName(){
62   - return $this->user_id.'11111111';
  62 + if($this->accounts instanceof Accounts){
  63 + return "โ„–{$this->user_id}, {$this->accounts->name}";
  64 + } else {
  65 + return "โ„–{$this->user_id}";
  66 + }
  67 +
63 68 }
  69 +
  70 + public function getDate(){
  71 + return date("Y-m-d H:i:s", $this->dt);
  72 +
  73 + }
  74 +
64 75 }
... ...
common/models/ArtHistorySearch.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -12,7 +12,8 @@ use common\models\ArtHistory;
12 12 */
13 13 class ArtHistorySearch extends ArtHistory
14 14 {
15   -
  15 + public $name;
  16 + public $date;
16 17 /**
17 18 * @inheritdoc
18 19 */
... ... @@ -20,7 +21,7 @@ class ArtHistorySearch extends ArtHistory
20 21 {
21 22 return [
22 23 [['id', 'user_id'], 'integer'],
23   - [['art', 'dt', 'name'], 'safe'],
  24 + [['art', 'dt', 'name','date'], 'safe'],
24 25 ];
25 26 }
26 27  
... ... @@ -50,11 +51,11 @@ class ArtHistorySearch extends ArtHistory
50 51 $dataProvider->setSort([
51 52 'attributes' => [
52 53 'id',
53   - 'user_id',
54   - 'art',
55 54 'dt',
  55 + 'art',
56 56 'name' => [
57   - 'default' => SORT_ASC
  57 + 'asc' => ['user_id' => SORT_ASC, Accounts::tableName().'.name' => SORT_ASC],
  58 + 'desc' => ['user_id' => SORT_DESC, Accounts::tableName().'.name' => SORT_DESC],
58 59 ]
59 60 ]
60 61 ]);
... ... @@ -74,7 +75,7 @@ class ArtHistorySearch extends ArtHistory
74 75  
75 76 $query->andFilterWhere(['like', 'art', $this->art])
76 77 ->andFilterWhere(['like', 'dt', $this->dt]);
77   - //$query->andFilterWhere(['like', Accounts::tableName().'.name', $this->name]);
  78 + $query->andFilterWhere(['like', Accounts::tableName().'.name', $this->name]);
78 79 return $dataProvider;
79 80 }
80 81 }
... ...
console/controllers/ParserController.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -35,7 +35,8 @@ class ParserController extends Controller
35 35 'importer_id' => $importer_id,
36 36 'parser_config' => ['keys' => $keys,
37 37 'converter_conf' =>
38   - [ 'sign' => $sign, 'multiplier' => $multiplier, 'importer_id' => $importer_id ],
  38 + ['sign' => $sign,
  39 + 'multiplier' => $multiplier],
39 40 'mode' => 'console']
40 41 ];
41 42 if ($this->parseFileConsole($file_path, $config)) {
... ...
console/migrations/m150925_111922_add_foreign_key_ImportFiles.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -22,7 +22,7 @@ class m150925_111922_add_foreign_key_ImportFiles extends Migration
22 22 $this->addForeignKey('importer_fk', '{{%importers_files}}', 'importer_id', '{{%importers}}', 'id');
23 23 }
24 24  
25   - public function safeDown()
  25 + public function down()
26 26 {
27 27 $this->dropForeignKey('importer_fk', '{{%importers_files}}');
28 28 }
... ...
frontend/views/site/BC2_catalog_zapchasti.php
  Show/Hide comments   View file @97dbfb3
... ... @@ -20,7 +20,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
20 20  
21 21 <div class="search_span zapchasti">
22 22  
23   - <img src="/images/car1.png">
  23 + <img src="/images/car1.png" id="zapchasti_car">
24 24 <p>ะฃะบะฐะถะธั‚ะต ัะฒะพะน ะฐะฒั‚ะพะผะพะฑะธะปัŒ
25 25 ะธ ะผั‹ ะฟั€ะตะดะปะพะถะธะผ ะฒะฐะผ
26 26 ะตั‰ะต ะะบะบัƒะผัƒะปัั‚ะพั€ั‹ (ะะšะ‘)</p>
... ... @@ -198,7 +198,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
198 198 </td>
199 199 <td class="large_width">12V 88Ah 740A
200 200 <a href=""><img src="/images/gear.png"></a>
201   - <a href="" type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><img src="/images/icon_cam.png"></a>
  201 + <a href="" data-container="body" data-toggle="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."><img src="/images/icon_cam.png"></a>
202 202 </td>
203 203 <td class="right instock">
204 204 <table class="right" cellspacing="0" cellpadding="0" border="0" style="border-bottom: 0;
... ...
frontend/views/site/notepad.php
  Show/Hide comments   View file @97dbfb3
1 1 <?php
2 2  
3   -$this->registerCssFile('/css/style/notepad.css.css');
  3 +$this->registerCssFile('/css/style/notepad.css');
4 4  
5 5 $this->params['breadcrumbs'][] = $this->title;
6 6 ?>
... ...
frontend/web/css/BC2_catalog.css
  Show/Hide comments   View file @97dbfb3
... ... @@ -484,4 +484,14 @@ color: #8ca1c8;
484 484 font-weight: 500;
485 485 margin-top: -15px;
486 486 margin-bottom: 20px;
  487 +}
  488 +
  489 +.filter-box-two a:hover{
  490 + text-decoration: none;
  491 +}
  492 +
  493 +table.trackbar {
  494 + width: 250px;
  495 + margin: 10px 30px;
  496 + background: none!important;
487 497 }
488 498 \ No newline at end of file
... ...
frontend/web/css/BC2_catalog_zapchasti.css
  Show/Hide comments   View file @97dbfb3
... ... @@ -16,7 +16,7 @@
16 16 }
17 17  
18 18 .vin{
19   - width: 960px;
  19 + width: 960px!important;
20 20 margin: 34px auto;
21 21 }
22 22  
... ... @@ -71,9 +71,9 @@
71 71  
72 72  
73 73 .zapchasti{
74   - width:220px;
75   - height: 264px;
76   - border:1px solid #dfdfdf;
  74 + width: 220px!important;
  75 + height: 264px!important;
  76 + border: 1px solid #dfdfdf;
77 77 }
78 78  
79 79 .zapchasti select{
... ... @@ -82,7 +82,7 @@
82 82 margin-left:21px;
83 83 }
84 84  
85   -.zapchasti img{
  85 +#zapchasti_car{
86 86 margin-left: 57px!important;
87 87 margin-top: 32px;
88 88 }
... ... @@ -90,7 +90,7 @@
90 90 .zapchasti p{
91 91 text-align: center;
92 92 font-size: 13px;
93   - margin: 13px 0 0 0;
  93 + margin: 13px 0 0 0!important;
94 94 }
95 95  
96 96 .zapchasti .purple{
... ... @@ -541,4 +541,6 @@ td .purple {
541 541 background-position:95% 58%;
542 542 background-color: #f5f5f5;
543 543 border: 1px solid #dfdfdf;
  544 + width: 180px;
  545 + margin-left: 20px;
544 546 }
545 547 \ No newline at end of file
... ...
frontend/web/css/catalog_marok.css
  Show/Hide comments   View file @97dbfb3
... ... @@ -336,6 +336,7 @@ td input {
336 336 }
337 337  
338 338 td .purple {
  339 + margin-left: -8px;
339 340 height: 31px;
340 341 width: 90px;
341 342 position: absolute;
... ... @@ -387,9 +388,12 @@ tr{
387 388 }
388 389  
389 390 td{
390   - padding-left: 17px;
  391 + padding-left: 17px!important;
  392 +}
  393 +table a {
  394 + color: #6b84b5;
  395 + text-decoration: none!important;
391 396 }
392   -
393 397 .modification_name{
394 398 font-size: 13px;
395 399 font-weight: 500;
... ... @@ -599,9 +603,7 @@ table a:visited{
599 603 top: 12px;
600 604 }
601 605  
602   -.left_small_menu{
603   - display: none;
604   -}
  606 +
605 607 .left_small_menu .header_small_menu{
606 608 background-color: #8da6d6;
607 609 color:#fff;
... ... @@ -626,6 +628,7 @@ table a:visited{
626 628  
627 629 .left_small_menu{
628 630 margin-bottom: -8px;
  631 + display: none;
629 632 }
630 633  
631 634 .gallery_tovars{
... ... @@ -732,8 +735,12 @@ table a:visited{
732 735  
733 736 .dropdown-menu{
734 737 position: static!important;
735   -}
736 738  
  739 +
  740 +}
  741 +.open .dropdown-menu{
  742 + margin-left: -48px;
  743 +}
737 744 .small_menu_width {
738 745 float: none
739 746 }
740 747 \ No newline at end of file
... ...
frontend/web/css/general_styles.css
  Show/Hide comments   View file @97dbfb3
... ... @@ -20,7 +20,9 @@ img {
20 20 a{
21 21 text-decoration: none;
22 22 }
23   -
  23 +a:hover{
  24 + text-decoration: none;
  25 +}
24 26 ul{
25 27 margin: 0 0 10px 0;
26 28 }
... ... @@ -618,7 +620,6 @@ li a{
618 620 .areamark {
619 621 width: 240px;
620 622 margin-left: 51px;
621   - background-color: #f5f5f5;
622 623 }
623 624 .selectize_item2 span {
624 625 margin-left: 0!important;
... ... @@ -632,7 +633,6 @@ li a{
632 633 margin-top: 15px;
633 634 width: 240px;
634 635 margin-left: 51px;
635   - background-color: #f5f5f5;
636 636 opacity: 0;
637 637 }
638 638  
... ... @@ -641,7 +641,6 @@ li a{
641 641 margin-top: 15px;
642 642 width: 240px;
643 643 margin-left: 51px;
644   - background-color: #f5f5f5;
645 644 }
646 645 .selectize_item3 span{
647 646 margin-left: 0!important;
... ... @@ -678,13 +677,11 @@ li a{
678 677 .area3{
679 678 width: 240px;
680 679 margin-left: 51px;
681   - background-color: #f5f5f5;
682 680 }
683 681 .area4{
684 682 margin-top: 15px;
685 683 width: 240px;
686 684 margin-left: 51px;
687   - background-color: #f5f5f5;
688 685 opacity: 0;
689 686 }
690 687  
... ... @@ -693,9 +690,42 @@ li a{
693 690 margin-top: 15px;
694 691 width: 240px;
695 692 margin-left: 51px;
696   - background-color: #f5f5f5;
697 693 }
698 694  
  695 +.areamark .selectize-input{
  696 + background: #f5f5f5;
  697 +}
  698 +.area1 .selectize-input{
  699 + background: #f5f5f5;
  700 +}
  701 +.area3 .selectize-input{
  702 + background: #f5f5f5;
  703 +}
  704 +.area4 .selectize-input{
  705 + background: #f5f5f5;
  706 +}
  707 +.area5 .selectize-input{
  708 + background: #f5f5f5;
  709 +}
  710 +
  711 +.areamark .selectize-input.full{
  712 + background: #f5f5f5;
  713 +}
  714 +.area1 .selectize-input.full{
  715 + background: #f5f5f5;
  716 +}
  717 +.area2 .selectize-input.full{
  718 + background: #f5f5f5;
  719 +}
  720 +.area5 .selectize-input.full{
  721 + background: #f5f5f5;
  722 +}
  723 +.area3 .selectize-input.full{
  724 + background: #f5f5f5;
  725 +}
  726 +.area4 .selectize-input.full{
  727 + background: #f5f5f5;
  728 +}
699 729 .registration_for_detail_search .selectize-input {
700 730 padding-bottom: 8px;
701 731 display: block;
... ... @@ -1314,6 +1344,7 @@ li a{
1314 1344 width:960px;
1315 1345 margin:0 auto;
1316 1346 margin-top:40px;
  1347 + position: relative;
1317 1348 }
1318 1349 /*td{
1319 1350 width:240px;
... ... @@ -2358,11 +2389,13 @@ left: -444px;
2358 2389 .number_of{
2359 2390 font-weight: 500;
2360 2391 font-size: 22px;
  2392 + margin-left: 15px;
2361 2393 }
2362 2394  
2363 2395 .general_number{
2364 2396 font-weight: 500;
2365 2397 font-size: 22px;
  2398 + margin-right: 6px;
2366 2399 }
2367 2400  
2368 2401 .block_project {
... ... @@ -2947,4 +2980,25 @@ input{
2947 2980  
2948 2981 #replace_form{
2949 2982 position: relative;
2950   -}
2951 2983 \ No newline at end of file
  2984 +}
  2985 +
  2986 +.telephone span{
  2987 + float: left;
  2988 + margin-top: 5px;
  2989 + margin-right: 3px;
  2990 +}
  2991 +
  2992 +.close {
  2993 + float: right;
  2994 + font-size: 21px;
  2995 + font-weight: bold;
  2996 + line-height: 1;
  2997 + color: #000;
  2998 + filter: alpha(opacity=20);
  2999 + opacity: 1!important;
  3000 +}
  3001 +.slider_block1 span img:nth-child(1) {
  3002 + position: absolute;
  3003 + top: 6px;
  3004 +}
  3005 +
... ...
frontend/web/css/search_filters.css
  Show/Hide comments   View file @97dbfb3
... ... @@ -374,8 +374,9 @@ input[type=&quot;checkbox&quot;] + label span {
374 374 display: inline-block;
375 375 }
376 376 .filter-box-two img{
377   - margin-bottom: 17px;
  377 + margin-bottom: 16px;
378 378 margin-left: 8px;
  379 + float: right;
379 380 }
380 381 .filter-box-two1 p{
381 382 position: absolute;
... ... @@ -564,4 +565,39 @@ td .purple {
564 565 }
565 566 .opposite1{
566 567 border-radius: 0 4px 4px 0;
  568 +}
  569 +
  570 +table.trackbar {
  571 + width: 250px;
  572 + margin: 10px 30px;
  573 + background: none!important;
  574 +}
  575 +
  576 +table.trackbar .l div{
  577 + height: 8px;
  578 + border: 3px solid #dfdfdf;
  579 + margin-top: 1.5px;
  580 + background-color: white;
  581 + border-radius: 13px 0 0 13px;
  582 +}
  583 +
  584 +table.trackbar .r div{
  585 + height: 8px;
  586 + border: 3px solid #dfdfdf;
  587 + margin-top: 3px;
  588 + background-color: white;
  589 + border-radius: 0 13px 13px 0;
  590 +}
  591 +
  592 +table.trackbar .c {
  593 + font-size: 1px;
  594 + width: 100%;
  595 + height: 6px;
  596 + background-image: url('../js/TrackBar/imgtrackbar/track_bar.png');
  597 + background-repeat: repeat no-repeat;
  598 + background-position: 1% 75%;
  599 +}
  600 +
  601 +table.trackbar {
  602 + margin: 10px 38px;
567 603 }
568 604 \ No newline at end of file
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @97dbfb3
... ... @@ -47,7 +47,7 @@ li a{
47 47 margin-top:5px;
48 48 }
49 49 .arrow_down{
50   - left: 129!important;
  50 + left: 129px!important;
51 51 top: 18px!important;
52 52 }
53 53 .our_project{
... ... @@ -59,7 +59,9 @@ li a{
59 59 -o-border-bottom: 1px dashed;
60 60 -ms-border-bottom: 1px dashed;
61 61 }
62   -
  62 +.our_project:hover{
  63 + text-decoration: none;
  64 +}
63 65 .contacts{
64 66 margin: 25px auto;
65 67 width:960px;
... ... @@ -736,7 +738,7 @@ ul span{
736 738  
737 739 .selectize_item .steel{
738 740 width: 241px!important;
739   - top: 9px;
  741 + top: 8px;
740 742 }
741 743  
742 744 .selectize_item1{
... ... @@ -1615,7 +1617,7 @@ span:first-child .tovars{
1615 1617 .slider_block span img:nth-child(1){
1616 1618 position: absolute;
1617 1619 top: 6px;
1618   - left: 181px;
  1620 + left: 188px;
1619 1621 }
1620 1622  
1621 1623 .slider_block span:nth-child(2) img{
... ... @@ -2338,12 +2340,13 @@ span:first-child .tovars{
2338 2340 .number_of{
2339 2341 font-weight: 500;
2340 2342 font-size: 22px;
2341   - margin-left: 15px;
  2343 + margin-left: 20px;
2342 2344 }
2343 2345  
2344 2346 .general_number{
2345 2347 font-weight: 500;
2346 2348 font-size: 22px;
  2349 + margin-right: 5px;
2347 2350 }
2348 2351  
2349 2352 .block_project{
... ... @@ -2449,28 +2452,60 @@ span:first-child .tovars{
2449 2452 }
2450 2453  
2451 2454 .steel .selectize-dropdown-content{
2452   - margin-left: -1!important;
  2455 + margin-left: -1px!important;
2453 2456 }
2454 2457  
2455 2458 .areamark{
2456 2459 width: 240px;
2457 2460 margin-left: 51px;
2458   - background-color: #f5f5f5;
  2461 +}
  2462 +
  2463 +.areamark .selectize-input.full{
  2464 + background: #f5f5f5;
  2465 +}
  2466 +.area1 .selectize-input.full{
  2467 + background: #f5f5f5;
  2468 +}
  2469 +.area2 .selectize-input.full{
  2470 + background: #f5f5f5;
  2471 +}
  2472 +.area5 .selectize-input.full{
  2473 + background: #f5f5f5;
  2474 +}
  2475 +.area3 .selectize-input.full{
  2476 + background: #f5f5f5;
  2477 +}
  2478 +.area4 .selectize-input.full{
  2479 + background: #f5f5f5;
2459 2480 }
2460 2481 .area1{
2461 2482 margin-top: 15px;
2462 2483 width: 240px;
2463 2484 margin-left: 51px;
2464   - background-color: #f5f5f5;
2465 2485 opacity: 0;
2466 2486 }
2467   -
  2487 +.area1 .selectize-input{
  2488 + background: #f5f5f5;
  2489 +}
  2490 +.area3 .selectize-input{
  2491 + background: #f5f5f5;
  2492 +}
  2493 +.area4 .selectize-input{
  2494 + background: #f5f5f5;
  2495 +}
  2496 +.area5 .selectize-input{
  2497 + background: #f5f5f5;
  2498 +}
2468 2499 .area2{
2469 2500 opacity: 0;
2470 2501 margin-top: 15px;
2471 2502 width: 240px;
2472 2503 margin-left: 51px;
2473   - background-color: #f5f5f5;
  2504 +
  2505 +}
  2506 +
  2507 +.area2 .selectize-input{
  2508 + background: #f5f5f5;
2474 2509 }
2475 2510 .selectize_item2 span{
2476 2511 margin-left: 0!important;
... ... @@ -2483,13 +2518,11 @@ span:first-child .tovars{
2483 2518 .area3{
2484 2519 width: 240px;
2485 2520 margin-left: 51px;
2486   - background-color: #f5f5f5;
2487 2521 }
2488 2522 .area4{
2489 2523 margin-top: 15px;
2490 2524 width: 240px;
2491 2525 margin-left: 51px;
2492   - background-color: #f5f5f5;
2493 2526 opacity: 0;
2494 2527 }
2495 2528  
... ... @@ -2498,7 +2531,6 @@ span:first-child .tovars{
2498 2531 margin-top: 15px;
2499 2532 width: 240px;
2500 2533 margin-left: 51px;
2501   - background-color: #f5f5f5;
2502 2534 }
2503 2535  
2504 2536 .shadow{
... ... @@ -3010,5 +3042,34 @@ input[type=&quot;checkbox&quot;]:checked + label span {
3010 3042 background-clip: padding-box;
3011 3043 height: 145px !important;
3012 3044 width: 732px !important;
3013   - left: -131px !important;
  3045 + left: -132px !important;
  3046 +}
  3047 +
  3048 +.telephone span{
  3049 + float: left;
  3050 + margin-top: 5px;
  3051 + margin-right: 3px;
  3052 +}
  3053 +
  3054 +.close {
  3055 + float: right;
  3056 + font-size: 21px;
  3057 + font-weight: bold;
  3058 + line-height: 1;
  3059 + color: #000;
  3060 + filter: alpha(opacity=20);
  3061 + opacity: 1!important;
  3062 +}
  3063 +
  3064 +
  3065 +.modal-header{
  3066 + border-bottom: none!important;
  3067 +}
  3068 +
  3069 +.selectize-control.single .selectize-input:after{
  3070 + top: 30%!important;
  3071 +}
  3072 +
  3073 +.search_by_vin .selectize-input{
  3074 + margin-top: -1px;
3014 3075 }
3015 3076 \ No newline at end of file
... ...
frontend/web/css/style/busket.css
  Show/Hide comments   View file @97dbfb3
... ... @@ -248,12 +248,12 @@ input[type=&quot;radio&quot;] + label span {
248 248 width:16px;
249 249 height:16px;
250 250 margin-bottom: 16px;
251   - background: url('../images/radio.png') no-repeat;
  251 + background: url('/images/radio.png') no-repeat;
252 252 cursor:pointer;
253 253  
254 254 }
255 255 input[type="radio"]:checked + label span{
256   - background: url('../images/blue_dot.png') no-repeat;
  256 + background: url('/images/blue_dot.png') no-repeat;
257 257 }
258 258  
259 259 input[type="radio"] + label span,
... ... @@ -278,13 +278,13 @@ input[type=&quot;checkbox&quot;] + label span {
278 278 width:16px;
279 279 height:16px;
280 280 margin-bottom: 16px;
281   - background: url('../images/checkbox.png') no-repeat;
  281 + background: url('/images/checkbox.png') no-repeat;
282 282 cursor:pointer;
283 283 margin-top: 10px;
284 284  
285 285 }
286 286 input[type="checkbox"]:checked + label span{
287   - background: url('../images/input-type-checked.png') no-repeat;
  287 + background: url('/images/input-type-checked.png') no-repeat;
288 288 margin-top: 10px;
289 289 }
290 290  
... ...
frontend/web/css/style/my_profile.css
  Show/Hide comments   View file @97dbfb3
... ... @@ -163,7 +163,7 @@ margin-left: -37px;
163 163 }
164 164  
165 165 .lend-tovar-cart-number {
166   - height: 29px;
  166 + height: 31px;
167 167 width: 28px;
168 168 border: none;
169 169 outline: none;
... ... @@ -175,6 +175,7 @@ margin-left: -37px;
175 175 position: relative;
176 176 padding-left: 0;
177 177 padding-bottom: 2px;
  178 + border-radius: 7px;
178 179 }
179 180  
180 181 .lend-tovar-cart-left {
... ...
frontend/web/css/style/news_all.css
  Show/Hide comments   View file @97dbfb3
... ... @@ -75,15 +75,9 @@ p, a, label, span{
75 75 width: 308px;
76 76 }
77 77  
78   -#pagination {
79   - height: 19px;
80   - display: table;
81   - margin: 0 auto;
82   -}
83   -
84 78 .pagination>li:first-child>a, .pagination>li:first-child>span {
85   - border-top-left-radius: 20px;
86   - border-bottom-left-radius: 20px;
  79 + border-top-left-radius: 20px!important;
  80 + border-bottom-left-radius: 20px!important;
87 81 height: 24px;
88 82 width: 24px;
89 83 padding-top: 1px;
... ... @@ -97,8 +91,7 @@ p, a, label, span{
97 91 float: left;
98 92 height: 24px;
99 93 width: 24px;
100   - padding-top: 1px;
101   - padding-left: 7px;
  94 + padding: 1px 7px!important;
102 95 margin-left: -1px;
103 96 line-height: 1.42857143;
104 97 color: #333;
... ... @@ -117,8 +110,14 @@ p, a, label, span{
117 110 }
118 111  
119 112 .pagination>li:last-child>a, .pagination>li:last-child>span {
120   - border-top-right-radius: 20px;
121   - border-bottom-right-radius: 20px;
  113 + border-top-right-radius: 20px!important;
  114 + border-bottom-right-radius: 20px!important;
  115 +}
  116 +
  117 +.pagination{
  118 + display: table!important;
  119 + padding-top: 23px!important;
  120 + margin: 20px auto!important;
122 121 }
123 122  
124 123 .choose_tovar a {
... ... @@ -154,7 +153,7 @@ p, a, label, span{
154 153  
155 154  
156 155 .back_news{
157   - background-image: url('../images/arrow_slider_back.png');
  156 + background-image: url('/images/arrow_slider_back.png');
158 157 background-repeat: no-repeat;
159 158 background-position: 0% 46%;
160 159 position: relative;
... ... @@ -163,7 +162,7 @@ p, a, label, span{
163 162 }
164 163 .next_news{
165 164 float: right;
166   - background-image: url('../images/arrow_slider_go.png');
  165 + background-image: url('/images/arrow_slider_go.png');
167 166 background-repeat: no-repeat;
168 167 background-position: 100% 42%;
169 168 position: relative;
... ...
frontend/web/css/style/optovikam.css
  Show/Hide comments   View file @97dbfb3
... ... @@ -49,7 +49,7 @@
49 49 }
50 50 .choose_tovar-list li{
51 51 padding-left: 13px;
52   - background-image: url("../images/purple_eclipse.png");
  52 + background-image: url("/images/purple_eclipse.png");
53 53 background-position: 2px 6px;
54 54 background-repeat: no-repeat;
55 55  
... ...
frontend/web/css/style_vin.css
  Show/Hide comments   View file @97dbfb3
... ... @@ -520,4 +520,10 @@ table a{
520 520 margin-left: 133px!important;
521 521 color: #6b84b5;
522 522 text-decoration: underline;
  523 +}
  524 +
  525 +.search_input .orange{
  526 + float: right;
  527 + margin-top: 4px;
  528 + margin-right: 3px;
523 529 }
524 530 \ No newline at end of file
... ...
frontend/web/js/script.js
  Show/Hide comments   View file @97dbfb3
... ... @@ -142,11 +142,11 @@ $(&#39;.phone_control, .phone_placeholder&#39;).click(
142 142  
143 143 $('#auto_staff').hover(
144 144 function(){
145   - $('.dropdown_menu').stop().slideDown(500);
  145 + $('.dropdown_menu').stop().fadeIn(500);
146 146  
147 147 },
148 148 function(){
149   - $('.dropdown_menu').stop().slideUp(400);
  149 + $('.dropdown_menu').stop().fadeOut(400);
150 150 // $('.dropdown_menu').delay(300).queue(function () {
151 151 // $(this).css({display:'none'});
152 152 // $(this).dequeue();});
... ...