Merge remote-tracking branch 'origin/master'

Administrator
2 parents 3b92b3de 98a795fb
Showing 7 changed files with 116 additions and 38 deletions Show diff stats
common/widgets/views/courses_field.php
common/widgets/views/development_field.php
common/widgets/views/education_field.php
common/widgets/views/soft_field.php
frontend/views/accounts/add-skills.php
frontend/views/layouts/admin.php
frontend/web/css/style.css
@@ -4,7 +4,7 @@
 ?>
 <fieldset>
-    <legend>Пройденные курсы, тренинги</legend>
+    <div class="skills-title">Пройденные курсы, тренинги</div>
     <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p>
@@ -4,7 +4,7 @@
 ?>
 <fieldset>
-    <legend>Собственные разработки, патенты</legend>
+    <div class="skills-title">Собственные разработки, патенты</div>
     <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p>
@@ -4,10 +4,10 @@
 ?>
 <fieldset>
-    <legend>Образование</legend>
+<div class="skills-title">Образование</div>
-    <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p>
+    <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p>
     <?php $t = 0;
         for($i = 1; $i <= count($model); $i++):
@@ -19,16 +19,24 @@
             'class' => 'form-group',
             'id'    => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0,
         ]) ?>
-            <input type="text" placeholder="Название" class="form-control" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][0][name]"/>
-            <input type="number" class="form-control" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][1][year_from]"/>
-            <input type="number" class="form-control" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][2][year_to]"/>
+            <input id="edu-name-<?= $t ?>" type="text" placeholder="Название" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][0][name]"/>
+            <label for="edu-name-<?= $t ?>"></label>
+
+            <input id="edu-to-<?= $t ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][1][year_from]"/>
+            <label for="edu-to-<?= $t ?>"></label>
+
+            <input id="edu-to-<?= $t ?>" type="number" class="form-control form-control custom-input-2 custom-input-2-date" value="<?= isset( $model[ ++$t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[education][<?= $row ?>][2][year_to]"/>
+            <label for="edu-out-<?= $t ?>"></label>
+
             <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
             <?= Html::endTag('div') ?>
             <?php $i = ++$t; ?>
         <?php endfor; ?>
+
 </fieldset>
+
 <script>
     var start_i_<?=$this->context->id?> = <?=$i?>;
     $ (document)
@@ -44,9 +52,12 @@
                             var block_id  = $ (this)
                                 .parent ('fieldset');
                             var sub_block = '<div class="form-group" >' +
-                                            '<input type="text" placeholder="Название" class="form-control" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
-                                            '<input type="number" class="form-control" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][1][year_from]" />' +
-                                            '<input type="number" class="form-control" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][2][year_to]" />' +
+                                            '<input id="edu-name-' + start_i_<?=$this->context->id?>++ +'" type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][0][name]" />' +
+                                            '<label for="edu-name-' + start_i_<?=$this->context->id?>++ +'"></label>'+
+                                            '<input id="edu-to-' + start_i_<?=$this->context->id?>++ +'" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][1][year_from]" />' +
+                                            '<label for="edu-to-' + start_i_<?=$this->context->id?>++ +'"></label>'+
+                                            '<input id="edu-out-' + start_i_<?=$this->context->id?>++ +'"" type="number" class="form-control custom-input-2 custom-input-2-date" value="" name="Fields[education][' + start_i_<?=$this->context->id?>++ + '][2][year_to]" />' +
+                                            '<label for="edu-out-' + start_i_<?=$this->context->id?>++ +'"></label>'+
                                             '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
                                             '<div>';
                             console.log (block);
@@ -4,7 +4,7 @@
 ?>
 <fieldset>
-    <legend>Работа с программами</legend>
+    <div class="skills-title">Работа с программами</div>
     <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p>
@@ -19,7 +19,7 @@
             'class' => 'form-group',
             'id'    => isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0,
         ]) ?>
-            <input type="text" placeholder="Программа" class="form-control" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[soft][<?= $row ?>][0][soft]"/>
+            <input type="text" placeholder="" class="form-control custom-input-2" value="<?= isset( $model[ $t ][ 'value' ] ) ? $model[ $t ][ 'value' ] : '' ?>" name="Fields[soft][<?= $row ?>][0][soft]"/>
             <span data-id="<?= isset( $model[ $i ][ 'parent_key' ] ) ? $model[ $i ][ 'parent_key' ] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
             <?= Html::endTag('div') ?>
             <?php $i = ++$t; ?>
