Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* ajusted views of module 'project'.

Browse Source
This commit is contained in:
Catouse
2014-03-25 14:07:37 +08:00
parent c1fd283142
commit a1c3b8582e
34 changed files with 534 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/common/lang/zh-cn.php
View File

@@ -414,6 +414,7 @@ $lang->icons['plan'] = 'flag';
$lang->icons['dynamic'] = 'volume-up';
$lang->icons['build'] = 'tag';
$lang->icons['test'] = 'check';
$lang->icons['team'] = 'group';
$lang->icons['create'] = 'plus';
$lang->icons['batchCreate'] = 'plus-sign';
@@ -432,5 +433,7 @@ $lang->icons['link'] = 'link';
$lang->icons['close'] = 'off';
$lang->icons['activate'] = 'off';
$lang->icons['review'] = 'search';
$lang->icons['putoff'] = 'calendar';
$lang->icons['suspend'] = 'pause';
include (dirname(__FILE__) . '/menuOrder.php');

5
module/project/css/manageproducts.css
View File

@@ -0,0 +1,5 @@
#productsBox {border-bottom: 1px solid #ddd; padding: 20px; margin-bottom: 20px;}
#productsBox > label {padding: 8px 15px; border:1px solid #ddd; min-width: 33.333333333%}
#productsBox > label > input {margin-left: 0; margin-right: 5px;}
#productsBox > label:hover {background: #f1f1f1}
#productsBox > label.checked, #productsBox > label.checked:hover {background: #E5FFE6; border: 1px solid #229F24;}

14
module/project/js/manageproducts.js Normal file
View File

@@ -0,0 +1,14 @@
$(function()
{
$('#productsBox input:checkbox').each(function()
{
var cb = $(this);
if(cb.attr('checked')) cb.closest('label').addClass('checked');
});
$('#productsBox input:checkbox').change(function()
{
var cb = $(this);
cb.closest('label').toggleClass('checked', cb.attr('checked'));
});
})

3
module/project/lang/zh-cn.php
View File

@@ -56,6 +56,7 @@ $lang->project->all = '所有';
$lang->project->typeDesc = '长期项目禁用燃尽图，运维项目禁用燃尽图和需求。';
$lang->project->mine = '我负责：';
$lang->project->other = '其他：';
$lang->project->deleted = '已删除';
$lang->project->start = '开始';
$lang->project->activate = '激活';
@@ -219,3 +220,5 @@ $lang->project->selectGroup->suspended = '(已挂起)';
$lang->project->selectGroup->done = '(已结束)';
$lang->project->projectTasks = '项目';
$lang->project->byUser = '按用户';

2
module/project/view/activate.html.php
View File

@@ -21,7 +21,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
</tr>
<tr>
<td colspan='2' class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
</tr>
</table>
<?php include '../../common/view/action.html.php';?>

4
module/project/view/batchedit.html.php
View File

@@ -25,7 +25,7 @@
<th class='w-150px'> <?php echo $lang->project->days;?></th>
</tr>
<?php foreach($projectIDList as $projectID):?>
<tr class='a-center'>
<tr class='text-center'>
<td><?php echo sprintf('%03d', $projectID) . html::hidden("projectIDList[$projectID]", $projectID);?></td>
<td><?php echo html::input("names[$projectID]", $projects[$projectID]->name, "class='text-1'");?></td>
<td><?php echo html::input("codes[$projectID]", $projects[$projectID]->code, "class='text-1'");?></td>
@@ -36,7 +36,7 @@
<td><?php echo html::input("dayses[$projectID]", $projects[$projectID]->days, "class='w-100px'") . $lang->project->day;?></td>
</tr>
<?php endforeach;?>
<tfoot><tr><td colspan='8' class='a-center'><?php echo html::submitButton();?></td></tr></tfoot>
<tfoot><tr><td colspan='8' class='text-center'><?php echo html::submitButton();?></td></tr></tfoot>
</table>
</form>
<?php include '../../common/view/footer.html.php';?>

31
module/project/view/bug.html.php
View File

@@ -11,19 +11,18 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<table class='table-1 fixed colored tablesorter' id='bugList'>
<caption class='caption-tl pb-10px'>
<div class='f-left'>
<?php
echo $lang->project->bug;
if($build) echo '<span class="red">(Build:' . $build->name . ')</span>';
?>
<div id='featurebar'>
<div class='heading'>
<?php echo html::icon($lang->icons['bug']);?> <?php echo $lang->project->bug;?>
<?php if($build) echo ' <span class="label label-danger">Build:' . $build->name . '</span>'; ?>
</div>
<div class='f-right'><?php common::printIcon('bug', 'create', "productID=$productID&extra=projectID=$project->id");?></div>
</caption>
<div class='actions'>
<?php common::printIcon('bug', 'create', "productID=$productID&extra=projectID=$project->id");?>
</div>
</div>
<table class='table table-fixed tablesorter' id='bugList'>
<thead>
<tr class='colhead'>
<tr>
<?php $vars = "projectID={$project->id}&orderBy=%s&build=$buildID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-severity'><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
@@ -38,22 +37,22 @@
</thead>
<tbody>
<?php foreach($bugs as $bug):?>
<tr class='a-center'>
<tr class='text-center'>
<td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
<td><span class='<?php echo 'severity' . $lang->bug->severityList[$bug->severity]?>'><?php echo $lang->bug->severityList[$bug->severity]?></span></td>
<td><span class='<?php echo 'pri' . $lang->bug->priList[$bug->pri]?>'><?php echo $lang->bug->priList[$bug->pri]?></span></td>
<td class='a-left' title="<?php echo $bug->title?>"><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
<td class='text-left' title="<?php echo $bug->title?>"><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
<td><?php echo zget($users, $bug->openedBy, $bug->openedBy);?></td>
<td><?php echo zget($users, $bug->assignedTo, $bug->assignedTo);?></td>
<td><?php echo zget($users, $bug->resolvedBy, $bug->resolvedBy);?></td>
<td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
<td class='a-right'>
<td class='text-right'>
<?php
$params = "bugID=$bug->id";
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', '', '', 'iframe', true);
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'search', '', 'iframe', true);
common::printIcon('bug', 'assignTo', $params, '', 'list', '', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'list', '', '', 'iframe', true);
common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true);
common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe text-danger', true);
common::printIcon('bug', 'edit', $params, $bug, 'list');
common::printIcon('bug', 'create', "product=$bug->product&extra=bugID=$bug->id", $bug, 'list', 'copy');
?>

33
module/project/view/build.html.php
View File

