Administrator / test_3

Commit 7fe508fbb9f90a5593463f34eaa32857a85392ca

Authored by Виталий
1 parent f1f3595c

tokar commit

Showing 11 changed files with 197 additions and 106 deletions   Show diff stats
Inline Side-by-side
common/widgets/views/_gallery_item.php
  Show/Hide comments   View file @7fe508f
... ... @@ -2,6 +2,7 @@
2 2 use yii\helpers\Html;
3 3  
4 4 ?>
  5 +
5 6 <div class="gallery_image">
6 7 <?= Html::img($item['image'])?>
7 8 <span data-url="<?=$item['image']?>" title="удалить изображение" class="glyphicon glyphicon-trash delete-gallery-item"></span>
... ...
common/widgets/views/image_sizer.php
  Show/Hide comments   View file @7fe508f
... ... @@ -61,6 +61,8 @@ $id = $model::tableName().&#39;_id&#39;;
61 61  
62 62  
63 63 $('body').on('click', '#<?=$field?>_save_img',function(){
  64 + $("#<?= $field?>_img_block").parent().parent().parent().removeClass('success_download')
  65 +
64 66 $("#<?=$field?>_buttons_block").remove();
65 67 var old_url = $('#<?=$field?>_old_img').val();
66 68 var new_url = $('#<?=$field?>_new_img').val();
... ...
common/widgets/views/phone_field.php
  Show/Hide comments   View file @7fe508f
... ... @@ -17,8 +17,8 @@
17 17  
18 18 <?= Html::beginTag('div',['class'=>'form-group','id'=>isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ])?>
19 19 <div class="input-blocks">
20   - <label for="cont-phone-<?= $label ?>">Телефон</label>
21   - <input id="cont-phone-<?= ++$label ?>" type="text" placeholder="" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[phone][<?=$row?>][0][phone]" />
  20 + <label for="cont-phone-<?= ++$label ?>">Телефон</label>
  21 + <input id="cont-phone-<?= $label ?>" type="text" placeholder="" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[phone][<?=$row?>][0][phone]" />
22 22 </div>
23 23 <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
24 24 <?= Html::endTag('div')?>
... ... @@ -39,8 +39,8 @@
39 39 var block_id = $(this).parent('fieldset');
40 40 var sub_block = '<div class="form-group" >'+
41 41 '<div class="input-blocks">'+
42   - '<label for="cont-phone-' + start_label_<?=$this->context->id?> +'">Телефон</label>'+
43   - '<input id="cont-phone-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[phone]['+ start_i_<?=$this->context->id?>++ +'][0][phone]" />'+
  42 + '<label for="cont-phone-' + ++start_label_<?=$this->context->id?> +'">Телефон</label>'+
  43 + '<input id="cont-phone-' + start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[phone]['+ start_i_<?=$this->context->id?>++ +'][0][phone]" />'+
44 44 '</div>'+
45 45 '<span class="glyphicon glyphicon-trash delete-field-item custom-remove-ico"></span>'+
46 46 '<div>';
... ...
common/widgets/views/site_field.php
  Show/Hide comments   View file @7fe508f
... ... @@ -18,8 +18,8 @@ use yii\helpers\Html;
18 18  
19 19 <?= Html::beginTag('div',['class'=>'form-group','id'=>isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ])?>
20 20 <div class="input-blocks">
21   - <label for="cont-site-<?= $label ?>">Сайт</label>
22   - <input id="cont-site-<?= ++$label ?>" type="text" placeholder="" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[site][<?=$row?>][0][site]" />
  21 + <label for="cont-site-<?= ++$label ?>">Сайт</label>
  22 + <input id="cont-site-<?= $label ?>" type="text" placeholder="" class="form-control custom-input-2" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[site][<?=$row?>][0][site]" />
23 23 </div>
24 24 <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
25 25 <?= Html::endTag('div')?>
... ... @@ -40,8 +40,8 @@ use yii\helpers\Html;
40 40 var sub_block = '<div class="form-group" >'+
41 41  
42 42 '<div class="input-blocks">'+
43   - '<label for="cont-site-' + start_label_<?=$this->context->id?> +'">Сайт</label>'+
44   - '<input id="cont-site-' + ++start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[site]['+ start_i_<?=$this->context->id?>++ +'][0][site]" />'+
  43 + '<label for="cont-site-' + ++start_label_<?=$this->context->id?> +'">Сайт</label>'+
  44 + '<input id="cont-site-' + start_label_<?=$this->context->id?> +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[site]['+ start_i_<?=$this->context->id?>++ +'][0][site]" />'+
45 45 '</div>'+
46 46 '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
47 47 '<div>';
... ...
common/widgets/views/youtube_field.php
  Show/Hide comments   View file @7fe508f
... ... @@ -4,12 +4,12 @@
4 4 ?>
5 5 <fieldset>
6 6  
7   - <legend>Видео с Youtube</legend>
8 7  
9 8 <div class="field_list">
10 9  
11 10  
12 11 <?php $t = 0;
  12 + $label = 0; // add this var
13 13 for($i = 1; $i <= count($model); $i++):
14 14 $row = $i;
15 15  
... ... @@ -19,7 +19,10 @@
19 19 'class' => 'form-group',
20 20 'id' => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0,
21 21 ]) ?>
22   - <input type="text" placeholder="Url видео" class="form-control" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[youtube][<?= $row ?>][0][youtube]"/>
  22 + <div class="input-blocks">
  23 + <label for="iframe_youtube-<?= ++$label ?>">Youtube</label>
  24 + <input id="iframe_youtube-<?= $label ?>" type="text" placeholder="iframe" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[youtube][<?= $row ?>][0][youtube]"/>
  25 + </div>
