execution->featureBar['all'] as $key => $label):?>
@@ -69,13 +54,13 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp
systemMode == 'new')) ? $lang->execution->execName : $lang->execution->name);?>
execution->owner);?>
- execution->end);?>
- execution->execStatus : $lang->execution->status);?>
- execution->totalEstimate;?>
- execution->totalConsumed;?>
- execution->totalLeft;?>
- execution->progress;?>
- execution->burn;?>
+ execution->end);?>
+ execution->execStatus : $lang->execution->status);?>
+ execution->totalEstimate;?>
+ execution->totalConsumed;?>
+ execution->totalLeft;?>
+ execution->progress;?>
+ execution->burn;?>
diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php
index fcf3050be7..8d9d0ed0de 100755
--- a/module/execution/view/batchedit.html.php
+++ b/module/execution/view/batchedit.html.php
@@ -49,23 +49,23 @@
| idAB;?> | +idAB;?> | systemMode == 'new' and isset($project) and $project->model == 'scrum'):?> -execution->project;?> | +execution->project;?> | execution->$name;?> | -execution->$code;?> | -'>execution->$PM;?> | -'>execution->PO;?> | -'>execution->QD;?> | -'>execution->RD;?> | -'>execution->$type;?> | -'>execution->$status;?> | -execution->begin;?> | -execution->end;?> | -'>execution->$desc;?> | -'>execution->teamname;?> | -'>execution->days;?> | +execution->$code;?> | +'>execution->$PM;?> | +'>execution->PO;?> | +'>execution->QD;?> | +'>execution->RD;?> | +'>execution->$type;?> | +'>execution->$status;?> | +execution->begin;?> | +execution->end;?> | +'>execution->$desc;?> | +'>execution->teamname;?> | +'>execution->days;?> | bug->severityAB);?> | -priAB);?> | -bug->title);?> | -openedByAB);?> | -bug->deadlineAB);?> | -assignedToAB);?> | -bug->resolvedBy);?> | -bug->resolutionAB);?> | +bug->severityAB);?> | +priAB);?> | +bug->title);?> | +openedByAB);?> | +bug->deadlineAB);?> | +assignedToAB);?> | +bug->resolvedBy);?> | +bug->resolutionAB);?> | actions;?> | diff --git a/module/execution/view/importbug.html.php b/module/execution/view/importbug.html.php index 6e31f313eb..aa87cd633c 100755 --- a/module/execution/view/importbug.html.php +++ b/module/execution/view/importbug.html.php @@ -36,14 +36,14 @@ var browseType = ''; idAB;?> -bug->severityAB;?> | -priAB;?> | +bug->severityAB;?> | +priAB;?> | bug->title;?> | -bug->statusAB;?> | -'>task->pri;?> | -'>task->assignedTo;?> | -'>task->estimate;?> | -'>task->deadline;?> | +bug->statusAB;?> | +'>task->pri;?> | +'>task->assignedTo;?> | +'>task->estimate;?> | +'>task->deadline;?> | diff --git a/module/execution/view/importtask.html.php b/module/execution/view/importtask.html.php index 4d9087e11a..836c8f5f8d 100644 --- a/module/execution/view/importtask.html.php +++ b/module/execution/view/importtask.html.php @@ -32,13 +32,13 @@ idAB;?> -execution->name ?> | -priAB;?> | +execution->name ?> | +priAB;?> | task->name;?> | -task->assignedTo;?> | -task->leftAB;?> | -task->deadlineAB;?> | -statusAB;?> | +task->assignedTo;?> | +task->leftAB;?> | +task->deadlineAB;?> | +statusAB;?> | task->story;?> | diff --git a/module/execution/view/linkstory.html.php b/module/execution/view/linkstory.html.php index 5bd27a5465..18f5ccfd2e 100644 --- a/module/execution/view/linkstory.html.php +++ b/module/execution/view/linkstory.html.php @@ -39,17 +39,17 @@ idAB;?> -priAB;?> | +priAB;?> | story->title;?> | -story->product;?> | -story->module;?> | -story->plan;?> | -story->stage;?> | +story->product;?> | +story->module;?> | +story->plan;?> | +story->stage;?> | -product->branchName[$productType];?> | +product->branchName[$productType];?> | openedByAB;?> | -story->estimateAB;?> | +story->estimateAB;?> | diff --git a/module/execution/view/managemembers.html.php b/module/execution/view/managemembers.html.php index ed523ff266..07543f6c1e 100644 --- a/module/execution/view/managemembers.html.php +++ b/module/execution/view/managemembers.html.php @@ -38,10 +38,10 @@
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| team->account;?> | team->role;?> | -team->days;?> | -team->hours;?> | -team->limited;?> | -actions;?> | +team->days;?> | +team->hours;?> | +team->limited;?> | +actions;?> | execution->orderAB);?> | +execution->orderAB);?> | -priAB);?> | -execution->storyTitle);?> | -story->category);?> | -openedByAB);?> | +priAB);?> | +execution->storyTitle);?> | +story->category);?> | +openedByAB);?> | assignedToAB);?> | -story->estimateAB);?> | -statusAB);?> | -story->stageAB);?> | -story->taskCountAB;?> | -story->bugCountAB;?> | -story->caseCountAB;?> | +story->estimateAB);?> | +statusAB);?> | +story->stageAB);?> | +story->taskCountAB;?> | +story->bugCountAB;?> | +story->caseCountAB;?> | actions;?> | diff --git a/module/execution/view/testcase.html.php b/module/execution/view/testcase.html.php index e7b166fdb9..2a02898d7c 100644 --- a/module/execution/view/testcase.html.php +++ b/module/execution/view/testcase.html.php @@ -23,14 +23,14 @@ recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>||||
| idAB);?> | -priAB);?> | -testcase->title);?> | -typeAB);?> | -openedByAB);?> | -testtask->lastRunAccount);?> | -testtask->lastRunTime);?> | -testtask->lastRunResult);?> | +idAB);?> | +priAB);?> | +testcase->title);?> | +typeAB);?> | +openedByAB);?> | +testtask->lastRunAccount);?> | +testtask->lastRunTime);?> | +testtask->lastRunResult);?> | statusAB);?> | actions;?> | testtask->name);?> | testtask->build);?> | -testtask->owner);?> | -testtask->begin);?> | -testtask->end);?> | -statusAB);?> | +testtask->owner);?> | +testtask->begin);?> | +testtask->end);?> | +statusAB);?> | actions;?> | diff --git a/module/gitlab/view/browse.html.php b/module/gitlab/view/browse.html.php index 7536dad016..bd21d2e159 100644 --- a/module/gitlab/view/browse.html.php +++ b/module/gitlab/view/browse.html.php @@ -32,8 +32,8 @@|||||||||
| gitlab->id);?> | -gitlab->name);?> | +gitlab->id);?> | +gitlab->name);?> | gitlab->url);?> | actions;?> |
| gitlab->gitlabIssue;?> | -gitlab->objectType;?> | -product->common;?> | -execution->common;?> | +gitlab->gitlabIssue;?> | +gitlab->objectType;?> | +product->common;?> | +execution->common;?> |
|---|
| group->id;?> | -group->name;?> | -group->desc;?> | +group->id;?> | +group->name;?> | +group->desc;?> | group->users;?> | actions;?> | ||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| jenkins->id); ?> | -jenkins->name); ?> | +jenkins->id); ?> | +jenkins->name); ?> | jenkins->url); ?> | actions; ?> | ||||||||||||||||||||||||||||||||
| job->id);?> | +job->id);?> | job->name);?> | -job->repo);?> | -job->engine);?> | -job->frame);?> | -job->buildSpec);?> | +job->repo);?> | +job->engine);?> | +job->frame);?> | +job->buildSpec);?> | job->triggerType;?> | -job->lastStatus);?> | -job->lastExec);?> | -actions;?> | +job->lastStatus);?> | +job->lastExec);?> | +actions;?> | mail->toList);?> | -mail->subject);?> | -mail->createdBy);?> | -mail->createdDate);?> | -mail->sendTime);?> | -mail->status);?> | -mail->failReason;?> | +mail->toList);?> | +mail->subject);?> | +mail->createdBy);?> | +mail->createdDate);?> | +mail->sendTime);?> | +mail->status);?> | +mail->failReason;?> | actions;?> | @@ -43,7 +43,7 @@|||||
|
-
+
id?>
diff --git a/module/my/css/common.css b/module/my/css/common.css
index d3dc6da131..7f537d48f0 100644
--- a/module/my/css/common.css
+++ b/module/my/css/common.css
@@ -8,4 +8,3 @@
.dropdown-list > li > a:focus {color: #1a4f85; text-decoration: none; background-color: #ddd;}
.btn-toolbar .nav-title {float: left; display: inline-block; padding: 6px 12px; margin-bottom: 0; font-size: 13px; font-weight: bolder; line-height: 18px; text-align: center; white-space: nowrap; vertical-align: middle;}
-.c-hours {text-align: right;}
diff --git a/module/my/css/project.css b/module/my/css/project.css
index 16862f86fc..0503e90a47 100644
--- a/module/my/css/project.css
+++ b/module/my/css/project.css
@@ -1,3 +1,5 @@
#projectTableList > tr.drop-not-allowed {opacity: 0.1 !important;}
#projectList .c-actions {overflow: visible;}
#projectTableList > tr:last-child .c-actions .dropdown-menu {top: auto; bottom: 100%; margin-bottom: -5px;}
+
+.c-budget {width: 100px;}
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index fe42b07dfd..c5b9b2f88e 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -45,7 +45,7 @@
+ |
|
-
@@ -53,25 +53,25 @@
idAB);?>
bug->severityAB);?> |
- priAB);?> |
- bug->title);?> |
- bug->product);?> |
- typeAB);?> |
+ bug->severityAB);?> |
+ priAB);?> |
+ bug->title);?> |
+ bug->product);?> |
+ typeAB);?> |
- openedByAB);?> |
+ openedByAB);?> |
rawMethod == 'work'):?>
- bug->deadlineAB);?> |
+ bug->deadlineAB);?> |
- bug->assignedTo);?> |
+ bug->assignedTo);?> |
- bug->resolvedByAB);?> |
+ bug->resolvedByAB);?> |
- bug->resolutionAB);?> |
- actions;?> |
+ bug->resolutionAB);?> |
+ actions;?> |
idAB;?> |
+ idAB;?> |
my->name;?> |
systemMode == 'new'):?>
my->projects;?> |
@@ -42,9 +42,9 @@
statusAB;?> |
team->role;?> |
team->join;?> |
- my->hours;?> |
- execution->assignedToMe;?> |
- execution->progress;?> |
+ my->hours;?> |
+ execution->assignedToMe;?> |
+ execution->progress;?> |
|
| idAB;?> | +idAB;?> | project->name;?> | -project->status;?> | +project->status;?> | -project->begin;?> | -project->end;?> | -project->budget;?> | -project->PM;?> | -actions;?> | +project->begin;?> | +project->end;?> | +project->budget;?> | +project->PM;?> | +actions;?> | idAB);?> | user->realname);?> | -user->account);?> | -user->role);?> | -user->email);?> | -user->gender);?> | -user->phone);?> | -config->isINT) ? common::printOrderLink('skype', $orderBy, $vars, $lang->user->skype) : common::printOrderLink('qq', $orderBy, $vars, $lang->user->qq);?> | -user->last);?> | -user->visits);?> | +user->account);?> | +user->role);?> | +user->email);?> | +user->gender);?> | +user->phone);?> | +config->isINT) ? common::printOrderLink('skype', $orderBy, $vars, $lang->user->skype) : common::printOrderLink('qq', $orderBy, $vars, $lang->user->qq);?> | +user->last);?> | +user->visits);?> | @@ -39,7 +39,7 @@ include '../../common/view/header.html.php';id);?> | id&from=my", $user->realname, '', "title='$user->realname' data-group='my'")) echo $user->realname;?> | account;?> | -'>user->roleList, $user->role, '');?> | +'>user->roleList, $user->role, '');?> | email);?> | user->genderList, $user->gender, $user->gender);?> | phone;?> | diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index 4c854bb812..46a93088ca 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -14,9 +14,6 @@ recTotal);?> rawMethod);?> - testcase->confirmDelete)?>priAB);?> | -testcase->title);?> | +priAB);?> | +testcase->title);?> | -testtask->common);?> | +testtask->common);?> | -typeAB);?> | -openedByAB);?> | -testtask->lastRunAccount);?> | -testtask->lastRunTime);?> | -testtask->lastRunResult);?> | -statusAB);?> | +typeAB);?> | +openedByAB);?> | +testtask->lastRunAccount);?> | +testtask->lastRunTime);?> | +testtask->lastRunResult);?> | +statusAB);?> | actions;?> | diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index c65c3115e8..b371ef8b25 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -33,13 +33,13 @@
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| idAB);?> | -testtask->name);?> | -testtask->execution);?> | -testtask->build);?> | -testtask->begin);?> | -testtask->end);?> | -statusAB);?> | +idAB);?> | +testtask->name);?> | +testtask->execution);?> | +testtask->build);?> | +testtask->begin);?> | +testtask->end);?> | +statusAB);?> | actions;?> |