Skip to content

T
taskonsite-архив-перенесен
Commit d742a2b2 authored by Александр Кузнецов's avatar Александр Кузнецов
Browse files
Options

Merge branch 'task-on.com/faq' into 'master' 

support новая верстка



See merge request !20
parents 6235ff4b 50dfc872
Hide whitespace changes
Inline Side-by-side
Showing with 783 additions and 16 deletions
common/modules/support/assets/GeneratorAsset.php 0 → 100644
View file @ d742a2b2
<?php
namespace common\modules\support\assets;
use yii\web\AssetBundle;
class GeneratorAsset extends AssetBundle
{
public $sourcePath = '@common/modules/support/assets/src';
public $css = [
'css/style_add.css',
'css/style_add_2.css',
'css/style_add_08.06.16.css',
];
public $js = [
// 'js/generator.js',
];
public $depends = [
'yii\web\JqueryAsset',
'yii\bootstrap\BootstrapAsset',
// 'backend\assets\AppAsset'
];
}
common/modules/support/assets/src/css/style_add.css 0 → 100644
View file @ d742a2b2
.clear {
clear: both;
}
.support_form {
width: 760px;
padding: 30px;
padding-bottom: 40px;
color: #525252;
}
.popup_2 .popup__title {
font-size: 38px;
font-weight: bold;
color: #344555;
text-align: left;
}
.support_form_left {
width: 45%;
float: left;
padding-right: 15px;
}
.support_form_right {
width: 55%;
float: right;
padding-left: 15px;
}
.popup_2 p {
font-size: 17px;
color: #525252;
line-height: 22px;
font-weight: 400;
}
.support_form .support_block__link_pv {
margin-top: 10px;
}
.popup_2 input:not([type="radio"]):not([type="checkbox"]){
border-radius: 10px;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
-o-border-radius: 10px;
-ms-border-radius: 10px;
width: 100%;
}
.popup_2 input {
margin-bottom: 10px;
}
.popup_2 input:not(:last-child) {
margin-bottom: 30px;
}
.popup_2 .checkbox:not(checked) + label {
position: relative;
padding: 6px 0px 0px 28px;
margin-bottom: 30px;
}
.popup_2 label {
margin-bottom: 10px;
}
.support_form_left2 {
float: left;
width: 50%;
padding-right: 15px;
}
.support_form_right2 {
float: right;
width: 50%;
padding-left: 15px;
margin-bottom: 30px;
}
.popup_2 .sect_cont_form__textarea {
background-color: #f1f1f1;
height: 170px;
width: 100%;
line-height: 24px;
resize: none;
}
.file-upload_block_cs2 {
height: 170px;
background-color: #f8f8f8;
padding-top: 30px;
border: 2px solid #f1f1f1;
border-radius: 10px;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
-o-border-radius: 10px;
-ms-border-radius: 10px;
}
.file-upload_block_cs2 .filename_cs {
background-color: #f8f8f8;
margin-bottom: 0px !important;
}
.button-lg {
padding-left: 30px;
padding-right: 30px;
width: auto;
}
.blog_form {
width: 820px;
padding: 30px;
padding-bottom: 40px;
color: #525252;
}
.blog_form_left {
width: 280px;
float: left;
padding-right: 18px;
}
.blog_form_right {
width: 340px;
float: left;
font-size: 15px;
}
.blog_form_right p {
font-size: 15px;
}
.blog_lmg {
float: right;
}
.blog_form_2 {
width: 670px;
padding: 30px;
padding-bottom: 40px;
color: #525252;
}
.blog_form_left50 {
float: left;
width: 50%;
padding-right: 15px;
}
.blog_form_right50 {
float: right;
width: 50%;
padding-left: 15px;
}
.registration_form {
width: 940px;
padding: 0;
color: #525252;
}
.popup__title2 {
display: block;
background-color: #3a4447;
padding: 30px;
font-size: 25px;
line-height: 30px;
color: #fff;
-moz-border-radius: 6px 6px 0 0;
-webkit-border-radius: 6px 6px 0 0;
-o-border-radius: 6px 6px 0 0;
-ms-border-radius: 6px 6px 0 0;
margin-top: -1px;
}
.validreg_form2 {
padding: 30px;
}
.registration_form .mfp-close {
color: #fff;
}
.registration_form_left {
width: 40%;
float: left;
padding-right: 15px;
}
.registration_form_right {
width: 60%;
float: right;
padding-left: 15px;
}
.save-button-lg {
height: 60px;
font-size: 24px;
margin-bottom: 30px;
}
.popup__title3 {
font-size: 25px;
line-height: 27px;
font-weight: bold;
margin-bottom: 18px;
display: block;
}
.registration_form p {
font-size: 16px;
color: #3c4755;
line-height: 27px;
font-weight: 400;
}
.registration_form input:not([type="radio"]):not([type="checkbox"]), select.input_st {
width: 100%;
}
.registration_form input:not(:last-child) {
margin-bottom: 20px;
}
.red_text {
color: #bb6e6e;
}
.registration_form_img img {
width: 100%;
}
.registration_form2 {
width: 700px;
}
.registration_form_left50 {
float: left;
width: 50%;
padding-right: 35px;
}
.registration_form_right50 {
float: right;
width: 50%;
padding-left: 35px;
}
.button_social a:hover {
opacity: 0.8;
}
.input_st_wr {
padding: 0 10px;
background: #F5F5F5;
border-radius: 50px;
-moz-border-radius: 50px;
-webkit-border-radius: 50px;
-o-border-radius: 50px;
-ms-border-radius: 50px;
margin-bottom: 20px;
}
.input_st_wr .input_st {
margin: 0;
}
@media only screen and (max-width: 992px) {
.registration_form, .blog_form_2, .blog_form, .support_form {
width: 100%;
height: auto;
}
.popup_2 .popup__title {
font-size: 32px;
}
}
@media only screen and (max-width: 820px) {
.blog_lmg {
display: none;
}
}
@media only screen and (max-width: 767px) {
.form_resp {
float: none;
width: 100%;
padding-left: 0;
padding-right: 0;
}
.support_form_right {
margin-bottom: 20px;
}
}
@media only screen and (max-width: 479px) {
.popup_2 .popup__title {
font-size: 22px;
}
.blog_form_right {
width: 100%;
}
}
\ No newline at end of file
common/modules/support/assets/src/css/style_add_08.06.16.css 0 → 100644
View file @ d742a2b2
@media only screen and (max-width: 969px) {
}
@media only screen and (max-width: 767px) {
.right_box_top_resp {
margin-bottom: 0;
}
.hide_resp_lg, .box_td_hide {
display: none;
}
.table_ex_1 .box_td_fir {
display: none;
}
.table_ex_1 table {
table-layout: fixed;
}
.table_ex_1 .box_td_cont {
min-width: auto;
width: 240px;
padding-right: 10px;
}
.table_ex_1 .panel-title2, .table_ex_1 .panel-title2 a{
white-space: normal;
}
.table_ex_1 .box_td p {
font-size: 12px;
}
.table_ex_1 .box_td {
width: auto;
min-width: auto;
}
.table_ex_1 .table_header td:first-child {
width: 240px;
}
.btn_resp_100pr {
width: 100%;
}
.text_box_form_top {
display: none;
}
}
@media only screen and (max-width: 479px) {
.hide_resp {
display: none;
}
.table_ex_1 .box_td_cont {
min-width: 100px;
padding-right: 10px;
}
.table_ex_1 .box_td_cont {
width: 140px;
}
.table_ex_1 .table_header td:first-child {
width: 140px;
}
}
\ No newline at end of file
common/modules/support/assets/src/css/style_add_2.css 0 → 100644
View file @ d742a2b2
.top_line {
background-color: #232323;
min-height: 44px;
padding-top: 8px;
padding-bottom: 8px;
}
.top_line span {
font-size: 13px;
line-height: 26px;
color: #737373;
padding-right: 8px;
}
.top_line strong {
font-size: 18px;
line-height: 26px;
color: #737373;
padding-right: 15px;
}
.top_line a {
text-decoration: none;
font-size: 13px;
line-height: 26px;
color: #7bd9ff;
}
.top_line a:hover {
border-bottom: 1px dotted #7bd9ff;
}
.top_line .name_text {
color: #bfc0c0;
}
.top_line i {
color: #bfc0c0;
}
.top_line a i {
color: #7bd9ff;
}
.top_line .label {
position: absolute;
top: -4px;
left: 15px;
font-size: 9px;
font-weight: normal;
}
.top_line .glyphicon-bell {
margin-right: 41px;
margin-top: 5px;
}
.top_line_right {
text-align: right;
}
.client_interface {
background-color: #fff;
padding-top: 40px;
}
.client_interface h2 {
font-size: 29px;
color: #2d3642;
margin-top: 20px;
margin-bottom: 10px;
}
.logo_taskon {
padding-top: 10px;
float: right;
}
.logo_taskon span {
display: block;
padding-top: 20px;
font-size: 13px;
color: #7e8792;
float: left;
padding-right: 30px;
}
.right_box_top {
margin-bottom: 20px;
}
.btn-success-2 {
background-color: #7cb336;
border-color: #7cb336;
margin-bottom: 10px;
color: #fff;
}
.btn-success-2:hover {
background-color: #96cc50;
border-color: #96cc50;
color: #fff;
}
.btn-success-2:focus {
color: #fff;
}
.btn-default-2 {
background-color: #919699;
border-color: #919699;
font-size: 15px;
line-height:15px ;
padding: 6px 7px;
color: #fff !important;
}
.btn-default-2:hover {
background-color: #919699;
color: #fff;
}
.btn-default-2.active {
background-color: #919699;
color: #fff;
}
.btn-size-2 {
font-size: 19px;
border-color: #ccc;
padding: 6px 20px;
padding-bottom: 7px;
}
.panel-group-2 {
font-size: 14px;
}
.panel-group-2 .panel {
border-radius: 0px !important;
background-color: #f2f2f2;
border: none;
margin-top: 0 !important;
}
.panel-group-2 .panel-heading {
border-bottom: 1px solid #c4c4c4;
background-color: #f5f5f5;
}
.w100pr {
width: 100%;
margin-bottom: 5px;
}
.panel-group-2 .panel-collapse {
background-color: #fff;
}
.gray_box_2 {
border-left: 3px solid #f5f5f5;
}
.pink_box_2 {
border-left: 3px solid #ffe5cc;
}
.color_on_cursor:hover {
background-color: #ffffdb;
}
.panel-group-2 a:hover {
text-decoration: none;
}
.panel-group-2 .glyphicon, .panel-group-2 .caret {
color: #919699;
}
.caret {
border-top: 4px solid #919699;
border-right: 4px solid transparent;
border-bottom: 0 dotted;
border-left: 4px solid transparent;
}
.arrov_poz span {
display: block;
float: none;
margin-bottom: 3px;
}
.caret_top {
border-top: 0 dotted;
border-bottom: 4px solid #919699;
content: "";
}
.table_header .box_td p {
margin: 0;
color: #2d3642;
font-size: 14px;
}
.table_header strong {
font-size: 14px;
}
.box_td {
width: 140px;
vertical-align: middle;
}
.box_td p {
margin: 0;
color: #737373;
}
.box_td p strong {
margin: 0;
color: #737373;
}
.box_td span {
color: #a3a3a3;
}
.panel-title2, .panel-title2 a {
color: #6a6d6f;
margin: 0;
}
.box_td_fir {
width: 70px;
}
.box_td_fir span {
color: #737373;
}
.w100pr {
width: 100%;
margin-bottom: 5px;
}
.box_td_fir .arrov_poz {
padding-top: 2px;
width: 25px;
}
.box_td_cont {
padding-right: 30px;
}
.box_td_cont p {
margin: 0;
}
.green_text, .green_text strong {
color: #b2cf9b !important;
}
.gray_box {
border-left: 3px solid #f5f5f5;
}
.green_text {
color: #b2cf9b !important;
}
.align_right {
text-align: right;
}
.logo_taskon {
padding-top: 10px;
float: right;
}
.logo_taskon span {
display: block;
padding-top: 20px;
font-size: 13px;
color: #7e8792;
float: left;
padding-right: 30px;
}
.logo_taskon a {
display: block;
float: left;
}
.tooltip_wr {
position: relative;
}
.tooltip_cont {
cursor: pointer;
}
.tooltip_box {
background: url(/images_new/tooltip_bg.png) no-repeat center center;
width: 180px;
height: 75px;
display: none;
position: absolute;
top: -77px;
left: -80px;
color: #3c4755;
font-family: "RobotoLight";
font-size: 14px;
line-height: 21px;
text-align: center;
padding-top: 20px;
}
.tooltip_wr:hover .tooltip_box{
display: block;
}
.separator_close {
display: block;
background-color: #dfe3e6;
height: 35px;
text-align: center;
line-height: 36px;
color: #45494d;
border-bottom: 1px solid #b9c1c4;
font-size: 13px;
text-transform: uppercase;
}
.separator_close:hover {
color: #45494d;
text-decoration: none;
background-color: #cdd1d5;
}
.panel-body-ex-1 {
border-left: 3px solid #fff;
padding: 8px 15px 5px 15px;
border-bottom: 1px solid #f2f2f2;
}
.panel-body-ex-1 label.btn {
display: inline-block;
padding: 0;
width: 13px;
height: 13px;
border: 1px solid #919699;
border-radius: 1px;
margin-top: 10px;
margin-right: 15px;
}
.text-mes {
float: left;
}
.panel-body-ex-2 .text-mes p {
line-height: 26px;
font-size: 13px;
color: #999999;
padding: 0;
margin: 0;
}
.panel-body-ex-1 label.btn.active {
background-image: url('/images_new/panel-body-label-bg-act.jpg');
background-repeat: no-repeat;
}
.panel-body-ex-2 label.btn {
border: 1px solid #b1b7bb;
margin-top: 7px;
}
.no_pad {
padding: 0 !important;
border: none !important;
}
.table-responsive-conf {
overflow-x: inherit ;
}
@media only screen and (max-width: 992px) {
.box_td {
min-width: 120px;
}
.top_line_right {
text-align: left;
}
}
@media only screen and (max-width: 767px) {
.logo_taskon {
float: left;
padding-top: 0;
}
.box_td_cont {
min-width: 400px;
white-space: normal;
}
.box_td_fir {
min-width: 70px;
}
.text-mes {
width: 90%;
}
.tooltip_box {
left: -150px;
}
}
@media only screen and (max-width: 479px) {
.top_line strong {
font-size: 14px;
padding-right: 8px;
}
.resp_hidden {
display: none;
}
}
\ No newline at end of file
common/modules/support/views/support/_loop.php
View file @ d742a2b2
...@@ -13,14 +13,14 @@ use yii\helpers\Html; ...@@ -13,14 +13,14 @@ use yii\helpers\Html;
<tr> <tr>
<td> <td>
<p class="panel-title2 pull-left"> <p class="panel-title2 pull-left">
<!-- <a href=""><span class="glyphicon glyphicon-align-justify"></span></a>&nbsp;&nbsp; --> <a href=""><span class="glyphicon glyphicon-align-justify"></span></a>&nbsp;&nbsp;
<strong><?=$title?></strong>&nbsp;&nbsp; <strong><?=$title?></strong>&nbsp;&nbsp;
</p> </p>
</td> </td>
<td class="box_td"> <td class="box_td box_td_hide">
<p><strong>Дата <br> поступления</strong></p> <p><strong>Дата <br> поступления</strong></p>
</td> </td>
<td class="box_td"> <td class="box_td box_td_hide">
<p><strong>Срок <br> исполнения</strong></p> <p><strong>Срок <br> исполнения</strong></p>
</td> </td>
<td class="box_td"> <td class="box_td">
...@@ -39,33 +39,31 @@ use yii\helpers\Html; ...@@ -39,33 +39,31 @@ use yii\helpers\Html;
<tbody> <tbody>
<tr> <tr>
<td class="box_td_fir"> <td class="box_td_fir">
<!-- <div class="arrov_poz pull-left"> <div class="arrov_poz pull-left">
<a href=""><span class="caret caret_top"></span></a> <a href=""><span class="caret caret_top"></span></a>
<a href=""><span class="caret"></span></a> <a href=""><span class="caret"></span></a>
</div> --> </div>
<span><?=$model['id']?></span> <span><?=$model['id']?></span>
</td> </td>
<td class="box_td_cont"> <td class="box_td_cont">
<p><strong><?=Html::a($model['subject'], ['/support/view/'.$model['id']])?></strong></p> <p><strong><?=Html::a($model['subject'], ['/support/view/'.$model['id']])?></strong></p>
</td> </td>
<td class="box_td"> <td class="box_td box_td_hide">
<span><?=date('d.m.Y', strtotime($model['created_on']))?></span> <span><?=date('d.m.Y', strtotime($model['created_on']))?></span>
</td> </td>
<td class="box_td"> <td class="box_td box_td_hide">
<span><?=($model->due_date?date('d.m.Y', strtotime($model['due_date'])):'Не установлено')?></span> <span><?=($model->due_date?date('d.m.Y', strtotime($model['due_date'])):'Не установлено')?></span>
</td> </td>
<td class="box_td"> <td class="box_td">
<?php if(!$output['rating'] && $model['price_for_customer'] == 0) : ?> <?php if(!$output['rating'] && $model['price_for_customer'] == 0) : ?>
<p class="green_text align_right"><strong>Гарантия</strong></p> <p class="green_text align_right"><strong>Гарантия</strong></p>
<?php else : ?> <?php else : ?>
<p class="pull-left"><strong><?=($model['price_for_customer']!=0 ? Yii::$app->formatter->asCurrency($model['price_for_customer'], 'RUR', [], [\NumberFormatter::CURRENCY_SYMBOL => '₽']) : 'Не установлено')?></strong></p> <p class="pull-left"><strong><?=($model['price_for_customer']!=0 ? Yii::$app->formatter->asCurrency($model['price_for_customer'], 'RUR', [], [\NumberFormatter::CURRENCY_SYMBOL => '₽']) : 'Не установлено')?></strong></p>
<div class="tooltip_wr pull-right">
<div class="tooltip_box">Счет был выставлен</div>
<span class="tooltip_cont"><img src="images_new/score_icon.jpg" height="24" width="19" alt=""></span>
</div>
<?php endif; ?> <?php endif; ?>
<!-- <div class="tooltip_wr pull-right">
<div class="tooltip_box">Счет был выставлен</div>
<span class="tooltip_cont"><img src="/images/score_icon.jpg" height="24" width="19" alt=""></span>
</div> -->
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
common/modules/support/views/support/index.php
View file @ d742a2b2
...@@ -5,7 +5,9 @@ use yii\grid\GridView; ...@@ -5,7 +5,9 @@ use yii\grid\GridView;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
use common\modules\support\models\redmine\RedmineHelper; use common\modules\support\models\redmine\RedmineHelper;
use common\modules\support\assets\GeneratorAsset;
GeneratorAsset::register($this);
?> ?>
<div class="client_interface"> <div class="client_interface">
...@@ -57,7 +59,7 @@ use common\modules\support\models\redmine\RedmineHelper; ...@@ -57,7 +59,7 @@ use common\modules\support\models\redmine\RedmineHelper;
<br> <br>
<div class="table-responsive table-responsive-conf"> <div class="table-responsive table-responsive-conf table_ex_1">
<table class="table"> <table class="table">
<tr> <tr>
...@@ -97,7 +99,10 @@ use common\modules\support\models\redmine\RedmineHelper; ...@@ -97,7 +99,10 @@ use common\modules\support\models\redmine\RedmineHelper;
<?php foreach ($accepteds as $model) : ?> <?php foreach ($accepteds as $model) : ?>
<div class="panel-body panel-body-ex-1 panel-body-ex-2"> <div class="panel-body panel-body-ex-1 panel-body-ex-2">
<div> <div data-toggle="buttons">
<label class="btn pull-left active">
<input type="checkbox">
</label>
<div class="text-mes"> <div class="text-mes">
<p><?=Html::a($model['subject'], ['/support/view/'.$model['id']])?></p> <p><?=Html::a($model['subject'], ['/support/view/'.$model['id']])?></p>
</div> </div>
......
common/modules/support/views/support/view.php
View file @ d742a2b2
...@@ -5,9 +5,11 @@ use yii\helpers\Html; ...@@ -5,9 +5,11 @@ use yii\helpers\Html;
use common\modules\support\models\redmine\Issue; use common\modules\support\models\redmine\Issue;
use common\modules\support\models\redmine\RedmineHelper; use common\modules\support\models\redmine\RedmineHelper;
use common\modules\support\assets\GeneratorAsset;
$parser = new \Netcarver\Textile\Parser(); $parser = new \Netcarver\Textile\Parser();
GeneratorAsset::register($this);
?> ?>
<div class="container_white support-block"> <div class="container_white support-block">
......
frontend/web/images_new/desktop.ini 0 → 100644
View file @ d742a2b2
[.ShellClassInfo]
InfoTip= .
IconFile=C:\Program Files (x86)\Google\Drive\googledrivesync.exe
IconIndex=16
\ No newline at end of file
frontend/web/images_new/images/desktop.ini 0 → 100644
View file @ d742a2b2
[.ShellClassInfo]
InfoTip= .
IconFile=C:\Program Files (x86)\Google\Drive\googledrivesync.exe
IconIndex=16
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

task-on.com - ООО "Арт Проект"