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

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

Browse Source
This commit is contained in:
liugang
2018-05-15 16:02:44 +08:00
parent 05b7ecb71e 572a80e9e9
commit ec4117c6b9
47 changed files with 140 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/admin.html.php
+1 -1
View File
@@ -40,7 +40,7 @@ include '../../common/view/chosen.html.php';
<div class="form-group form-actions">
<div class="col-sm-7 col-sm-offset-3">
<button type="submit" class="btn btn-wide btn-primary"><?php echo $lang->save;?></button>
<button type="cancel" class="btn btn-wide btn-gray" data-dismiss="modal"><?php echo $lang->cancel;?></button>
<button type="cancel" class="btn btn-wide" data-dismiss="modal"><?php echo $lang->cancel;?></button>
</div>
</div>
</form>
module/bug/lang/en.php
+2
View File
@@ -129,6 +129,8 @@ $lang->bug->resolvedByMeAB = 'Resolved By Me';
$lang->bug->ditto = 'Ditto';
$lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!';
$lang->bug->noAssigned = 'Not Assigned';
$lang->bug->noBug = 'No BUG. You could ';
$lang->bug->noModule = '<div>You have no modules</div><div>Manage now</div>';
/* 页面标签。*/
$lang->bug->lblAssignedTo = 'Assignee';
module/bug/lang/zh-cn.php
+1
View File
@@ -130,6 +130,7 @@ $lang->bug->ditto = '同上';
$lang->bug->dittoNotice = '该bug与上一bug不属于同一产品！';
$lang->bug->noAssigned = '未指派';
$lang->bug->noBug = '暂时没有BUG，您现在可以';
$lang->bug->noModule = '<div>您现在还没有模块信息</div><div>请维护测试模块</div>';
/* 页面标签。*/
$lang->bug->lblAssignedTo = '当前指派';
module/bug/view/browse.html.php
+11 -8
View File
@@ -11,11 +11,6 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php if(empty($bugs)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->bug->noBug;?></span> <?php common::printLink('bug', 'create', "productID={$productID}", "<i class='icon icon-plus'> </i>" . $lang->bug->create, '', "class='btn btn-info'");?></p>
</div>
<?php else:?>
<?php
include '../../common/view/datatable.fix.html.php';
js::set('browseType', $browseType);
@@ -182,6 +177,11 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<div id="mainContent" class="main-row">
<div class="side-col" id="sidebar">
<div class="cell">
<?php if(!$moduleTree):?>
<hr class="space">
<div class="text-center text-muted"><?php echo $lang->bug->noModule;?></div>
<hr class="space">
<?php endif;?>
<?php echo $moduleTree;?>
<div class="text-center">
<?php common::printLink('tree', 'browse', "productID=$productID&view=bug", $lang->tree->manage, '', "class='btn btn-info btn-wide'");?>
@@ -229,10 +229,10 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<?php endforeach;?>
</tbody>
</table>
<?php if(!empty($bugs)):?>
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php if(!empty($bugs)):?>
<div class='btn-group dropup'>
<?php
$actionLink = $this->createLink('bug', 'batchEdit', "productID=$productID&branch=$branch");
@@ -361,10 +361,14 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
?>
</ul>
</div>
<?php endif;?>
</div>
<?php $pager->show('right', 'pagerjs');?>
</div>
<?php elseif(common::hasPriv('bug', 'create')):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->bug->noBug;?></span> <?php common::printLink('bug', 'create', "productID={$productID}", "<i class='icon icon-plus'> </i>" . $lang->bug->create, '', "class='btn btn-info'");?></p>
</div>
<?php endif;?>
</form>
</div>
</div>
@@ -392,5 +396,4 @@ $(function(){$('#modulemenu .nav li:last').after("<li class='right'><a style='fo
#querybox #searchform{border-bottom: 1px solid #ddd; margin-bottom: 20px;}
</style>
<?php endif;?>
<?php endif;?>
<?php include '../../common/view/footer.html.php';?>
module/bug/view/resolve.html.php
+10 -7
View File
@@ -49,13 +49,16 @@ js::set('productID' , $bug->product);
</div>
</td>
<td>
<div class='input-group'>
<span id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $builds, '', "class='form-control chosen'");?></span>
<?php if(common::hasPriv('build', 'create')):?>
<span id='newBuildBox' class='hidden'><?php echo html::input('buildName', '', "class='form-control' placeholder='{$lang->bug->placeholder->newBuildName}'");?></span>
<span class='input-group-addon'><label class="checkbox-inline"><input name="createBuild" value="1" id="createBuild" type="checkbox"> <?php echo $lang->bug->createBuild?></label></span>
<?php endif;?>
<span id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $builds, '', "class='form-control chosen'");?></span>
<span id='newBuildBox' class='hidden'><?php echo html::input('buildName', '', "class='form-control' placeholder='{$lang->bug->placeholder->newBuildName}'");?></span>
</td>
<td>
<?php if(common::hasPriv('build', 'create')):?>
<div class='checkbox-primary'>
<input type='checkbox' id='createBuild' name='createBuild' value='1' />
<label for='createBuild'><?php echo $lang->bug->createBuild;?></label>
</div>
<?php endif;?>
</td>
</tr>
<tr>
@@ -72,7 +75,7 @@ js::set('productID' , $bug->product);
</tr>
<tr>
<th><?php echo $lang->comment;?></th>
<td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
<td colspan='3'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<th></th><td colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList);?></td>
module/build/view/create.html.php
+1 -1
View File
@@ -75,7 +75,7 @@
<tr>
<td colspan="3" class="text-center">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/build/view/edit.html.php
+1 -1
View File
@@ -69,7 +69,7 @@
<tr>
<td colspan="3" class="text-center">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo $this->config->global->flow != 'onlyTest' ? html::hidden('project', $build->project) : '';?>
</td>
</tr>
module/common/view/customfield.html.php
+1 -1
View File
@@ -26,7 +26,7 @@
</div>
<div>
<?php echo html::submitButton($lang->save);?>
<?php echo html::commonButton($lang->cancel, '', "btn btn-gray close-dropdown");?>
<?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
</div>
</form>
</div>
module/dept/view/browse.html.php
+1 -1
View File
@@ -66,7 +66,7 @@
<td></td>
<td>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('maxOrder', $maxOrder);?>
<?php echo html::hidden('parentDeptID', $deptID);?>
</td>
module/doc/model.php
+1 -1
View File
@@ -157,7 +157,7 @@ class docModel extends model
if(isset($menu['link']))
{
list($menuLabel, $module, $method, $vars) = explode('|', $menu['link']);
$actions .= html::a(helper::createLink($module, $method, $vars), $menuLabel, '', "class='btn btn-gray'");
$actions .= html::a(helper::createLink($module, $method, $vars), $menuLabel, '', "class='btn'");
}
}
module/doc/view/browse.html.php
+2 -2
View File
@@ -40,8 +40,8 @@ var browseType = '<?php echo $browseType;?>';
</div>
<nav class="panel-actions btn-toolbar">
<div class="btn-group">
<?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-gray btn-icon text-primary'");?>
<?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-gray btn-icon'");?>
<?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
<?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
</div>
</nav>
</div>
module/doc/view/browsebygrid.html.php
+2 -2
View File
@@ -4,8 +4,8 @@
<div class="panel-title font-normal"><i class="icon icon-folder-open-o text-muted"></i> <?php echo $title;?></div>
<nav class="panel-actions btn-toolbar">
<div class="btn-group">
<?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-gray btn-icon'");?>
<?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-gray btn-icon text-primary'");?>
<?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
<?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
</div>
</nav>
</div>
module/doc/view/create.html.php
+1 -1
View File
@@ -77,7 +77,7 @@
</tr>
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray') . html::hidden('lib', $libID);?>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide') . html::hidden('lib', $libID);?>
</td>
</tr>
</tbody>
module/doc/view/edit.html.php
+1 -1
View File
@@ -74,7 +74,7 @@
</tr>
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/doc/view/objectlibs.html.php
+2 -2
View File
@@ -23,7 +23,7 @@
</div>
<nav class="panel-actions btn-toolbar">
<div class="dropdown">
<button type="button" title="<?php echo $lang->customConfig;?>" class="btn btn-gray btn-icon" data-toggle="dropdown"><i class="icon icon-cog"></i></button>
<button type="button" title="<?php echo $lang->customConfig;?>" class="btn btn-icon" data-toggle="dropdown"><i class="icon icon-cog"></i></button>
<div class="dropdown-menu pull-right col-lg" id="pageSetting">
<form class='with-padding load-indicator' id='pageSettingForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('custom', 'ajaxSaveCustomFields', 'module=doc&section=custom&key=objectLibs');?>'>
<div><?php echo $lang->customConfig;?></div>
@@ -40,7 +40,7 @@
</div>
<div>
<?php echo html::submitButton($lang->save);?>
<?php echo html::commonButton($lang->cancel, '', "btn btn-gray close-dropdown");?>
<?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
</div>
</form>
</div>
module/doc/view/showfiles.html.php
+2 -2
View File
@@ -39,8 +39,8 @@
</form>
</div>
<div class="btn-group">
<?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=list"), "<i class='icon icon-bars'></i>" , '', "title={$lang->doc->browseTypeList['list']} class='btn btn-gray btn-icon text-primary'");?>
<?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=card"), "<i class='icon icon-cards-view'></i>", '', "title={$lang->doc->browseTypeList['grid']} class='btn btn-gray btn-gray btn-icon'");?>
<?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=list"), "<i class='icon icon-bars'></i>" , '', "title={$lang->doc->browseTypeList['list']} class='btn btn-icon text-primary'");?>
<?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=card"), "<i class='icon icon-cards-view'></i>", '', "title={$lang->doc->browseTypeList['grid']} class='btn btn-icon'");?>
</div>
</nav>
</div>
module/file/view/buildform.html.php
+1 -1
View File
@@ -8,7 +8,7 @@
<input type="text" name="labels[]" class="form-control file-editbox" placeholder="<?php echo $lang->file->title;?>">
<div class="input-group-btn">
<button type="button" class="btn btn-success file-name-confirm"><i class="icon icon-check"></i></button>
<button type="button" class="btn btn-gray file-name-cancel"><i class="icon icon-close"></i></button>
<button type="button" class="btn file-name-cancel"><i class="icon icon-close"></i></button>
</div>
</div>
<div class="file-input-normal input-group">
module/group/view/manageview.html.php
+1 -1
View File
@@ -65,7 +65,7 @@
<th><span class='hidden'><?php echo html::selectAll('', 'checkbox')?></span></th>
<td colspan='2'>
<?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('foo'); // Just a hidden var, to make sure $_POST is not empty.?>
</td>
</tr>
module/group/view/privbygroup.html.php
+2 -2
View File
@@ -38,7 +38,7 @@
<th class='text-right'></th>
<td>
<?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('noChecked'); // Save the value of no checked.?>
</td>
</tr>
@@ -122,7 +122,7 @@
</th>
<td>
<?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('noChecked'); // Save the value of no checked.?>
</td>
</tr>
module/group/view/privbymodule.html.php
+1 -1
View File
@@ -42,7 +42,7 @@
<tr>
<td class='text-center' colspan='3'>
<?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('foo'); // Just make $_POST not empty..?>
</td>
</tr>
module/product/view/batchedit.html.php
+1 -1
View File
@@ -72,7 +72,7 @@
<tr>
<td colspan="<?php echo count($visibleFields) + 4?>" class="text-center">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
<?php echo html::backButton('', '', "btn btn-wide");?>
</td>
</tr>
</tfoot>
module/product/view/create.html.php
+1 -1
View File
@@ -84,7 +84,7 @@
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tbody>
module/product/view/edit.html.php
+1 -1
View File
@@ -73,7 +73,7 @@
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tbody>
module/productplan/view/batchedit.html.php
+1 -1
View File
@@ -42,7 +42,7 @@
<tr>
<td colspan='5' class="text-center">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
<?php echo html::backButton('', '', "btn btn-wide");?>
</td>
</tr>
</tfoot>
module/productplan/view/create.html.php
+1 -1
View File
@@ -59,7 +59,7 @@
<tr>
<td colspan='4' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('product', $product->id);?>
</td>
</tr>
module/productplan/view/edit.html.php
+1 -1
View File
@@ -59,7 +59,7 @@
<tr>
<td colspan='4' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('product', $product->id);?>
</td>
</tr>
module/project/view/create.html.php
+1 -1
View File
@@ -138,7 +138,7 @@
<td colspan='3'><?php echo html::checkbox('whitelist', $groups, $whitelist, '', '', 'inline');?></td>
</tr>
<tr>
<td colspan='4' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray');?></td>
<td colspan='4' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/project/view/edit.html.php
+1 -1
View File
@@ -145,7 +145,7 @@
<th><?php echo $lang->project->whitelist;?></th>
<td colspan='2' id='whitelistBox'><?php echo html::checkbox('whitelist', $groups, $project->whitelist, '', '', 'inline');?></td>
</tr>
<tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray');?></td></tr>
<tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td></tr>
</table>
</form>
</div>
module/release/view/create.html.php
+1 -1
View File
@@ -50,7 +50,7 @@
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tbody>
module/release/view/edit.html.php
+1 -1
View File
@@ -58,7 +58,7 @@
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('product', $release->product);?>
</td>
</tr>
module/search/view/buildform.html.php
+1 -1
View File
@@ -211,7 +211,7 @@ foreach($fieldParams as $fieldName => $param)
if($style != 'simple')
{
if(common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), $lang->save, '', "class='btn-save-form btn btn-secondary btn-wide'") . "&nbsp;";
echo html::commonButton($lang->search->reset, 'onclick=resetForm(this)', 'btn-reset-form btn btn-gray btn-wide');
echo html::commonButton($lang->search->reset, 'onclick=resetForm(this)', 'btn-reset-form btn btn-wide');
}
echo html::commonButton('<i class="icon icon-chevron-double-down"></i>', '', 'btn-expand-form btn btn-info pull-right');
echo html::hidden('formType', 'lite');
module/story/view/batchclose.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
<tr>
<td colspan='5' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/story/view/batchcreate.html.php
+1 -1
View File
@@ -92,7 +92,7 @@
<tr>
<td colspan="<?php echo count($visibleFields) + 3?>" class="text-center form-actions">
<?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
<?php echo html::backButton('', '', "btn btn-wide");?>
</td>
</tr>
</tfoot>
module/story/view/batchedit.html.php
+1 -1
View File
@@ -149,7 +149,7 @@ foreach(explode(',', $showFields) as $field)
<tr>
<td colspan='<?php echo count($visibleFields) + ($branchProduct ? 3 : 2);?>' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tfoot>
module/story/view/create.html.php
+1 -1
View File
@@ -186,7 +186,7 @@
<tr>
<td colspan="5" class="text-center">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tfoot>
module/task/view/batchcreate.html.php
+1 -1
View File
@@ -135,7 +135,7 @@
<tr>
<td colspan='<?php echo $colspan?>' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tbody>
module/task/view/batchedit.html.php
+1 -1
View File
@@ -111,7 +111,7 @@
<tr>
<td colspan='<?php echo count($visibleFields) + 3;?>' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tfoot>
module/task/view/create.html.php
+1 -1
View File
@@ -166,7 +166,7 @@
<tr>
<td colspan='4' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
<?php echo html::backButton('', '', 'btn btn-gray btn-wide');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/testcase/view/review.html.php
+12 -14
View File
@@ -14,14 +14,14 @@
<?php include '../../common/view/chosen.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['testcase']);?> <strong><?php echo $case->id;?></strong></span>
<strong><?php echo html::a($this->createLink('case', 'view', "caseID=$case->id"), $case->title);?></strong>
<small><?php echo html::icon($lang->icons['review']) . ' ' . $lang->testcase->review;?></small>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2>
<span class='label label-id'><?php echo $case->id;?></span>
<?php echo html::a($this->createLink('case', 'view', "caseID=$case->id"), $case->title);?>
</h2>
</div>
</div>
<form method='post' target='hiddenwin' class='form-condensed'>
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->testcase->reviewedDateAB;?></th>
@@ -40,13 +40,11 @@
<td colspan='2'><?php echo html::textarea('comment', '', "rows='8' class='form-control'");?></td>
</tr>
<tr>
<td></td>
<td colspan='2'>
<?php echo html::submitButton();?>
</td>
<td colspan='3' class='text-center'><?php echo html::submitButton();?></td>
</tr>
</table>
</form>
<hr class='small'>
<div class='main'><?php include '../../common/view/action.html.php';?></div>
</form>
<hr class='small' />
<div class='main'><?php include '../../common/view/action.html.php';?></div>
</div>
<?php include '../../common/view/footer.lite.html.php';?>
module/testtask/view/batchrun.html.php
+58 -60
View File
@@ -12,68 +12,66 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php $this->app->loadLang('testcase'); unset($this->lang->testcase->resultList['n/a']); ?>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['testtask']);?></span>
<strong><small class='text-muted'><?php echo html::icon($lang->icons['batchRun']);?></small> <?php echo $lang->testtask->common . $lang->colon . $lang->testtask->batchRun;?></strong>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2><?php echo $lang->testtask->common . $lang->colon . $lang->testtask->batchRun;?></h2>
</div>
<form method='post' target='hiddenwin'>
<table class='table table-fixed table-form table-bordered'>
<thead>
<tr>
<th class='w-id'> <?php echo $lang->idAB;?></th>
<th class='w-100px'><?php echo $lang->testcase->module;?></th>
<th class='w-200px'><?php echo $lang->testcase->title;?></th>
<th class='precondition w-60px'><?php echo $lang->testcase->precondition;?></th>
<th class='w-80px'><?php echo $lang->testcase->result?></th>
<th> <?php echo $lang->testcase->stepDesc . '/' . $lang->testcase->stepExpect?></th>
</tr>
</thead>
<?php foreach($caseIDList as $caseID):?>
<?php if(!$productID) $moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($cases[$caseID]->product, $viewType = 'case', $startModuleID = 0);?>
<tr class='text-center'>
<td><?php echo $caseID . html::hidden("version[$caseID]", $cases[$caseID]->version)?></td>
<td class='text-left'><?php echo "<span title='" . $moduleOptionMenu[$cases[$caseID]->module] . "'>" . $moduleOptionMenu[$cases[$caseID]->module] . "</span>"?></td>
<td class='text-left wordwrap'><?php echo "<span title='{$cases[$caseID]->title}'>{$cases[$caseID]->title}</span>"?></td>
<td class='text-left precondition wordwrap'><?php echo "<span title='{$cases[$caseID]->precondition}'>{$cases[$caseID]->precondition}</span>"?></td>
<td><?php echo html::radio("results[$caseID]", $this->lang->testcase->resultList, 'pass', "onclick='showAction(this.value,\".action$caseID\")'", 'block')?></td>
<td>
<?php if(!empty($steps[$caseID])):?>
<table class='table table-fixed'>
<?php $stepId = $childId = 0;?>
<?php foreach($steps[$caseID] as $stepID => $step):?>
<?php
if($step->type == 'group' or $step->type == 'step')
{
$stepId ++;
$childId = 0;
}
$ID = $step->type == 'item' ? "{$stepId}.{$childId}" : $stepId;
$stepClass = $step->type == 'item' ? 'step-item' : 'step-group';
?>
<tr>
<td class='text-left w-p30' <?php if($step->type == 'group') echo "colspan='2'"?>><?php echo "<span title='$step->desc' class='$stepClass'>" . $ID . "、" . $step->desc . '</span>'?></td>
<?php if($step->type != 'group'):?>
<td class='text-left w-p30'><?php echo "<span title='$step->expect'>" . $lang->testcase->stepExpect . "：" . $step->expect . '</span>'?></td>
<td class='w-80px hidden action<?php echo $caseID?>'><?php echo html::select("steps[$caseID][$stepID]", $lang->testcase->resultList, 'pass', "class='form-control'")?></td>
<td class='hidden action<?php echo $caseID?>'><?php echo html::input("reals[$caseID][$stepID]", '', "class='form-control'");?></td>
<?php endif;?>
</tr>
<?php $childId ++;?>
<?php endforeach?>
</table>
<?php else:?>
<span class='hidden action<?php echo $caseID?>'><?php echo html::input("reals[$caseID][]", '', "class='form-control'");?></span>
<?php endif;?>
</td>
</tr>
<?php endforeach;?>
<tr><td colspan='6' class='text-center'><?php echo html::submitButton();?></td></tr>
</table>
</form>
</div>
<form class='form-condensed' method='post' target='hiddenwin'>
<table class='table table-fixed table-form table-bordered'>
<thead>
<tr>
<th class='w-id'> <?php echo $lang->idAB;?></th>
<th class='w-100px'><?php echo $lang->testcase->module;?></th>
<th width='200'> <?php echo $lang->testcase->title;?></th>
<th class='precondition' width='60'><?php echo $lang->testcase->precondition;?></th>
<th width='180'> <?php echo $lang->testcase->result?></th>
<th> <?php echo $lang->testcase->stepDesc . '/' . $lang->testcase->stepExpect?></th>
</tr>
</thead>
<?php foreach($caseIDList as $caseID):?>
<?php if(!$productID) $moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($cases[$caseID]->product, $viewType = 'case', $startModuleID = 0);?>
<tr class='text-center'>
<td><?php echo $caseID . html::hidden("version[$caseID]", $cases[$caseID]->version)?></td>
<td class='text-left'><?php echo "<span title='" . $moduleOptionMenu[$cases[$caseID]->module] . "'>" . $moduleOptionMenu[$cases[$caseID]->module] . "</span>"?></td>
<td class='text-left wordwrap'><?php echo "<span title='{$cases[$caseID]->title}'>{$cases[$caseID]->title}</span>"?></td>
<td class='text-left precondition wordwrap'><?php echo "<span title='{$cases[$caseID]->precondition}'>{$cases[$caseID]->precondition}</span>"?></td>
<td><?php echo html::radio("results[$caseID]", $this->lang->testcase->resultList, 'pass', "onclick='showAction(this.value,\".action$caseID\")'", 'block')?></td>
<td>
<?php if(!empty($steps[$caseID])):?>
<table class='table table-fixed'>
<?php $stepId = $childId = 0;?>
<?php foreach($steps[$caseID] as $stepID => $step):?>
<?php
if($step->type == 'group' or $step->type == 'step')
{
$stepId ++;
$childId = 0;
}
$ID = $step->type == 'item' ? "{$stepId}.{$childId}" : $stepId;
$stepClass = $step->type == 'item' ? 'step-item' : 'step-group';
?>
<tr>
<td class='text-left w-p30' <?php if($step->type == 'group') echo "colspan='2'"?>><?php echo "<span title='$step->desc' class='$stepClass'>" . $ID . "、" . $step->desc . '</span>'?></td>
<?php if($step->type != 'group'):?>
<td class='text-left w-p30'><?php echo "<span title='$step->expect'>" . $lang->testcase->stepExpect . "：" . $step->expect . '</span>'?></td>
<td class='w-80px hidden action<?php echo $caseID?>'><?php echo html::select("steps[$caseID][$stepID]", $lang->testcase->resultList, 'pass', "class='form-control'")?></td>
<td class='hidden action<?php echo $caseID?>'><?php echo html::input("reals[$caseID][$stepID]", '', "class='form-control'");?></td>
<?php endif;?>
</tr>
<?php $childId ++;?>
<?php endforeach?>
</table>
<?php else:?>
<span class='hidden action<?php echo $caseID?>'><?php echo html::input("reals[$caseID][]", '', "class='form-control'");?></span>
<?php endif;?>
</td>
</tr>
<?php endforeach;?>
<tr><td colspan='6' class='text-center'><?php echo html::submitButton();?></td></tr>
</table>
</form>
<script type='text/javascript'>
<script>
function showAction(value, obj)
{
if(value == 'pass')
module/todo/view/batchcreate.html.php
+1 -1
View File
@@ -83,7 +83,7 @@
<?php endfor;?>
</tbody>
<tfoot>
<tr><td class='text-center' colspan='<?php echo $columns?>'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray');?></td></tr>
<tr><td class='text-center' colspan='<?php echo $columns?>'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td></tr>
</tfoot>
</table>
<div class="hidden">
module/todo/view/edit.html.php
+1 -1
View File
@@ -138,7 +138,7 @@
<div class="row form-group form-actions">
<div class="col-sm-offset-2 col-sm-10">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</div>
</div>
</form>
module/tree/view/browse.html.php
+1 -1
View File
@@ -126,7 +126,7 @@
<?php endif;?>
<td colspan="2">
<?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
<?php echo $this->session->{$viewType . 'List'} ? html::linkButton($this->lang->goback, $this->session->{$viewType .'List'}, 'btn btn-wide btn-gray') : html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo $this->session->{$viewType . 'List'} ? html::linkButton($this->lang->goback, $this->session->{$viewType .'List'}, 'btn btn-wide') : html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('parentModuleID', $currentModuleID);?>
<?php echo html::hidden('maxOrder', $maxOrder);?>
</td>
module/user/view/batchcreate.html.php
+1 -1
View File
@@ -103,7 +103,7 @@
<tr>
<td colspan="<?php echo count($visibleFields) + 6?>" class="text-center">
<?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
<?php echo html::backButton('', '', "btn btn-wide");?>
</td>
</tr>
</tfoot>
module/user/view/batchedit.html.php
+1 -1
View File
@@ -95,7 +95,7 @@
<tr>
<td colspan="<?php echo count($visibleFields) + 4;?>" class="text-center">
<?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
<?php echo html::backButton('', '', "btn btn-wide");?>
</td>
</tr>
</tfoot>
module/user/view/create.html.php
+1 -1
View File
@@ -85,7 +85,7 @@
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/user/view/edit.html.php
+1 -1
View File
@@ -117,7 +117,7 @@
<tr>
<td colspan='2' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>