+
action->periods as $period => $label):?>
$label";
@@ -28,9 +29,8 @@
?>
-
-
+
+
$actions):?>
diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php
index 6f27e66325..e0f0ac5d28 100755
--- a/module/user/view/featurebar.html.php
+++ b/module/user/view/featurebar.html.php
@@ -4,7 +4,7 @@
" . $userList . "
";
+ echo "
" . $userList . "
";
$methodName = $this->app->getMethodName();
@@ -36,7 +36,7 @@
echo html::a($this->createLink('user', 'bug', "account=$account"), $label, '', "class='btn btn-link $active'");
$label = "
{$lang->user->test}";
- $active = $methodName == 'testtask' ? ' btn-active-text' : '';
+ $active = ($methodName == 'testtask' or $methodName == 'testcase')? ' btn-active-text' : '';
echo html::a($this->createLink('user', 'testtask', "account=$account"), $label, '', "class='btn btn-link $active'");
}
diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php
index 976d69dd8b..c02bed9610 100644
--- a/module/user/view/profile.html.php
+++ b/module/user/view/profile.html.php
@@ -13,15 +13,16 @@
-
-
-
- icons['user']);?> id;?>
- realname;?> (account;?>)
- user->profile;?>
-
-
- createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?>
+
+
+
+ icons['user']);?>
+ realname;?> (account;?>)
+ user->profile;?>
+
+
+ createLink('user', 'edit', "userID=$user->id"), html::icon('pencil') . ' ' . $lang->user->editProfile, '', "class='btn btn-primary'"); ?>
+
diff --git a/module/user/view/project.html.php b/module/user/view/project.html.php
index 3b1e89eb4b..65498bf742 100644
--- a/module/user/view/project.html.php
+++ b/module/user/view/project.html.php
@@ -14,40 +14,42 @@
-
-
-
- | idAB;?> |
- project->code;?> |
- project->name;?> |
- project->begin;?> |
- project->end;?> |
- statusAB;?> |
- team->role;?> |
- team->join;?> |
- team->hours;?> |
-
-
-
-
- createLink('project', 'browse', "projectID=$project->id");?>
-
- | id);?> |
- code;?> |
- name);?> |
- begin;?> |
- end;?> |
- delay)):?>
- project->delayed;?> |
-
- project->statusList[$project->status];?> |
-
- role;?> |
- join;?> |
- hours;?> |
-
-
-
-
+
+
+
+
+ | idAB;?> |
+ project->code;?> |
+ project->name;?> |
+ project->begin;?> |
+ project->end;?> |
+ statusAB;?> |
+ team->role;?> |
+ team->join;?> |
+ team->hours;?> |
+
+
+
+
+ createLink('project', 'browse', "projectID=$project->id");?>
+
+ | id);?> |
+ code;?> |
+ name);?> |
+ begin;?> |
+ end;?> |
+ delay)):?>
+ project->delayed;?> |
+
+ project->statusList[$project->status];?> |
+
+ role;?> |
+ join;?> |
+ hours;?> |
+
+
+
+
+
diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php
index 9c4e561169..67a6f6477a 100644
--- a/module/user/view/story.html.php
+++ b/module/user/view/story.html.php
@@ -13,51 +13,60 @@
-
-
- " . html::a(inlink('story', "account=$account&type=assignedTo"), $lang->user->assignedTo) . "";
- echo "- " . html::a(inlink('story', "account=$account&type=openedBy"), $lang->user->openedBy) . "
";
- echo "- " . html::a(inlink('story', "account=$account&type=reviewedBy"), $lang->user->reviewedBy) . "
";
- echo "- " . html::a(inlink('story', "account=$account&type=closedBy"), $lang->user->closedBy) . "
";
- ?>
-
-
-
-
-
- | idAB;?> |
- priAB;?> |
- story->product;?> |
- story->title;?> |
- story->plan;?> |
- openedByAB;?> |
- story->estimateAB;?> |
- statusAB;?> |
- story->stageAB;?> |
-
-
-
- $story):?>
- createLink('story', 'view', "id=$story->id");?>
-
- | id));?> |
- story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> |
- productTitle;?> |
- title);?> |
- planTitle;?> |
- openedBy];?> |
- estimate;?> |
- story->statusList[$story->status];?> |
- story->stageList[$story->stage];?> |
-
-
-
-
-
-
-
+
+
+
+
+
+
+ | idAB;?> |
+ priAB;?> |
+ story->product;?> |
+ story->title;?> |
+ story->plan;?> |
+ openedByAB;?> |
+ story->estimateAB;?> |
+ statusAB;?> |
+ story->stageAB;?> |
+
+
+
+ $story):?>
+ createLink('story', 'view', "id=$story->id");?>
+
+ | id));?> |
+ story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> |
+ productTitle;?> |
+ title);?> |
+ planTitle;?> |
+ openedBy];?> |
+ estimate;?> |
+ story->statusList[$story->status];?> |
+ story->stageList[$story->stage];?> |
+
+
+
+
+
+
+
+
-
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index 66c7849d13..f5201bde09 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -13,51 +13,62 @@
-
-
- " . html::a(inlink('task', "account=$account&type=assignedTo"), $lang->user->assignedTo) . "";
- echo "- " . html::a(inlink('task', "account=$account&type=openedBy"), $lang->user->openedBy) . "
";
- echo "- " . html::a(inlink('task', "account=$account&type=finishedBy"), $lang->user->finishedBy) . "
";
- echo "- " . html::a(inlink('task', "account=$account&type=closedBy"), $lang->user->closedBy) . "
";
- echo "- " . html::a(inlink('task', "account=$account&type=canceledBy"), $lang->user->canceledBy) . "
";
- ?>
-
-
-
-
-
- | idAB;?> |
- priAB;?> |
- task->project;?> |
- task->name;?> |
- task->estimateAB;?> |
- task->consumedAB;?> |
- task->leftAB;?> |
- task->deadlineAB;?> |
- statusAB;?> |
-
-
-
-
-
- | createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?> |
- task->priList, $task->pri, $task->pri);?>'>pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri)?> |
- createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?> |
- createLink('task', 'view', "taskID=$task->id"), $task->name);?> |
- estimate;?> |
- consumed;?> |
- left;?> |
- delay)) echo 'delayed';?>>deadline, 0, 4) > 0) echo $task->deadline;?> |
- task->statusList[$task->status];?> |
-
-
-
-
-
-
-
+
+
+
+
+
+
+ | idAB;?> |
+ priAB;?> |
+ task->project;?> |
+ task->name;?> |
+ task->estimateAB;?> |
+ task->consumedAB;?> |
+ task->leftAB;?> |
+ task->deadlineAB;?> |
+ statusAB;?> |
+
+
+
+
+
+ | createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?> |
+ task->priList, $task->pri, $task->pri);?>'>pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri)?> |
+ createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?> |
+ createLink('task', 'view', "taskID=$task->id"), $task->name);?> |
+ estimate;?> |
+ consumed;?> |
+ left;?> |
+ delay)) echo 'delayed';?>>deadline, 0, 4) > 0) echo $task->deadline;?> |
+ task->statusList[$task->status];?> |
+
+
+
+
+
+
+
+
-
diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php
index ddcbe69eb0..56ca4d2fc2 100755
--- a/module/user/view/testcase.html.php
+++ b/module/user/view/testcase.html.php
@@ -12,51 +12,59 @@
?>
-
-
- " . html::a($this->createLink('user', 'testtask', "account=$account"), $lang->user->testTask2Him) . "";
- echo "- " . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"), $lang->user->case2Him) . "
";
- echo "- " . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"), $lang->user->caseByHim) . "
";
- ?>
-
-
+
+
-
- app->loadLang('testtask');
- ?>
-
-
- | idAB);?> |
- priAB);?> |
- testcase->title);?> |
- typeAB);?> |
- openedByAB);?> |
- testtask->lastRunAccount);?> |
- testtask->lastRunTime);?> |
- testtask->lastRunResult);?> |
- statusAB);?> |
-
-
-
-
- case : $case->id?>
-
- | createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), sprintf('%03d', $caseID));?> |
- testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri)?> |
- createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title);?> |
- testcase->typeList[$case->type];?> |
- openedBy];?> |
- lastRunner];?> |
- lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> |
- lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> |
- testcase->statusList[$case->status];?> |
-
-
-
- | show();?> |
-
-
+
+
+ app->loadLang('testtask');
+ ?>
+
+
+ | idAB);?> |
+ priAB);?> |
+ testcase->title);?> |
+ typeAB);?> |
+ openedByAB);?> |
+ testtask->lastRunAccount);?> |
+ testtask->lastRunTime);?> |
+ testtask->lastRunResult);?> |
+ statusAB);?> |
+
+
+
+
+ case : $case->id?>
+
+ | createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), sprintf('%03d', $caseID));?> |
+ testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri)?> |
+ createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title);?> |
+ testcase->typeList[$case->type];?> |
+ openedBy];?> |
+ lastRunner];?> |
+ lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> |
+ lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> |
+ testcase->statusList[$case->status];?> |
+
+
+
+
+
+
+
+
+
diff --git a/module/user/view/testtask.html.php b/module/user/view/testtask.html.php
index e3a704a358..94d9bb539a 100755
--- a/module/user/view/testtask.html.php
+++ b/module/user/view/testtask.html.php
@@ -12,46 +12,48 @@
?>
-
-
- " . html::a($this->createLink('user', 'testtask', "account=$account"), $lang->user->testTask2Him) . "";
- echo "- " . html::a($this->createLink('user', 'testcase', "account=$account&type=case2Him"), $lang->user->case2Him) . "
";
- echo "- " . html::a($this->createLink('user', 'testcase', "account=$account&type=caseByHim"), $lang->user->caseByHim) . "
";
- ?>
-
-
-
-
-
-
- | idAB);?> |
- testtask->name);?> |
- testtask->project);?> |
- testtask->build);?> |
- testtask->begin);?> |
- testtask->end);?> |
- statusAB);?> |
-
-
-
-
-
- | createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?> |
- createLink('testtask', 'view', "taskID=$task->id"), $task->name);?> |
- projectName?> |
- build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?> |
- begin?> |
- end?> |
- testtask->statusList[$task->status];?> |
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ | idAB);?> |
+ testtask->name);?> |
+ testtask->project);?> |
+ testtask->build);?> |
+ testtask->begin);?> |
+ testtask->end);?> |
+ statusAB);?> |
+
+
+
+
+
+ | createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?> |
+ createLink('testtask', 'view', "taskID=$task->id"), $task->name);?> |
+ projectName?> |
+ build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?> |
+ begin?> |
+ end?> |
+ testtask->statusList[$task->status];?> |
+
+
+
+
+
+
+
+
-
diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php
index 3fdff6d261..21074bec8d 100644
--- a/module/user/view/todo.html.php
+++ b/module/user/view/todo.html.php
@@ -13,23 +13,26 @@
-
-
-
- todo->periods as $period => $label)
- {
- $vars = "account={$account}&date=$period";
- if($period == 'before') $vars .= "&status=undone";
- echo "- " . html::a(inlink('todo', $vars), $label) . '
';
- }
- ?>
-
-
+
+