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

* ajusted views.

Browse Source
This commit is contained in:
Catouse
2014-04-15 17:35:20 +08:00
parent 23cbb7c9f3
commit 59e08a2c72
10 changed files with 167 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,6 +425,7 @@ $lang->icons['team'] = 'group';
$lang->icons['company'] = 'building';
$lang->icons['user'] = 'user';
$lang->icons['dept'] = 'sitemap';
$lang->icons['tree'] = 'sitemap';
$lang->icons['usecase'] = 'usecase';
$lang->icons['testcase'] = 'smile';
$lang->icons['result'] = 'flag-checkered';

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

@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/treetable.html.php';?>
<?php include './taskheader.html.php';?>
<table class='table fixed' id='treetable'>
<table class='table table-fixed' id='treetable'>
<thead>
<tr>
<th class='w-120px'></th>

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

@@ -18,7 +18,7 @@
<div class='actions'>
<div class='btn-group'>
<?php
common::printIcon('story', 'export', "productID=$productID&orderBy=id_desc");
common::printIcon('story', 'export', "productID=$productID&orderBy=id_desc", '', 'button', '', '', 'export');
$this->lang->story->create = $this->lang->project->createStory;
if($productID) common::printIcon('story', 'create', "productID=$productID&moduleID=0&story=0&project=$project->id");

2
module/qa/view/index.html.php
View File

@@ -12,5 +12,5 @@
?>
<?php include '../../common/view/header.html.php';?>
<div id='doc3'>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>

12
module/task/view/batchedit.html.php
View File

@@ -28,16 +28,16 @@
<th class='w-30px'><?php echo $lang->idAB;?></th>
<th class='required'> <?php echo $lang->task->name?></th>
<th class='w-150px'><?php echo $lang->task->module?></th>
<th class='w-80px'><?php echo $lang->task->assignedTo;?></th>
<th class='w-70px required'><?php echo $lang->typeAB;?></th>
<th class='w-80px'><?php echo $lang->task->status;?></th>
<th class='w-100px'><?php echo $lang->task->assignedTo;?></th>
<th class='w-80px required'><?php echo $lang->typeAB;?></th>
<th class='w-90px'><?php echo $lang->task->status;?></th>
<th class='w-60px'><?php echo $lang->task->pri;?></th>
<th class='w-40px required'><?php echo $lang->task->estimateAB;?></th>
<th class='w-60px required'><?php echo $lang->task->consumedThisTime?></th>
<th class='w-40px required'><?php echo $lang->task->leftAB?></th>
<th class='w-90px'><?php echo $lang->task->finishedBy;?></th>
<th class='w-90px'><?php echo $lang->task->closedBy;?></th>
<th class='w-90px'><?php echo $lang->task->closedReason;?></th>
<th class='w-100px'><?php echo $lang->task->finishedBy;?></th>
<th class='w-100px'><?php echo $lang->task->closedBy;?></th>
<th class='w-100px'><?php echo $lang->task->closedReason;?></th>
</tr>
</thead>
<?php foreach($taskIDList as $taskID):?>

61
module/task/view/editestimate.html.php
View File

@@ -13,30 +13,39 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php js::set('confirmRecord', $lang->task->confirmRecord);?>
<form method='post' target='hiddenwin' <?php if($estimate->isLast) echo "onsubmit='return confirmLeft();'"?>>
<table class='table-1 a-left'>
<caption><?php echo $lang->task->editEstimate;?></caption>
<tr>
<th><?php echo $lang->task->date;?></th>
<td><?php echo html::input('date', $estimate->date, 'class="select-3 date"');?></td>
</tr>
<tr>
<th><?php echo $lang->task->record;?></th>
<td><?php echo html::input('consumed', $estimate->consumed, 'class="form-control"');?></td>
</tr>
<tr>
<th><?php echo $lang->task->left;?></th>
<td><?php echo html::input('left', $estimate->left, 'class="form-control"');?></td>
</tr>
<tr>
<th><?php echo $lang->comment;?></th>
<td><?php echo html::textarea('work', $estimate->work, "class=text-5");?></td>
</tr>
<tr>
<td colspan='2' class='text-center'>
<?php echo html::submitButton() . html::backButton();?>
</td>
</tr>
</table>
</form>
<div class='container mw-600px'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['task']) . ' #' . $task->id;;?></span>
<strong><?php echo $lang->task->editEstimate;?></strong>
<small class='text-muted'><?php echo html::icon($lang->icons['edit']);?></small>
</div>
</div>
<form class='form-condensed' method='post' target='hiddenwin' <?php if($estimate->isLast) echo "onsubmit='return confirmLeft();'"?>>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->task->date;?></th>
<td class='w-p45'><?php echo html::input('date', $estimate->date, 'class="form-control form-date"');?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->task->record;?></th>
<td><?php echo html::input('consumed', $estimate->consumed, 'class="form-control"');?></td>
</tr>
<tr>
<th><?php echo $lang->task->left;?></th>
<td><?php echo html::input('left', $estimate->left, 'class="form-control"');?></td>
</tr>
<tr>
<th><?php echo $lang->comment;?></th>
<td colspan='2'><?php echo html::textarea('work', $estimate->work, "class=form-control");?></td>
</tr>
<tr>
<td></td><td colspan='2' class='text-center'>
<?php echo html::submitButton() . html::backButton();?>
</td>
</tr>
</table>
</form>
</div>
<?php include '../../common/view/footer.lite.html.php';?>