@@ -42,7 +42,7 @@
                             var block_id  = $ (this)
                                 .parent ('fieldset');
                             var sub_block = '<div class="form-group" >' +
-                                            '<input type="text" placeholder="Программа" class="form-control" value="" name="Fields[soft][' + start_i_<?=$this->context->id?>++ + '][0][soft]" />' +
+                                            '<input type="text" placeholder="" class="form-control custom-input-2" value="" name="Fields[soft][' + start_i_<?=$this->context->id?>++ + '][0][soft]" />' +
                                             '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>' +
                                             '<div>';
                             console.log (block);
@@ -12,31 +12,57 @@ use \common\widgets\MultiLangForm;
     $this->title = 'Дополнительные навыки';
     $this->params['breadcrumbs'][] = $this->title;
 ?>
-<h1><?=  $this->title ?></h1>
+    <div class="login-left-column-title"><?= $this->title ?></div>
 <?php
     $form = ActiveForm::begin();
 ?>
-<?= FieldEditor::widget (
-    [
-        'template' => 'soft', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
-    ]
-); ?>
-<?= FieldEditor::widget (
-    [
-        'template' => 'education', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
-    ]
-); ?>
-<?= FieldEditor::widget (
-    [
-        'template' => 'development', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
-    ]
-); ?>
-<?= FieldEditor::widget (
-    [
-        'template' => 'courses', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
-    ]
-); ?>
-    <?= Html::submitButton('Обновить') ?>
+<div class="skills-admin-wrapper style">
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+            <?= FieldEditor::widget (
+                [
+                    'template' => 'soft', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
+                ]
+            ); ?>
+        </div>
+    </div>
+
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+            <?= FieldEditor::widget (
+                [
+                    'template' => 'education', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
+                ]
+            ); ?>
+        </div>
+    </div>
+
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+            <?= FieldEditor::widget (
+                [
+                    'template' => 'development', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
+                ]
+            ); ?>
+        </div>
+    </div>
+
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+            <?= FieldEditor::widget (
+                [
+                    'template' => 'courses', 'item_id' => $user->id, 'model' => 'common\models\User', 'language' => 'ru',
+                ]
+            ); ?>
+        </div>
+    </div>
+
+    <div class="input-blocks-wrapper">
+        <div class="input-blocks">
+            <?= Html::submitButton('Обновить') ?>
+        </div>
+    </div>
+</div>
 <?php
     $form->end();
 ?>
 \ No newline at end of file
@@ -69,7 +69,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                                         ],
                                         [
                                             'label' => 'Галерея',
-                                            'url' => ['accounts/gallery'],
+                                            'url' => ['accounts/gallery-create'],
                                         ],
                                         [
                                             'label' => 'Сообщения',
@@ -4567,7 +4567,7 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m
 .custom-input-2.fix-input-2 {width: 100%}
 .custom-input-2:focus, .selectize-input input:focus {box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s}
-.input-blocks label {
+.input-blocks label, .skills-title {
     font-size: 13px;
     color: inherit;
     font-weight: 700;
@@ -5413,4 +5413,45 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
     top: 25px;
     left: 288px;
 }
-.success_download .not-file-mb-adm{display: none}
 \ No newline at end of file
+.success_download .not-file-mb-adm{display: none}
+.skills-title {border-bottom: none}
+.skills-admin-wrapper {margin-top: 29px}
+.skills-admin-wrapper .btn{
+    border: none;
+    background: none;
+    color: #0072bc;
+    border-bottom: 1px dashed #0072bc;
+    padding: 0;
+    border-radius: 0;
+    line-height: 13px;
+}
+.skills-admin-wrapper .btn:focus, .skills-admin-wrapper .btn:active{
+    background: none;
+    color: #003AA7;
+    box-shadow: none;
+}
+.skills-admin-wrapper .glyphicon-trash:before {
+    content: '' !important;
+    width: 13px;
+    height: 13px;
+    cursor: pointer;
+    background: url("/images/delete-ico.png") no-repeat;
+    display: block;
+}
+.skills-admin-wrapper .custom-input-2 {
+    border-radius: 0;
+    outline: none;
+}
+.skills-admin-wrapper .custom-input-2:focus{border: 1px solid #dcdcdc;}
+.skills-admin-wrapper .form-group {position: relative}
+.skills-admin-wrapper .glyphicon {
+    position: absolute;
+    top: 50%;
+    margin-top: -7px;
+    right: -18px;
+}
+.custom-input-2.custom-input-2-date {
+    width: 60px;
+    padding: 0;
+    padding-left: 12px;
+}
 \ No newline at end of file