@@ -13,13 +13,18 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php js::set('confirmDelete', $lang->build->confirmDelete)?>
<table class='table-1 tablesorter fixed' id='buildList'>
<caption class='caption-tl pb-10px'>
<div class='f-left'><?php echo $lang->project->build;?></div>
<div class='f-right'><?php common::printIcon('build', 'create', "project=$project->id");?></div>
</caption>
<div id='featurebar'>
<div class='heading'>
<?php echo html::icon($lang->icons['build']);?> <?php echo $lang->project->build;?>
</div>
<div class='actions'>
<?php common::printIcon('build', 'create', "project=$project->id");?>
</div>
</div>
<table class='table tablesorter table-fixed' id='buildList'>
<thead>
<tr class='colhead'>
<tr>
<th class='w-id'><?php echo $lang->build->id;?></th>
<th class='w-120px'><?php echo $lang->build->product;?></th>
<th><?php echo $lang->build->name;?></th>
@@ -27,29 +32,29 @@
<th><?php echo $lang->build->filePath;?></th>
<th class='w-date'><?php echo $lang->build->date;?></th>
<th class='w-user'><?php echo $lang->build->builder;?></th>
<th class='w-150px'><?php echo $lang->actions;?></th>
<th class='w-80px'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
<?php foreach($builds as $build):?>
<tr class='a-center'>
<tr class='text-center'>
<td><?php echo $build->id;?></td>
<td><?php echo $build->productName;?></td>
<td class='a-left'><?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name);?></td>
<td class='a-left' title="<?php echo $build->scmPath?>"><?php strpos($build->scmPath, 'http') === 0 ? printf(html::a($build->scmPath)) : printf($build->scmPath);?></td>
<td class='a-left' title="<?php echo $build->filePath?>"><?php strpos($build->filePath, 'http') === 0 ? printf(html::a($build->filePath)) : printf($build->filePath);?></td>
<td class='text-left'><?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name);?></td>
<td class='text-left' title="<?php echo $build->scmPath?>"><?php strpos($build->scmPath, 'http') === 0 ? printf(html::a($build->scmPath)) : printf($build->scmPath);?></td>
<td class='text-left' title="<?php echo $build->filePath?>"><?php strpos($build->filePath, 'http') === 0 ? printf(html::a($build->filePath)) : printf($build->filePath);?></td>
<td><?php echo $build->date?></td>
<td><?php echo $users[$build->builder]?></td>
<td class='a-right'>
<td class='text-right'>
<?php
common::printIcon('testtask', 'create', "product=0&project=$project->id&build=$build->id", '', 'list');
$lang->project->bug = $lang->project->viewBug;
common::printIcon('project', 'bug', "project=$project->id&orderBy=status&build=$build->id", '', 'list');
common::printIcon('build', 'edit', "buildID=$build->id");
common::printIcon('build', 'edit', "buildID=$build->id", '', 'list');
if(common::hasPriv('build', 'delete'))
{
$deleteURL = $this->createLink('build', 'delete', "buildID=$build->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"buildList\",confirmDelete)", '<i class="icon-green-common-delete"></i>', '', "class='link-icon' title='{$lang->build->delete}'");
echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"buildList\",confirmDelete)", '<i class="icon-remove"></i>', '', "class='btn-icon' title='{$lang->build->delete}'");
}
?>
</td>

2
module/project/view/burn.html.php
View File

@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include './taskheader.html.php';?>
<script>$('#burnTab').addClass('active');</script>
<div class='a-center'>
<div class='text-center'>
<?php
echo $charts;
common::printLink('project', 'computeBurn', 'reload=yes', $lang->project->computeBurn, 'hiddenwin');

2
module/project/view/close.html.php
View File

@@ -20,7 +20,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
</tr>
<tr>
<td colspan='2' class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
</tr>
</table>
<?php include '../../common/view/action.html.php';?>

4
module/project/view/create.html.php
View File