2
module/tree/css/common.css
View File

@@ -2,3 +2,5 @@
.copy {display:block; margin-bottom:5px;}
.outer .row .col-md-8 .table-form {max-width: 600px}
#moduleBox span > .form-control {margin-bottom: 5px;}

167
module/tree/view/browsetask.html.php
View File

@@ -12,85 +12,92 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/treeview.html.php';?>
<table class='cont-lt5'>
<tr valign='top'>
<td class='side'>
<form method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'updateOrder', "root={$root->id}&viewType=task");?>'>
<table class='table-1'>
<caption><?php echo $title;?></caption>
<tr>
<td>
<div id='main'><?php echo $modules;?></div>
<div class='text-center'>
<?php if(common::hasPriv('tree', 'updateorder')) echo html::submitButton($lang->tree->updateOrder);?>
</div>
</td>
</tr>
</table>
</form>
</td>
<td class='divider'></td>
<td>
<form method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'manageChild', "root={$root->id}&viewType=task");?>'>
<table align='center' class='table-1'>
<div id='featurebar'>
<div class='heading'><i class='icon-cogs'></i> <?php echo $lang->tree->common;?> </div>
</div>
<div class='row'>
<div class='col-md-4 col-lg-3'>
<form class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'updateOrder', "root={$root->id}&viewType=task");?>'>
<div class='panel'>
<div class='panel-heading'>
<i class='icon-cog'></i> <strong><?php echo $title;?></strong>
</div>
<div class='panel-body'>
<div id='main'><?php echo $modules;?></div>
<div class='text-center'>
<?php if(common::hasPriv('tree', 'updateorder')) echo html::submitButton($lang->tree->updateOrder);?>
</div>
</div>
</div>
</form>
</div>
<div class='col-md-8 col-lg-9'>
<form class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'manageChild', "root={$root->id}&viewType=task");?>'>
<div class='panel'>
<div class='panel-heading'>
<i class='icon-sitemap'></i>
<?php $manageChild = 'manageTaskChild';?>
<caption><?php echo $lang->tree->$manageChild;?></caption>
<tr>
<td class='parentModule'>
<nobr>
<?php
echo html::a($this->createLink('tree', 'browsetask', "root={$root->id}&productID=$productID&viewType=task"), $root->name);
echo $lang->arrow;
foreach($parentModules as $module)
{
echo html::a($this->createLink('tree', 'browsetask', "root={$root->id}&productID=$productID&moduleID=$module->id"), $module->name);
echo $lang->arrow;
}
?>
</nobr>
</td>
<td id='moduleBox'>
<?php
$maxOrder = 0;
if($newModule and !$productID)
{
foreach($products as $id => $product)
{
echo '<span>' . html::input("products[id$id]", $product, 'class=text-3 style="margin-bottom:5px" disabled="true"') . '<br /></span>';
}
}
else
{
echo '<div id="sonModule">';
foreach($sons as $sonModule)
{
if($sonModule->order > $maxOrder) $maxOrder = $sonModule->order;
$disabled = $sonModule->type == 'task' ? '' : 'disabled="true"';
echo '<span>' . html::input("modules[id$sonModule->id]", $sonModule->name, 'class=text-3 style="margin-bottom:5px" ' . $disabled) . '<br /></span>';
}
for($i = 0; $i < TREE::NEW_CHILD_COUNT ; $i ++) echo '<span>' . html::input("modules[]", '', 'class=text-3 style="margin-bottom:5px"') . '<br /></span>';
}
?>
</div>
</td>
</tr>
<tr>
<td></td>
<td colspan='2'>
<?php
if(!$newModule or $productID)
{
echo html::submitButton() . html::backButton();
echo html::hidden('parentModuleID', $currentModuleID);
echo html::hidden('maxOrder', $maxOrder);
}
?>
<input type='hidden' value='<?php echo $currentModuleID;?>' name='parentModuleID' />
</td>
</tr>
</table>
</form>
</td>
</tr>
</table>
<?php echo $lang->tree->$manageChild;?>
</div>
<div class='panel-body'>
<table class='table table-form'>
<tr>
<td class='parentModule'>
<nobr>
<?php
echo html::a($this->createLink('tree', 'browsetask', "root={$root->id}&productID=$productID&viewType=task"), $root->name);
echo $lang->arrow;
foreach($parentModules as $module)
{
echo html::a($this->createLink('tree', 'browsetask', "root={$root->id}&productID=$productID&moduleID=$module->id"), $module->name);
echo $lang->arrow;
}
?>
</nobr>
</td>
<td id='moduleBox'>
<?php
$maxOrder = 0;
if($newModule and !$productID)
{
foreach($products as $id => $product)
{
echo '<span>' . html::input("products[id$id]", $product, 'class=form-control disabled="true"') . '</span>';
}
}
else
{
echo '<div id="sonModule">';
foreach($sons as $sonModule)
{
if($sonModule->order > $maxOrder) $maxOrder = $sonModule->order;
$disabled = $sonModule->type == 'task' ? '' : 'disabled="true"';
echo '<span>' . html::input("modules[id$sonModule->id]", $sonModule->name, 'class=form-control ' . $disabled) . '</span>';
}
for($i = 0; $i < TREE::NEW_CHILD_COUNT ; $i ++) echo '<span>' . html::input("modules[]", '', 'class=form-control') . '</span>';
}
?>
</div>
</td>
</tr>
<tr>
<td></td>
<td colspan='2'>
<?php
if(!$newModule or $productID)
{
echo html::submitButton() . html::backButton();
echo html::hidden('parentModuleID', $currentModuleID);
echo html::hidden('maxOrder', $maxOrder);
}
?>
<input type='hidden' value='<?php echo $currentModuleID;?>' name='parentModuleID' />
</td>
</tr>
</table>
</div>
</div>
</form>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>

