Merge remote-tracking branch 'origin/master'

Administrator
2 parents 1aca8918 29f6660a
Showing 7 changed files with 130 additions and 45 deletions Show diff stats
common/widgets/views/phone_field.php
common/widgets/views/site_field.php
frontend/views/accounts/contacts.php
frontend/web/css/style.css
frontend/web/images/arrow-menu-two-calendar-h.png
frontend/web/images/arrow-menu-two-calendar-r-h.png
frontend/web/images/arrow-menu-two-calendar.png
@@ -3,39 +3,48 @@
 ?>
 <fieldset>
  
-    <legend>Телефон</legend>
-
     <div class="field_list">
  
  
-    <?php    $t = 0; for($i=1; $i <= count($model); $i++):
+    <?php    $t = 0;
+
+    $label = 0; // add this var
+
+    for($i=1; $i <= count($model); $i++):
         $row = $i;
  
         ?>
  
         <?= Html::beginTag('div',['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[phone][<?=$row?>][0][phone]" />
-        <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
+        <div class="input-blocks">
+            <label for="cont-phone-<?= $label ?>">Телефон</label>
+            <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]" />
+        </div>
+            <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; ?>
  
     </div>
-    <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p>
+    <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить еще</p>
  
 </fieldset>
 <script>
     var start_i_<?=$this->context->id?> = <?=$i?>;
+    var start_label_<?=$this->context->id?> = <?=$label?>; // add this var
     $( document ).ready(function(){
         $('.add_field_<?=$this->context->id?>').click(function(){
             var block     = $ (this)
                 .siblings('.field_list');
             var block_id =  $(this).parent('fieldset');
             var sub_block = '<div class="form-group" >'+
-                '<input type="text" placeholder="Телефон" class="form-control" value="" name="Fields[phone]['+ start_i_<?=$this->context->id?>++ +'][0][phone]" />'+
-                '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
+                '<div class="input-blocks">'+
+                '<label for="cont-phone-' + start_label_<?=$this->context->id?> +'">Телефон</label>'+
+                '<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]" />'+
+                '</div>'+
+                '<span class="glyphicon glyphicon-trash delete-field-item custom-remove-ico"></span>'+
                 '<div>';
-            console.log(block);
+//            console.log(block);
             block.append(sub_block);
  
         });
@@ -3,39 +3,49 @@ use yii\helpers\Html;
 ?>
 <fieldset>
  
-    <legend>Сайт</legend>
  
     <div class="field_list">
  
  
-    <?php    $t = 0; for($i=1; $i <= count($model); $i++):
-        $row = $i;
+        <?php    $t = 0;
  
-        ?>
+        $label = 0; // add this var
+
+        for($i=1; $i <= count($model); $i++):
+            $row = $i;
+
+            ?>
  
         <?= Html::beginTag('div',['class'=>'form-group','id'=>isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ])?>
-            <input type="text" placeholder="www.example.com" class="form-control" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[site][<?=$row?>][0][site]" />
+            <div class="input-blocks">
+                <label for="cont-site-<?= $label ?>">Сайт</label>
+                <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]" />
+            </div>
             <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; ?>
-
     </div>
-    <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить поле</p>
+    <p class="btn btn-success add_field_<?= $this->context->id ?>">Добавить еще</p>
  
 </fieldset>
 <script>
     var start_i_<?=$this->context->id?> = <?=$i?>;
+    var start_label_<?=$this->context->id?> = <?=$label?>; // add this var
     $( document ).ready(function(){
         $('.add_field_<?=$this->context->id?>').click(function(){
             var block     = $ (this)
                 .siblings('.field_list');
             var block_id =  $(this).parent('fieldset');
             var sub_block = '<div class="form-group" >'+
-                '<input type="text" placeholder="Телефон" class="form-control" value="" name="Fields[site]['+ start_i_<?=$this->context->id?>++ +'][0][site]" />'+
+
+                '<div class="input-blocks">'+
+                '<label for="cont-site-' + start_label_<?=$this->context->id?> +'">Сайт</label>'+
+                '<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]" />'+
+                '</div>'+
                 '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
                 '<div>';
-            console.log(block);
+//            console.log(block);
             block.append(sub_block);
  
         });
@@ -15,7 +15,7 @@
 <div class="login-left-column-title style"><span><?= $this->title ?></span><p class="login-left-column-title-hint">Будут видны всем</p></div>
  
  
-<div class=" admin-contacts-wr style">
+<div class="admin-contacts-wr style">
     <?php
     $form = ActiveForm::begin ();
     ?>
@@ -2361,7 +2361,7 @@ input[type=file]::-webkit-file-upload-button {
     margin: 0 auto;
     overflow: hidden;
     padding-top: 40px;
-    height: 108px;
+    height: 148px;
 }
 .gallery-show-big tr{display: none}
 .gallery-show-big tr:first-child{display: block}
@@ -4565,9 +4565,11 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m
     line-height: 27px;
     padding-left: 8px;
     margin-top: 5px;
+    border-radius: 0;
+    outline: none;
 }
 .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}
+.custom-input-2:focus, .selectize-input input:focus {border: 1px solid #dcdcdc;box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none}
  
 .input-blocks label, .skills-title {
     font-size: 13px;
@@ -5108,6 +5110,8 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
  
  
 .login-left-column-title {border-bottom: 1px solid #dbdbdb;  margin-top: 15px;  padding-bottom: 23px;}
+.login-left-column-title span {}
+.login-left-column-title p {font-size: 13px; color: #b7b7b7}
 .login-left-column-title,  .login-left-column-title h1{font-size: 18px}
 .form-group{margin-bottom: 0}
 .border-general {
@@ -5357,7 +5361,7 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
 .conacts-admin {
     font-size: 13px;
     margin-top: 11px;
-   color: #b7b7b7}
+    color: #b7b7b7}
 .header-cabinet-profile.not-login {
     margin-top: -3px;
 }
@@ -5418,7 +5422,7 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
 .success_download .not-file-mb-adm{display: none}
 .skills-title {border-bottom: none}
 .skills-admin-wrapper {margin-top: 29px}
-.skills-admin-wrapper .btn{
+.skills-admin-wrapper .btn, .add-field-employment .btn,  .admin-contacts-wr .btn{
     border: none;
     background: none;
     color: #0072bc;
@@ -5429,18 +5433,11 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
     margin-left: 193px;
     margin-top: 7px;
 }
-.skills-admin-wrapper .btn:focus, .skills-admin-wrapper .btn:active{
+.skills-admin-wrapper .btn:focus, .skills-admin-wrapper .btn:active, .add-field-employment .btn:focus, .add-field-employment .btn:active, .admin-contacts-wr .btn:focus, .admin-contacts-wr .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;
+    outline: none;
 }
 .skills-admin-wrapper .custom-input-2 {
     border-radius: 0;
@@ -5448,14 +5445,24 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
 }
 .skills-admin-wrapper .custom-input-2:focus{border: 1px solid #dcdcdc;}
 .skills-admin-wrapper .form-group {position: relative}
-.skills-admin-wrapper .glyphicon {
+.skills-admin-wrapper .glyphicon, .admin-contacts-wr .glyphicon {
     position: absolute;
     top: 50%;
     margin-top: -3px;
     left: 311px;
 }
+.admin-contacts-wr .glyphicon {margin-top: 0; top: 43px}
+.admin-contacts-wr .form-group:first-child .glyphicon {top: 31px}
  
 .education-skills .glyphicon {top: 13px; margin-top: 0; margin-left: 105px}
+.skills-admin-wrapper .glyphicon-trash:before, .admin-contacts-wr .glyphicon-trash:before{
+    content: '' !important;
+    width: 13px;
+    height: 13px;
+    cursor: pointer;
+    background: url("/images/delete-ico.png") no-repeat;
+    display: block;
+}
 .custom-input-2.custom-input-2-date {
     width: 60px;
     padding: 0;
@@ -5480,7 +5487,8 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
  
 .skills-add-wr .form-group:first-child .input-blocks{margin-top: 5px}
 .skills-add-wr .form-group .input-blocks{margin-top: 5px}
-.skills-add-wr .form-group:first-child .input-blocks:first-child{margin-top: 0}
+.admin-contacts-wr .form-group .input-blocks{margin-top: 11px}
+.skills-add-wr .form-group:first-child .input-blocks:first-child, .admin-contacts-wr .form-group:first-child .input-blocks{margin-top: 0}
 .skills-programs .input-blocks input {margin-top: 10px}
 .skills-programs .input-blocks .form-group:first-child input {margin-top: 5px}
 .skills-save-btn {
@@ -5505,17 +5513,75 @@ a.blog-new-link:hover{text-decoration: underline !important;}
     border: none;
     outline: none;
 }
-.login-left-column-title-hint {
-    font-size: 13px;
-    color: #b7b7b7;
-    padding: 0;
-    margin: 0;
-    height: 21px;
-    line-height: 21px;
-    float: left;;padding-bottom: 23px;
+.input-blocks-wrapper.admin-quantity-project {
+    height: 52px;
+    position: relative;
+}
+.admin-quantity-project .input-blocks{width: 360px}
+.fix-quantity-project input{margin-left: 6px}
+.fix-quantity-project{
+    position: absolute;
+    top: 18px;
+    left: 68px;
+}
+.current_job_inputs, .previous-employment-wr {margin-top: 25px}
+.current_job_inputs.first_current_job_inputs {margin-top: 10px}
+.previous-employment-wr {margin-bottom: -35px}
+.none-job-inputs .previous-employment-wr {display: none}
+.add-field-employment.none-job-inputs {margin-top: 21px}
+.prev_job_inputs {position: relative; float: left; width: 100%;border-right: 1px solid #dbdbdb;}
+.prev_job_inputs .remove_job_button {
+    position: absolute;
+    top: 50%;
+    margin-top: -6px;
+    right: -33px;
+}
+.prev_job_container {width: 667px}
+.prev_job_container .prev_job_inputs {margin-top: 45px}
+.fix_add-field-employment .btn{margin-left: 0; margin-top: 10px}
+.ui-datepicker-month, .ui-datepicker-year{cursor: pointer; outline: none}
+.admin-contacts-wr .form-group {
+    float: left;
+    position: relative;
+}
+
  
+/****calendar****/
+.ui-widget-header {
+background: #0072bc;
 }
-.login-left-column-title span{float: left;display: block;padding-bottom: 23px}
-.admin-contacts-wr legend {
-    display: none;
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+background: #f3f3f3;
+    border: #fff;
+}
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br, .ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl, .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr, .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl {
+    border-radius: 0;
+}
+.ui-widget {font-family: 'Roboto'}
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
+    background: #fff;
+    border: none;
+    cursor: pointer;
+}
+.ui-state-hover.ui-datepicker-next-hover {right: 6px}
+.ui-datepicker .ui-datepicker-prev {
+    left: 7px;
+}
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next {
+    top: 6px;
+    width: 23px;
+    height: 23px;
+}
+.ui-datepicker .ui-datepicker-next {right: 6px}
+.ui-icon.ui-icon-circle-triangle-w {
+    background: url("/images/arrow-menu-two-calendar.png") 50% 50% no-repeat;
+}
+.ui-state-hover .ui-icon.ui-icon-circle-triangle-w{
+    background: url("/images/arrow-menu-two-calendar-h.png") 50% 50% no-repeat;
+}
+.ui-icon.ui-icon-circle-triangle-e {
+    background: url("/images/arrow-menu-two.png") 50% 50% no-repeat;
+}
+.ui-state-hover .ui-icon.ui-icon-circle-triangle-e{
+    background: url("/images/arrow-menu-two-calendar-r-h.png") 50% 50% no-repeat;
 }
 \ No newline at end of file