@@ -77,7 +77,7 @@ $(document).ready(function()
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
<td class='a-left' id='productsBox'><?php echo html::select("products[]", $allProducts, $products, "class='select-1 chosen' data-placeholder='{$lang->project->linkProduct}' multiple");?></td>
<td class='text-left' id='productsBox'><?php echo html::select("products[]", $allProducts, $products, "class='select-1 chosen' data-placeholder='{$lang->project->linkProduct}' multiple");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->desc;?></th>
@@ -92,7 +92,7 @@ $(document).ready(function()
<td><?php echo html::checkbox('whitelist', $groups, $whitelist);?></td>
</tr>
<tr>
<td colspan='2' class='a-center'><?php echo html::submitButton() . html::backButton();?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
</tr>
</table>
</form>

24
module/project/view/doc.html.php
View File

@@ -12,13 +12,17 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<?php js::set('confirmDelete', $lang->doc->confirmDelete)?>
<table class='table-1 fixed colored tablesorter' align='center' id='docList'>
<caption class='caption-tl pb-10px'>
<div class='f-left'> <?php echo $lang->project->doc;?></div>
<div class='f-right'><?php common::printIcon('doc', 'create', "libID=project&moduleID=0&productID=0&projectID=$project->id&from=project");?></div>
</caption>
<div class='container'>
<div id='featurebar'>
<div class='heading'>
<?php echo html::icon($lang->icons['doc']);?> <?php echo $lang->project->doc;?>
</div>
<div class='actions'>
<?php common::printIcon('doc', 'create', "libID=project&moduleID=0&productID=0&projectID=$project->id&from=project");?>
</div>
</div>
<table class='table table-fixed tablesorter' align='center' id='docList'>
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->idAB;?></th>
@@ -35,7 +39,7 @@
$viewLink = $this->createLink('doc', 'view', "docID=$doc->id");
$canView = common::hasPriv('doc', 'view');
?>
<tr class='a-center'>
<tr class='text-center'>
<td><?php if($canView) echo html::a($viewLink, sprintf('%03d', $doc->id)); else printf('%03d', $doc->id);?></td>
<td><?php if(isset($modules[$doc->module]))print($modules[$doc->module]);?></td>
<td class='a-left nobr'><nobr><?php echo html::a($viewLink, $doc->title);?></nobr></td>
@@ -43,11 +47,11 @@
<td><?php echo $doc->addedDate;?></td>
<td>
<?php
common::printIcon('doc', 'edit', "doc=$doc->id");
common::printIcon('doc', 'edit', "doc=$doc->id", '', 'list');
if(common::hasPriv('doc', 'delete'))
{
$deleteURL = $this->createLink('doc', 'delete', "docID=$doc->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"docList\",confirmDelete)", '<i class="icon-green-common-delete"></i>', '', "class='link-icon' title='{$lang->doc->delete}'");
echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"docList\",confirmDelete)", '<i class="icon-remove"></i>', '', "class='btn-icon' title='{$lang->doc->delete}'");
}
?>
</td>
@@ -55,4 +59,6 @@
<?php endforeach;?>
</tbody>
</table>
</div>
<?php include '../../common/view/footer.html.php';?>

44
module/project/view/dynamic.html.php
View File

@@ -13,22 +13,40 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<div id='featurebar'>
<div class='heading'>
<?php echo html::icon($lang->icons['dynamic']);?> <?php echo $lang->project->dynamic;?>
</div>
<ul class='nav'>
<?php
echo '<span id="today">' . html::a(inlink('dynamic', "projectID=$projectID&type=today"), $lang->action->dynamic->today) . '</span>';
echo '<span id="yesterday">' . html::a(inlink('dynamic', "projectID=$projectID&type=yesterday"), $lang->action->dynamic->yesterday) . '</span>';
echo '<span id="twodaysago">' . html::a(inlink('dynamic', "projectID=$projectID&type=twodaysago"), $lang->action->dynamic->twoDaysAgo) . '</span>';
echo '<span id="thisweek">' . html::a(inlink('dynamic', "projectID=$projectID&type=thisweek"), $lang->action->dynamic->thisWeek) . '</span>';
echo '<span id="lastweek">' . html::a(inlink('dynamic', "projectID=$projectID&type=lastweek"), $lang->action->dynamic->lastWeek) . '</span>';
echo '<span id="thismonth">' . html::a(inlink('dynamic', "projectID=$projectID&type=thismonth"), $lang->action->dynamic->thisMonth) . '</span>';
echo '<span id="lastmonth">' . html::a(inlink('dynamic', "projectID=$projectID&type=lastmonth"), $lang->action->dynamic->lastMonth) . '</span>';
echo '<span id="all">' . html::a(inlink('dynamic', "projectID=$projectID&type=all"), $lang->action->dynamic->all) . '</span>';
echo "<span id='account'>" . html::select('account', $users, $account, "onchange=changeUser(this.value,$projectID)") . '</span>';
echo '<li id="today">' . html::a(inlink('dynamic', "projectID=$projectID&type=today"), $lang->action->dynamic->today) . '</li>';
echo '<li id="yesterday">' . html::a(inlink('dynamic', "projectID=$projectID&type=yesterday"), $lang->action->dynamic->yesterday) . '</li>';
echo '<li id="twodaysago">' . html::a(inlink('dynamic', "projectID=$projectID&type=twodaysago"), $lang->action->dynamic->twoDaysAgo) . '</li>';
echo '<li id="thisweek">' . html::a(inlink('dynamic', "projectID=$projectID&type=thisweek"), $lang->action->dynamic->thisWeek) . '</li>';
echo '<li id="lastweek">' . html::a(inlink('dynamic', "projectID=$projectID&type=lastweek"), $lang->action->dynamic->lastWeek) . '</li>';
echo '<li id="thismonth">' . html::a(inlink('dynamic', "projectID=$projectID&type=thismonth"), $lang->action->dynamic->thisMonth) . '</li>';
echo '<li id="lastmonth">' . html::a(inlink('dynamic', "projectID=$projectID&type=lastmonth"), $lang->action->dynamic->lastMonth) . '</li>';
echo '<li id="all">' . html::a(inlink('dynamic', "projectID=$projectID&type=all"), $lang->action->dynamic->all) . '</li>';
// echo "<li id='account'>" . html::select('account', $users, $account, "onchange=changeUser(this.value,$projectID)") . '</li>';
echo "<li id='account' class='dropdown'>";
$current = $users[isset($account) ? $account : ''];
if(empty($current)) $current = $lang->project->byUser;
echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown'");
echo "<ul class='dropdown-menu'>";
foreach ($users as $key => $value)
{
echo '<li' . ($key == $account ? " class='active'" : '') . '>';
if($key == '') echo html::a($this->createLink('project', 'dynamic', "projectID=$projectID&type=all"), $lang->project->all);
else echo html::a($this->createLink('project', 'dynamic', "projectID=$projectID&type=account&param=$key"), $value);
}
echo '</ul></li>';
?>
</ul>
</div>
<table class='table-1 colored tablesorter fixed'>
<table class='table table-fixed'>
<thead>
<tr class='colhead'>
<tr>
<th class='w-150px'><?php echo $lang->action->date;?></th>
<th class='w-user'> <?php echo $lang->action->actor;?></th>
<th class='w-100px'><?php echo $lang->action->action;?></th>
@@ -40,13 +58,13 @@
<tbody>
<?php foreach($actions as $action):?>
<?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
<tr class='a-center'>
<tr class='text-center'>
<td><?php echo $action->date;?></td>
<td><?php isset($users[$action->actor]) ? print($users[$action->actor]) : print($action->actor);?></td>
<td><?php echo $action->actionLabel;?></td>
<td><?php echo $lang->action->objectTypes[$action->objectType];?></td>
<td><?php echo $action->objectID;?></td>
<td class='a-left'><?php echo html::a($action->objectLink, $action->objectName);?></td>
<td class='text-left'><?php echo html::a($action->objectLink, $action->objectName);?></td>
</tr>
<?php endforeach;?>
</tbody>

4
module/project/view/edit.html.php
View File

@@ -67,7 +67,7 @@
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
<td class='a-left' id='productsBox'><?php echo html::select("products[]", $allProducts, $linkedProducts, "class='select-1 chosen' data-placeholder='{$lang->project->linkProduct}' multiple");?></td>
<td class='text-left' id='productsBox'><?php echo html::select("products[]", $allProducts, $linkedProducts, "class='select-1 chosen' data-placeholder='{$lang->project->linkProduct}' multiple");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->desc;?></th>
@@ -81,7 +81,7 @@
<th class='rowhead'><?php echo $lang->project->whitelist;?></th>
<td id='whitelistBox'><?php echo html::checkbox('whitelist', $groups, $project->whitelist);?></td>
</tr>
<tr><td colspan='2' class='a-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
<tr><td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
</table>
</form>
<?php include '../../common/view/footer.html.php';?>

2
module/project/view/grouptask.html.php
View File

@@ -91,7 +91,7 @@
?>
<tr id='<?php echo $task->id;?>' class='a-center child-of-node-<?php echo $groupKey;?>'>
<td class='<?php echo $groupClass;?>'></td>
<td class='a-left'>&nbsp;<?php echo $task->id . $lang->colon; if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
<td class='text-left'>&nbsp;<?php echo $task->id . $lang->colon; if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
<td><span class='<?php echo 'pri' . $task->pri?>'><?php echo $task->pri;?></span></td>
<td <?php echo $assignedToClass;?>><?php echo $task->assignedToRealName;?></td>
<td><?php echo $users[$task->finishedBy];?></td>

2
module/project/view/importbug.html.php
View File

@@ -37,7 +37,7 @@ var browseType = '<?php echo $browseType;?>';
</thead>
<tbody>
<?php foreach($bugs as $bug):?>
<tr class='a-center'>
<tr class='text-center'>
<td>
<?php echo html::checkbox("import[$bug->id]", '');?>
<?php echo sprintf('%03d', $bug->id) . html::hidden("id[$bug->id]", $bug->id);?>

2
module/project/view/importtask.html.php
View File

@@ -37,7 +37,7 @@
<tbody>
<?php foreach($tasks2Imported as $task):?>
<?php $class = $task->assignedTo == $app->user->account ? 'style=color:red' : '';?>
<tr class='a-center'>
<tr class='text-center'>
<td>
<input type='checkbox' name='tasks[]' value='<?php echo $task->id;?>' />

8
module/project/view/index.html.php
View File

@@ -36,15 +36,15 @@
</tr>
<?php $canBatchEdit = common::hasPriv('project', 'batchEdit'); ?>
<?php foreach($projectStats as $project):?>
<tr class='a-center'>
<tr class='text-center'>
<td>
<?php if($canBatchEdit):?>
<input type='checkbox' name='projectIDList[<?php echo $project->id;?>]' value='<?php echo $project->id;?>' />
<?php endif;?>
<?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), sprintf('%03d', $project->id));?>
</td>
<td class='a-left'><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name);?></td>
<td class='a-left'><?php echo $project->code;?></td>
<td class='text-left'><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name);?></td>
<td class='text-left'><?php echo $project->code;?></td>
<td><?php echo $users[$project->PM];?></td>
<td><?php echo $project->end;?></td>
<td><?php echo $lang->project->statusList[$project->status];?></td>
@@ -61,7 +61,7 @@
<?php if($canBatchEdit):?>
<tfoot>
<tr>
<td colspan='10' class='a-right'>
<td colspan='10' class='text-right'>
<div class='f-left'>
<?php echo html::selectAll() . html::selectReverse();?>
<?php echo html::submitButton($lang->project->batchEdit);?>

