git

Виталий
1 parent 869aec6f
Showing 5 changed files with 202 additions and 62 deletions Show diff stats
common/modules/comment/widgets/views/form-project-comment.php
frontend/views/company/_portfolio_list_view.php
frontend/views/performer/_portfolio_list_view.php
frontend/views/tender/view.php
frontend/web/css/style.css
@@ -10,12 +10,12 @@
  
     $currencies = Currency::getCurrencyDropdown();
 ?>
+<div class="tender-add-answer-title fix_tender_answer"><?= Yii::t('app', 'add_answer') ?></div>
+<div class="new-portf-add-comm style fix-portf_">
  
-<div class="new-portf-add-comm style">
-    <div class="box-wr">
-        <div class="box-all">
-            <div class="tender-add-answer-title"><?= Yii::t('app', 'add_answer') ?></div>
-            <div class="form-tender-answer style">
+
+
+            <div class="form-tender-answer _fix_errors_tender style">
                 <?php
                     $form = ActiveForm::begin([ 'options' => [ 'class' => 'resformsfile MultiFile-intercepted', 'enctype' => 'multipart/form-data' ] ]);
                 ?>
@@ -96,6 +96,6 @@
                     $form->end();
                 ?>
             </div>
-        </div>
-    </div>
+
+
 </div>
 \ No newline at end of file
@@ -53,5 +53,5 @@
             <div class="portfolio-project-views-txt">14</div>
         </div>
     </div>
