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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2016-04-26 10:26:17 +08:00
parent 8362b154c7 23773b99c8
commit 23de8db1cd
12 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+1 -1
View File
@@ -299,7 +299,7 @@ class block extends control
echo "<th>{$this->lang->block->lblBlock}</th>";
echo '<td>' . html::select('moduleBlock', $blockPairs, ($block and $block->source != '') ? $block->block : '', "class='form-control' onchange='getBlockParams(this.value, \"$module\")'") . '</td>';
if(isset($block->source)) echo "<script>$(function(){console.log(1, window.getBlockParams); getBlockParams($('#moduleBlock').val(), '{$block->source}')})</script>";
if(isset($block->source)) echo "<script>$(function(){getBlockParams($('#moduleBlock').val(), '{$block->source}')})</script>";
}
elseif($mode == 'getblockform')
{
module/block/view/bugblock.html.php
+7 -5
View File
@@ -14,9 +14,10 @@
<thead>
<tr>
<th width='50'><?php echo $lang->idAB?></th>
<th width='40'><?php echo $lang->bug->severityAB?></th>
<th width='40'><?php echo $lang->priAB?></th>
<th width='50'><?php echo $lang->priAB?></th>
<th> <?php echo $lang->bug->title;?></th>
<th width='50'><?php echo $lang->bug->severityAB?></th>
<th width='70'><?php echo $lang->bug->statusAB;?></th>
</tr>
</thead>
<?php foreach($bugs as $bug):?>
@@ -25,10 +26,11 @@
$viewLink = $this->createLink('bug', 'view', "bugID={$bug->id}");
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<td><?php echo $bug->id;?></td>
<td><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></td>
<td><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></td>
<td class='text-center'><?php echo $bug->id;?></td>
<td class='text-center'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></td>
<td style='color: <?php echo $bug->color?>' title='<?php echo $bug->title?>'><?php echo $bug->title?></td>
<td class='text-center'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></td>
<td class='text-center'><?php echo zget($lang->bug->statusList, $bug->status, $bug->status)?></td>
</tr>
<?php endforeach;?>
</table>
module/block/view/caseblock.html.php
+7 -7
View File
@@ -14,11 +14,11 @@
<thead>
<tr>
<th width='50'><?php echo $lang->idAB?></th>
<th width='40'><?php echo $lang->priAB?></th>
<th width='50'><?php echo $lang->priAB?></th>
<th> <?php echo $lang->case->title;?></th>
<th width='120'> <?php echo $lang->testtask->lastRunTime;?></th>
<th width='60'> <?php echo $lang->testtask->lastRunResult;?></th>
<th width='50'><?php echo $lang->statusAB;?></th>
<th width='70'><?php echo $lang->statusAB;?></th>
</tr>
</thead>
<?php foreach($cases as $case):?>
@@ -27,12 +27,12 @@
$viewLink = $this->createLink('testcase', 'view', "caseID={$case->id}");
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<td><?php echo $case->id;?></td>
<td><?php echo zget($lang->case->priList, $case->pri, $case->pri)?></td>
<td class='text-center'><?php echo $case->id;?></td>
<td class='text-center'><?php echo zget($lang->case->priList, $case->pri, $case->pri)?></td>
<td style='color: <?php echo $case->color?>' title='<?php echo $case->title?>'><?php echo $case->title?></td>
<td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
<td><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
<td><?php echo $lang->testcase->statusList[$case->status];?></td>
<td class='text-center'><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
<td class='text-center'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
<td class='text-center'><?php echo $lang->testcase->statusList[$case->status];?></td>
</tr>
<?php endforeach;?>
</table>
module/block/view/releaseblock.html.php
+6 -6
View File
@@ -18,7 +18,7 @@
<th> <?php echo $lang->release->name;?></th>
<th> <?php echo $lang->release->build;?></th>
<th width='80'><?php echo $lang->release->date;?></th>
<th width='80'><?php echo $lang->release->status;?></th>
<th width='70'><?php echo $lang->release->status;?></th>
</tr>
</thead>
<?php foreach($releases as $release):?>
@@ -28,11 +28,11 @@
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<td class='text-center'><?php echo $release->id;?></td>
<td title='<?php echo $release->productName?>'><?php echo $release->productName?></td>
<td title='<?php echo $release->name?>'><?php echo $release->name?></td>
<td title='<?php echo $release->buildName?>'><?php echo $release->buildName?></td>
<td><?php echo $release->date?></td>
<td><?php echo $lang->release->statusList[$release->status]?></td>
<td class='text-left' title='<?php echo $release->productName?>'><?php echo $release->productName?></td>
<td class='text-center' title='<?php echo $release->name?>'><?php echo $release->name?></td>
<td class='text-center' title='<?php echo $release->buildName?>'><?php echo $release->buildName?></td>
<td class='text-center'><?php echo $release->date?></td>
<td class='text-center'><?php echo $lang->release->statusList[$release->status]?></td>
</tr>
<?php endforeach;?>
</table>
module/block/view/storyblock.html.php
+7 -7
View File
@@ -17,8 +17,8 @@
<th width='30'><?php echo $lang->priAB?></th>
<th> <?php echo $lang->story->title;?></th>
<th width='50'><?php echo $lang->story->estimateAB;?></th>
<th width='50'><?php echo $lang->statusAB;?></th>
<th width='60'><?php echo $lang->story->stageAB;?></th>
<th width='70'><?php echo $lang->statusAB;?></th>
<th width='70'><?php echo $lang->story->stageAB;?></th>
</tr>
</thead>
<?php foreach($stories as $story):?>
@@ -27,12 +27,12 @@
$viewLink = $this->createLink('story', 'view', "storyID={$story->id}");
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<td><?php echo $story->id;?></td>
<td><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></td>
<td class='text-center'><?php echo $story->id;?></td>
<td class='text-center'><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></td>
<td style='color: <?php echo $story->color?>' title='<?php echo $story->title?>'><?php echo $story->title?></td>
<td><?php echo $story->estimate?></td>
<td ><?php echo zget($lang->story->statusList, $story->status, $story->status);?></th>
<td ><?php echo zget($lang->story->stageList, $story->stage, $story->stage);?></th>
<td class='text-center'><?php echo $story->estimate?></td>
<td class='text-center'><?php echo zget($lang->story->statusList, $story->status, $story->status);?></th>
<td class='text-center'><?php echo zget($lang->story->stageList, $story->stage, $story->stage);?></th>
</tr>
<?php endforeach;?>
</table>
module/block/view/taskblock.html.php
+5 -5
View File
@@ -21,7 +21,7 @@ td.delayed{background: #e84e0f!important; color: white;}
<th> <?php echo $lang->task->name;?></th>
<th width='40'><?php echo $lang->task->estimateAB;?></th>
<th width='75'><?php echo $lang->task->deadline;?></th>
<th width='50'><?php echo $lang->statusAB;?></th>
<th width='70'><?php echo $lang->statusAB;?></th>
</tr>
</thead>
<?php foreach($tasks as $task):?>
@@ -30,12 +30,12 @@ td.delayed{background: #e84e0f!important; color: white;}
$viewLink = $this->createLink('task', 'view', "taskID={$task->id}");
?>
<tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<td><?php echo $task->id;?></td>
<td><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></td>
<td class='text-center'><?php echo $task->id;?></td>
<td class='text-center'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></td>
<td style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo $task->name?></td>
<td><?php echo $task->estimate?></td>
<td class='text-center'><?php echo $task->estimate?></td>
<td class='<?php if(isset($task->delay)) echo 'delayed';?>'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
<td ><?php echo zget($lang->task->statusList, $task->status, $task->status);?></th>
<td class='text-center'><?php echo zget($lang->task->statusList, $task->status, $task->status);?></th>
</tr>
<?php endforeach;?>
</table>
module/block/view/testtaskblock.html.php
+2 -2
View File
@@ -16,7 +16,7 @@
<th width='50'><?php echo $lang->idAB?></th>
<th> <?php echo $lang->testtask->product;?></th>
<th> <?php echo $lang->testtask->name;?></th>
<th> <?php echo $lang->testtask->project . '/' . $lang->testtask->project;?></th>
<th> <?php echo $lang->testtask->project . '/' . $lang->testtask->build;?></th>
<th width='80'><?php echo $lang->testtask->begin;?></th>
<th width='80'><?php echo $lang->testtask->end;?></th>
</tr>
@@ -30,7 +30,7 @@
<td class='text-center'><?php echo $testtask->id;?></td>
<td title='<?php echo $testtask->productName?>'><?php echo $testtask->productName?></td>
<td title='<?php echo $testtask->name?>'><?php echo $testtask->name?></td>
<td title='<?php echo $testtask->projectName . '/' . $testtask->buildName?>'><?php echo $testtask->projectName . '/' . $testtask->buildName?></td>
<td class='text-center' title='<?php echo $testtask->projectName . '/' . $testtask->buildName?>'><?php echo $testtask->projectName . '/' . $testtask->buildName?></td>
<td><?php echo $testtask->begin?></td>
<td><?php echo $testtask->end?></td>
</tr>
module/common/lang/en.php
+1 -1
View File
@@ -178,7 +178,7 @@ $lang->todo->menu = $lang->my->menu;
$lang->product = new stdclass();
$lang->product->menu = new stdclass();
$lang->product->menu->list = array('link' => '%s' . $lang->arrow, 'fixed' => true);
$lang->product->menu->list = array('link' => '%s', 'fixed' => true);
$lang->product->menu->index = 'Index|product|index|locate=no';
$lang->product->menu->story = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->menu->dynamic = 'Dynamic|product|dynamic|productID=%s';
module/file/view/buildexporttpl.html.php
+4
View File
@@ -1,3 +1,7 @@
<style>
.chosen-container-single {max-width: 100px;}
.chosen-container[id^="template"] .chosen-drop {min-width: 180px;!important}
</style>
<?php
echo html::select('template', $templatePairs, $templateID, "class='form-control chosen' onchange='setTemplate(this.value)'");
foreach($templates as $key => $template) echo "<span id='template$template->id' class='hidden'>$template->content</span>";
module/release/js/view.js
-1
View File
@@ -25,7 +25,6 @@ $(function()
if(tabPane.size() == 0) return;
var formID = tabPane.find('.linkBox').find('form:last');
if(formID.size() == 0) formID = tabPane.find('form:last');
console.log(formID);
setTimeout(function(){fixedTfootAction(formID)}, 100);
});
})
module/search/lang/en.php
+2
View File
@@ -22,6 +22,8 @@ $lang->search->deleteQuery = 'Delete query';
$lang->search->setQueryTitle = 'Please input the title（execute searching before save）：';
$lang->search->select = 'Stories/Tasks filter';
$lang->search->me = 'Me';
$lang->search->shortcut = 'Shortcut';
$lang->search->noQuery = 'Save no query!';
$lang->search->operators['='] = '=';
$lang->search->operators['!='] = '!=';
module/tutorial/view/index.html.php
-1
View File
@@ -440,7 +440,6 @@ $(function()
$progress.find('.progress-text').text(progress + '%');
showTask(current);
console.log('totalCount', totalCount, 'finishCount', finishCount);
};
updateUI();