4
module/project/view/linkstory.html.php
View File

@@ -32,7 +32,7 @@
<?php if(isset($prjStories[$story->id])) continue;?>
<?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id");?>
<tr>
<td class='a-left'>
<td class='text-left'>
<input type='checkbox' name='stories[]' value='<?php echo $story->id;?>'/>
<input type='hidden' name='products[]' value='<?php echo $story->product;?>' />
<?php echo html::a($storyLink, $story->id);?>
@@ -49,7 +49,7 @@
</tbody>
<tfoot>
<tr>
<td colspan='7' class='a-left'>
<td colspan='7' class='text-left'>
<?php
if($storyCount) echo html::selectAll() . html::selectReverse() . html::submitButton();
if(!$storyCount) echo $lang->project->whyNoStories;

2
module/project/view/m.task.html.php
View File

@@ -8,7 +8,7 @@
<h1 onClick="showDetail('task', <?php echo $task->id;?>)"><?php echo $task->name;?></h1>
<div><?php echo $task->desc?></div>
<div id='item<?php echo $task->id;?>'></div>
<div data-role='content' class='a-center'>
<div data-role='content' class='text-center'>
<?php
common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task);
common::printIcon('task', 'start', "taskID=$task->id", $task);

2
module/project/view/managechilds.html.php
View File

@@ -22,7 +22,7 @@
?>
</td>
</tr>
<tr><td class='a-center'><input type='submit' name='submit' /></td></tr>
<tr><td class='text-center'><input type='submit' name='submit' /></td></tr>
</table>
</form>
</div>

21
module/project/view/manageproducts.html.php
View File

@@ -11,13 +11,20 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<div class='container mw-700px'>
<div id='featurebar'>
<div class='heading'>
<?php echo html::icon($lang->icons['product']);?> <?php echo $lang->project->manageProducts;?>
</div>
</div>
<form class='form-condensed' method='post'>
<div id='productsBox'><?php echo html::checkbox("products", $allProducts, $linkedProducts);?><?php echo html::hidden("post", 'post');?></div>
<div class="text-center">
<?php echo html::submitButton();?>
</div>
</form>
</div>
<form method='post'>
<table align='center' class='table-6'>
<caption><?php echo $lang->project->manageProducts;?></caption>
<tr>
<td id='productsBox'><?php echo html::checkbox("products", $allProducts, $linkedProducts);?><?php echo html::hidden("post", 'post');?></td>
</tr>
<tr><td class='a-center'><?php echo html::submitButton();?></td></tr>
</table>
</form>
<?php include '../../common/view/footer.html.php';?>

2
module/project/view/putoff.html.php
View File

@@ -34,7 +34,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
</tr>
<tr>
<td colspan='2' class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
</tr>
</table>
<?php include '../../common/view/action.html.php';?>

2
module/project/view/start.html.php
View File

@@ -20,7 +20,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
</tr>
<tr>
<td colspan='2' class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
</tr>
</table>
<?php include '../../common/view/action.html.php';?>

42
module/project/view/story.html.php
View File

@@ -14,20 +14,22 @@
<?php include '../../common/view/tablesorter.html.php';?>
<?php js::set('confirmUnlinkStory', $lang->project->confirmUnlinkStory)?>
<div id='featurebar'>
<div class='f-left'><?php echo $lang->project->story;?></div>
<div class='f-right'>
<div class='heading'><?php echo html::icon($lang->icons['story']);?> <?php echo $lang->project->story;?></div>
<div class='actions'>
<div class='btn-group'>
<?php
common::printIcon('story', 'export', "productID=$productID&orderBy=id_desc");
$this->lang->story->create = $this->lang->project->createStory;
if($productID) common::printIcon('story', 'create', "productID=$productID&moduleID=0&story=0&project=$project->id");
common::printIcon('project', 'linkStory', "project=$project->id");
common::printIcon('project', 'linkStory', "project=$project->id", '', 'button', 'link');
?>
</div>
</div>
</div>
<form method='post' id='projectStoryForm'>
<table class='table-1 fixed colored tablesorter datatable' id='storyList'>
<table class='table tablesorter' id='storyList'>
<thead>
<tr class='colhead'>
<?php $vars = "projectID={$project->id}&orderBy=%s"; ?>
@@ -35,11 +37,11 @@
<th class='w-pri {sorter:false}'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='{sorter:false}'> <?php common::printOrderLink('title', $orderBy, $vars, $lang->story->title);?></th>
<th class='w-user {sorter:false}'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-hour {sorter:false}'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='w-80px {sorter:false}'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='w-hour {sorter:false}'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
<th class='w-hour {sorter:false}'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-status {sorter:false}'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
<th class='w-50px'> <?php echo $lang->story->taskCount;?></th>
<th class='w-70px'> <?php echo $lang->story->taskCount;?></th>
<th class='w-100px {sorter:false}'> <?php echo $lang->actions;?></th>
</tr>
</thead>
@@ -54,7 +56,7 @@
$storyLink = $this->createLink('story', 'view', "storyID=$story->id");
$totalEstimate += $story->estimate;
?>
<tr class='a-center' id="story<?php echo $story->id?>">
<tr class='text-center' id="story<?php echo $story->id?>">
<td>
<?php if($canBatchEdit or $canBatchClose):?>
<input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' />
@@ -62,11 +64,11 @@
<?php echo html::a($storyLink, sprintf('%03d', $story->id));?>
</td>
<td><span class='<?php echo 'pri' . $lang->story->priList[$story->pri]?>'><?php echo $lang->story->priList[$story->pri];?></span></td>
<td class='a-left' title="<?php echo $story->title?>"><?php echo html::a($storyLink,$story->title);?></td>
<td class='text-left' title="<?php echo $story->title?>"><?php echo html::a($storyLink,$story->title);?></td>
<td><?php echo $users[$story->openedBy];?></td>
<td><?php echo $users[$story->assignedTo];?></td>
<td><?php echo $story->estimate;?></td>
<td class='<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
<td class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
<td><?php echo $lang->story->stageList[$story->stage];?></td>
<td class='linkbox'>
<?php
@@ -74,23 +76,23 @@
$storyTasks[$story->id] > 0 ? print(html::a($tasksLink, $storyTasks[$story->id], '', 'class="iframe"')) : print(0);
?>
</td>
<td class='a-center'>
<td>
<?php
$param = "projectID={$project->id}&story={$story->id}&moduleID={$story->module}";
$lang->task->create = $lang->project->wbs;
common::printIcon('task', 'create', $param, '', 'list');
common::printIcon('task', 'create', $param, '', 'list', 'branch');
$lang->task->batchCreate = $lang->project->batchWBS;
common::printIcon('task', 'batchCreate', "projectID={$project->id}&story={$story->id}", '', 'list');
common::printIcon('task', 'batchCreate', "projectID={$project->id}&story={$story->id}", '', 'list', 'stack');
$lang->testcase->batchCreate = $lang->testcase->create;
if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list');
if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list', 'usecase');
if(common::hasPriv('project', 'unlinkStory'))
{
$unlinkURL = $this->createLink('project', 'unlinkStory', "projectID=$project->id&storyID=$story->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '<i class="icon-remove"></i>', '', "class='link-icon' title='{$lang->project->unlinkStory}'");
echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '<i class="icon-remove"></i>', '', "class='btn-icon' title='{$lang->project->unlinkStory}'");
}
?>
</td>
@@ -100,24 +102,26 @@
<tfoot>
<tr>
<td colspan='10'>
<div class='f-left'>
<div class='table-actions clearfix'>
<?php
if(count($stories))
{
if($canBatchEdit or $canBatchClose) echo html::selectAll() . html::selectReverse();
if($canBatchEdit or $canBatchClose) echo "<div class='btn-group'>" . html::selectAll() . html::selectReverse() . '</div>';
echo "<div class='btn-group'>";
if($canBatchEdit)
{
$actionLink = $this->createLink('story', 'batchEdit', "productID=0&projectID=$project->id");
echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
echo html::commonButton("<i class='icon-pencil'></i> " . $lang->edit, "onclick=\"setFormAction('$actionLink')\"");
}
if($canBatchClose)
{
$actionLink = $this->createLink('story', 'batchClose', "productID=0&projectID=$project->id");
echo html::commonButton($lang->close, "onclick=\"setFormAction('$actionLink')\"");
echo html::commonButton("<i class='icon-off'></i> " . $lang->close, "onclick=\"setFormAction('$actionLink')\"");
}
echo '</div>';
}
echo $summary;
echo "<div class='text'>" . $summary . '</div>';
?>
</div>
</td>

