Commit 5aefd508db4c27e2ddf6009db517d56524ed0cdd

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

tokar commit

frontend/views/accounts/_projects_form.php
@@ -142,47 +142,83 @@ @@ -142,47 +142,83 @@
142 </div> 142 </div>
143 143
144 <div class="input-blocks-wrapper"> 144 <div class="input-blocks-wrapper">
145 - <?= $form->field($project, 'payment_variant')  
146 - ->radioList([  
147 - 1 => 'Без предоплаты',  
148 - 2 => 'Предоплата возможна',  
149 - ],[  
150 - 'item' => function($index, $label, $name, $checked, $value) {  
151 - $return = '<div class="admin-who-check">';  
152 - $return .= '<input class="custom-radio" id="select_admin_mfp'.$value.'" type="radio" name="' . $name . '" value="' . $value . '" '.($checked ? "checked" :"").' >';  
153 - $return .= '<label for="select_admin_mfp'.$value.'" >';  
154 - $return .= '<span></span>' . ucwords($label);  
155 - $return .= '</label>';  
156 - $return .= '</div>';  
157 - return $return;  
158 - }  
159 - ]) ?> 145 + <div class="input-blocks">
  146 + <?= $form->field($project, 'payment_variant')
  147 + ->radioList([
  148 + 1 => 'Без предоплаты',
  149 + 2 => 'Предоплата возможна',
  150 + ],[
  151 + 'item' => function($index, $label, $name, $checked, $value) {
  152 + $return = '<div class="admin-who-check">';
  153 + $return .= '<input class="custom-radio" id="select_admin_mfp'.$value.'" type="radio" name="' . $name . '" value="' . $value . '" '.($checked ? "checked" :"").' >';
  154 + $return .= '<label for="select_admin_mfp'.$value.'" >';
  155 + $return .= '<span></span>' . ucwords($label);
  156 + $return .= '</label>';
  157 + $return .= '</div>';
  158 + return $return;
  159 + }
  160 + ]) ?>
  161 + </div>
160 </div> 162 </div>
161 163
  164 +<div class="input-blocks-wrapper">
  165 + <div class="input-blocks">
  166 + <?= $form->field($project, 'paymentInput')
  167 + ->checkboxList($payment,[
  168 + 'item' => function($index, $label, $name, $checked, $value) {
  169 + $return = '<div class="admin-who-check-payment">';
  170 + $return .= '<input class="custom-check" id="check_admin_mfp'.$value.'" type="checkbox" name="' . $name . '" value="' . $value . '" '.($checked ? "checked" :"").' >';
  171 + $return .= '<label for="check_admin_mfp'.$value.'" >';
  172 + $return .= '<span></span>' . ucwords($label);
  173 + $return .= '</label>';
  174 + $return .= '</div>';
  175 + return $return;
  176 + }
  177 + ]) ?>
  178 + </div>
  179 +</div>
162 180
163 181
164 -<?= $form->field($project, 'paymentInput')  
165 - ->checkboxList($payment) ?>  
166 <div class="input-blocks-wrapper"> 182 <div class="input-blocks-wrapper">
  183 + <div class="input-blocks admin-project-days">
  184 + <?= $form->field($project, 'deadline', [ 'template' => "{label}<br />{input}<span class='admn-input-txt' style='padding-left: 10px'>дней</span>\n{hint}\n{error}" ])
  185 + ->textInput (['class'=> 'custom-input-2 custom-input-2-date','type'=>'number']) ?>
  186 + </div>
  187 +</div>
  188 +
  189 +<div class="input-blocks-wrapper full-blocks admin-editor-bl">
167 <div class="input-blocks"> 190 <div class="input-blocks">
168 - <?= $form->field($project, 'deadline', [ 'template' => "{label}{input} дней\n{hint}\n{error}" ])  
169 - ->textInput (['class'=> 'custom-input-2','type'=>'number']) ?> 191 + <?= $form->field($project, 'description')
  192 + ->widget(CKEditor::className()) ?>
170 </div> 193 </div>
171 </div> 194 </div>
172 195
  196 +<div class="input-blocks-wrapper admin-project-file">
  197 + <div class="input-blocks">
  198 + <div style="position: absolute; float: left;top: 0; left: 0; z-index: 1; width: 100%; overflow: hidden">
  199 + <div class="gen-admin-title">Присоединить файл</div>
  200 + <div class="admin-project-file-btn">Загрузить</div>
  201 + <div class="not-file-mb-adm">До 3 Мб файл</div>
  202 + </div>
  203 + <div style="opacity: 0; height: 54px; width: 100%; float: left;position: absolute; top: 0;left: 0; z-index: 2;-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)'">
  204 + <?= $form->field($project, 'file')
173 205
174 -<?= $form->field($project, 'description')  
175 - ->widget(CKEditor::className()) ?> 206 + ->fileInput([ 'multiple' => 'multiple' ]) ?>
  207 + </div>
176 208
177 -<?= $form->field($project, 'file')  
178 - ->fileInput([ 'multiple' => 'multiple' ]) ?> 209 + </div>
  210 +</div>
