Merge remote-tracking branch 'origin/master'

Administrator
2 parents 3c71c462 cbb1e4f4
Showing 4 changed files with 638 additions and 5 deletions Show diff stats
frontend/views/accounts/general.php
frontend/views/layouts/main.php
frontend/views/site/registration.php
frontend/web/css/style.css
@@ -19,6 +19,7 @@
 <h1><?= $this->title ?></h1>
 <div class="" id="form_definition">
     <?php
+
         $form = ActiveForm::begin ();
         echo $form->field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])
                   ->label ('<span></span>Я - исполнитель')
@@ -122,6 +122,14 @@ AppAsset::register($this);
                 <form action="">
                     <input type="search"/>
                     <input type="submit" value=""/>
+                    <div class="search-list">
+                        <span>Исполнители</span>
+                        <ul>
+                            <li>Проекты</li>
+                            <li>Исполнители</li>
+                            <li>Заказчики</li>
+                        </ul>
+                    </div>
                 </form>
             </div>
             <?php
+<div class="section-box content">
+    <div class="section-box registration">
+        <div class="box-wr">
+            <div class="box-all">
+                <div class="registration-title style">Регистрация</div>
+                <div class="registration-form style">
+                    <form action="" method="">
+
+                        <div class="input-blocks-wrapper">
+                            <div class="input-blocks">
+                                <div class="form-group field-accountsform-email require has-erro">
+                                    <label for="input-txt-1">Логин</label>
+                                    <input class="custom-input-2" id="input-txt-1" type="text">
+                                    <div class="help-block">Значение «E-mail (Логин)» не является правильным email адресом.</div>
+                                </div>
+                            </div>
+                            <div class="input-blocks-help-wr">
+                                <div class="input-blocks-help">Логин должен содержать не менее 3-х символов, начинаться с английской буквы и заканчиваться буквой или цифрой. Допускаются английские буквы, цифры и знаки 'тире', 'подчеркивание', 'точка'</div>
+                            </div>
+                        </div>
+
+                        <div class="input-blocks-wrapper">
+                            <div class="input-blocks">
+
+                                <label for="input-txt-2">Пароль</label>
+                                <input class="custom-input-2" id="input-txt-2" type="text">
+
+                            </div>
+                            <div class="input-blocks-help-wr">
+                                <div class="input-blocks-help">Пароль должен содержать не менее 6-ти символов.</div>
+                            </div>
+                        </div>
+
+                        <div class="input-blocks-wrapper">
+                            <div class="input-blocks">
+                                <label for="input-txt-3">E-mail</label>
+                                <input class="custom-input-2" id="input-txt-3" type="text">
+                            </div>
+                            <div class="input-blocks-help-wr">
+                                <div class="input-blocks-help">На этот адрес электронной почты будет отправлено уведомление о регистрации.</div>
+                            </div>
+                        </div>
+
+                        <div class="who-you-are style">
+                            <div class="who-you-are-title style">Кто Вы</div>
+                            <div class="who-you-are-form-wr style">
+                                <div class="who-you-are-form">
+                                    <div class="check-radio-wr">
+                                        <div class="custom-form-buttons">
+                                            <input class="custom-radio" id="custom-radio-1" name="group-1" checked="checked" type="radio">
+                                            <label for="custom-radio-1"><span></span>Частное лицо copy</label>
+                                        </div>
+
+                                        <div class="custom-form-buttons">
+                                            <input class="custom-radio" id="custom-radio-2" name="group-1" type="radio">
+                                            <label for="custom-radio-2"><span></span>Компания</label>
+                                        </div>
+                                    </div>
+                                    <div class="check-radio-wr">
+                                        <div class="custom-form-buttons">
+                                            <input class="custom-check" id="custom-check-1" type="checkbox" checked>
+                                            <label for="custom-check-1"><span></span>Я - Фрилансер</label>
+                                        </div>
+
+                                        <div class="custom-form-buttons">
+                                            <input class="custom-check" id="custom-check-2" type="checkbox">
+                                            <label for="custom-check-2"><span></span>Я - Заказчик</label>
+                                        </div>
+                                    </div>
+
+
+                                    <div class="input-blocks-wrapper">
+                                        <div class="input-blocks">
+                                            <label for="input-txt-4">Имя</label>
+                                            <input class="custom-input-2" id="input-txt-4" type="text">
+                                        </div>
+                                    </div>
+                                    <div class="input-blocks-wrapper">
+                                        <div class="input-blocks">
+                                            <label for="input-txt-5">Фамилия</label>
+                                            <input class="custom-input-2" id="input-txt-5" type="text">
+                                        </div>
+                                    </div>
+                                    <div class="input-blocks-wrapper city" >
+
+                                        <div class="control-group">
+                                            <div id="btnClear" style=""></div>
+
+                                            <label for="select-beast-w">Город</label>
+                                            <select id="select-beast-w" placeholder="">
+                                                <option value="">Выберите город</option>
+                                                <option value="4">Киев</option>
+                                                <option value="1">Одесса</option>
+                                                <option value="3">Харьков</option>
+                                                <option value="2">Днепр</option>
+                                                <option value="6">Чернигов</option>
+                                                <option value="8">Черкасы</option>
+                                                <option value="9">Черкасы</option>
+                                                <option value="5">Черкасы</option>
+                                            </select>
+                                        </div>
+
+                                        <!--<div class="input-blocks">-->
+                                        <!--<select name="" id="" >-->
+                                        <!--<option selected disabled></option>-->
+                                        <!--<option value="">Киев</option>-->
+                                        <!--<option value="">Киев</option>-->
+                                        <!--<option value="">Киев</option>-->
+                                        <!--</select>-->
+                                        <!--</div>-->
+                                    </div>
+
+                                    <div class="input-blocks-wrapper city-two">
+                                        <div class="input-blocks">
+                                            <label for="input-txt-7">Город не в списке</label>
+                                            <input class="custom-input-2" id="input-txt-7" type="text">
+                                        </div>
+                                        <div class="form-help-two">Если вашего города нет в списке, введите его. </div>
+                                    </div>
+
+                                    <div class="input-blocks-wrapper captcha">
+                                        <div class="input-blocks-captcha">
+                                            <img id="accountsform-verifycode-image" src="images/captcha.png" alt="">
+                                        </div>
+                                    </div>
+
+                                    <div class="input-blocks-wrapper">
+                                        <div class="input-blocks">
+                                            <label for="input-txt-8">Введите проверочный код</label>
+                                            <input class="custom-input-2" id="input-txt-8" type="text">
+                                        </div>
+                                    </div>
+                                    <div class="input-blocks-wrapper button">
+                                        <button type="submit" value="Submit">Зарегистрироваться</button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
 \ No newline at end of file
