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

* finish task #2366.

Browse Source
This commit is contained in:
wangyidong
2015-10-14 16:46:47 +08:00
parent e4c40098c2
commit d449255cda
6 changed files with 61 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/story/css/create.css
View File

@@ -2,5 +2,5 @@
select {border:1px solid #ccc}
#module_chosen.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
.row .col-sm-10{width:89%}
.row .col-sm-2{padding-left:0px; width:11%}
.row .col-sm-8{width:76%}
.row .col-sm-2{padding-left:0px; padding-right:0px; width:12%}

2
module/story/lang/en.php
View File

@@ -275,7 +275,7 @@ $lang->story->report->storysPerEstimate->graph->xAxisName = 'Estimate';
$lang->story->report->storysPerChange->graph->xAxisName = 'Change';
$lang->story->placeholder = new stdclass();
$lang->story->placeholder->estimate = 'Estimate the story point.';
$lang->story->placeholder->estimate = $lang->story->hour;
$lang->story->chosen = new stdClass();
$lang->story->chosen->reviewedBy = 'Choose users who review...';

2
module/story/lang/zh-cn.php
View File

@@ -275,7 +275,7 @@ $lang->story->report->storysPerEstimate->graph->xAxisName = '预计时间';
$lang->story->report->storysPerChange->graph->xAxisName = '变更次数';
$lang->story->placeholder = new stdclass();
$lang->story->placeholder->estimate = "完成该需求的工作量";
$lang->story->placeholder->estimate = $lang->story->hour;
$lang->story->chosen = new stdClass();
$lang->story->chosen->reviewedBy = '选择评审人...';

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

@@ -29,6 +29,7 @@
</td>
<td class='w-p25-f'>
<div class='input-group' id='moduleIdBox'>
<span class='input-group-addon'><?php echo $lang->story->module;?></span>
<?php
echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control chosen'");
if(count($moduleOptionMenu) == 1)
@@ -75,19 +76,12 @@
<span class='input-group-addon'><?php echo html::checkbox('needNotReview', $lang->story->needNotReview, '', "id='needNotReview' {$needReview}");?></span>
</div>
</td>
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->story->estimate;?></span>
<?php echo html::input('estimate', $estimate, "class='form-control'");?>
<span class='input-group-addon'><?php echo $lang->story->hour;?></span>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->story->title;?></th>
<td colspan='3'>
<div class='row'>
<div class='col-sm-10'>
<div class='col-sm-8'>
<?php echo html::input('title', $storyTitle, "class='form-control'");?>
</div>
<div class='col-sm-2'>
@@ -96,6 +90,12 @@
<?php echo html::select('pri', (array)$lang->story->priList, $pri, "class='form-control'");?>
</div>
</div>
<div class='col-sm-2'>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->story->estimateAB;?></span>
<?php echo html::input('estimate', $estimate, "class='form-control'");?>
</div>
</div>
</div>
</td>
</tr>
@@ -108,21 +108,32 @@
<td colspan='3'><?php echo html::textarea('verify', $verify, "rows='6' class='form-control'");?></td>
</tr>
<tr>
<th><nobr><?php echo $lang->story->mailto;?></nobr></th>
<td colspan='3'>
<th><?php echo $lang->story->mailto;?></th>
<td colspan='2'>
<div class='input-group'>
<?php
echo html::select('mailto[]', $users, str_replace(' ' , '', $mailto), "multiple");
if($contactLists) echo html::select('', $contactLists, '', "class='form-control' style='width: 150px' onchange=\"setMailto('mailto', this.value)\"");
if($contactLists) echo html::select('', $contactLists, '', "class='form-control chosen' onchange=\"setMailto('mailto', this.value)\"");
if(empty($contactLists))
{
echo '<span class="input-group-addon">';
echo '<a href="' . $this->createLink('company', 'browse') . '" target="_blank">' . $lang->user->contacts->manage . '</a>';
echo '</span>';
echo '<span class="input-group-addon">';
echo '<a href="###" onclick="ajaxGetContacts(this)">' . $lang->refresh . '</a>';
echo '</span>';
}
?>
</div>
</td>
<td>
<div class='input-group'>
<span class='input-group-addon'><?php echo $lang->story->keywords;?></span>
<?php echo html::input('keywords', $keywords, 'class="form-control"');?>
</div>
</td>
</tr>
<tr>
<th><nobr><?php echo $lang->story->keywords;?></nobr></th>
<td colspan='3'><?php echo html::input('keywords', $keywords, 'class="form-control"');?></td>
</tr>
<tr>
<th><?php echo $lang->story->legendAttatch;?></th>
<td colspan='3'><?php echo $this->fetch('file', 'buildform');?></td>
</tr>
@@ -131,4 +142,5 @@
<span id='responser'></span>
</form>
</div>
<?php js::set('storyModule', $lang->story->module);?>
<?php include '../../common/view/footer.html.php';?>

46
module/story/view/edit.html.php
View File

@@ -59,31 +59,35 @@
</tr>
<tr>
<th><?php echo $lang->story->module;?></th>
<td id='moduleIdBox'>
<?php
echo html::select('module', $moduleOptionMenu, $story->module, 'class="form-control chosen"');
if(count($moduleOptionMenu) == 1)
{
echo "<span class='help-block'>";
echo html::a($this->createLink('tree', 'browse', "rootID=$story->product&view=story"), $lang->tree->manage, '_blank');
echo html::a("javascript:loadProductModules($story->product)", $lang->refresh);
echo '</span>';
}
?>
<td>
<div class='input-group' id='moduleIdBox'>
<?php
echo html::select('module', $moduleOptionMenu, $story->module, 'class="form-control chosen"');
if(count($moduleOptionMenu) == 1)
{
echo "<span class='inpug-group-addon'>";
echo html::a($this->createLink('tree', 'browse', "rootID=$story->product&view=story"), $lang->tree->manage, '_blank');
echo html::a("javascript:loadProductModules($story->product)", $lang->refresh);
echo '</span>';
}
?>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->story->plan;?></th>
<td id='planIdBox'>
<?php echo html::select('plan', $plans, $story->plan, "class='form-control chosen'");
if(count($plans) == 1)
{
echo "<span class='help-block'>";
echo html::a($this->createLink('productplan', 'create', "productID=$story->product"), $lang->productplan->create, '_blank');
echo html::a("javascript:loadProductPlans($story->product)", $lang->refresh);
echo '</span>';
}
?>
<td>
<div class='input-group' id='planIdBox'>
<?php echo html::select('plan', $plans, $story->plan, "class='form-control chosen'");
if(count($plans) == 1)
{
echo "<span class='input-group-addon'>";
echo html::a($this->createLink('productplan', 'create', "productID=$story->product"), $lang->productplan->create, '_blank');
echo html::a("javascript:loadProductPlans($story->product)", $lang->refresh);
echo '</span>';
}
?>
</div>
</td>
</tr>
<tr>

6
module/story/view/header.html.php
View File

@@ -10,7 +10,11 @@ function loadProduct(productID)
function loadProductModules(productID)
{
moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=story&rootModuleID=0&returnType=html&needManage=true');
$('#moduleIdBox').load(moduleLink, function(){$('#moduleIdBox #module').chosen(defaultChosenOptions);});
$('#moduleIdBox').load(moduleLink, function()
{
$('#moduleIdBox #module').chosen(defaultChosenOptions);
if(typeof(storyModule) == 'string') $('#moduleIdBox').prepend("<span class='input-group-addon'>" + storyModule + "</span>")
});
}
function loadProductPlans(productID)