git

Виталий
1 parent 70d00c60
Showing 3 changed files with 59 additions and 25 deletions Show diff stats
common/modules/comment/widgets/views/form-comment-answer.php
common/modules/comment/widgets/views/list-comment-question.php
frontend/web/css/style.css
@@ -9,17 +9,19 @@
     use yii\helpers\Html;
  
 ?>
-<?php
-    if(!empty( $dataProvider )) {
-        ?>
-        <div class="new-portf-comm-count">Вопросов: <?= $dataProvider->totalCount ?></div>
-        <?php
-    }
-?>
+<div class="tender-add-answer-title fix_tender_answer">Задать вопрос</div>
+<div class="new-portf-add-comm style tender_questions_" style="padding-top: 16px">
+
+    <?php
+    if(!empty(\Yii::$app->user->id)) {?>
+        <div class="form-ico-ded-wr" style="width: 100%">
+            <div class="header-cabinet-foto"><img src="<?php echo \Yii::$app->user->identity->userInfo->image; ?>" alt=""></div>
+            <div class="form-value-ded-name"><?php echo \Yii::$app->user->identity->name; ?></div>
+        </div>
  
-<div class="new-portf-add-comm style">
  
     <?php
+    }
         $form = ActiveForm::begin();
         if(!$model->isNewRecord) {
             echo $form->field($model, 'comment_id')
@@ -60,7 +62,7 @@
  
         echo $form->field($model, 'text', [
             'options'      => [
-                'class' => 'input-blocks-comm area-comm',
+                'class' => 'input-blocks-comm area-comm tender_com_fix_',
             ],
             'inputOptions' => [
                 'class' => 'custom-area-4',
@@ -72,9 +74,9 @@
     <div class="input-blocks-comm-button style">
         <?php
             if($model->isNewRecord) {
-                echo Html::submitButton('Добавить комментарий');
+                echo Html::submitButton('Задать вопрос');
             } else {
-                echo Html::submitButton('Обновить комментарий', [ 'class' => 'artbox_comment_update_answer_submit' ]);
+                echo Html::submitButton('Обновить вопрос', [ 'class' => 'artbox_comment_update_answer_submit' ]);
             }
         ?>
     </div>
@@ -5,6 +5,15 @@
      */
     use common\modules\comment\models\Comment;
     use common\modules\comment\widgets\CommentWidget;
+
+
+    if(!empty( $dataProvider )) {
+        ?>
+        <div class="tender-offer-proj-title-all">Вопросов: (<?= $dataProvider->totalCount ?>)</div>
+        <?php
+    }
+
+
     echo \yii\widgets\ListView::widget([
         'dataProvider' => $dataProvider,
         'itemView'     => '_question_comment_view',
@@ -4398,11 +4398,11 @@ ul.min_markers_two
     margin-top: 4px;
 }
 .tender-map {margin-top: 15px}
-.tender-offer-proj-title-all {text-align: center; font-size: 20px; margin-top: 78px;}
+.tender-offer-proj-title-all {text-align: left; font-size: 20px; margin-top: 35px;}
 .tender-offer-proj-blocks-wr {padding-bottom: 50px}
 .tender-offer-proj-blocks .performer-vacancy-sidebar-left {top: -10px; padding-top: 10px}
 .tender-offer-proj-blocks {padding-bottom: 17px; border-bottom: 1px solid #bababa; margin-top: 50px}
-.tender-offer-proj-blocks:first-child{margin-top: 47px}
+.tender-offer-proj-blocks:first-child{margin-top: 25px}
 .tender-see-profile {
     text-decoration: none;
     text-align: center;
@@ -4581,7 +4581,7 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m
 .form-tender-txt textarea{
     width: 100%;
     max-width: 100%;
-    border: 1px solid #c2c2c2;
+    border: 1px solid #f1f1f1;
     /*min-height: 98px;*/
     height: 100px;
     box-sizing: border-box;
@@ -4593,7 +4593,7 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m
     float: left;
     margin-top: 18px;
 }
-.form-tender-answer form input[type="submit"] {
+.form-tender-answer form input[type="submit"], .tender_questions_ .input-blocks-comm-button button {
     height: 45px;
     outline: none;
     color: #fff;
@@ -4603,12 +4603,13 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m
     border-top: none;
     border-left: none;
     border-right: none;
-    width: 170px;
+    width: 167px;
     border-radius: 4px;
     cursor: pointer;
     margin-right: 10px;
     float: left;
 }
+
 .tender-form-buttons-wr a {
     height: 29px;
     line-height: 29px;
@@ -5290,9 +5291,8 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
     position: relative;
 }
 .input-blocks-comm:first-child{margin-left: 0}
-.new-portf-add-comm {padding: 24px 20px 0 20px; box-sizing: border-box;
+.new-portf-add-comm {padding: 24px 20px 30px 20px; box-sizing: border-box;
     margin-top: 10px;
-    padding-bottom: 30px;
     background: #f1f1f1;}
 .input-blocks-comm.area-comm {
     width: 680px;
@@ -5300,6 +5300,9 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
     margin-top: 10px;
     position: relative;
 }
+.tender_questions_ .input-blocks-comm.area-comm {
+    margin-top: 15px;
+}
 .custom-input-4 {
     width: 230px;
     height: 32px;
@@ -7044,7 +7047,7 @@ li.active-menu-admin:hover a .ico_num {
     font-size: 18px;
 }
 .form-tender-answer .form-value-wr {
-    margin-top: 15px;
+    margin-top: 16px;
 }
 .new-portf-add-comm.fix-portf_  {padding-top: 0}
 #commentproject-budget_from, #commentproject-budget_to, #commentproject-term_from, #commentproject-term_to {
@@ -7058,13 +7061,13 @@ li.active-menu-admin:hover a .ico_num {
 ._fix_errors_tender .help-block{
     display: none;
 }
-._fix_errors_tender .has-error input, ._fix_errors_tender .has-error textarea {
+._fix_errors_tender .has-error input, ._fix_errors_tender .has-error textarea, .tender_com_fix_.has-error textarea {
     border:1px solid #f10b00;
 }
 ._fix_errors_tender .form-price-wr span {margin-left: 10px; display: block; width: 55px; float: left}
 ._fix_errors_tender .form-price-wr span:first-child {margin-left: 0}
 ._fix_errors_tender select {background: #fff; padding-left: 5px}
-._fix_errors_tender .get-project-new {
+._fix_errors_tender .get-project-new, .tender_questions_ .input-blocks-comm-button button {
     height: 29px !important;
     line-height: 29px !important;
     background: #148ad6;
@@ -7074,7 +7077,8 @@ li.active-menu-admin:hover a .ico_num {
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#148ad6', endColorstr='#0054a6',GradientType=0 );
     border-bottom: 0;
 }
-._fix_errors_tender .get-project-new:hover {
+._fix_errors_tender .get-project-new:hover, .tender_questions_ .input-blocks-comm-button button:hover {
+    color: #fff;
     background: #0054a6;
     background: -moz-linear-gradient(top,  #0054a6 5%, #207cca 5%, #207cca 5%, #207cca 5%, #148ad6 100%);
     background: -webkit-linear-gradient(top,  #0054a6 5%,#207cca 5%,#207cca 5%,#207cca 5%,#148ad6 100%);
@@ -7085,7 +7089,7 @@ li.active-menu-admin:hover a .ico_num {
     box-shadow: none;
     border-bottom: 0;
 }
-._fix_errors_tender .get-project-new:active {
+._fix_errors_tender .get-project-new:active, .tender_questions_ .input-blocks-comm-button button:active {
     background: #0054a6;
 }
 ._fix_errors_tender .get-list-new {
@@ -7219,7 +7223,7 @@ li.active-menu-admin:hover a .ico_num {
     font-style: normal;
     font-weight: normal;
     line-height: 1;
-
+    font-size: 16px;
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
 }
@@ -8013,4 +8017,23 @@ li.active-menu-admin:hover a .ico_num {
 .hide {
     visibility: hidden;
 }
-/*End of rating glyphicon*/
 \ No newline at end of file
+.rating-container .star {margin: 0 1px !important;}
+.rating-container .empty-stars {
+    color: #dac782;
+}
+.rating-container .filled-stars {
+
+    color: #dac782 !important;
+
+    -webkit-text-stroke: 0 #dac782;
+    text-shadow: none;
+
+}
+/*End of rating glyphicon*/
+.tender_com_fix_ {
+    width: 100% !important;
+}
+.tender_com_fix_ .help-block {
+    display: none;
+}
+.tender_questions_ .input-blocks-comm-button {margin-top: 20px}