From 7cf9a891789a30c156b94a18151f437fda804fc8 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 26 Nov 2012 05:26:15 +0000 Subject: [PATCH] * finish task #908. --- module/bug/view/browse.html.php | 4 ++-- module/build/view/view.html.php | 2 +- module/my/view/bug.html.php | 4 ++-- module/my/view/story.html.php | 2 +- module/my/view/task.html.php | 2 +- module/my/view/testcase.html.php | 2 +- module/my/view/todo.html.php | 2 +- module/product/view/browse.html.php | 2 +- module/productplan/view/linkstory.html.php | 4 ++-- module/productplan/view/view.html.php | 2 +- module/project/view/bug.html.php | 4 ++-- module/project/view/grouptask.html.php | 2 +- module/project/view/importbug.html.php | 4 ++-- module/project/view/importtask.html.php | 16 ++++++++------- module/project/view/linkstory.html.php | 2 +- module/project/view/story.html.php | 2 +- module/project/view/task.html.php | 2 +- module/release/view/view.html.php | 2 +- module/testcase/view/browse.html.php | 2 +- module/testtask/view/cases.html.php | 2 +- module/testtask/view/linkcase.html.php | 2 +- module/user/view/bug.html.php | 2 +- module/user/view/task.html.php | 2 +- module/user/view/todo.html.php | 2 +- www/theme/default/style.css | 24 +++++++++++----------- 25 files changed, 49 insertions(+), 47 deletions(-) diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 4013fce696..e079e27e74 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -109,8 +109,8 @@ if($customed) id");?> id));?> - severity;?>'>  - bug->priList[$bug->pri];?>'>  + severity;?>'>severity;?> + bug->priList[$bug->pri];?>'>bug->priList[$bug->pri];?> confirmed;?> [{$lang->bug->confirmedList[$bug->confirmed]}] " . html::a($bugLink, $bug->title);?> diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 27b7e07961..bda7c2213e 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -46,7 +46,7 @@ createLink('story', 'view', "storyID=$story->id");?> id);?> - story->priList[$story->pri];?> + story->priList[$story->pri]?>'>story->priList[$story->pri];?> title, '', "class='preview'");?> openedBy];?> estimate;?> diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index a0e514b260..677cd376d8 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -41,8 +41,8 @@ createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?> - bug->severityList[$bug->severity]?> - bug->priList[$bug->pri]?> + bug->severityList[$bug->severity]?>'>bug->severityList[$bug->severity]) ? $lang->bug->severityList[$bug->severity] : $bug->severity;?> + bug->priList[$bug->pri]?>'>bug->priList[$bug->pri]) ? $lang->bug->priList[$bug->pri] : $bug->pri?> bug->typeList[$bug->type]?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy];?> diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 43b744b5bf..20098d5759 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -42,7 +42,7 @@ createLink('story', 'view', "id=$story->id");?> id));?> - pri;?> + pri;?>'>pri?> productTitle;?> title);?> planTitle;?> diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index 150a6a63ce..5904225046 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -52,7 +52,7 @@ createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?> - task->priList[$task->pri];?> + task->priList[$task->pri];?>'>task->priList[$task->pri]) ? $lang->task->priList[$task->pri] : $task->pri;?> createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?> createLink('task', 'view', "taskID=$task->id"), $task->name);?> estimate;?> diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index 6e61b3a28f..575aa1717a 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -40,7 +40,7 @@ createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?> - pri?> + pri?>'>pri?> createLink('testcase', 'view', "testcaseID=$case->id"), $case->title);?> testcase->typeList[$case->type];?> openedBy];?> diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 3fadb48b7f..e8e1235d2b 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -78,7 +78,7 @@ date == '2030-01-01' ? $lang->todo->dayInFuture : $todo->date;?> todo->typeList->{$todo->type};?> - pri;?> + pri;?>'>pri?> createLink('todo', 'view', "id=$todo->id&from=my"), $todo->name);?> begin;?> end;?> diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index b23cde9e8d..3fac32b9f6 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -83,7 +83,7 @@ var browseType = ''; id)); else printf('%03d', $story->id);?> - story->priList[$story->pri];?> + story->priList[$story->pri];?>'>story->priList[$story->pri]?> title);?> planTitle;?> story->sourceList[$story->source];?> diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index e1a995dfed..abe2761889 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -36,7 +36,7 @@ ?> createLink('story', 'view', "storyID=$story->id"), $story->id);?> - pri;?> + pri;?>'>pri?> planTitle;?> createLink('story', 'view', "storyID=$story->id"), $story->title);?> openedBy];?> @@ -74,7 +74,7 @@ createLink('story', 'view', "storyID=$story->id"), $story->id);?> - pri;?> + pri;?>'>pri?> createLink('story', 'view', "storyID=$story->id"), $story->title);?> openedBy];?> assignedTo];?> diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 95067bca62..6f3c7c2211 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -57,7 +57,7 @@ ?> id);?> - pri;?> + pri?>'>pri;?> title);?> openedBy];?> assignedTo];?> diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index a4cf6c33bc..52c4a79de6 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -40,8 +40,8 @@ createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?> - bug->severityList[$bug->severity]?> - bug->priList[$bug->pri]?> + bug->severityList[$bug->severity]?>'>bug->severityList[$bug->severity]?> + bug->priList[$bug->pri]?>'>bug->priList[$bug->pri]?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy];?> assignedTo];?> diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php index de40e72529..2c5ddfdd65 100644 --- a/module/project/view/grouptask.html.php +++ b/module/project/view/grouptask.html.php @@ -91,7 +91,7 @@  id . $lang->colon; if(common::hasPriv('task', 'view')) echo html::a($this->createLink('task', 'view', "task=$task->id"), $task->name); else echo $task->name;?> - pri;?> + pri?>'>pri;?> >assignedToRealName;?> finishedBy];?> estimate;?> diff --git a/module/project/view/importbug.html.php b/module/project/view/importbug.html.php index 0986eb9225..9533a8addd 100755 --- a/module/project/view/importbug.html.php +++ b/module/project/view/importbug.html.php @@ -41,8 +41,8 @@ var browseType = ''; id]", '');?> id) . html::hidden("id[$bug->id]", $bug->id);?> - bug->severityList[$bug->severity]?> - bug->priList[$bug->pri]?> + bug->severityList[$bug->severity]?>'>bug->severityList[$bug->severity]?> + bug->priList[$bug->pri]?>'>bug->priList[$bug->pri]?> id", $bug->title, '', "class='preview'", true, true);?> bug->statusList[$bug->status];?> id]", $lang->task->priList, 3);?> diff --git a/module/project/view/importtask.html.php b/module/project/view/importtask.html.php index abd0d89b8b..63201abac0 100644 --- a/module/project/view/importtask.html.php +++ b/module/project/view/importtask.html.php @@ -14,14 +14,16 @@
+ - + @@ -39,7 +41,7 @@ - + diff --git a/module/project/view/linkstory.html.php b/module/project/view/linkstory.html.php index 5bf553198e..c2bbb32508 100644 --- a/module/project/view/linkstory.html.php +++ b/module/project/view/linkstory.html.php @@ -37,7 +37,7 @@ id);?> - + diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index d77ddf23c6..ec57ec0abb 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -50,7 +50,7 @@ id));?> - + diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index 26a3bf987c..2474b9574d 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -92,7 +92,7 @@ var browseType = ''; id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?> - + - + diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 124622b69e..6819b346d1 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -75,7 +75,7 @@ var moduleID = ''; id");?> - + diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index 450182fc70..c7a520e978 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -63,7 +63,7 @@ var moduleID = ''; - + diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php index c475a0cf74..97ed735a7a 100644 --- a/module/testtask/view/linkcase.html.php +++ b/module/testtask/view/linkcase.html.php @@ -40,7 +40,7 @@ createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?> - + - + diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php index 6507f759c6..6e2bcd814f 100644 --- a/module/user/view/task.html.php +++ b/module/user/view/task.html.php @@ -31,7 +31,7 @@ - + diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php index 19504eed8a..bb74302e72 100644 --- a/module/user/view/todo.html.php +++ b/module/user/view/todo.html.php @@ -54,7 +54,7 @@ - + diff --git a/www/theme/default/style.css b/www/theme/default/style.css index be2caad2e9..51596fee7c 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -422,12 +422,12 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table /* Common icons. */ #featurebar .f-right .icon-goback {padding:0px 9px} -.pri1 {padding:2px 8px; background:url(images/main/zt-icons.png) 0px -141px;} -.pri2 {padding:2px 8px; background:url(images/main/zt-icons.png) -20px -141px;} -.pri3 {padding:2px 8px; background:url(images/main/zt-icons.png) -40px -141px;} -.pri4 {padding:2px 8px; background:url(images/main/zt-icons.png) -60px -141px;} -.pri5 {padding:2px 8px; background:url(images/main/zt-icons.png) -80px -141px;} -.pri6 {padding:2px 8px; background:url(images/main/zt-icons.png) -100px -141px;} +.pri1 {background:url(images/main/zt-icons.png) 0px -143px; text-indent:-9999px; display:block; width:17px; margin:0 auto;} +.pri2 {background:url(images/main/zt-icons.png) -20px -143px; text-indent:-9999px; display:block; width:17px; margin:0 auto;} +.pri3 {background:url(images/main/zt-icons.png) -40px -143px; text-indent:-9999px; display:block; width:17px; margin:0 auto;} +.pri4 {background:url(images/main/zt-icons.png) -60px -143px; text-indent:-9999px; display:block; width:17px; margin:0 auto;} +.pri5 {background:url(images/main/zt-icons.png) -80px -143px; text-indent:-9999px; display:block; width:17px; margin:0 auto;} +.pri6 {background:url(images/main/zt-icons.png) -100px -143px; text-indent:-9999px; display:block; width:17px; margin:0 auto;} .icon-goback {padding:2px 8px; background:url(images/main/zt-icons.png) 0px -42px;} .icon-pre {padding:2px 8px; background:url(images/main/zt-icons.png) -20px -42px;} .icon-next {padding:2px 8px; background:url(images/main/zt-icons.png) -40px -42px;} @@ -491,12 +491,12 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table #featurebar .f-right .icon-green-task-batchCreate {padding:2px 7px 2px 10px; background:url(images/main/zt-icons.png) -20px -242px;} /* Bug icons. */ -.severity1 {padding:2px 8px; background:url(images/main/zt-icons.png) 0px -381px;} -.severity2 {padding:2px 8px; background:url(images/main/zt-icons.png) -20px -381px;} -.severity3 {padding:2px 8px; background:url(images/main/zt-icons.png) -40px -381px;} -.severity4 {padding:2px 8px; background:url(images/main/zt-icons.png) -60px -381px;} -.severity5 {padding:2px 8px; background:url(images/main/zt-icons.png) -80px -381px;} -.severity6 {padding:2px 8px; background:url(images/main/zt-icons.png) -100px -381px;} +.severity1 {width:17px; margin:0px auto; display:block; background:url(images/main/zt-icons.png) 0px -383px; text-indent:-9999px;} +.severity2 {width:17px; margin:0px auto; display:block; background:url(images/main/zt-icons.png) -20px -383px; text-indent:-9999px;} +.severity3 {width:17px; margin:0px auto; display:block; background:url(images/main/zt-icons.png) -40px -383px; text-indent:-9999px;} +.severity4 {width:17px; margin:0px auto; display:block; background:url(images/main/zt-icons.png) -60px -383px; text-indent:-9999px;} +.severity5 {width:17px; margin:0px auto; display:block; background:url(images/main/zt-icons.png) -80px -383px; text-indent:-9999px;} +.severity6 {width:17px; margin:0px auto; display:block; background:url(images/main/zt-icons.png) -100px -383px; text-indent:-9999px;} .icon-green-bug-confirmBug {padding:2px 8px; background:url(images/main/zt-icons.png) -40px -282px;}
+ $lang->project->fromproject) + $projects; + echo $lang->project->selectProject . ':'; + echo html::select('fromproject', $projects, $fromProject, "class='select-2' onchange='reload($projectID, this.value)'"); + ?> +
- $lang->project->fromproject) + $projects; - echo html::select('fromproject', $projects, $fromProject, "class='select-2' onchange='reload($projectID, this.value)'"); - ?> - project->name ?> idAB;?> priAB;?> task->name;?>
project];?> id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?>pri;?>pri?>'>pri;?> id", $task->name)) echo $task->name;?> >assignedToRealName;?> left;?> story->priList[$story->pri];?>story->priList[$story->pri]?>'>story->priList[$story->pri];?> createLink('product', 'browse', "productID=$story->product"), $products[$story->product], '_blank');?> title);?> planTitle;?> story->priList[$story->pri];?>story->priList[$story->pri]?>'>story->priList[$story->pri];?> title);?> openedBy];?> assignedTo];?> task->priList[$task->pri];?>task->priList[$task->pri]?>'>task->priList[$task->pri];?> id", $task->name)) echo $task->name; diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 6d5aa4f6eb..2d3547d4db 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -49,7 +49,7 @@ createLink('story', 'view', "storyID=$story->id");?>
id);?>story->priList[$story->pri];?>story->priList[$story->pri]?>'>story->priList[$story->pri];?> title, '', "class='preview'");?> openedBy];?> estimate;?>
id));?>pri?>pri?>'>pri?> title);?> createLink('story', 'view', "storyID=$case->story"), $case->storyTitle, '_blank');?>
case);?>pri?>pri?>'>pri?> createLink('testcase', 'view', "caseID=$run->case&version=$run->version"), $run->title, '_blank');?> testcase->typeList[$run->type];?> id]", array_combine(range($case->version, 1), range($case->version, 1)), '', 'class=select-1');?> pri?>pri?>'>pri?> title . ' ( '; diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php index ddb99947d9..02cf648045 100644 --- a/module/user/view/bug.html.php +++ b/module/user/view/bug.html.php @@ -31,7 +31,7 @@
createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?> bug->severityList[$bug->severity]?>bug->priList[$bug->pri]?>bug->priList[$bug->pri]?>'>bug->priList[$bug->pri]?> bug->typeList[$bug->type]?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy];?>
createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?>task->priList[$task->pri];?>task->priList[$task->pri];?>'>task->priList[$task->pri]?> createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?> createLink('task', 'view', "taskID=$task->id"), $task->name);?> estimate;?>id;?> date == '2030-01-01' ? $lang->todo->dayInFuture : $todo->date;?> todo->typeList->{$todo->type};?>pri;?>pri;?>'>pri?> id", $todo->name)) echo $todo->name;?> begin;?> end;?>