2
module/project/view/suspend.html.php
View File

@@ -20,7 +20,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='area-1'");?></td>
</tr>
<tr>
<td colspan='2' class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList); ?></td>
</tr>
</table>
<?php include '../../common/view/action.html.php';?>

78
module/project/view/task.html.php
View File

@@ -12,7 +12,6 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<?php include '../../common/view/treeview.html.php';?>
<?php include './taskheader.html.php';?>
<?php js::set('moduleID', $moduleID);?>
@@ -20,29 +19,26 @@
<script language='Javascript'>
var browseType = '<?php echo $browseType;?>';
</script>
<div id='querybox' class='<?php if($browseType != 'bysearch') echo 'hidden';?>'></div>
<div class='treeSlider' id='taskTree'><span>&nbsp;</span></div>
<form method='post' id='projectTaskForm'>
<table class='cont-lt2'>
<tr valign='top'>
<td class='side'>
<div class='box-title'><?php echo $project->name;?></div>
<div class='box-content'>
<div class='side' id='taskTree'>
<button class='side-handle' data-id='storyTree'><i class='icon-caret-left'></i></button>
<header class='nobr'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->name;?></strong></header>
<div class='side-body'>
<?php echo $moduleTree;?>
<div class='a-right'>
<div class='text-right'>
<?php common::printLink('project', 'edit', "projectID=$projectID", $lang->edit);?>
<?php common::printLink('project', 'delete', "projectID=$projectID&confirm=no", $lang->delete, 'hiddenwin');?>
<?php common::printLink('tree', 'browsetask', "rootID=$projectID&productID=0", $lang->tree->manage);?>
<?php common::printLink('tree', 'fix', "root=$projectID&type=task", $lang->tree->fix, 'hiddenwin');?>
</div>
</div>
</td>
<td class='divider'></td>
<td>
<table class='table-1 fixed colored tablesorter datatable' id='taskList'>
</div>
<div class='main'>
<form method='post' id='projectTaskForm'>
<table class='table table-condensed table-hover table-striped table-borderless tablesorter table-fixed' id='taskList'>
<?php $vars = "projectID=$project->id&status=$status&parma=$param&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?>
<thead>
<tr class='colhead'>
<tr>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='w-p30'> <?php common::printOrderLink('name', $orderBy, $vars, $lang->task->name);?></th>
@@ -57,12 +53,12 @@ var browseType = '<?php echo $browseType;?>';
<th class='w-user'> <?php common::printOrderLink('finishedBy', $orderBy, $vars, $lang->task->finishedByAB);?></th>
<?php if($this->cookie->windowWidth > $this->config->wideSize):?>
<th class='w-40px'> <?php common::printOrderLink('finishedDate', $orderBy, $vars, $lang->task->finishedDateAB);?></th>
<th class='w-50px'> <?php common::printOrderLink('finishedDate', $orderBy, $vars, $lang->task->finishedDateAB);?></th>
<?php endif;?>
<th class='w-35px'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->task->estimateAB);?></th>
<th class='w-40px'> <?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
<th class='w-40px'> <?php common::printOrderLink('left', $orderBy, $vars, $lang->task->leftAB);?></th>
<th class='w-50px'> <?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
<th class='w-40px nobr'> <?php common::printOrderLink('left', $orderBy, $vars, $lang->task->leftAB);?></th>
<?php if($project->type == 'sprint') print '<th>' and common::printOrderLink('story', $orderBy, $vars, $lang->task->story) and print '</th>';?>
<th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
@@ -70,13 +66,13 @@ var browseType = '<?php echo $browseType;?>';
<tbody>
<?php foreach($tasks as $task):?>
<?php $class = $task->assignedTo == $app->user->account ? 'style=color:red' : ''; ?>
<tr class='a-center'>
<tr class='text-center'>
<td>
<input type='checkbox' name='taskIDList[]' value='<?php echo $task->id;?>'/>
<?php if(!common::printLink('task', 'view', "task=$task->id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?>
</td>
<td><span class='<?php echo 'pri'. $lang->task->priList[$task->pri]?>'><?php echo $lang->task->priList[$task->pri];?></span></td>
<td class='a-left' title="<?php echo $task->name?>">
<td class='text-left' title="<?php echo $task->name?>">
<?php
if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;
if($task->fromBug) echo html::a($this->createLink('bug', 'view', "id=$task->fromBug"), "[BUG#$task->fromBug]", '_blank', "class='bug'");
@@ -107,7 +103,7 @@ var browseType = '<?php echo $browseType;?>';
<?php
if($project->type == 'sprint')
{
echo '<td class="a-left" title="' . $task->storyTitle . '">';
echo '<td class="text-left" title="' . $task->storyTitle . '">';
if($task->storyID)
{
if(!common::printLink('story', 'view', "storyid=$task->storyID", $task->storyTitle)) print $task->storyTitle;
@@ -115,19 +111,19 @@ var browseType = '<?php echo $browseType;?>';
echo '</td>';
}
?>
<td class='a-right'>
<td class='text-right'>
<?php
common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true);
if($browseType == 'needconfirm')
{
$lang->task->confirmStoryChange = $lang->confirm;
common::printIcon('task', 'confirmStoryChange', "taskid=$task->id", '', 'list', '', 'hiddenwin');
}
common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe text-danger', true);
common::printIcon('task', 'edit',"taskID=$task->id", '', 'list');
?>
</td>
@@ -138,24 +134,27 @@ var browseType = '<?php echo $browseType;?>';
<tr>
<?php $columns = ($this->cookie->windowWidth > $this->config->wideSize ? 14 : 12) - ($project->type == 'sprint' ? 0 : 1);?>
<td colspan='<?php echo $columns;?>'>
<div class='f-left'>
<div class='table-actions clearfix'>
<?php
$canBatchEdit = common::hasPriv('task', 'batchEdit');
$canBatchClose = common::hasPriv('task', 'batchClose') and strtolower($browseType) != 'closedBy';
if(count($tasks))
{
echo "<div class='groupButton'>";
echo html::selectAll() . html::selectReverse();
echo "</div>";
echo "<div class='btn-group'>" . html::selectAll() . html::selectReverse() . '</div>';
$actionLink = $this->createLink('task', 'batchEdit', "projectID=$projectID");
$misc = $canBatchEdit ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
echo "<div class='groupButton dropButton'>";
echo html::commonButton($lang->edit, $misc);
echo "<button id='moreAction' type='button' onclick=\"toggleSubMenu(this.id, 'top', 0)\"><span class='caret'></span></button>";
echo "</div>";
echo "<div class='btn-group dropup'>";
echo html::commonButton("<i class='icon-pencil'></i> " . $lang->edit, $misc);
echo "<button id='moreAction' type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
echo "<ul class='dropdown-menu' id='moreActionMenu'>";
$actionLink = $this->createLink('task', 'batchClose');
$misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : "class='disabled'";
echo "<li>" . html::a('#', $lang->close, '', $misc) . "</li>";
echo "</ul></div>";
}
echo "<span class='f-12px'>" . $summary . "</span>";
echo "<div class='text'>" . $summary . "</div>";
?>
</div>
<?php $pager->show();?>
@@ -163,21 +162,8 @@ var browseType = '<?php echo $browseType;?>';
</tr>
</tfoot>
</table>
</td>
</tr>
</table>
</form>
<div id='moreActionMenu' class='listMenu hidden'>
<ul>
<?php
$actionLink = $this->createLink('task', 'batchClose');
$misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink','hiddenwin')\"" : "class='disabled'";
echo "<li>" . html::a('#', $lang->close, '', $misc) . "</li>";
?>
</ul>
</div>
<?php js::set('replaceID', 'taskList')?>
<script language='javascript'>
$('#project<?php echo $projectID;?>').addClass('active')

85
module/project/view/taskheader.html.php
View File

@@ -1,44 +1,55 @@
<?php include $this->app->getModuleRoot() . 'common/view/dropmenu.html.php';?>
<div id='featurebar'>
<div class='f-left'>
<ul class='nav'>
<?php
echo "<span id='allTab'>"; common::printLink('project', 'task', "project=$projectID&type=all", $lang->project->allTasks); echo '</span>' ;
if($project->type == 'sprint') print "<span id='burnTab'>" and common::printLink('project', 'burn', "project=$projectID", $lang->project->burn); print '</span>' ;
echo "<span id='assignedtomeTab'>"; common::printLink('project', 'task', "project=$projectID&type=assignedtome", $lang->project->assignedToMe); echo '</span>' ;
echo "<li id='allTab'>"; common::printLink('project', 'task', "project=$projectID&type=all", $lang->project->allTasks); echo '</li>' ;
if($project->type == 'sprint') print "<li id='burnTab'>" and common::printLink('project', 'burn', "project=$projectID", $lang->project->burn); print '</li>' ;
echo "<li id='assignedtomeTab'>"; common::printLink('project', 'task', "project=$projectID&type=assignedtome", $lang->project->assignedToMe); echo '</li>' ;
echo "<span id='statusTab'>";
echo html::select('status', $lang->project->statusSelects, isset($status) ? $status : '', "onchange='switchStatus({$projectID}, this.value)'");
echo "</span>";
echo "<li id='statusTab' class='dropdown'>";
$current = $lang->project->statusSelects[isset($status) ? $status : ''];
if(empty($current)) $current = $lang->project->statusSelects[''];
echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown'");
echo "<ul class='dropdown-menu'>";
foreach ($lang->project->statusSelects as $key => $value)
{
if($key == '') continue;
echo '<li' . ($key == $status ? " class='active'" : '') . '>';
echo html::a($this->createLink('project', 'task', "project=$projectID&type=$key"), $value);
}
echo '</ul></li>';
echo "<span id='groupTab'>";
echo html::select('groupBy', $lang->project->groups, isset($groupBy) ? $groupBy : '', "onchange='switchGroup($projectID, this.value)'");
echo "</span>";
echo "<li id='groupTab' class='dropdown'>";
$current = $lang->project->groups[isset($groupBy) ? $groupBy : ''];
if(empty($current)) $current = $lang->project->groups[''];
echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown'");
echo "<ul class='dropdown-menu'>";
foreach ($lang->project->groups as $key => $value)
{
if($key == '') continue;
echo '<li' . ($key == $groupBy ? " class='active'" : '') . '>';
echo html::a($this->createLink('project', 'groupTask', "project=$projectID&groupBy=$key"), $value);
}
echo '</ul></li>';
if($this->methodName == 'task') echo "<span id='bysearchTab'><a href='#' class='link-icon'><i class='icon-search icon icon-large'></i>&nbsp;{$lang->project->byQuery}</a></span> ";
if($this->methodName == 'task') echo "<li id='bysearchTab'><a href='#'><i class='icon-search icon'></i>&nbsp;{$lang->project->byQuery}</a></li> ";
?>
</div>
<div class='f-right'>
</ul>
<div class='actions'>
<div class='btn-group'>
<?php
if(!isset($browseType)) $browseType = '';
if(!isset($orderBy)) $orderBy = '';
common::printIcon('task', 'report', "project=$projectID&browseType=$browseType");
echo '<span class="link-button dropButton">';
echo html::a("#", "<i class='icon-upload-alt'></i> " . $lang->export, '', "id='exportAction' onclick=\"toggleSubMenu(this.id,'bottom',0)\" title='{$lang->export}'");
echo '</span>';
echo '<span class="link-button dropButton">';
echo html::a("#", "<i class='icon-download-alt'></i> " . $lang->import, '', "id='importAction' onclick=\"toggleSubMenu(this.id,'bottom',0)\" title='{$lang->import}'");
echo '</span>';
common::printIcon('task', 'batchCreate', "projectID=$projectID");
common::printIcon('task', 'create', "project=$projectID");
?>
</div>
</div>
<div id='exportActionMenu' class='listMenu hidden'>
<ul>
<div class='btn-group'>
<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown' id='exportAction'>
<i class='icon-download-alt'></i> <?php echo $lang->export ?>
<span class='caret'></span>
</button>
<ul class='dropdown-menu' id='exportActionMenu'>
<?php
$misc = common::hasPriv('task', 'export') ? "class='export'" : "class=disabled";
$link = common::hasPriv('task', 'export') ? $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy") : '#';
@@ -47,8 +58,12 @@
</ul>
</div>
<div id='importActionMenu' class='listMenu hidden'>
<ul>
<div class='btn-group'>
<button type='button' class='btn btn-default dropdown-toggle' data-toggle='dropdown' id='importAction'>
<i class='icon-upload-alt'></i> <?php echo $lang->export ?>
<span class='caret'></span>
</button>
<ul class='dropdown-menu' id='importActionMenu'>
<?php
$misc = common::hasPriv('project', 'importTask') ? '' : "class=disabled";
$link = common::hasPriv('project', 'importTask') ? $this->createLink('project', 'importTask', "project=$project->id") : '#';
@@ -60,5 +75,15 @@
?>
</ul>
</div>
</div>
<div class='btn-group'>
<?php
common::printIcon('task', 'batchCreate', "projectID=$projectID");
common::printIcon('task', 'create', "project=$projectID", '', 'button', 'branch');
?>
</div>
</div>
<div id='querybox' class='<?php if($browseType == 'bysearch') echo 'show';?>'></div>
</div>
<?php foreach(glob(dirname(dirname(__FILE__)) . "/ext/view/featurebar.*.html.hook.php") as $fileName) include_once $fileName; ?>

21
module/project/view/team.html.php
View File

@@ -13,9 +13,18 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php js::set('confirmUnlinkMember', $lang->project->confirmUnlinkMember)?>
<table align='center' class='table-5 tablesorter' id='memberList'>
<div class='container mw-700px'>
<div id='featurebar'>
<div class='heading'>
<?php echo html::icon($lang->icons['team']);?> <?php echo $lang->project->team;?>
</div>
<div class='actions'>
<?php common::printLink('project', 'managemembers', "projectID=$project->id", "<i class='icon-cogs'></i> " . $lang->project->manageMembers, '', "class='btn btn-primary'");?>
</div>
</div>
<table class='table tablesorter' id='memberList'>
<thead>
<tr class='colhead'>
<tr>
<th><?php echo $lang->team->account;?></th>
<th><?php echo $lang->team->role;?></th>
<th><?php echo $lang->team->join;?></th>
@@ -28,7 +37,7 @@
<tbody>
<?php $totalHours = 0;?>
<?php foreach($teamMembers as $member):?>
<tr class='a-center'>
<tr class='text-center'>
<td>
<?php
if(!common::printLink('user', 'view', "account=$member->account", $member->realname)) print $member->realname;
@@ -46,7 +55,7 @@
if (common::hasPriv('project', 'unlinkMember'))
{
$unlinkURL = $this->createLink('project', 'unlinkMember', "projectID=$project->id&account=$member->account&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"memberList\",confirmUnlinkMember)", '<i class="icon-green-project-unlinkMember icon-remove"></i>', '', "class='link-icon' title='{$lang->project->unlinkMember}'");
echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"memberList\",confirmUnlinkMember)", '<i class="icon-green-project-unlinkMember icon-remove"></i>', '', "class='btn-icon' title='{$lang->project->unlinkMember}'");
}
?>
</td>
@@ -56,10 +65,10 @@
<tfoot>
<tr>
<td colspan='7'>
<div class='f-left'><?php echo $lang->team->totalHours . '：' . "<strong>$totalHours</strong>";?></div>
<div class='f-right'><?php common::printLink('project', 'managemembers', "projectID=$project->id", $lang->project->manageMembers);?></div>
<div class='table-actions clearfix'><div class='text'><?php echo $lang->team->totalHours . '：' . "<strong>$totalHours</strong>";?></div></div>
</td>
</tr>
</tfoot>
</table>
</div>
<?php include '../../common/view/footer.html.php';?>

27
module/project/view/testtask.html.php
View File

@@ -13,13 +13,18 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php js::set('confirmDelete', $lang->testtask->confirmDelete)?>
<table class='table-1 colored tablesorter fixed' id='taskList'>
<caption class='caption-tl pb-10px'>
<div class='f-left'><?php echo $lang->testtask->browse;?></div>
<div class='f-right'><?php common::printIcon('testtask', 'create', "product=0&project=$projectID");?></div>
</caption>
<div id='featurebar'>
<div class='heading'>
<?php echo html::icon($lang->icons['test']);?> <?php echo $lang->testtask->browse;?>
</div>
<div class='actions'>
<?php common::printIcon('testtask', 'create', "product=0&project=$projectID");?>
</div>
</div>
<table class='table tablesorter table-fixed' id='taskList'>
<thead>
<tr class='colhead'>
<tr>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th><?php echo $lang->testtask->name;?></th>
<th><?php echo $lang->testtask->build;?></th>
@@ -32,9 +37,9 @@
</thead>
<tbody>
<?php foreach($tasks as $task):?>
<tr class='a-center'>
<tr class='text-center'>
<td><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
<td class='a-left' title="<?php echo $task->name?>"><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
<td class='text-left' title="<?php echo $task->name?>"><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
<td title="<?php echo $task->buildName?>"><?php $task->build == 'trunk' ? print('Trunk') : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
<td><?php echo $users[$task->owner];?></td>
<td><?php echo $task->begin?></td>
@@ -42,14 +47,14 @@
<td><?php echo $lang->testtask->statusList[$task->status];?></td>
<td>
<?php
common::printIcon('testtask', 'cases', "taskID=$task->id", '', 'list');
common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list');
common::printIcon('testtask', 'cases', "taskID=$task->id", '', 'list', 'smile');
common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'list', 'link');
common::printIcon('testtask', 'edit', "taskID=$task->id", '', 'list');
if(common::hasPriv('testtask', 'delete'))
{
$deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-green-common-delete"></i>', '', "class='link-icon' title='{$lang->testtask->delete}'");
echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-remove"></i>', '', "class='btn-icon' title='{$lang->testtask->delete}'");
}
?>
</td>