23 26 <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
24 27 <?= Html::endTag('div') ?>
25 28 <?php $i = ++$t; ?>
... ... @@ -30,6 +33,7 @@
30 33 </fieldset>
31 34 <script>
32 35 var start_i_<?=$this->context->id?> = <?=$i?>;
  36 + var start_label_<?=$this->context->id?> = <?=$label?>; // add this var
33 37 $ (document)
34 38 .ready (
35 39 function ()
... ... @@ -43,10 +47,13 @@
43 47 var block_id = $ (this)
44 48 .parent ('fieldset');
45 49 var sub_block = '<div class="form-group" >' +
46   - '<input type="text" placeholder="Url видео" class="form-control" value="" name="Fields[youtube][' + start_i_<?=$this->context->id?>++ + '][0][youtube]" />' +
  50 + '<div class="input-blocks">'+
  51 + '<label for="iframe_youtube-' + ++start_label_<?=$this->context->id?> +'">Youtube</label>'+
  52 + '<input id="iframe_youtube-' + start_label_<?=$this->context->id?> +'" type="text" placeholder="iframe" class="form-control custom-input-2" value="" name="Fields[youtube][' + start_i_<?=$this->context->id?>++ + '][0][youtube]" />' +
  53 + '</div>'+
47 54 '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
48 55 '<div>';
49   - console.log (block);
  56 +// console.log (block);
50 57 block.append (sub_block);
51 58 }
52 59 );
... ...
frontend/views/accounts/_gallery_form.php
  Show/Hide comments   View file @7fe508f
... ... @@ -9,30 +9,35 @@
9 9 use yii\helpers\Html;
10 10 use yii\widgets\ActiveForm;
11 11  
12   - $this->title = 'Мой профиль';
  12 + $this->title = 'Галерея Фото';
13 13 $this->params[ 'breadcrumbs' ][] = $this->title;
14 14 ?>
15   -<h1><?= $this->title ?></h1>
  15 +<div class="login-left-column-title"><?= $this->title ?></div>
16 16  
17 17 <?php
18 18 $form = ActiveForm::begin();
19 19 ?>
20   -
21   -<?= $gallery->date_add ?>
22   -
23   -<?= $form->field($gallery, 'name')
24   - ->textInput() ?>
25   -
26   -<?= ImageUploader::widget([
27   - 'model' => $gallery,
28   - 'field' => 'cover',
29   - 'width' => 210,
30   - 'height' => 150,
31   - 'multi' => false,
32   - 'gallery' => $gallery->cover,
33   - 'name' => 'Загрузить главное фото',
34   -]); ?>
35   -
  20 +<div class="input-blocks-wrapper full-blocks data-block">Дата создания: <?= $gallery->date_add ?></div>
  21 +<div class="login-left-column-title-two admin-gallery-photo-edit style">Редактирование:</div>
  22 +
  23 +<div class="input-blocks-wrapper">
  24 + <div class="input-blocks">
  25 + <?= $form->field($gallery, 'name')
  26 + ->textInput (['class'=> 'custom-input-2']) ?>
  27 + </div>
  28 +</div>
  29 +
  30 +<div class="input-blocks-wrapper admin-avatar amin-team-foto">
  31 + <?= ImageUploader::widget([
  32 + 'model' => $gallery,
  33 + 'field' => 'cover',
  34 + 'width' => 210,
  35 + 'height' => 150,
  36 + 'multi' => false,
  37 + 'gallery' => $gallery->cover,
  38 + 'name' => 'Загрузить главное фото',
  39 + ]); ?>
  40 +</div>
