diff --git a/module/bug/control.php b/module/bug/control.php index f145caaa5d..69e36ad8ab 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -325,7 +325,7 @@ class bug extends control $keywords = ''; $severity = 3; $type = 'codeerror'; - $pri = ''; + $pri = 3; $color = ''; /* Parse the extras. extract fix php7.2*/ diff --git a/module/productplan/css/view.css b/module/productplan/css/view.css index 7c8355f705..edfc610213 100644 --- a/module/productplan/css/view.css +++ b/module/productplan/css/view.css @@ -19,5 +19,5 @@ .linkBox #queryBox .search-form .form-actions {padding-bottom: 5px;} .linkBox .table-header {padding: 8px 15px; border-bottom: 1px solid #cbd0db;} #unlinkStoryList, #unlinkBugList {border-top: 1px solid #cbd0db;} -.detail-content{margin-left: 0px;} .fixed-footer .text{color:#fff} +ol, ul { padding-left: 20px; } diff --git a/module/release/css/view.css b/module/release/css/view.css index 998393007e..ac7072bb65 100644 --- a/module/release/css/view.css +++ b/module/release/css/view.css @@ -8,4 +8,4 @@ #tabsNav .nav-tabs > li.pull-right {margin-right: 120px; margin-top: -5px} #tabsNav .nav-tabs > li.active + li.pull-right {margin-right: 0;} -.detail-content{margin-left: 0px;} +ol, ul { padding-left: 20px; } diff --git a/module/task/css/create.css b/module/task/css/create.css index ce475de180..d9e30cfcb3 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -1 +1,8 @@ #copyButton {width: 56px; background-color: #f1f1f1; opacity: 1;} /*Adjust for task #4151;*/ + +.title-group.required:after {display: none;} +.title-group.required > .required:after {display: block; right: 29px; top: 5px;} +#pri + .chosen-container > .chosen-single {border-top-left-radius: 0!important; border-bottom-left-radius: 0!important;} + +.pri-selector > .btn {padding: 5px 8px!important; width: 100%;} +.pri-selector > .dropdown-menu {padding: 10px;} diff --git a/module/task/js/create.js b/module/task/js/create.js index 99dc9bb969..946a40201b 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -162,10 +162,18 @@ function setStories(moduleID, projectID) $(document).ready(function() { + $('#pri').on('change', function() + { + var $select = $(this); + var $selector = $select.closest('.pri-selector'); + var value = $select.val(); + $selector.find('.pri-text').html('' + value + ''); + }); + setStoryRelated(); $('#selectAllUser').on('click', function() - { + { var $assignedTo = $('#assignedTo'); if($assignedTo.attr('multiple')) { diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index a17f63411d..5e3c3ec936 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -67,58 +67,64 @@ task->name;?> -
-
- - - +
+
+
+ +
    +
  • task->colorTag;?>
    • +
+ +
+ name, "class='form-control' autocomplete='off' required");?> + global->flow != 'onlyTask'):?> + task->copyStoryTitle;?> + + +
+ + task->pri;?> + task->priList as $priKey => $priValue) + { + if(!empty($priKey) and (string)$priKey != (string)$priValue) + { + $hasCustomPri = true; + break; + } + } + $priList = $lang->task->priList; + if(end($priList)) + { + unset($priList[0]); + $priList[0] = ''; + } + ?> + + pri, "class='form-control'");?> + +
+ +
+ pri, "class='form-control' data-provide='labelSelector' data-label-class='label-pri'");?> +
+
+ + + +
+
+ task->estimateAB;?> + +
- name, "class='form-control' autocomplete='off' required");?> - global->flow != 'onlyTask'):?> - task->copyStoryTitle;?> -
- - - task->pri;?> - task->priList as $priKey => $priValue) - { - if(!empty($priKey) and (string)$priKey != (string)$priValue) - { - $hasCustomPri = true; - break; - } - } - $priList = $lang->task->priList; - if(end($priList)) - { - unset($priList[0]); - $priList[0] = ''; - } - ?> - - - pri, "class='form-control chosen'");?> - - pri, "class='form-control' data-provide='labelSelector' data-label-class='label-pri'");?> - - - - - - - task->estimateAB;?> - - task->hour;?> - - task->desc;?> desc, "rows='10' class='form-control'");?> diff --git a/module/user/view/project.html.php b/module/user/view/project.html.php index f19b013c89..18dd1a5340 100644 --- a/module/user/view/project.html.php +++ b/module/user/view/project.html.php @@ -32,20 +32,20 @@ createLink('project', 'browse', "projectID=$project->id");?> - - id);?> - code;?> - name);?> - begin;?> - end;?> + + id);?> + code;?> + name);?> + begin;?> + end;?> delay)):?> - project->delayed;?> + project->delayed;?> - project->statusList[$project->status];?> + project->statusList[$project->status];?> - role;?> - join;?> - hours;?> + role;?> + join;?> + hours;?> diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 96a019f21d..053dcfb61f 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -11,3 +11,6 @@ /* Finish task #4751. */ .hide-sidebar #sidebar .cell{display:none;} + +/* 取消历史记录的缩进,与标题对齐*/ +ol, ul { padding-left: 15px; }