73
module/project/view/view.html.php
View File

@@ -12,23 +12,32 @@
?>
<?php include '../../common/view/header.html.php';?>
<div id='titlebar'>
<div id='main' <?php if($project->deleted) echo "class='deleted'";?>>PROJECT #<?php echo $project->id . ' ' . $project->name;?></div>
<div>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['project']) . ' #' . $project->id;?></span>
<strong><?php echo $project->name;?></strong>
<?php if($project->deleted):?>
<small class='label label-danger'><?php echo $lang->project->deleted;?></small>
<?php endif; ?>
</div>
<div class='actions'>
<?php
$params = "project=$project->id";
$browseLink = $this->session->projectList ? $this->session->projectList : inlink('browse', "projectID=$project->id");
if(!$project->deleted)
{
ob_start();
echo "<div class='btn-group'>";
common::printIcon('project', 'start', "projectID=$project->id", $project);
common::printIcon('project', 'activate', "projectID=$project->id", $project);
common::printIcon('project', 'activate', "projectID=$project->id", $project, 'button', '', '', 'text-success');
common::printIcon('project', 'putoff', "projectID=$project->id", $project);
common::printIcon('project', 'suspend', "projectID=$project->id", $project);
common::printIcon('project', 'close', "projectID=$project->id", $project);
common::printIcon('project', 'close', "projectID=$project->id", $project, 'button', '', '', 'text-danger');
echo '</div>';
common::printDivider();
echo "<div class='btn-group'>";
common::printIcon('project', 'edit', $params);
common::printIcon('project', 'delete', $params, '', 'button', '', 'hiddenwin');
echo '</div>';
common::printRPN($browseLink);
$actionLinks = ob_get_contents();
@@ -42,10 +51,9 @@
?>
</div>
</div>
<table class='cont-rt5'>
<tr valign='top'>
<td>
<div class='row'>
<div class='col-md-8 col-lg-9'>
<div class='main'>
<fieldset>
<legend><?php echo $lang->project->goal;?></legend>
<div class='content'><?php echo $project->goal;?></div>
@@ -55,65 +63,66 @@
<div class='content'><?php echo $project->desc;?></div>
</fieldset>
<?php include '../../common/view/action.html.php';?>
<div class='a-center actionLink'> <?php if(!$project->deleted) echo $actionLinks;?></div>
</td>
<td class="divider"></td>
<td class="side">
<div class='actions'> <?php if(!$project->deleted) echo $actionLinks;?></div>
</div>
</div>
<div class='col-md-4 col-lg-3'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->project->basicInfo?></legend>
<table class='table-1 a-left'>
<table class='table table-data table-condensed table-borderless'>
<tr>
<th width='25%' class='a-right'><?php echo $lang->project->name;?></th>
<th class='w-80px text-right strong'><?php echo $lang->project->name;?></th>
<td><?php echo $project->name;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->code;?></th>
<th><?php echo $lang->project->code;?></th>
<td><?php echo $project->code;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->beginAndEnd;?></th>
<th><?php echo $lang->project->beginAndEnd;?></th>
<td><?php echo $project->begin . ' ~ ' . $project->end;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->days;?></th>
<th><?php echo $lang->project->days;?></th>
<td><?php echo $project->days;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->type;?></th>
<th><?php echo $lang->project->type;?></th>
<td><?php echo $lang->project->typeList[$project->type];?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->status;?></th>
<th><?php echo $lang->project->status;?></th>
<td class='<?php echo $project->status;?>'><?php $lang->show($lang->project->statusList, $project->status);?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->PM;?></th>
<th><?php echo $lang->project->PM;?></th>
<td><?php echo $users[$project->PM];?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->PO;?></th>
<th><?php echo $lang->project->PO;?></th>
<td><?php echo $users[$project->PO];?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->QD;?></th>
<th><?php echo $lang->project->QD;?></th>
<td><?php echo $users[$project->QD];?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->RD;?></th>
<th><?php echo $lang->project->RD;?></th>
<td><?php echo $users[$project->RD];?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->products;?></th>
<th><?php echo $lang->project->products;?></th>
<td>
<?php foreach($products as $productID => $productName) echo html::a($this->createLink('product', 'browse', "productID=$productID"), $productName) . '<br />';?>
</td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->acl;?></th>
<th><?php echo $lang->project->acl;?></th>
<td><?php echo $lang->project->aclList[$project->acl];?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->project->whitelist;?></th>
<th><?php echo $lang->project->whitelist;?></th>
<td>
<?php
$whitelist = explode(',', $project->whitelist);
@@ -125,14 +134,14 @@
</fieldset>
<fieldset>
<legend><?php echo $lang->project->otherInfo?></legend>
<table class='table-1 a-left'>
<table class='table table-data table-condensed table-borderless'>
<tr>
<th class='rowhead'><?php echo $lang->project->lblStats;?></th>
<th class='w-80px'><?php echo $lang->project->lblStats;?></th>
<td><?php printf($lang->project->stats, $project->totalHours, $project->totalEstimate, $project->totalConsumed, $project->totalLeft, 10)?></td>
</tr>
</table>
</fieldset>
</td>
</tr>
</table>
</div>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>

2
www/js/my.full.js
View File

@@ -384,7 +384,7 @@ function saveWindowSize()
*/
function setOuterBox()
{
if($('#treebox').length) $('.outer').addClass('with-side');
if($('.outer > .side').length) $('.outer').addClass('with-side');
var resetOuterHeight = function()
{

7
www/theme/default/style.css
View File

@@ -40,6 +40,10 @@ tr.text-center > td.text-right, tr.text-center > th.text-right {text-align: righ
/* Table */
.table td .input[type="radio"], .table td input[type="checkbox"] {margin-top: 2px}
.table-fixed {table-layout: fixed;}
.table-fixed th, .table-fixed td {overflow:hidden; white-space:nowrap;}
.table-fixed tfoot > tr > th, .table-fixed tfoot > tr > td {overflow: visible;}
/* Tables sorters */
.tablesorter thead tr div {padding:0; margin:0}
.tablesorter thead tr .header {cursor:pointer;}
@@ -350,8 +354,9 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
#featurebar .nav {height: 30px; float: left;}
#featurebar .nav > li {float: left; margin-right: 2px;}
#featurebar .nav > li > .form-control {margin-left: 6px; padding: 1px 8px; height: 30px}
#featurebar .nav > li > .form-control {margin-left: 6px; padding: 1px 8px; height: 30px; margin-right: 10px;}
#featurebar .nav > li > .form-control.form-date {width: 110px}
#featurebar .nav > li.datepicker-wrapper:before {right: 15px}
#featurebar .nav > li > a {padding: 0px 6px;}
#featurebar .nav > li.active > a, #featurebar .nav > li.active > a:hover, #featurebar .nav > li.active > a:active, #featurebar .nav > li.active > a:focus {font-weight: bold; color: #333}
#featurebar .nav > li.active > .form-control, #featurebar .nav > li.active > .form-control:hover, #featurebar .nav > li.active > .form-control:active, #featurebar .nav > li.active > .form-control:focus {border-color: #009900}