diff --git a/module/bug/model.php b/module/bug/model.php index 1813bf7047..7c98897c05 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2039,10 +2039,10 @@ class bugModel extends model break; case 'title': $class = 'confirm' . $bug->confirmed; - echo "[{$lang->bug->confirmedList[$bug->confirmed]}] "; - if($bug->branch)echo "{$branches[$bug->branch]}"; - if($modulePairs and $bug->module)echo "{$modulePairs[$bug->module]}"; - echo html::a($bugLink, $bug->title); + echo "[{$this->lang->bug->confirmedList[$bug->confirmed]}] "; + if($bug->branch)echo "{$branches[$bug->branch]} "; + if($modulePairs and $bug->module)echo "{$modulePairs[$bug->module]} "; + echo html::a($bugLink, $bug->title, null, "style='color: $bug->color'"); break; case 'branch': echo $branches[$bug->branch]; diff --git a/module/bug/view/browsedata.html.php b/module/bug/view/browsedata.html.php index 323350bfd1..f7ca113e50 100644 --- a/module/bug/view/browsedata.html.php +++ b/module/bug/view/browsedata.html.php @@ -55,10 +55,10 @@ confirmed;?> [{$lang->bug->confirmedList[$bug->confirmed]}] "; - if($bug->branch)echo "{$branches[$bug->branch]}"; - if($modulePairs and $bug->module)echo "{$modulePairs[$bug->module]}"; - echo html::a($bugLink, $bug->title); + echo "[{$lang->bug->confirmedList[$bug->confirmed]}] "; + if($bug->branch)echo "{$branches[$bug->branch]} "; + if($modulePairs and $bug->module)echo "{$modulePairs[$bug->module]} "; + echo html::a($bugLink, $bug->title, null, "style='color: $bug->color'"); ?> needconfirm ? "{$lang->story->changed}" : $lang->bug->statusList[$bug->status];?> diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 2d729bac68..dd244f218e 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -114,7 +114,7 @@ js::set('refresh', $lang->refresh);
- +
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 38df2ea8d0..97bc2f8bf9 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -29,7 +29,8 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
icons['bug']);?> id;?> - createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> + createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '', + 'class="bug-title"');?> icons['edit']) . ' ' . $lang->bug->edit;?>
@@ -40,7 +41,10 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
- title), 'class="form-control" placeholder="' . $lang->bug->title . '"');?> +
+ + title), 'class="form-control" placeholder="' . $lang->bug->title . '"');?> +
bug->legendSteps;?> diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 8f3dc537de..e2614ed586 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -15,7 +15,7 @@
icons['bug']);?> id;?> - title;?> + title;?> deleted):?> bug->deleted;?> diff --git a/module/common/view/datatable.html.php b/module/common/view/datatable.html.php index 41c677aff3..ec5c1faf9b 100644 --- a/module/common/view/datatable.html.php +++ b/module/common/view/datatable.html.php @@ -56,6 +56,7 @@ $(document).ready(function() sortable : false, scrollPos : 'out', tableClass : 'tablesorter', + storage : false, ready: function() { if(!this.$table) return; diff --git a/module/product/view/browsedata.html.php b/module/product/view/browsedata.html.php index aa38fa8f0e..719ddc2fd5 100644 --- a/module/product/view/browsedata.html.php +++ b/module/product/view/browsedata.html.php @@ -40,8 +40,8 @@ story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri)?> branch) echo "{$branches[$story->branch]}"?> - module) echo "{$modulePairs[$story->module]}"?> - title);?> + module) echo "{$modulePairs[$story->module]} "?> + title, null, "style='color: $story->color'");?> planTitle;?> story->sourceList[$story->source];?> diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index 3cfe0e4ed5..9931e98812 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -46,7 +46,7 @@ bug->severityList, $bug->severity, $bug->severity)?>'>bug->severityList, $bug->severity, $bug->severity)?> bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> - createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> + createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?> openedBy, $bug->openedBy);?> assignedTo, $bug->assignedTo);?> resolvedBy, $bug->resolvedBy);?> diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index b7fbb1f695..4b50bc3de9 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -79,7 +79,7 @@ story->priList, $story->pri, $story->pri)?>'>story->priList, $story->pri, $story->pri);?> product][$story->branch])) echo "" . $branchGroups[$story->product][$story->branch] . '';?> - title);?> + title, null, "style='color: $story->color'");?> openedBy];?> assignedTo];?> diff --git a/module/project/view/taskdata.html.php b/module/project/view/taskdata.html.php index 3b6d732060..b86ee533db 100644 --- a/module/project/view/taskdata.html.php +++ b/module/project/view/taskdata.html.php @@ -50,7 +50,7 @@ product][$task->branch])) echo "" . $branchGroups[$task->product][$task->branch] . '';?> module) echo "" . $modulePairs[$task->module] . '';?> id", $task->name)) echo $task->name; + if(!common::printLink('task', 'view', "task=$task->id", $task->name, null, "style='color: $task->color'")) echo $task->name; if($task->fromBug) echo html::a($this->createLink('bug', 'view', "id=$task->fromBug"), "[BUG#$task->fromBug]", '_blank', "class='bug'"); ?> diff --git a/module/story/model.php b/module/story/model.php index 20e86d8415..33640f5c56 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2130,9 +2130,9 @@ class storyModel extends model echo ""; break; case 'title': - if($story->branch) echo "{$branches[$story->branch]}"; - if($modulePairs and $story->module) echo "{$modulePairs[$story->module]}"; - echo html::a($storyLink, $story->title); + if($story->branch) echo "{$branches[$story->branch]} "; + if($modulePairs and $story->module) echo "{$modulePairs[$story->module]} "; + echo html::a($storyLink, $story->title, null, "style='color: $story->color'"); break; case 'plan': echo $story->planTitle; diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 3b54cb313f..1cdd651206 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -91,7 +91,7 @@
- +
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index d1ac368f6f..08f6bfb14d 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -15,7 +15,7 @@
icons['story']);?> id;?> - createLink('story', 'view', "storyID=$story->id"), $story->title);?> + createLink('story', 'view', "storyID=$story->id"), $story->title, '', 'class="story-title"');?> icons['edit']) . ' ' . $lang->story->edit;?>
@@ -25,6 +25,12 @@
+
+
+ + title, 'class="form-control disabled" disabled="disabled"');?> +
+
story->legendSpec;?>
spec;?>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index f6f09fb967..f4364cdb65 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -15,7 +15,7 @@
icons['story']);?> id;?> - title;?> + title;?> version > 1):?> diff --git a/module/task/css/create.css b/module/task/css/create.css index c5d79d63c4..d41b0faec8 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -8,4 +8,3 @@ .minw-80px {min-width: 80px;} .minw-60px {min-width: 60px;} -.colorpicker.input-group-btn > .btn {border-right: none} diff --git a/module/task/model.php b/module/task/model.php index 341d9c8811..a0fe79368b 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1541,9 +1541,9 @@ class taskModel extends model echo ""; break; case 'name': - if(isset($branchGroups[$task->product][$task->branch])) echo "" . $branchGroups[$task->product][$task->branch] . ''; - if($modulePairs and $task->module) echo "" . $modulePairs[$task->module] . ''; - echo html::a($taskLink, $task->name); + if(isset($branchGroups[$task->product][$task->branch])) echo "" . $branchGroups[$task->product][$task->branch] . ' '; + if($modulePairs and $task->module) echo "" . $modulePairs[$task->module] . ' '; + echo html::a($taskLink, $task->name, null, "style='color: $task->color'"); if($task->fromBug) echo html::a(helper::createLink('bug', 'view', "id=$task->fromBug"), "[BUG#$task->fromBug]", '_blank', "class='bug'"); break; case 'type': diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index f484d2ecfd..3e5879b771 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -59,7 +59,7 @@
- + name, "class='form-control'");?> task->copyStoryTitle;?>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index d37227c54c..d2a2953043 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -21,7 +21,7 @@
icons['task']);?> id;?> - createLink('task', 'view', "taskID=$task->id"), $task->name);?> + createLink('task', 'view', "taskID=$task->id"), $task->name, '', "class='task-title'");?> icons['edit']) . ' ' . $lang->task->edit;?>
@@ -32,7 +32,10 @@
- name, 'class="form-control" placeholder="' . $lang->task->name . '"');?> +
+ + name, 'class="form-control" placeholder="' . $lang->task->name . '"');?> +
task->desc;?> diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index c45ab41115..66e6aa247e 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -15,7 +15,7 @@
icons['task']);?> id;?> - name;?> + name;?> deleted):?> task->deleted;?> diff --git a/module/testcase/model.php b/module/testcase/model.php index 555e7bdebb..e2c740439b 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -954,9 +954,9 @@ class testcaseModel extends model echo ""; break; case 'title': - if($case->branch) echo "{$branches[$case->branch]}"; - if($modulePairs and $case->module) echo "{$modulePairs[$case->module]}"; - echo html::a($caseLink, $case->title); + if($case->branch) echo "{$branches[$case->branch]} "; + if($modulePairs and $case->module) echo "{$modulePairs[$case->module]} "; + echo html::a($caseLink, $case->title, null, "style='color: $case->color'"); break; case 'branch': echo $branches[$case->branch]; diff --git a/module/testcase/view/browsedata.html.php b/module/testcase/view/browsedata.html.php index 9b933ef909..1279603fa4 100644 --- a/module/testcase/view/browsedata.html.php +++ b/module/testcase/view/browsedata.html.php @@ -40,9 +40,9 @@ testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri);?> - branch) echo "{$branches[$case->branch]}"?> - module) echo "{$modulePairs[$case->module]}"?> - title);?> + branch) echo "{$branches[$case->branch]} "?> + module) echo "{$modulePairs[$case->module]} "?> + title, null, "style='color: $case->color'");?> createLink('story', 'view', "storyID=$case->story"), $case->storyTitle, '_blank');?> diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index 26ac81d4a5..89870e0377 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -86,7 +86,7 @@
- +
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php index c36a768edc..7dd3f41627 100644 --- a/module/testcase/view/edit.html.php +++ b/module/testcase/view/edit.html.php @@ -19,7 +19,7 @@
icons['testcase']);?> id;?> - createLink('testcase', 'view', "caseID=$case->id"), $case->title);?> + createLink('testcase', 'view', "caseID=$case->id"), $case->title, '', 'class="case-title"');?> case->edit;?>
@@ -30,7 +30,10 @@
- title, 'class="form-control" placeholder="' . $lang->case->title . '"');?> +
+ + title, 'class="form-control" placeholder="' . $lang->case->title . '"');?> +
testcase->precondition;?> diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index a6441ea3ca..a559264708 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -15,7 +15,7 @@
icons['testcase']);?> id;?> - title;?> + title;?> deleted):?> case->deleted;?> diff --git a/www/theme/default/style.css b/www/theme/default/style.css index b39a8d5a0e..2bd09289ac 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -604,6 +604,12 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} .outer form > .btn {margin-right: 10px;} .outer form .panel {margin-bottom: 0;} +/* Color picker in form */ +.colorpicker.fix-border-right > .btn {border-right-color: transparent} +.colorpicker.fix-border-left > .btn {border-left-color: transparent} +.colorpicker.fix-border-right > .btn:hover {border-right-color: #bdbdbd} +.colorpicker.fix-border-left > .btn:hover {border-left-color: #bdbdbd} + /* Pager. */ .pager {margin-bottom:0;line-height: 20px; color: #999} .pager .dropdown {display: inline-block;}