36 41 <?= ImageUploader::widget([
37 42 'model' => $gallery,
38 43 'field' => 'photo',
... ...
frontend/views/accounts/_team_form.php
  Show/Hide comments   View file @7fe508f
... ... @@ -13,65 +13,108 @@
13 13 use yii\web\JsExpression;
14 14 use yii\widgets\ActiveForm;
15 15  
16   - $this->title = 'Мой профиль';
  16 + $this->title = 'Команда';
17 17 $this->params[ 'breadcrumbs' ][] = $this->title;
18 18 ?>
19   -<h1><?= $this->title ?></h1>
  19 +<div class="login-left-column-title"><?= $this->title ?></div>
  20 +<div class="login-left-column-title-two style">Редактирование:</div>
20 21  
21   -<?php
22   - $form = ActiveForm::begin();
23   -?>
  22 +<div class="input-blocks-wrapper">
  23 + <div class="input-blocks">
  24 + <?php
  25 + $form = ActiveForm::begin();
  26 + ?>
  27 + </div>
  28 +</div>
24 29  
25   -<?= $form->field($team, 'lastname')
26   - ->textInput() ?>
  30 +<div class="input-blocks-wrapper">
  31 + <div class="input-blocks">
  32 + <?= $form->field($team, 'lastname')
  33 + ->textInput (['class'=> 'custom-input-2']) ?>
  34 + </div>
  35 +</div>
27 36  
28   -<?= $form->field($team, 'firstname')
29   - ->textInput() ?>
  37 +<div class="input-blocks-wrapper">
  38 + <div class="input-blocks">
  39 + <?= $form->field($team, 'firstname')
  40 + ->textInput (['class'=> 'custom-input-2']) ?>
  41 + </div>
  42 +</div>
30 43  
31   -<?= $form->field($team, 'middlename')
32   - ->textInput() ?>
  44 +<div class="input-blocks-wrapper">
  45 + <div class="input-blocks">
  46 + <?= $form->field($team, 'middlename')
  47 + ->textInput (['class'=> 'custom-input-2']) ?>
  48 + </div>
  49 +</div>
33 50  
34   -<?= $form->field($team, 'link')
35   - ->textInput() ?>
  51 +<div class="input-blocks-wrapper">
  52 + <div class="input-blocks">
  53 + <?= $form->field($team, 'link')
  54 + ->textInput (['class'=> 'custom-input-2']) ?>
  55 + </div>
  56 +</div>
36 57  
37   -<?= $form->field($team, 'position')
38   - ->textInput() ?>
  58 +<div class="input-blocks-wrapper">
  59 + <div class="input-blocks">
  60 + <?= $form->field($team, 'position')
  61 + ->textInput (['class'=> 'custom-input-2']) ?>
  62 + </div>
  63 +</div>
39 64  
40   -<?= $form->field($team, 'department_id')
41   - ->dropDownList($department) ?>
  65 +<div class="input-blocks-wrapper admn-select-company">
  66 + <div class="input-blocks">
  67 + <?= $form->field($team, 'department_id')
  68 + ->dropDownList($department) ?>
  69 + </div>
  70 +</div>
42 71  
43   -<?= $form->field($team, 'experience_from', [ 'template' => "{label}, с {input} года \n{hint}\n{error}" ])
44   - ->input('number') ?>
  72 +<div class="input-blocks-wrapper">
  73 + <div class="input-blocks">
  74 + <?= $form->field($team, 'experience_from', [ 'template' => "{label},<span style='font-weight: 700;font-size: 13px'>лет</span><br /><span class='admn-input-txt' style='margin-right: 10px'>с</span>{input}<span class='admn-input-txt' style='margin-left: 10px'>года</span> \n{hint}\n{error}" ])
  75 + ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number'])?>
  76 + </div>
  77 +</div>
45 78  
46   -<?=
47   - $form->field($team, 'country_id')->widget(Select2::classname(), [
48   - 'options' => ['placeholder' => 'Выбор страны ...'],
49   - 'pluginOptions' => [
50   - 'allowClear' => true,
51   - 'minimumInputLength' => 3,
52   - 'ajax' => [
53   - 'url' => \yii\helpers\Url::to(['site/country']),
54   - 'dataType' => 'json',
55   - 'data' => new JsExpression('function(params) { return {q:params.term}; }')
  79 +<div class="input-blocks-wrapper">
  80 + <div class="input-blocks">
  81 + <?=
  82 + $form->field($team, 'country_id')->widget(Select2::classname(), [
  83 + 'options' => ['placeholder' => 'Выбор страны ...'],
  84 + 'pluginOptions' => [
  85 + 'allowClear' => true,
  86 + 'minimumInputLength' => 3,
  87 + 'ajax' => [
  88 + 'url' => \yii\helpers\Url::to(['site/country']),
  89 + 'dataType' => 'json',
  90 + 'data' => new JsExpression('function(params) { return {q:params.term}; }')
  91 + ],
  92 + 'escapeMarkup' => new JsExpression('function (markup) { return markup; }'),
  93 + 'templateResult' => new JsExpression('function(country) { return country.text; }'),
  94 + 'templateSelection' => new JsExpression('function (country) { return country.text; }'),
56 95 ],
57   - 'escapeMarkup' => new JsExpression('function (markup) { return markup; }'),
58   - 'templateResult' => new JsExpression('function(country) { return country.text; }'),
59   - 'templateSelection' => new JsExpression('function (country) { return country.text; }'),
60   - ],
61   - ]);
62   -?>
  96 + ]);
  97 + ?>
  98 + </div>
  99 +</div>
63 100  
64   -<?= ImageUploader::widget([
65   - 'model' => $team,
66   - 'field' => 'photo',
67   - 'width' => 220,
68   - 'height' => 220,
69   - 'multi' => false,
70   - 'gallery' => $team->photo,
71   - 'name' => 'Загрузить фото',
72   -]); ?>
  101 +<div class="input-blocks-wrapper admin-avatar amin-team-foto">
  102 + <?= ImageUploader::widget([
  103 + 'model' => $team,
  104 + 'field' => 'photo',
  105 + 'width' => 100,
  106 + 'height' => 100,
  107 + 'multi' => false,
  108 + 'gallery' => $team->photo,
  109 + 'name' => 'Загрузить фото',
  110 + ]); ?>
  111 +</div>
73 112  
74   -<?= Html::submitButton('Добавить') ?>
  113 +<div class="input-blocks-wrapper">
  114 + <div class="admin-save-btn skills-save-btn style">
  115 + <?= Html::submitButton('Добавить',['class'=>'input-blocks-wrapper button']) ?>
  116 + </div>
  117 +</div>
75 118  
76 119 <?php
77 120 $form->end();
... ...
frontend/views/accounts/gallery-video.php
  Show/Hide comments   View file @7fe508f
... ... @@ -9,24 +9,30 @@ use common\widgets\FieldEditor;
9 9 use yii\helpers\Html;
10 10 use yii\widgets\ActiveForm;
11 11  
12   -$this->title = 'Мой профиль';
  12 +$this->title = 'Галерея Видео';
13 13 $this->params[ 'breadcrumbs' ][] = $this->title;
14 14 ?>
15   -<h1><?= $this->title ?></h1>
16   -
17   -<?php
18   -$form = ActiveForm::begin();
19   -?>
20   -
21   -<?= FieldEditor::widget (
22   - [
23   - 'template' => 'youtube', 'item_id' => $user->id, 'model' => 'common\models\Gallery', 'language' => 'ru',
24   - ]
25   -); ?>
26   -
27   -<?= Html::submitButton('Добавить') ?>
28   -
29   -<?php
30   -$form->end();
31   -?>
  15 +<div class="login-left-column-title"><?= $this->title ?></div>
32 16  
  17 +<div class="admin-contacts-wr style">
  18 + <?php
  19 + $form = ActiveForm::begin();
  20 + ?>
  21 + <div class="input-blocks-wrapper">
  22 + <div class="input-blocks">
  23 + <?= FieldEditor::widget (
  24 + [
  25 + 'template' => 'youtube', 'item_id' => $user->id, 'model' => 'common\models\Gallery', 'language' => 'ru',
  26 + ]
  27 + ); ?>
  28 + </div>
  29 + </div>
  30 + <div class="input-blocks-wrapper">
  31 + <div class="admin-save-btn style">
  32 + <?= Html::submitButton('Сохранить') ?>
  33 + </div>
  34 + </div>
  35 + <?php
  36 + $form->end();
  37 + ?>
  38 +</div>
... ...
frontend/views/accounts/gallery.php
  Show/Hide comments   View file @7fe508f
... ... @@ -11,12 +11,13 @@
11 11 $this->title = 'Галерея';
12 12 $this->params[ 'breadcrumbs' ][] = $this->title;
13 13 ?>
14   -<h1><?= $this->title ?></h1>
15   -<p>
  14 +<div class="login-left-column-title"><?= $this->title ?></div>
  15 +<div class="admin-all-pages-add">
16 16 <?= Html::a(Yii::t('app', 'Добавить'), [ 'gallery-create' ], [ 'class' => 'btn btn-success' ]) ?>
17   -</p>
  17 +</div>
  18 +
18 19 <?= GridView::widget([
19   - 'options'=>['class'=>'test'],
  20 + 'options' => ['class'=>'style admin-all-pages-wr'],
20 21 'dataProvider' => $dataProvider,
21 22 'filterModel' => $searchModel,
22 23 'columns' => [
... ... @@ -49,10 +50,13 @@
49 50 'class' => 'yii\grid\ActionColumn',
50 51 'buttons' => [
51 52 'update' => function($url, $model, $key) {
52   - return Html::a('Update', ['gallery-update', 'id' => $model->gallery_id]);
  53 + return Html::a('<img src="/images/ico_pencil.png" alt="">', ['gallery-update', 'id' => $model->gallery_id
  54 + ],[
  55 + 'title' => 'Редактировать',
  56 + ]);
53 57 },
54 58 'delete' => function($url, $model, $key) {
55   - return Html::a('Delete', ['gallery-delete', 'id' => $model->gallery_id], [
  59 + return Html::a('<img src="/images/delete-ico.png" alt="">', ['gallery-delete', 'id' => $model->gallery_id], [
56 60 'title' => 'Удалить',
57 61 'aria-label' => 'Удалить',
58 62 'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?',
... ...
frontend/views/accounts/service.php
  Show/Hide comments   View file @7fe508f
... ... @@ -201,12 +201,6 @@
201 201 </div>
202 202 </div>
203 203  
204   -
205   -
206   -
207   -
208   -
209   -
210 204 <div class="input-blocks-wrapper">
211 205 <div class="admin-save-btn style admin-save-btn-fix-line">
212 206 <?= Html::submitButton('Сохранить') ?>
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @7fe508f
... ... @@ -5930,4 +5930,33 @@ a {color: #0072bc}
5930 5930 font-size: 13px;
5931 5931 color: #0072bc;
5932 5932 border-bottom: 1px dashed #0072bc;
5933   -}
5934 5933 \ No newline at end of file
  5934 +}
  5935 +.input-blocks-wrapper.admn-select-company select{
  5936 + line-height: normal;
  5937 + padding: 0 0 0 8px;
  5938 + outline: none;
  5939 + border-radius: 0;
  5940 +}
  5941 +.input-blocks-wrapper.admn-select-company select:focus, .input-blocks-wrapper.admn-select-company select:active {
  5942 + border: 1px solid #dcdcdc;
  5943 + box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset;
  5944 + transition: 0.1s;
  5945 +}
  5946 +.input-blocks-wrapper.amin-team-foto .admin-avatar-pattern{
  5947 + background: none;
  5948 + height: auto;
  5949 + width: 100%;
  5950 +}
  5951 +.input-blocks-wrapper.amin-team-foto .tst{ height: auto}
  5952 +.input-blocks-wrapper.amin-team-foto .btn{margin-left: 0;}
  5953 +.input-blocks-wrapper.amin-team-foto .file-uploader-block{width: 100%}
  5954 +.input-blocks-wrapper.amin-team-foto .admin-avatar-pattern-wr{width: 100%}
  5955 +.input-blocks-wrapper.amin-team-foto #photo_buttons_block, .input-blocks-wrapper.amin-team-foto #cover_buttons_block{width: 560px; float: right}
  5956 +.input-blocks-wrapper.amin-team-foto #photo_buttons_block .btn, .input-blocks-wrapper.amin-team-foto #cover_buttons_block .btn{margin-left: 10px}
  5957 +.input-blocks-wrapper.amin-team-foto.success_download .uploader-button{margin-top: -29px}
  5958 +.input-blocks-wrapper.amin-team-foto .admin-avatar-pattern img{width: auto !important; height: auto!important;}
  5959 +.input-blocks-wrapper.amin-team-foto .admin-ava-wr{width: auto; height: auto;background: none; display: block; text-align: left}
  5960 +.admin-gallery-photo-edit {margin-top: 3px}
  5961 +
  5962 +
  5963 +
... ...