-    <div class="portfolio-project-blocks-tags"><?= StringHelper::truncate(implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')), 20) ?></div>
+    <div title="<?= implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')) ?>" class="portfolio-project-blocks-tags"><?= implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')) ?></div>
 </div>
 \ No newline at end of file
@@ -54,5 +54,5 @@
             <div class="portfolio-project-views-txt">14</div>
         </div>
     </div>
-    <div class="portfolio-project-blocks-tags"><?= implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')) ?></div>
+    <div title="<?= implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')) ?>" class="portfolio-project-blocks-tags"><?= implode(', ', ArrayHelper::getColumn($model->specializations, 'specialization_name')) ?></div>
 </div>
 \ No newline at end of file
@@ -222,59 +222,114 @@ $this-&gt;title = &#39;My Yii Application&#39;;
         </div>
         <div id="map_canvas" style="width: 100%; height:100%;"></div>
     </div>
-    <?php
-        echo \common\modules\comment\widgets\CommentWidget::widget([
-            'context'       => $this,
-            'model'         => $model->className(),
-            'model_id'      => $model->project_id,
-            'comment_class' => \common\modules\comment\models\CommentProjectAnswer::className(),
-            'class_options' => [
-                'scenario'     => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST,
-                'user_id'      => \Yii::$app->user->getId(),
-                'guestComment' => false,
-                'status'       => \common\modules\comment\models\Comment::STATUS_ACTIVE,
-            ],
-            'list_options'  => [
-                'view' => 'list-comment-question',
-            ],
-            'form_options'  => [
-                'view' => 'form-comment-answer',
-                'tag'  => 'span',
-            ],
-            'options'       => [
-                'class' => 'proektant-comments-wr style',
-            ],
-        ]);
-    ?>
-    <?php
-        echo \common\modules\comment\widgets\CommentWidget::widget([
-            'context'       => $this,
-            'model'         => $model::className(),
-            'model_id'      => $model->project_id,
-            'comment_class' => \common\modules\comment\models\CommentProject::className(),
-            'class_options' => [
-                'scenario'     => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST,
-                'user_id'      => \Yii::$app->user->getId(),
-                'guestComment' => false,
-                'status'       => \common\modules\comment\models\CommentProject::STATUS_ACTIVE,
-            ],
-            'list_options'  => [
-                'view' => 'list-project-comment',
-                'class' => 'section box tender-offer-proj-wr',
-            ],
-            'form_options'  => [
-                'view'  => 'form-project-comment',
-                'tag'   => 'div',
-                'class' => 'artbox_comment_form section-box tender-add-answer',
-            ],
-            'options'       => [
-                'tag' => false,
-            ],
-        ]);
-    ?>
+    <div class="tabs_1 style">
+        <div class="tabs_list style" style="display: none">
+            <div class="box-wr">
+                <div class="box-all">
+                    <ul>
+                        <li class="active">Заявки</li>
+                        <li>Вопрос-Ответ</li>
+                    </ul>
+                </div>
+            </div>
+
+        </div>
+        
+        <div class="tabs_views-wr">
+           <div class="_tabs style">
+                <div class="box-wr">
+                    <div class="box-all">
+                        <?php
+                        echo \common\modules\comment\widgets\CommentWidget::widget([
+                            'context'       => $this,
+                            'model'         => $model::className(),
+                            'model_id'      => $model->project_id,
+                            'comment_class' => \common\modules\comment\models\CommentProject::className(),
+                            'class_options' => [
+                                'scenario'     => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST,
+                                'user_id'      => \Yii::$app->user->getId(),
+                                'guestComment' => false,
+                                'status'       => \common\modules\comment\models\CommentProject::STATUS_ACTIVE,
+                            ],
+                            'list_options'  => [
+                                'view' => 'list-project-comment',
+                                'class' => 'section box tender-offer-proj-wr',
+                            ],
+                            'form_options'  => [
+                                'view'  => 'form-project-comment',
+                                'tag'   => 'div',
+                                'class' => 'artbox_comment_form section-box tender-add-answer',
+                            ],
+                            'options'       => [
+                                'tag' => false,
+                            ],
+                        ]);
+                        ?>
+                    </div>
+                </div>
+           </div>
+           <div class="_tabs style">
+               <div class="box-wr">
+                   <div class="box-all">
+                       <?php
+                       echo \common\modules\comment\widgets\CommentWidget::widget([
+                           'context'       => $this,
+                           'model'         => $model->className(),
+                           'model_id'      => $model->project_id,
+                           'comment_class' => \common\modules\comment\models\CommentProjectAnswer::className(),
+                           'class_options' => [
+                               'scenario'     => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST,
+                               'user_id'      => \Yii::$app->user->getId(),
+                               'guestComment' => false,
+                               'status'       => \common\modules\comment\models\Comment::STATUS_ACTIVE,
+                           ],
+                           'list_options'  => [
+                               'view' => 'list-comment-question',
+                           ],
+                           'form_options'  => [
+                               'view' => 'form-comment-answer',
+                               'tag'  => 'span',
+                           ],
+                           'options'       => [
+                               'class' => 'proektant-comments-wr style',
+                           ],
+                       ]);
+                       ?>
+                   </div>
+               </div>
+           </div>
+        </div>
+    </div>
+
+
+
  
 </div>
 <script>
+    $(document).ready(function () {
+        tabs_()
+        inputNumber()
+        function inputNumber() {
+            $("#commentproject-budget_from, #commentproject-budget_to, #commentproject-term_from, #commentproject-term_to").keypress(function(e){return 8==e.which||e.which>47&&e.which<58?void 0:!1})
+        }
+
+        function tabs_() {
+
+        }
+        $('.tabs_list').css('display','block')
+        $('._tabs').css({display:'none'})
+        $('._tabs:first-child').css({display:'block'})
+        $('.tabs_list ul li').click(function () {
+            $('.tabs_list ul li').removeClass('active')
+            $(this).addClass('active')
+            var index = $(this).index()
+            var tabs = $('._tabs')
+            tabs.css({display:'none'})
+            $(tabs[index]).css({display:'block'})
+        })
+    })
+</script>
+<script>
     $('div.rating, div.rating-new').rating({
         fx: 'full',
         readOnly: 'true',
@@ -3121,11 +3121,11 @@ input[type=file]::-webkit-file-upload-button {
     position: relative;
 }
 .portfolio-project-blocks-tags:before {
-    ontent: '';
+    content: '';
     position: absolute;
     width: 7px;
     height: 100%;
-    right: 14px;
+    right: 19px;
     top: 0;
     opacity: 1;
     background: -moz-linear-gradient(left, rgba(255,255,255,0.5) 0%, rgba(255,255,255,1) 100%);
@@ -4722,7 +4722,7 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m
     outline: none;
 }
 .custom-input-2.fix-input-2 {width: 100%}
-.custom-input-2:focus, .selectize-input input:focus, .search-work-form select:focus, input.hasDatepicker:focus {border: 1px solid #dcdcdc;box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none}
+.custom-input-2:focus, .selectize-input input:focus, .search-work-form select:focus, input.hasDatepicker:focus, ._fix_errors_tender input:focus, ._fix_errors_tender select:focus, ._fix_errors_tender textarea: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 select {margin-top: 5px}
 .input-blocks label, .skills-title {
     font-size: 13px;
@@ -6968,4 +6968,89 @@ li.active-menu-admin:hover a .ico_num {
     float: left;
     margin-bottom: 16px;
  
+}
+.tabs_list {
+    border-bottom: 1px solid #dcdcdc;
+}
+.tabs_list ul{
+    width: 100%;
+    float: left;
+    height: 42px;
+}
+.tabs_list ul li {
+    list-style: none;
+    float: left;
+    background: #f1f1f1;
+    height: 42px;
+    line-height: 42px;
+    color: inherit;
+    font-size: 15px;
+    padding: 0 20px;
+    cursor: pointer;
+    border-top: 3px solid #f1f1f1;
+    box-sizing: border-box;
+}
+.tabs_list ul li.active {
+    background: #fff;
+    border-top: 3px solid #0072bc;
+    color: #0072bc;
+    position: relative;
+}
+
+
+.tabs_list ul li.active:before {
+    width: 100%;
+    height: 40px;
+    border-right: 1px solid #dcdcdc;
+    border-bottom: 1px solid #fff;
+    position: absolute;
+    left: 0;
+    bottom: -1px;
+    content: '';
+    box-sizing: border-box;
+}
+.tabs_list ul li:first-child:before {
+    border-left: 1px solid #dcdcdc;
+    border-right: 0;
+}
+.tabs_1 {
+    margin-top: 40px;
+}
+.fix_tender_answer {
+    text-align: left;
+    font-size: 18px;
+}
+.form-tender-answer .form-value-wr {
+    margin-top: 15px;
+}
+.new-portf-add-comm.fix-portf_  {padding-top: 0}
+#commentproject-budget_from, #commentproject-budget_to, #commentproject-term_from, #commentproject-term_to {
+    -webkit-appearance: none;
+    -moz-appearance:textfield;
+    appearance: none;
+}
+#commentproject-budget_from::-webkit-inner-spin-button, #commentproject-budget_to::-webkit-inner-spin-button, #commentproject-term_from::-webkit-inner-spin-button, #commentproject-term_to::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+}
+._fix_errors_tender .help-block{
+    display: none;
+}
+._fix_errors_tender .has-error input, ._fix_errors_tender .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 {
+    height: 29px !important;
+    line-height: 29px !important;
+    background: #087dc8 !important;
+    border-bottom: 1px solid #0054a6;
+}
+._fix_errors_tender .get-list-new {
+    height: 29px !important;
+    line-height: 29px !important;
+    background: none !important;
+    border: 1px solid #0072bc !important;
+    color: #0072bc !important;
 }
 \ No newline at end of file