57
module/tree/view/edit.html.php
View File

@@ -11,29 +11,36 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<form method='post' class='mt-10px' id='dataform'>
<table class='table-1'>
<caption><?php echo $lang->tree->edit;?></caption>
<?php $hidden = ($type != 'story' and $module->type == 'story');?>
<tr <?php if($hidden) echo "style='display:none'";?>>
<th><?php echo $lang->tree->parent;?></th>
<td><?php echo html::select('parent', $optionMenu, $module->parent, "class='form-control'");?></td>
</tr>
<tr <?php if($hidden) echo "style='display:none'";?>>
<th><?php echo $lang->tree->name;?></th>
<td><?php echo html::input('name', $module->name, "class='form-control'");?></td>
</tr>
<?php if($type == 'bug'):?>
<tr>
<th><?php echo $lang->tree->owner;?></th>
<td><?php echo html::select('owner', $users, $module->owner, "class='form-control'", true);?></td>
</tr>
<?php endif;?>
<tr>
<td colspan='2' class='text-center'>
<?php echo html::submitButton();?>
</td>
</tr>
</table>
</form>
<div class='container mw-500px'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['tree']);?></span>
<strong><small class='text-muted'><?php echo html::icon($lang->icons['edit']);?></small> <?php echo $lang->tree->edit;?></strong>
</div>
</div>
<form class='form-condensed' method='post' class='mt-10px' id='dataform'>
<table class='table table-form'>
<?php $hidden = ($type != 'story' and $module->type == 'story');?>
<tr <?php if($hidden) echo "style='display:none'";?>>
<th class='w-80px'><?php echo $lang->tree->parent;?></th>
<td><?php echo html::select('parent', $optionMenu, $module->parent, "class='form-control'");?></td>
</tr>
<tr <?php if($hidden) echo "style='display:none'";?>>
<th class='w-80px'><?php echo $lang->tree->name;?></th>
<td><?php echo html::input('name', $module->name, "class='form-control'");?></td>
</tr>
<?php if($type == 'bug'):?>
<tr>
<th class='w-80px'><?php echo $lang->tree->owner;?></th>
<td><?php echo html::select('owner', $users, $module->owner, "class='form-control'", true);?></td>
</tr>
<?php endif;?>
<tr>
<td colspan='2' class='text-center'>
<?php echo html::submitButton();?>
</td>
</tr>
</table>
</form>
</div>
<?php include '../../common/view/footer.lite.html.php';?>

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

@@ -108,6 +108,7 @@ i[class^="icon-"].disabled,i[class*=" icon-"].disabled,i[class^="icon-"].disable
.actionbox ol {padding-left: 25px; line-height: 20px}
.actionbox .alert {margin:2px 0 8px; padding: 5px 10px; min-height: 34px}
.actionbox #historyItem {margin:0}
.actionbox blockquote {margin:0}
/* zenicon */
.icon-green-testcase-createCase:before,.icon-green-story-createCase:before,.icon-green-task-create:before,