179 211
180 -<?= $form->field($project, 'date_end')  
181 - ->dropDownList([  
182 - 1 => 'Неделя',  
183 - 2 => '2 неделю',  
184 - 3 => 'Месяц',  
185 - ]) ?> 212 +<div class="input-blocks-wrapper">
  213 + <div class="input-blocks admin-project-list admin-currency-second">
  214 + <?= $form->field($project, 'date_end')
  215 + ->dropDownList([
  216 + 1 => 'Неделя',
  217 + 2 => '2 неделю',
  218 + 3 => 'Месяц',
  219 + ]) ?>
  220 + </div>
  221 +</div>
186 222
187 <div class="input-blocks-wrapper"> 223 <div class="input-blocks-wrapper">
188 <div class="admin-save-btn skills-save-btn admin-add-remove-wr style"> 224 <div class="admin-save-btn skills-save-btn admin-add-remove-wr style">
@@ -228,5 +264,14 @@ @@ -228,5 +264,14 @@
228 $('.admin-project-list-two input, .admin-project-list-two select').removeAttr('disabled') 264 $('.admin-project-list-two input, .admin-project-list-two select').removeAttr('disabled')
229 } 265 }
230 }) 266 })
  267 +
  268 +
  269 + $('.admin-project-file input[type="file"]').change(function(){
  270 + var strInput = this.value
  271 + $('.admin-project-file .not-file-mb-adm').html(strInput.replace(/^.*\\/, ""))
  272 +
  273 + });
  274 +
  275 +
231 }) 276 })
232 -</script>  
233 \ No newline at end of file 277 \ No newline at end of file
  278 +</script>
frontend/web/css/style.css
@@ -4571,7 +4571,7 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m @@ -4571,7 +4571,7 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m
4571 } 4571 }
4572 .custom-input-2.fix-input-2 {width: 100%} 4572 .custom-input-2.fix-input-2 {width: 100%}
4573 .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} 4573 .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}
4574 - 4574 +.input-blocks select {margin-top: 5px}
4575 .input-blocks label, .skills-title { 4575 .input-blocks label, .skills-title {
4576 font-size: 13px; 4576 font-size: 13px;
4577 color: inherit; 4577 color: inherit;
@@ -4636,7 +4636,7 @@ input.custom-radio + label span { @@ -4636,7 +4636,7 @@ input.custom-radio + label span {
4636 input.custom-radio:checked + label span, input.custom-radio:checked + label:hover span { 4636 input.custom-radio:checked + label span, input.custom-radio:checked + label:hover span {
4637 background: url(/images/sets-ico/radio.png) no-repeat;transition: .2s; 4637 background: url(/images/sets-ico/radio.png) no-repeat;transition: .2s;
4638 } 4638 }
4639 -input.custom-radio + label:hover{ border-bottom: 1px solid #333;} 4639 +input.custom-radio + label:hover, input.custom-check + label:hover{ border-bottom: 1px solid #333;}
4640 input.custom-check + label span { 4640 input.custom-check + label span {
4641 width: 12px; 4641 width: 12px;
4642 height: 12px; 4642 height: 12px;
@@ -6150,4 +6150,47 @@ input[disabled], select[disabled] { @@ -6150,4 +6150,47 @@ input[disabled], select[disabled] {
6150 .admin-add-remove-wr button{ 6150 .admin-add-remove-wr button{
6151 float: right; 6151 float: right;
6152 margin-left: 10px; 6152 margin-left: 10px;
  6153 +}
  6154 +#project-budget_currency[disabled]{
  6155 + background: #f1f1f1 url("/images/sets-ico/select-arrow-disabled.jpg")right center no-repeat;
  6156 +}
  6157 +.admin-project-days input{margin-left: 0!important;}
  6158 +.select2-container--krajee .select2-selection {border: 1px solid #dcdcdc !important;}
  6159 +.admin-project-file {
  6160 + position: relative;
  6161 + height: 54px;
  6162 +}
  6163 +.admin-project-file .admin-project-file-btn{
  6164 + background: #fff;
  6165 + color: #0072bc;
  6166 + height: 29px;
  6167 + border: 1px solid #0072bc;
  6168 + padding: 0;
  6169 + width: 160px;
  6170 + line-height: 29px;
  6171 + font-size: 13px;
  6172 + text-align: center;
  6173 + float: left;
  6174 + border-radius: 4px;
  6175 + cursor: pointer;
  6176 +}
  6177 +.admin-project-file .admin-project-file-btn:hover{
  6178 + transition: 0.2s;
  6179 + background: #0072bc;
  6180 + color: #fff;
  6181 +}
  6182 +.admin-project-file .gen-admin-title{
  6183 + font-size: 13px;
  6184 + font-weight: 700;
  6185 + margin-bottom: 10px;
  6186 +}
  6187 +.admin-project-file input[type="file"]{
  6188 + width: 360px;
  6189 + height: 29px;
  6190 + cursor: pointer;
  6191 +}
  6192 +.admin-project-file .not-file-mb-adm{
  6193 + position: static;
  6194 + margin-left: 10px;
  6195 + width: 540px;
6153 } 6196 }
6154 \ No newline at end of file 6197 \ No newline at end of file