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:
daitingting
2018-05-03 14:58:34 +08:00
parent 46e8569973 9271d69db6
commit fdfa1bbd22
21 changed files with 223 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update9.8.1.sql
+2 -2
View File
@@ -1,3 +1,3 @@
ALTER TABLE `zt_release` ADD `marker` enum('0','1') NOT NULL default '0' AFTER `name`;
ALTER TABLE `zt_doc` ADD `collector` text NOT NULL default '' AFTER `views`,
ADD `visitedDate` text NOT NULL default '' AFTER `editedDate`;
ALTER TABLE `zt_doc` ADD `collector` text NOT NULL AFTER `views`;
ALTER TABLE `zt_doc` ADD `visitedDate` datetime NOT NULL AFTER `editedDate`;
db/zentao.sql
+3
View File
@@ -255,10 +255,12 @@ CREATE TABLE IF NOT EXISTS `zt_doc` (
`keywords` varchar(255) NOT NULL,
`type` varchar(30) NOT NULL,
`views` smallint(5) unsigned NOT NULL,
`collector` text NOT NULL,
`addedBy` varchar(30) NOT NULL,
`addedDate` datetime NOT NULL,
`editedBy` varchar(30) NOT NULL,
`editedDate` datetime NOT NULL,
`visitedDate` datetime NOT NULL,
`acl` varchar(10) NOT NULL DEFAULT 'open',
`groups` varchar(255) NOT NULL,
`users` text NOT NULL,
@@ -518,6 +520,7 @@ CREATE TABLE IF NOT EXISTS `zt_release` (
`branch` mediumint(8) unsigned NOT NULL default '0',
`build` mediumint(8) unsigned NOT NULL,
`name` char(30) NOT NULL default '',
`marker` enum('0','1') NOT NULL default '0',
`date` date NOT NULL,
`stories` text NOT NULL,
`bugs` text NOT NULL,
module/admin/view/safe.html.php
+4 -1
View File
@@ -48,7 +48,10 @@
</tr>
<tr>
<th></th>
<td colspan='2'><?php echo html::submitButton();?></td>
<td colspan='2'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
</form>
module/admin/view/sso.html.php
+4 -3
View File
@@ -41,9 +41,10 @@
<td><?php echo html::input('key', $key, "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center'>
<?php echo html::submitButton(); ?>
</td>
<td colspan='2' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
</form>
module/block/lang/en.php
+5 -5
View File
@@ -374,8 +374,8 @@ $lang->block->gridOptions[8] = 'Left';
$lang->block->gridOptions[4] = 'Right';
$lang->block->flowchart = array();
$lang->block->flowchart[] = array('Administration', 'Manage a Company', 'Add Users', 'Maintain Privileges');
$lang->block->flowchart[] = array($lang->productCommon . ' Manager', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Release');
$lang->block->flowchart[] = array($lang->projectCommon . ' Manager', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Decompose Tasks');
$lang->block->flowchart[] = array('DEV Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs');
$lang->block->flowchart[] = array('QA Team', 'Write Cases', 'Implement Cases', 'Report Bugs', 'Resolve Bugs', 'Close Bugs');
$lang->block->flowchart[] = array('Administlrator', 'Add Departments', 'Add Users', 'Maintain Privileges');
$lang->block->flowchart[] = array($lang->productCommon . ' Owner', 'Add ' . $lang->productCommon, 'Maintain Modules', 'Maintain Plans', 'Maintain Stories', 'Create Release');
$lang->block->flowchart[] = array('Scrum Master', 'Add ' . $lang->projectCommon, 'Maintain Teams', 'Link ' . $lang->productCommon . 's', 'Link Stories', 'Decompose Tasks');
$lang->block->flowchart[] = array('Dev Team', 'Claim Tasks/Bugs', 'Update Status', 'Finish Tasks/Bugs');
$lang->block->flowchart[] = array('QA Team', 'Write Cases', 'Execute Cases', 'Report Bugs', 'Check Bugs', 'Close Bugs');
module/mail/view/browse.html.php
+4 -4
View File
@@ -12,11 +12,11 @@
?>
<?php include $this->app->getModuleRoot() . 'message/view/header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<div class='heading'>
<strong><?php echo $lang->mail->browse?></strong>
<div class='main-header'>
<div class='heading'>
<strong><?php echo $lang->mail->browse?></strong>
</div>
</div>
</div>
<form class='main-table' method='post' action='<?php echo inlink('batchDelete')?>' target='hiddenwin' id='mailForm' data-ride='table'>
<table class='table has-sort-head table-fixed'>
<?php $vars = "orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
module/misc/css/changelog.css
+1 -1
View File
@@ -1,4 +1,4 @@
#versionMenu {margin: 20px;}
#versionMenu {margin-left: 20px;}
#versionMenu .dropdown-menu {min-width: 130px; max-height:180px;overflow-y:auto;}
#featureList {padding: 0 20px 20px; min-height:200px;}
module/misc/view/changelog.html.php
+28 -26
View File
@@ -1,33 +1,35 @@
<?php include '../../common/view/header.lite.html.php';?>
<div class='container mw-800px'>
<div id='titlebar'>
<div class='heading'>
<strong><?php echo $lang->changeLog ?></strong>
<div id='mainContent' class='main-content'>
<div class='center-block mw-800px'>
<div class='main-header clearfix'>
<h2 class='pull-left'><?php echo $lang->changeLog ?></h2>
<div class='btn-toolbar pull-left'>
<div class='dropdown' id='versionMenu'>
<button class='btn dropdown-toggle' type='button' data-toggle='dropdown'><?php echo $version === 'latest' ? $lang->misc->feature->lastest : ('v' . $version) ?> <span class='caret'></span></button>
<ul class='dropdown-menu'>
<?php foreach(array_keys($lang->misc->feature->all) as $versionName):?>
<li<?php echo $versionName === $version ? " class='active'" : '' ?>>
<?php echo html::a(helper::createLink('misc', 'changeLog', "version=$versionName"), $versionName === 'latest' ? $lang->misc->feature->lastest : ('v' . $versionName));?>
</li>
<?php endforeach; ?>
</ul>
</div>
</div>
</div>
</div>
<div class='dropdown' id='versionMenu'>
<button class='btn btn-sm dropdown-toggle' type='button' data-toggle='dropdown'><?php echo $version === 'latest' ? $lang->misc->feature->lastest : ('v' . $version) ?> <span class='caret'></span></button>
<ul class='dropdown-menu'>
<?php foreach(array_keys($lang->misc->feature->all) as $versionName):?>
<li<?php echo $versionName === $version ? " class='active'" : '' ?>>
<?php echo html::a(helper::createLink('misc', 'changeLog', "version=$versionName"), $versionName === 'latest' ? $lang->misc->feature->lastest : ('v' . $versionName));?>
</li>
<div id='featureList' class='article-content'>
<?php $idx = count($features) == 1 ? '' : 1; ?>
<?php foreach ($features as $feature):?>
<div class='item'>
<h3><?php echo $idx . ($idx == '' ? '' : '. ') . $feature['title'] ?></h3>
<div class='desc'><?php echo $feature['desc'] ?></div>
</div>
<?php $idx++; ?>
<?php endforeach; ?>
</ul>
</div>
<div id='featureList' class='article-content'>
<?php $idx = count($features) == 1 ? '' : 1; ?>
<?php foreach ($features as $feature):?>
<div class='item'>
<h3><?php echo $idx . ($idx == '' ? '' : '. ') . $feature['title'] ?></h3>
<div class='desc'><?php echo $feature['desc'] ?></div>
<?php if($detailed and $this->app->getClientLang() != 'en'):?>
<div> <a href='###' onclick="$('.detailed').toggle()"><?php echo $lang->misc->feature->detailed;?></a></div>
<div class='detailed hide'><?php echo $detailed;?></div>
<?php endif;?>
</div>
<?php $idx++; ?>
<?php endforeach; ?>
<?php if($detailed and $this->app->getClientLang() != 'en'):?>
<div> <a href='###' onclick="$('.detailed').toggle()"><?php echo $lang->misc->feature->detailed;?></a></div>
<div class='detailed hide'><?php echo $detailed;?></div>
<?php endif;?>
</div>
</div>
<?php include '../../common/view/footer.lite.html.php';?>
module/misc/view/checktable.html.php
-53
View File
@@ -1,53 +0,0 @@
<?php
/**
* The reset view file of user module of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Yidong Wang <yidong@cnezsoft.com>
* @package user
* @version $Id$
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<div class='alert alert-info'><strong><?php echo $lang->misc->repairTable;?></strong></div>
<div class='container mw-700px'>
<?php if($status == 'createFile'):?>
<div class='panel-body'>
<?php printf($lang->misc->noticeRepair, $this->session->checkFileName);?>
</div>
<p><?php echo html::a(inlink('checkTable'), $this->lang->refresh, '', "class='btn'")?></p>
<?php elseif($status == 'check'):?>
<div class='panel'>
<table class='table table-form'>
<thead>
<tr>
<th><?php echo $lang->misc->tableName?></th>
<th><?php echo $lang->misc->tableStatus?></th>
</tr>
</thead>
<tbody>
<?php $needRepair = false;?>
<?php foreach($tables as $tableName => $tableStatus):?>
<?php if($tableStatus != 'ok') $needRepair = true;?>
<tr>
<td><?php echo $tableName;?></td>
<td><span style='color:<?php echo $tableStatus == 'ok' ? 'green' : 'red'?>'><?php echo $tableStatus;?></span></td>
</tr>
</tbody>
<?php endforeach;?>
<?php if($needRepair):?>
<tfoot>
<tr><td class='text-center' colspan='2'><?php echo html::a(inlink('checkTable', "type=repair"), $lang->misc->needRepair, '', "class='btn btn-primary'")?></td></tr>
</tfoot>
<?php endif;?>
</table>
</div>
<?php endif;?>
</div>
<script laguage='Javascript'>
<?php if(isset($pageJS)) echo $pageJS;?>
</script>
</body>
</html>
module/misc/view/qrcode.html.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php include '../../common/view/header.lite.html.php';?>
<table class='table-1' style='margin-top:100px;'>
<table class='table' style='margin-top:100px;'>
<caption><?php echo $lang->misc->mobile?></caption>
<tr><td><?php echo $noGDLib?></td></tr>
</table>
module/project/css/create.css
+2
View File
@@ -15,3 +15,5 @@
.checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {margin-top: 1px;}
.type-tips {display: none;}
#whitelistBox .checkbox-inline, #whitelistBox .radio-inline{margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}
module/project/view/create.html.php
+5 -1
View File
@@ -54,6 +54,10 @@
</tr>
<tr>
<th><?php echo $lang->project->dateRange;?></th>
<td colspan='3'><?php echo html::radio('delta', $lang->project->endList , '', "onclick='computeEndDate(this.value)'");?></td>
</tr>
<tr>
<th></th>
<td>
<div class='input-group'>
<?php echo html::input('begin', (isset($plan) && !empty($plan->begin) ? $plan->begin : date('Y-m-d')), "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->begin . "' required");?>
@@ -61,7 +65,7 @@
<?php echo html::input('end', (isset($plan) && !empty($plan->end) ? $plan->end : ''), "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->end . "' required");?>
</div>
</td>
<td colspan='2'><?php echo html::radio('delta', $lang->project->endList , '', "onclick='computeEndDate(this.value)'");?></td>
<td></td><td></td>
</tr>
<tr>
<th><?php echo $lang->project->days;?></th>
module/project/view/story.html.php
+1 -1
View File
@@ -185,7 +185,7 @@
if(common::hasPriv('project', 'unlinkStory', $project))
{
$unlinkURL = $this->createLink('project', 'unlinkStory', "projectID=$project->id&storyID=$story->id&confirm=yes");
echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '<i class="icon-unlink"></i>', '', "class='btn btn-link' title='{$lang->project->unlinkStory}'");
echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '<i class="icon-unlink"></i>', '', "class='btn' title='{$lang->project->unlinkStory}'");
}
?>
</td>
module/search/view/savequery.html.php
-1
View File
@@ -26,4 +26,3 @@
</div>
</form>
<?php include '../../common/view/footer.lite.html.php';?>
module/sso/view/bind.html.php
+58 -58
View File
@@ -14,64 +14,64 @@
<?php include '../../common/view/chosen.html.php';?>
<?php if(!empty($config->safe->mode)) $lang->user->placeholder->password1 = $lang->user->placeholder->passwordStrength[$config->safe->mode]?>
<?php js::set('holders', $lang->user->placeholder);?>
<div class='container mw-700px'>
<div class= 'panel' style='margin-top:50px'>
<div class='panel-heading'><strong><?php echo $lang->sso->bind?></strong></div>
<form method='post' target='hiddenwin' id='bindForm'>
<table class='table table-form'>
<tr>
<th class='w-100px'><?php echo $lang->sso->bindType?></th>
<td><?php echo html::radio('bindType', $lang->sso->bindTypeList, 'bind')?></td>
<td></td>
</tr>
<tr class='params bind'>
<th><?php echo $lang->sso->bindUser?></th>
<td><?php echo html::select('bindUser', $users, $data->account, "class='form-control chosen'")?></td>
</tr>
<tr class='params bind'>
<th><?php echo $lang->user->password?></th>
<td><?php echo html::password('bindPassword', '', "class='form-control'")?></td>
</tr>
<tr class='params add hide'>
<th><?php echo $lang->user->account?></th>
<td><?php echo html::input('account', $data->account, "class='form-control' autocomplete='off'")?></td>
</tr>
<tr class='params add hide'>
<th><?php echo $lang->user->password?></th>
<td>
<span class='input-group'>
<?php echo html::password('password1', '', "class='form-control' autocomplete='off' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)'");?>
<span class='input-group-addon' id='passwordStrength'></span>
</span>
</td>
</tr>
<tr class='params add hide'>
<th><?php echo $lang->user->password2?></th>
<td><?php echo html::password('password2', '', "class='form-control'")?></td>
</tr>
<tr class='params add hide'>
<th><?php echo $lang->user->realname?></th>
<td><?php echo html::input('realname', $data->realname, "class='form-control' autocomplete='off'")?></td>
</tr>
<tr class='params add hide'>
<th><?php echo $lang->user->gender?></th>
<td><?php echo html::radio('gender', $lang->user->genderList, $data->gender)?></td>
</tr>
<tr class='params add hide'>
<th><?php echo $lang->user->email?></th>
<td><?php echo html::input('email', $data->email, "class='form-control' autocomplete='off'")?></td>
</tr>
<tr class='params add hide'>
<th></th>
<td colspan='2'><span style='color:red'><?php echo $lang->sso->bindNotice?></span></td>
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton()?></td>
</tr>
</table>
</form>
</div>
<div id='mainContent' class='main-content'>
<div class='center-block mw-700px'>
<div class='main-header'><h2><?php echo $lang->sso->bind?></h2></div>
<form method='post' target='hiddenwin' id='bindForm'>
<table class='table table-form'>
<tr>
<th class='w-100px'><?php echo $lang->sso->bindType?></th>
<td><?php echo html::radio('bindType', $lang->sso->bindTypeList, 'bind')?></td>
<td></td>
</tr>
<tr class='params bind'>
<th><?php echo $lang->sso->bindUser?></th>
<td><?php echo html::select('bindUser', $users, $data->account, "class='form-control chosen'")?></td>
</tr>
<tr class='params bind'>
<th><?php echo $lang->user->password?></th>
<td><?php echo html::password('bindPassword', '', "class='form-control'")?></td>
</tr>
<tr class='params add hide'>
<th><?php echo $lang->user->account?></th>
<td><?php echo html::input('account', $data->account, "class='form-control' autocomplete='off'")?></td>
</tr>
<tr class='params add hide'>
<th><?php echo $lang->user->password?></th>
<td>
<span class='input-group'>
<?php echo html::password('password1', '', "class='form-control' autocomplete='off' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)'");?>
<span class='input-group-addon' id='passwordStrength'></span>
</span>
</td>
</tr>
<tr class='params add hide'>
<th><?php echo $lang->user->password2?></th>
<td><?php echo html::password('password2', '', "class='form-control'")?></td>
</tr>
<tr class='params add hide'>
<th><?php echo $lang->user->realname?></th>
<td><?php echo html::input('realname', $data->realname, "class='form-control' autocomplete='off'")?></td>
</tr>
<tr class='params add hide'>
<th><?php echo $lang->user->gender?></th>
<td><?php echo html::radio('gender', $lang->user->genderList, $data->gender)?></td>
</tr>
<tr class='params add hide'>
<th><?php echo $lang->user->email?></th>
<td><?php echo html::input('email', $data->email, "class='form-control' autocomplete='off'")?></td>
</tr>
<tr class='params add hide'>
<th></th>
<td colspan='2'><span style='color:red'><?php echo $lang->sso->bindNotice?></span></td>
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton()?></td>
</tr>
</table>
</form>
</div>
</div>
<script>
$(function()
module/story/css/batchcreate.css
-1
View File
@@ -1,4 +1,3 @@
#batchCreateForm .col-id {width: 50px; text-align: center; color: #838A9D}
#batchCreateForm .col-module,
#batchCreateForm .col-plan {width: 180px;}
module/svn/view/cat.html.php
+4 -2
View File
@@ -11,6 +11,8 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<div class='box-title'><?php echo "$url@$revision";?></div>
<div class='box-content'><xmp><?php echo $code;?></xmp></div>
<div class='detail'>
<div class='detail-title'><?php echo "$url@$revision";?></div>
<div class='detail-content'><xmp><?php echo $code;?></xmp></div>
</div>
<?php include '../../common/view/footer.lite.html.php';?>
module/svn/view/diff.html.php
+4 -2
View File
@@ -12,6 +12,8 @@
?>
<?php include '../../common/view/header.lite.html.php';?>
<?php $catLink = $this->svn->buildURL('cat', $url, $revision);?>
<div class='box-title'><?php echo html::a($catLink, "$url@$revision");?></div>
<div class='box-content'><xmp><?php echo $diff;?></xmp></div>
<div class='detail'>
<div class='detail-title'><?php echo html::a($catLink, "$url@$revision");?></div>
<div class='detail-content'><xmp><?php echo $diff;?></xmp></div>
</div>
<?php include '../../common/view/footer.lite.html.php';?>
module/task/css/batchcreate.css
+4
View File
File diff suppressed because one or more lines are too long
module/testcase/css/batchcreate.css
+7
View File
File diff suppressed because one or more lines are too long
module/testcase/view/batchcreate.html.php
+86 -75
View File
@@ -14,84 +14,97 @@
<?php js::set('testcaseBatchCreateNum', $config->testcase->batchCreate);?>
<?php js::set('productID', $productID);?>
<?php js::set('branch', $branch);?>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['testcase']);?></span>
<strong>
<small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small>
<div id="mainContent" class="main-content">
<div class="main-header">
<h2>
<?php echo $lang->testcase->batchCreate;?>
<?php if($this->session->currentProductType !== 'normal') echo '<span class="label label-info">' . $branches[$branch] . '</span>';?>
</strong>
<?php if($story):?>
<small class='text-muted'><?php echo html::icon($lang->icons['story']) . ' ' . $story->title ?></small>
<?php endif;?>
<div class='actions'>
<?php echo html::commonButton($lang->pasteText, "data-toggle='myModal'", 'btn btn-primary')?>
<button type="button" class="btn btn-default" data-toggle="customModal"><i class='icon icon-cog'></i></button>
<?php if($story):?>
<small class='text'><?php echo $lang->arrow . $story->title ?></small>
<?php endif;?>
</h2>
<div class="pull-right btn-toolbar">
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=testcase&section=custom&key=batchCreateFields')?>
<?php include '../../common/view/customfield.html.php';?>
</div>
</div>
<?php
$visibleFields = array();
foreach(explode(',', $showFields) as $field)
{
if($field) $visibleFields[$field] = '';
}
$colspan = count($visibleFields) + 3;
$hiddenStory = (isonlybody() and $story) ? ' hidden' : '';
if($hiddenStory and isset($visibleFields['story'])) $colspan -= 1;
?>
<form method='post' class='load-indicator main-form' enctype='multipart/form-data' target='hiddenwin' id="batchCreateForm">
<table class="table table-form" id="tableBody">
<thead>
<tr class='text-center'>
<th class='w-50px'><?php echo $lang->idAB;?></th>
<th class='w-120px<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo $lang->product->branch;?></th>
<th class='w-180px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
<th class='w-180px<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?>'> <?php echo $lang->testcase->story;?></th>
<th class='text-left required has-btn'>
<?php echo $lang->testcase->title;?></span>
<button type='button' data-toggle="importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
</th>
<th class='w-120px text-left required'><?php echo $lang->testcase->type;?></th>
<th class='w-80px<?php echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->testcase->pri;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'precondition', ' hidden')?>'><?php echo $lang->testcase->precondition;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'> <?php echo $lang->testcase->keywords;?></th>
<th class='w-140px<?php echo zget($visibleFields, 'stage', ' hidden')?>'> <?php echo $lang->testcase->stage;?></th>
<th class='w-70px<?php echo zget($visibleFields, 'review', ' hidden')?>'> <?php echo $lang->testcase->review;?></th>
</tr>
</thead>
<tbody>
<?php unset($lang->testcase->typeList['']);?>
<?php for($i = 0; $i < $config->testcase->batchCreate; $i++):?>
<?php
if($i != 0) $currentModuleID = 'ditto';
if($i != 0) $lang->testcase->typeList['ditto'] = $lang->testcase->ditto;
if($i != 0) $lang->testcase->priList['ditto'] = $lang->testcase->ditto;
$type = $i == 0 ? 'feature' : 'ditto';
$pri = $i == 0 ? 3 : 'ditto';
?>
<tr class='text-center'>
<td><?php echo $i+1;?></td>
<td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branch[$i]", $branches, $branch, "class='form-control' onchange='setModules(this.value, $productID, $i)'");?></td>
<td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen'");?></td>
<td class='text-left<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?>' style='overflow:visible'> <?php echo html::select("story[$i]", $storyList, $story ? $story->id : '', 'class="form-control chosen"');?></td>
<td style='overflow:visible'>
<div class='input-group'>
<div class="input-control has-icon-right">
<?php echo html::input("title[$i]", '', "class='form-control' autocomplete='off'");?>
<div class="colorpicker">
<button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
<ul class="dropdown-menu clearfix">
<li class="heading"><?php echo $lang->testcase->colorTag;?><i class="icon icon-close"></i></li>
</ul>
<?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-icon='color' data-wrapper='input-control-icon-right' data-update-color='#title\\[$i\\]'");?>
</div>
</div>
</div>
</td>
<td><?php echo html::select("type[$i]", $lang->testcase->typeList, $type, "class=form-control");?></td>
<td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'> <?php echo html::select("pri[$i]", $lang->testcase->priList, $pri, "class=form-control");?></td>
<td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$i]", '', "rows='1' class='form-control autosize'")?></td>
<td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'> <?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
<td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[$i][]", $lang->testcase->stageList, '', "class='form-control chosen' multiple");?></td>
<td class='<?php echo zget($visibleFields, 'review', 'hidden')?>'><?php echo html::select("needReview[$i]", $lang->testcase->reviewList, $needReview, "class='form-control'");?></td>
</tr>
<?php endfor;?>
<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');?>
</td>
</tr>
</tbody>
</table>
</form>
</div>
<?php
$visibleFields = array();
foreach(explode(',', $showFields) as $field)
{
if($field) $visibleFields[$field] = '';
}
$colspan = count($visibleFields) + 3;
$hiddenStory = (isonlybody() and $story) ? ' hidden' : '';
if($hiddenStory and isset($visibleFields['story'])) $colspan -= 1;
?>
<form class='form-condensed' method='post' enctype='multipart/form-data' target='hiddenwin'>
<table align='center' class='table table-form table-fixed'>
<thead>
<tr>
<th class='w-50px'><?php echo $lang->idAB;?></th>
<th class='w-120px<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo $lang->product->branch;?></th>
<th class='w-180px<?php echo zget($visibleFields, 'module', ' hidden')?>'><?php echo $lang->testcase->module;?></th>
<th class='w-180px<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?>'> <?php echo $lang->testcase->story;?></th>
<th><?php echo $lang->testcase->title;?> <span class='required'></span></th>
<th class='w-100px'><?php echo $lang->testcase->type;?> <span class='required'></span></th>
<th class='w-80px<?php echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->testcase->pri;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'precondition', ' hidden')?>'><?php echo $lang->testcase->precondition;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden')?>'> <?php echo $lang->testcase->keywords;?></th>
<th class='w-200px<?php echo zget($visibleFields, 'stage', ' hidden')?>'> <?php echo $lang->testcase->stage;?></th>
<th class='w-70px<?php echo zget($visibleFields, 'review', ' hidden')?>'> <?php echo $lang->testcase->review;?></th>
</tr>
</thead>
<?php unset($lang->testcase->typeList['']);?>
<?php for($i = 0; $i < $config->testcase->batchCreate; $i++):?>
<?php
if($i != 0) $currentModuleID = 'ditto';
if($i != 0) $lang->testcase->typeList['ditto'] = $lang->testcase->ditto;
if($i != 0) $lang->testcase->priList['ditto'] = $lang->testcase->ditto;
$type = $i == 0 ? 'feature' : 'ditto';
$pri = $i == 0 ? 3 : 'ditto';
?>
<tr class='text-center'>
<td><?php echo $i+1;?></td>
<td class='text-left<?php echo zget($visibleFields, $product->type, ' hidden')?>'><?php echo html::select("branch[$i]", $branches, $branch, "class='form-control' onchange='setModules(this.value, $productID, $i)'");?></td>
<td class='text-left<?php echo zget($visibleFields, 'module', ' hidden')?>' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $currentModuleID, "class='form-control chosen'");?></td>
<td class='text-left<?php echo zget($visibleFields, 'story', ' hidden'); echo $hiddenStory;?>' style='overflow:visible'> <?php echo html::select("story[$i]", $storyList, $story ? $story->id : '', 'class="form-control chosen"');?></td>
<td style='overflow:visible'>
<div class='input-group'>
<?php echo html::hidden("color[$i]", '', "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->testcase->colorTag}' data-update-text='#title\\[{$i}\\]'");?>
<?php echo html::input("title[$i]", '', "class='form-control' autocomplete='off'");?>
</div>
</td>
<td><?php echo html::select("type[$i]", $lang->testcase->typeList, $type, "class=form-control");?></td>
<td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'> <?php echo html::select("pri[$i]", $lang->testcase->priList, $pri, "class=form-control");?></td>
<td class='<?php echo zget($visibleFields, 'precondition', 'hidden')?>'><?php echo html::textarea("precondition[$i]", '', "rows='1' class='form-control autosize'")?></td>
<td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?>'> <?php echo html::input("keywords[$i]", '', "class='form-control' autocomplete='off'");?></td>
<td class='text-left<?php echo zget($visibleFields, 'stage', ' hidden')?>' style='overflow:visible'><?php echo html::select("stage[$i][]", $lang->testcase->stageList, '', "class='form-control chosen' multiple");?></td>
<td class='<?php echo zget($visibleFields, 'review', 'hidden')?>'><?php echo html::select("needReview[$i]", $lang->testcase->reviewList, $needReview, "class='form-control'");?></td>
</tr>
<?php endfor;?>
<tfoot>
<tr><td colspan='<?php echo $colspan?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td></tr>
</tfoot>
</table>
</form>
<table class='hide' id='trTemp'>
<tbody>
<tr class='text-center'>
@@ -113,7 +126,5 @@ if($hiddenStory and isset($visibleFields['story'])) $colspan -= 1;
</tr>
</tbody>
</table>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=testcase&section=custom&key=batchCreateFields')?>
<?php include '../../common/view/customfield.html.php';?>
<?php include '../../common/view/pastetext.html.php';?>
<?php include '../../common/view/footer.html.php';?>