@@ -252,7 +252,7 @@ ul.main-menu li span:after{
     margin-top: 6px;
 }
 .search-main-menu form input {
-    width: 100%;
+    width: 268px;
     height: 29px;
     border: none;
     box-sizing: border-box;
@@ -260,12 +260,11 @@ ul.main-menu li span:after{
 }
 .search-main-menu form input[type="submit"] {
     width: 29px;
-    height: 27px;
-    margin-top: 1px;
+    height: 29px;
     position: absolute;
     top: 0;
     right: 1px;
-    background: #fff url("/images/ico-search.png") 7px 6px no-repeat;
+    background: #fff url("/images/ico-search.png")  50% 50% no-repeat;
     border: none;
     outline: none;
     cursor: pointer;
@@ -4503,4 +4502,483 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m
 .all-table tr:first-child td {border-top: none}
  
 .tb-team-wr {margin-top: 15px}
-.tb-team-wr table img{vertical-align: middle}
 \ No newline at end of file
+.tb-team-wr table img{vertical-align: middle}
+
+
+
+
+
+/**registration**/
+.register-a {font-size: 18px !important;color: inherit !important; text-decoration: none !important; float: none !important; margin:0 !important;}
+.register-a span {border-bottom: 1px dashed #333}
+.header-cabinet-wr span {}
+.registration-title {
+    font-size: 21px;
+    text-align: center;
+    margin-top: 25px;
+}
+.registration-form {margin-top: 24px; margin-bottom: 50px}
+.input-blocks-wrapper {
+    width: 100%;float: left;margin-top: 11px; position: relative;
+}
+.input-blocks-wrapper:first-child{margin-top: 0}
+.input-blocks {
+    width: 300px;
+    float: left;
+}
+
+.custom-input-2 {
+    width: 300px;
+    height: 29px;
+    border: 1px solid #dcdcdc;
+    box-sizing: border-box;
+    outline: none;
+    color: #636363;
+    font-size: 13px;
+    line-height: 27px;
+    padding-left: 8px;
+    margin-top: 5px;
+}
+
+.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 {
+    font-size: 13px;
+    color: inherit;
+    font-weight: 700;
+}
+
+.input-blocks-help-wr {
+    width: 620px;
+    height: 29px;
+    float: right;
+    margin-top: 23px;
+}
+.input-blocks-help {
+    width: 620px;
+    height: 29px;
+    display: table-cell;
+    vertical-align: middle;
+    font-size: 13px;
+    color: #b7b7b7;
+}
+.who-you-are {
+    border-top: 1px solid #dbdbdb;
+    margin-top: 28px;
+    padding-top: 30px;
+    width: 100%;
+}
+.who-you-are-title {font-size: 15px; font-weight: 700; text-align: center}
+.who-you-are-form {
+    margin: 0 auto;
+    width: 300px;
+}
+.custom-form-buttons {
+    height: 15px;
+    line-height: 15px;
+    margin-top: 11px;
+}
+input.custom-radio, input.custom-check {
+    display: none;
+}
+input.custom-radio + label, input.custom-check + label {
+    color: inherit;
+    font-size: 13px;
+    cursor: pointer;
+    margin-left: 6px;
+}
+input.custom-radio:checked + label, input.custom-check:checked + label {
+    color: #0072bc;
+    border-bottom: 1px solid #0072bc;
+}
+input.custom-radio + label span, input.custom-check + label span {
+    margin-top: 2px;
+}
+input.custom-radio + label span {
+    width: 12px;
+    height: 12px;
+    background: url(../images/sets-ico/radio-active.png) no-repeat;
+    float: left;
+}
+input.custom-radio:checked + label span, input.custom-radio:checked + label:hover span {
+    background: url(../images/sets-ico/radio.png) no-repeat;transition: .2s;
+}
+input.custom-check + label span {
+    width: 12px;
+    height: 12px;
+    background: url(../images/sets-ico/check.png) no-repeat;
+    float: left;
+    margin-left: 46px;
+}
+input.custom-check:checked + label span, input.custom-check:checked + label:hover span {
+    background: url(../images/sets-ico/check-active.png) no-repeat;transition: .2s;
+}
+.check-radio-wr {
+    width: 50%;
+    float: left;
+}
+.input-blocks select {
+    width: 300px;
+    height: 29px;
+    border: 1px solid #dcdcdc;
+    box-sizing: border-box;
+    outline: none;
+    color: #333!important;
+    font-size: 13px !important;
+    line-height: 27px;
+    padding-left: 8px;
+    cursor: pointer;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    background: url("../images/sets-ico/select-arrow.jpg")right center no-repeat ;
+    font-family: 'Roboto'!important;
+    font-style: normal!important;
+    font-weight: 400!important;
+}
+.input-blocks-wrapper.button {
+    height: 29px;
+    text-align: center;
+    margin-top: 36px;
+}
+.input-blocks-wrapper.button button{
+    width: 180px;
+    height: 29px;
+    border: 1px solid #0072bc;
+    background: #0072bc;;
+    color: #fff;
+    text-align: center;
+    font-size: 13px;
+    border-radius: 4px;
+    cursor: pointer;
+    line-height: 29px;
+    outline: none;
+
+}
+.input-blocks-wrapper.button button:hover{
+    background: #fff;
+    color: #0072bc;
+    transition: 0.2s;
+}
+.input-blocks-wrapper.button button:focus {
+    color: #fff;
+    background: #00568e;
+    transition: 0s;
+}
+.input-blocks-captcha img {
+    width: 139px !important;
+    height: 59px !important;
+    opacity: 0.7;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+    cursor: pointer;
+    position: relative;
+
+}
+
+.input-blocks-wrapper.captcha {
+    height: 59px;
+    text-align: center;
+    margin-top: 18px;
+}
+.input-blocks-captcha {
+    width: 139px;
+    height: 59px;
+    margin: 0 auto;
+    background: url("../images/captcha-bg.jpg");
+}
+
+.who-you-are-form .check-radio-wr {
+    margin-top: 15px;
+}
+.input-blocks-wrapper.city {
+    /*margin-top: 34px;*/
+}
+.input-blocks-wrapper.city-two {position: relative}
+.form-help-two {
+    position: absolute;
+    height: 29px;
+    line-height: 29px;
+    font-size: 13px;
+    color: #b7b7b7;
+    top: 23px;
+    left: 320px;
+    width: 300px;
+}
+
+
+/***selectize***/
+.selectize-control {
+    width: 300px;
+    height: 29px;
+    position: relative;
+    margin-top: 5px;
+}
+.selectize-input {
+    width: 100%;
+    height: 100%;
+}
+
+.control-group label {
+    font-size: 13px;
+    color: inherit;
+    font-weight: 700;
+}
+
+.selectize-dropdown, .selectize-input, .selectize-input input {
+    font-family: inherit;
+    font-size: 13px;
+    -webkit-font-smoothing: inherit;
+    line-height: 18px;
+    color: #303030;
+}
+.selectize-input, .selectize-control.single .selectize-input.input-active {
+    display: inline-block;
+    cursor: text;
+    background: #fff;
+}
+.selectize-input {
+    position: relative;
+    z-index: 1;
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+    border: 1px solid #d0d0d0;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+.selectize-control.single .selectize-input, .selectize-control.single .selectize-input input {
+    cursor: pointer;
+}
+.selectize-control.single .selectize-input {
+    background: #fff;
+}
+
+.selectize-control.single .selectize-input, .selectize-dropdown.single {
+    border-color: #dcdcdc;
+}
+.selectize-input > * {
+    display: -moz-inline-stack;
+    display: inline-block;
+    vertical-align: 29px;
+    zoom: 1;
+}
+
+.selectize-input > input {
+    max-width: 298px !important;
+    width: 298px !important;
+    height: 27px !important;
+    max-height: none !important;
+    min-height: 0 !important;
+    padding: 0 0 0 8px !important;
+    margin: 0 0 !important;
+    line-height: 27px !important;
+    text-indent: 0 !important;
+    background: none !important;
+    border: 0 none !important;
+    -webkit-box-shadow: none !important;
+    box-shadow: none !important;
+    -webkit-user-select: auto !important;
+    outline: none;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+}
+
+.selectize-control.single .selectize-input, .selectize-control.single .selectize-input input {
+    cursor: pointer;
+}
+.selectize-input::before {
+    display: block;
+    content: '';
+}
+.selectize-control.single .selectize-input:before {
+    position: absolute;
+    top: 0;
+    right: 0;
+    display: block;
+    width: 25px;
+    height: 28px;
+    margin-top: 0;
+    content: '';
+    background: url("../images/sets-ico/select-arrow.jpg") no-repeat;
+}
+
+.selectize-dropdown {
+    position: absolute;
+    z-index: 10;
+    margin: -1px 0 0 0;
+    background: #ffffff;
+    border: 1px solid #d0d0d0;
+    border-top: 0 none;
+    -webkit-border-radius: 0 0 3px 3px;
+    -moz-border-radius: 0 0 3px 3px;
+    border-radius: 0 0 3px 3px;
+    -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+.selectize-control.single .selectize-input, .selectize-dropdown.single {
+    border-color: #dcdcdc;
+}
+
+.selectize-dropdown-content {
+    max-height: 203px;
+    overflow-x: hidden;
+    overflow-y: auto;
+}
+.selectize-dropdown-content div:hover{background: #009bff; color: #fff}
+.selectize-dropdown [data-selectable] {
+    overflow: hidden;
+    cursor: pointer;
+}
+.selectize-dropdown [data-selectable], .selectize-dropdown .optgroup-header {
+    padding: 5px 8px;
+}
+.selectize-dropdown [data-selectable] .highlight {
+    background: #0072bc;
+    background: rgba(0, 114, 168, 0.9);
+    color: #fff;
+    -webkit-border-radius: 1px;
+    -moz-border-radius: 1px;
+    border-radius: 1px;
+}
+.control-group {position: relative}
+#btnClear {
+    width: 300px;
+    height: 29px;
+    background: none;
+    position: absolute;
+    top: 23px;
+    left: 0;
+    opacity: 0;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+    z-index: 2;
+    display: none;
+    cursor: pointer;
+}
+.selectize-input .item {
+    width: 298px;
+    height: 27px;
+    line-height: 27px;
+    box-sizing: border-box;
+    padding-left: 8px;
+}
+.help-block {
+    width: 330px;
+    margin-left: -20px;
+    text-align: center;
+    position: relative;
+    border: 1px solid #c1c1c1;
+    margin-top: 25px;
+    box-shadow: 3px 3px 7px 0 rgba(200, 200, 200, .5), inset 0 -3px 0 0 #c1c1c1;
+    padding: 15px 0;
+    display: none;
+}
+.has-error .help-block {display: block}
+.help-block:before {
+    content: '';
+    width: 20px;
+    height: 20px;
+    background: #fff;
+    border: 1px solid #c1c1c1;
+    transform: rotate(45deg);
+    position: absolute;
+    top: -12px;
+    left: 50%;
+    margin-left: -10px;
+}
+
+.help-block:after {
+    content: '';
+    width: 20px;
+    height: 20px;
+    transform: rotate(45deg);
+    position: absolute;
+    top: -10px;
+    left: 50%;
+    margin-left: -10px;
+    background: #fff;
+    border: 1px solid #fff;
+}
+
+.input-blocks .required:before {
+    display: block;
+    content: "*";
+    color: #D40000;
+    position: absolute;
+    top: 32px;
+    left: -15px;
+    width: 15px;
+}
+
+.input-blocks .has-success:before {
+    display: block;
+    content: "*";
+    color: #D40000;
+    position: absolute;
+    top: 32px;
+    left: -15px;
+    width: 15px;
+}
+
+.form-group.required:after {
+    display: none !important;
+}
+.has-success {}
+.input-blocks .has-error label {color: #D40000; !important;}
+.input-blocks .has-error input{
+    box-shadow: 1px 2px 2px 0px rgba(212, 0, 0, 0.2) inset;
+}
+.header-cabinet-wr.not-register {
+    padding-top: 58px;
+}
+/**search-header**/
+.search-list {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 29px;
+}
+.search-list span {
+    display: block;
+    height: 19px;
+    line-height: 19px;
+    font-size: 13px;
+    color: #b7b7b7;
+    padding-left: 10px;
+    border-right: 1px solid #b7b7b7;
+    margin-top: 7px;
+    cursor: pointer;
+    position: relative;
+}
+.search-list span:after {
+
+}
+.search-list ul {
+    position: absolute;
+    z-index: 2;
+    left: 0;
+    top: 35px;
+    border-left: 1px solid #b7b7b7;
+    border-right: 1px solid #b7b7b7;
+    border-bottom: 1px solid #b7b7b7;
+}
+.search-list li {
+    list-style: none;
+    padding: 0 20px 0 10px;
+    border-top: 1px solid #b7b7b7;
+    height: 20px;
+    line-height: 20px;
+    background: #fff;
+    font-size: 13px;
+    color: #b7b7b7;
+    cursor: pointer;
+}
+.search-list li:hover {
+    transition: 0.2s;
+    background: #62b8ef;
+    color: #fff;
+}
 \ No newline at end of file