From 9995fdec6ca4b530dc85824eee924c6156189f80 Mon Sep 17 00:00:00 2001 From: Catouse Date: Sat, 23 Jun 2018 20:02:57 +0800 Subject: [PATCH] * support show some data view with datatable. --- module/block/css/dashboard.css | 2 +- module/bug/view/browse.html.php | 50 +++++++-------- module/common/view/datatable.fix.html.php | 14 ++-- module/common/view/datatable.html.php | 72 ++++++++------------- module/datatable/lang/en.php | 16 ++--- module/datatable/lang/zh-cn.php | 16 ++--- module/product/view/browse.html.php | 58 +++++++++-------- module/project/js/common.js | 2 +- module/project/view/task.html.php | 78 +++++++++++++---------- module/testcase/view/browse.html.php | 52 +++++++-------- www/js/zui/min.js | 6 +- www/theme/zui/css/min.css | 2 +- 12 files changed, 183 insertions(+), 185 deletions(-) diff --git a/module/block/css/dashboard.css b/module/block/css/dashboard.css index c0fac847ee..f994a71ecc 100644 --- a/module/block/css/dashboard.css +++ b/module/block/css/dashboard.css @@ -4,7 +4,7 @@ #dashboard .panel-actions.nav .icon-more {font-size: 14px;} #dashboard .panel-body {max-height: 400px; overflow: auto;} #dashboard .panel-move-handler {position: absolute; top: 0; left: 0; right: 50px; height: 40px; z-index: 10; cursor: move;} -#dashboard .panel-heading {cursor: move;} +#dashboard .panel-heading {cursor: move; padding-right: 75px;} #dashboard .panel.table-scrolled .table-header-fixed {border-bottom: 1px solid #ddd; box-shadow: 0 1px 1px rgba(0,0,0,.05), 0 2px 4px 0 rgba(0,0,0,0.025);} @media (min-width: 992px) { diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 6a6731a4f1..8c2b3e3660 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -186,31 +186,31 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow $widths = $this->datatable->setFixedFieldWidth($setting); $columns = 0; ?> -
- - - - $value) - { - if($value->show) - { - $this->datatable->printHead($value, $orderBy, $vars); - $columns ++; - } - } - ?> - - - - - - $value) $this->bug->printCell($value, $bug, $users, $builds, $branches, $modulePairs, $projects, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table');?> - - - -
-
+ ';?> + ' id='bugList' data-fixed-left-width='' data-fixed-right-width=''> + + + $value) + { + if($value->show) + { + $this->datatable->printHead($value, $orderBy, $vars); + $columns ++; + } + } + ?> + + + + + + $value) $this->bug->printCell($value, $bug, $users, $builds, $branches, $modulePairs, $projects, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table');?> + + + +
+ ';?>