diff --git a/module/product/css/all.css b/module/product/css/all.css index 36799514d6..adc7407106 100644 --- a/module/product/css/all.css +++ b/module/product/css/all.css @@ -37,24 +37,48 @@ .side-col {padding-right: 20px; width: 18%;} #sidebar>.cell {width: 100%;} -.main-table thead>tr:first-of-type>th {border-left: 1px solid #ddd;} -.main-table thead>tr:first-of-type>th:first-child {border-left: none;} -th.table-nest-title .nest-has-checkbox {margin-top: 7px; margin-left: 35px;} -th.table-nest-title .nest-none-checkbox {margin-top: 8px; margin-left: 5px;} -th.table-nest-title .header {margin-left: 5px;} -th.table-nest-title .sort-up {padding-left: 5px;} -th.table-nest-title .sort-down {padding-left: 5px;} -th.table-nest-title .table-nest-toggle {top: 12px; opacity: .6;} -th.table-nest-title .table-nest-toggle:hover {opacity: 1;} +th.c-name {width: 400px;} +th.c-requirement {width: 290px;} +th.c-story {width: 290px;} +th.c-bug {width: 200px;} +th.c-plan {width: 45px;} +th.c-release {width: 50px;} +th.c-actions {width: 60px;} -#productTableList .icon-product:before {content: '\e98f'; width: 22px; height: 22px; background: none; color: rgb(166, 170, 184); top: 0; line-height: 22px; margin-right: 2px; font-size: 14px;} +#productListForm thead>tr>th, +#productListForm tbody>tr>td {text-align: center; text-overflow: unset!important} +#productListForm thead>tr>th {padding: 0; line-height: 24px;} +#productListForm thead>tr:first-child>th {border-left: 1px solid #ddd;} +#productListForm thead>tr>th.c-checkbox {border-left: none; padding-left: 15px; width: 45px;} +#productListForm tbody>tr>td {padding: 2px 4px;} +#productListForm tbody>tr>td:first-child {text-align: left; padding-left: 15px;} +#productListForm th.table-nest-title .nest-has-checkbox {margin-top: 7px; margin-left: 35px;} +#productListForm th.table-nest-title .nest-none-checkbox {margin-top: 8px; margin-left: 5px;} +#productListForm th.table-nest-title .header {margin-left: 5px;} +#productListForm th.table-nest-title .sort-up {padding-left: 5px;} +#productListForm th.table-nest-title .sort-down {padding-left: 5px;} +#productListForm th.table-nest-title .table-nest-toggle {top: 12px; opacity: .6;} +#productListForm th.table-nest-title .table-nest-toggle:hover {opacity: 1;} +#productListForm .table.has-sort-head thead>tr>th>a:after, +#productListForm .table.has-sort-head thead>tr>th>a:before {top: -3px;} +#productListForm .icon-product:before {content: '\e98f'; width: 22px; height: 22px; background: none; color: rgb(166, 170, 184); top: 0; line-height: 22px; margin-right: 2px; font-size: 14px;} -.table.has-sort-head thead>tr>th>a:after, .table.has-sort-head thead>tr>th>a:before {top: -3px;} -.main-table thead>tr>th {padding: 0px 8px; line-height: 24px;} +@media screen and (max-width: 1460px) +{ + th.c-name {width: auto;} +} +@media screen and (max-width: 1300px) +{ + [lang^='zh-'] th.c-requirement {width: 240px;} + [lang^='zh-'] th.c-story {width: 240px;} +} -.icon-move {color: #16a8f8;} -.c-name {text-overflow: unset !important; width: 110px !important;} -.c-checkbox {width: 45px;} -.c-story {width: 300px;} -.c-bug {width: 200px;} -.c-plan, .c-release {width: 60px;} +@media screen and (max-width: 1250px) +{ + #productListForm thead>tr>th {font-size: 12px;} + th.c-requirement {width: 280px;} + th.c-story {width: 280px;} + th.c-actions {width: 50px;} + [lang^='zh-'] th.c-requirement {width: 220px;} + [lang^='zh-'] th.c-story {width: 220px;} +} diff --git a/module/product/js/all.js b/module/product/js/all.js index f03b8f9c58..aa33a70d54 100644 --- a/module/product/js/all.js +++ b/module/product/js/all.js @@ -58,8 +58,10 @@ $(function() }); } - $('#productTableList').on('click', '.row-program,.row-line', function() + $('#productTableList').on('click', '.row-program,.row-line', function(e) { + if($(e.target).closest('.table-nest-toggle,a').length) return; + var $row = $(this); var $checkbox = $row.find('.program-checkbox').toggleClass('checked').removeClass('indeterminate'); var isChecked = $checkbox.hasClass('checked'); diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 6cab222cc8..1e60ab39fe 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -36,7 +36,7 @@ $canOrder = common::hasPriv('product', 'updateOrder'); $canBatchEdit = common::hasPriv('product', 'batchEdit'); ?> - +
@@ -50,28 +50,28 @@ product->name);?> config->URAndSR):?> - + - + config->URAndSR):?> - - - - + + + + - - - - - - - + + + + + + + @@ -85,7 +85,7 @@ systemMode == 'new'):?> > - + > - + > - +
story->requirement;?>story->requirement;?> story->story;?> bug->common;?> product->plan;?> product->release;?>actions;?>actions;?>
story->draft;?>story->activate;?>story->change;?>story->completeRate;?>story->draft;?>story->activate;?>story->change;?>story->completeRate;?> story->draft;?>story->activate;?>story->change;?>story->completeRate;?>bug->activate;?>close;?>bug->fixedRate;?>story->draft;?>story->activate;?>story->change;?>story->completeRate;?>bug->activate;?>close;?>bug->fixedRate;?>
@@ -129,7 +129,7 @@ ?>
@@ -185,7 +185,7 @@ ?>
id => ''));?>id => ''));?> id", $product, 'list', 'edit');?> - +