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:
Yagami
2018-09-27 14:00:02 +08:00
parent bb3c7e82e3 b4407c7529
commit 4f718b3796
115 changed files with 434 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/base/front/front.class.php
+2 -2
View File
@@ -462,7 +462,7 @@ class baseHTML
* @access public
* @return string the reset button tag.
*/
public static function resetButton($label = '', $class = '')
public static function resetButton($label = '', $class = 'btn-wide')
{
if(empty($label))
{
@@ -482,7 +482,7 @@ class baseHTML
* @access public
* @return string the back button tag.
*/
public static function backButton($label = '', $misc = '', $class = '')
public static function backButton($label = '', $misc = '', $class = 'btn-wide')
{
if(helper::inOnlyBodyMode()) return false;
module/admin/view/safe.html.php
+1 -1
View File
@@ -49,7 +49,7 @@
<tr>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</table>
module/admin/view/sso.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
<tr>
<td colspan='2' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</table>
module/block/view/todoblock.html.php
+3 -3
View File
@@ -18,8 +18,8 @@ if(!$selfCall) die(include('./todolist.html.php'));
.block-todoes .todoes-input .form-control::-moz-placeholder {font-size: 12px; line-height: 20px; color: #a4a8b6;}
.block-todoes .todoes-input .form-control:-ms-input-placeholder {font-size: 12px; line-height: 20px;color: #a4a8b6;}
.block-todoes .todoes-input .form-control::placeholder {font-size: 12px; line-height: 20px; color: #a4a8b6;}
.block-todoes .todoes {padding: 0 10px 10px 10px; margin: 0 -20px; max-height: 350px; overflow: auto;}
.block-todoes .todoes > li {position: relative; padding: 5px 10px 5px 35px; list-style: none;}
.block-todoes .todoes {padding: 0 10px 10px 10px; margin: 0 -20px; max-height: 350px; overflow: auto; overflow-x:hidden}
.block-todoes .todoes > li {position: relative; padding: 5px 10px 5px 35px; list-style: none; white-space:nowrap;}
.block-todoes .todoes > li:hover {background-color: #e9f2fb;}
.block-todoes .todo-title {padding: 5px;}
.block-todoes .todo-pri {margin: 0 5px;}
@@ -103,7 +103,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
<span class="todo-time"><?php echo date(DT_DATE4, strtotime($todo->date)) . ' ' . $todo->begin;?></span>
<?php endif;?>
<span class="todo-pri label-pri label-pri-<?php echo $todo->pri?>" title="<?php echo zget($lang->todo->priList, $todo->pri);?>"><?php echo zget($lang->todo->priList, $todo->pri);?></span>
<span class="todo-title"><?php echo $todo->name;?></span>
<span class="todo-title" title='<?php echo $todo->name;?>'><?php echo $todo->name;?></span>
</a>
</li>
<?php endforeach;?>
module/bug/model.php
-1
View File
@@ -2472,7 +2472,6 @@ class bugModel extends model
switch($id)
{
case 'id':
//if($mode == 'table' && $canBatchAction)
if($canBatchAction)
{
echo html::checkbox('bugIDList', array($bug->id => sprintf('%03d', $bug->id)));
module/bug/view/batchcreate.html.php
+1 -1
View File
@@ -164,7 +164,7 @@
<tr>
<td colspan='<?php echo count($visibleFields) + 3?>' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/bug/view/batchedit.html.php
+1 -1
View File
@@ -142,7 +142,7 @@
<tr>
<td colspan='<?php echo $branchProduct ? $columns : ($columns - 1);?>' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/bug/view/create.html.php
+1 -1
View File
@@ -299,7 +299,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
<tr>
<td colspan="3" class="text-center form-actions">
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
<?php echo html::hidden('case', (int)$caseID) . html::hidden('caseVersion', (int)$version);?>
<?php echo html::hidden('result', (int)$runID) . html::hidden('testtask', (int)$testtask);?>
</td>
module/bug/view/view.html.php
+28 -26
View File
@@ -53,6 +53,34 @@
<?php $actionFormLink = $this->createLink('action', 'comment', "objectType=bug&objectID=$bug->id");?>
<?php include '../../common/view/action.html.php';?>
</div>
<?php
$params = "bugID=$bug->id";
$copyParams = "productID=$productID&branch=$bug->branch&extras=bugID=$bug->id";
$convertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&bugID=$bug->id";
?>
<div class='main-actions'>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php if(!$bug->deleted):?>
<div class='divider'></div>
<?php
common::printIcon('bug', 'confirmBug', $params, $bug, 'button', 'search', '', 'iframe', true);
common::printIcon('bug', 'assignTo', $params, $bug, 'button', '', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'button', 'checked', '', 'iframe showinonlybody', true);
common::printIcon('bug', 'close', $params, $bug, 'button', '', '', 'text-danger iframe showinonlybody', true);
common::printIcon('bug', 'activate', $params, $bug, 'button', '', '', 'text-success iframe showinonlybody', true);
if($config->global->flow != 'onlyTest') common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story']);
common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap');
echo "<div class='divider'></div>";
common::printIcon('bug', 'edit', $params, $bug);
common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy');
common::printIcon('bug', 'delete', $params, $bug, 'button', '', 'hiddenwin');
?>
<?php endif;?>
</div>
</div>
</div>
<div class="side-col col-4">
<div class="cell">
@@ -314,34 +342,8 @@
</div>
</div>
<?php
$params = "bugID=$bug->id";
$copyParams = "productID=$productID&branch=$bug->branch&extras=bugID=$bug->id";
$convertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&bugID=$bug->id";
?>
<div id="mainActions" class='main-actions'>
<?php common::printPreAndNext($preAndNext);?>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php if(!$bug->deleted):?>
<div class='divider'></div>
<?php
common::printIcon('bug', 'confirmBug', $params, $bug, 'button', 'search', '', 'iframe', true);
common::printIcon('bug', 'assignTo', $params, $bug, 'button', '', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'button', 'checked', '', 'iframe showinonlybody', true);
common::printIcon('bug', 'close', $params, $bug, 'button', '', '', 'text-danger iframe showinonlybody', true);
common::printIcon('bug', 'activate', $params, $bug, 'button', '', '', 'text-success iframe showinonlybody', true);
if($config->global->flow != 'onlyTest') common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story']);
common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap');
echo "<div class='divider'></div>";
common::printIcon('bug', 'edit', $params, $bug);
common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy');
common::printIcon('bug', 'delete', $params, $bug, 'button', '', 'hiddenwin');
?>
<?php endif;?>
</div>
</div>
<?php include '../../common/view/syntaxhighlighter.html.php';?>
<?php include '../../common/view/footer.html.php';?>
module/build/view/create.html.php
+1 -1
View File
@@ -75,7 +75,7 @@
<tr>
<td colspan="3" class="text-center form-actions">
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</table>
module/build/view/edit.html.php
+1 -1
View File
@@ -69,7 +69,7 @@
<tr>
<td colspan="3" class="text-center form-actions">
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
<?php echo $config->global->flow != 'onlyTest' ? html::hidden('project', $build->project) : '';?>
</td>
</tr>
module/common/lang/en.php
+1 -2
View File
@@ -659,8 +659,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTask')
/* Adjust sub menu of project module. */
unset($lang->project->menu->story);
unset($lang->project->menu->build);
unset($lang->project->menu->bug);
unset($lang->project->menu->testtask);
unset($lang->project->menu->qa);
unset($lang->project->menu->product);
unset($lang->project->menu->doc);
module/common/lang/zh-cn.php
+1 -2
View File
@@ -659,8 +659,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTask')
/* Adjust sub menu of project module. */
unset($lang->project->menu->story);
unset($lang->project->menu->build);
unset($lang->project->menu->bug);
unset($lang->project->menu->testtask);
unset($lang->project->menu->qa);
unset($lang->project->menu->product);
unset($lang->project->menu->doc);
module/common/view/action.html.php
+4 -4
View File
@@ -1,6 +1,6 @@
<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
<?php if(!empty($blockHistory)):?>
<div class="panel block-histories histories" data-textDiff="<?php echo $lang->action->textDiff;?>" data-original="<?php echo $lang->action->original;?>">
<div class="panel block-histories histories no-margin" data-textDiff="<?php echo $lang->action->textDiff;?>" data-original="<?php echo $lang->action->original;?>">
<?php else:?>
<div class="detail histories" id='actionbox' data-textDiff="<?php echo $lang->action->textDiff;?>" data-original="<?php echo $lang->action->original;?>">
<?php endif;?>
@@ -14,7 +14,7 @@
$('blockquote.textdiff').each(function()
{
newBoxID = $(this).parent().attr('id');
if(newBoxID != oldBoxID)
if(newBoxID != oldBoxID)
{
oldBoxID = newBoxID;
if($(this).html() != $(this).next().html()) $(this).closest('.history-changes').before(diffButton);
@@ -61,12 +61,12 @@
<?php echo $this->action->printChanges($action->objectType, $action->history);?>
</div>
<?php endif;?>
<?php if(!empty($action->comment)):?>
<?php if(!empty($action->comment)):?>
<?php if($canEditComment):?>
<?php echo html::commonButton('<i class="icon icon-pencil"></i>', "title='{$lang->action->editComment}'", 'btn btn-link btn-icon btn-sm btn-edit-comment');?>
<?php endif;?>
<div class='article-content comment'>
<?php echo strip_tags($action->comment) == $action->comment ? nl2br($action->comment) : $action->comment;?>
<?php echo strip_tags($action->comment) == $action->comment ? nl2br($action->comment) : $action->comment;?>
</div>
<?php if($canEditComment):?>
<form method='post' class='comment-edit-form' action='<?php echo $this->createLink('action', 'editComment', "actionID=$action->id")?>'>
module/datatable/model.php
+1
View File
@@ -86,6 +86,7 @@ class datatableModel extends model
unset($setting[$key]);
continue;
}
if($set->id == 'actions') $set->width = $fieldList[$set->id]['width'];
$set->title = $fieldList[$set->id]['title'];
$set->sort = isset($fieldList[$set->id]['sort']) ? $fieldList[$set->id]['sort'] : 'yes';
}
module/datatable/view/ajaxcustom.html.php
+1
View File
@@ -99,6 +99,7 @@ $(function()
$cols.filter('.fixed-flex, .fixed-no').appendTo('#colsFixedFlex');
$cols.filter('.fixed-right').appendTo('#colsFixedRight');
$('#originCols').remove();
$('[data-key=actions] #width').attr('disabled', 'disabled');
if(typeof setting[0] === 'string')
{
module/dept/view/browse.html.php
+1 -1
View File
@@ -66,7 +66,7 @@
<td></td>
<td class='form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
<?php echo html::hidden('maxOrder', $maxOrder);?>
<?php echo html::hidden('parentDeptID', $deptID);?>
</td>
module/dev/config.php
+13
View File
@@ -1,4 +1,5 @@
<?php
$config->dev->group['index'] = 'my';
$config->dev->group['my'] = 'my';
$config->dev->group['todo'] = 'my';
$config->dev->group['product'] = 'product';
@@ -16,6 +17,7 @@ $config->dev->group['taskestimate'] = 'project';
$config->dev->group['team'] = 'project';
$config->dev->group['build'] = 'project';
$config->dev->group['burn'] = 'project';
$config->dev->group['qa'] = 'qa';
$config->dev->group['bug'] = 'qa';
$config->dev->group['case'] = 'qa';
$config->dev->group['testcase'] = 'qa';
@@ -49,6 +51,17 @@ $config->dev->group['mail'] = 'admin';
$config->dev->group['backup'] = 'admin';
$config->dev->group['cron'] = 'admin';
$config->dev->group['dev'] = 'admin';
$config->dev->group['svn'] = 'repo';
$config->dev->group['git'] = 'repo';
$config->dev->group['api'] = 'api';
$config->dev->group['entry'] = 'api';
$config->dev->group['install'] = 'system';
$config->dev->group['upgrade'] = 'system';
$config->dev->group['sso'] = 'system';
$config->dev->group['search'] = 'system';
$config->dev->group['message'] = 'message';
$config->dev->group['mail'] = 'message';
$config->dev->group['webhook'] = 'message';
$config->dev->tableMap['storyspec'] = 'story';
$config->dev->tableMap['storystage'] = 'story';
module/dev/lang/en.php
+4
View File
@@ -103,4 +103,8 @@ $lang->dev->groupList['qa'] = 'QA';
$lang->dev->groupList['doc'] = 'Doc';
$lang->dev->groupList['company'] = 'Company';
$lang->dev->groupList['admin'] = 'Admin';
$lang->dev->groupList['repo'] = 'Code';
$lang->dev->groupList['api'] = 'API';
$lang->dev->groupList['system'] = 'System';
$lang->dev->groupList['message'] = 'Message';
$lang->dev->groupList['other'] = 'Others';
module/dev/lang/zh-cn.php
+4
View File
@@ -103,4 +103,8 @@ $lang->dev->groupList['qa'] = '测试';
$lang->dev->groupList['doc'] = '文档';
$lang->dev->groupList['company'] = '组织';
$lang->dev->groupList['admin'] = '后台';
$lang->dev->groupList['repo'] = '代码';
$lang->dev->groupList['api'] = 'API';
$lang->dev->groupList['system'] = '系统';
$lang->dev->groupList['message'] = '消息';
$lang->dev->groupList['other'] = '其他模块';
module/dev/view/db.html.php
+2
View File
@@ -5,6 +5,7 @@
<div class="panel panel-sm with-list">
<div class='panel-heading'><i class='icon-list'></i> <strong><?php echo $lang->dev->dbList?></strong></div>
<?php foreach($lang->dev->groupList as $group => $groupName):?>
<?php if(isset($tables[$group])):?>
<div class='modulegroup'><?php echo $groupName?></div>
<?php foreach($tables[$group] as $subTable => $table):?>
<?php
@@ -13,6 +14,7 @@
?>
<?php echo html::a(inlink('db', "table=$table"), $tableName, '', "class='$active'");?>
<?php endforeach;?>
<?php endif;?>
<?php endforeach;?>
</div>
</div>
module/doc/view/create.html.php
+1 -1
View File
@@ -77,7 +77,7 @@
</tr>
<tr>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton() . ' ' . html::backButton('', '', 'btn btn-wide') . html::hidden('lib', $libID);?>
<?php echo html::submitButton() . ' ' . html::backButton() . html::hidden('lib', $libID);?>
</td>
</tr>
</tbody>
module/doc/view/edit.html.php
+1 -1
View File
@@ -77,7 +77,7 @@
<?php
echo html::hidden('editedDate', $doc->editedDate);
echo html::submitButton();
echo html::backButton('', '', 'btn btn-wide');
echo html::backButton();
?>
</td>
</tr>
module/doc/view/view.html.php
+17 -15
View File
@@ -100,6 +100,23 @@
<?php $actionFormLink = $this->createLink('action', 'comment', "objectType=doc&objectID=$doc->id");?>
<?php include '../../common/view/action.html.php';?>
</div>
<div class='main-actions'>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php
if(!$doc->deleted)
{
echo "<div class='divider'></div>";
common::printIcon('doc', 'edit', "docID=$doc->id", $doc);
common::printIcon('doc', 'delete', "docID=$doc->id", $doc, 'button', '', 'hiddenwin');
}
else
{
common::printRPN($browseLink);
}
?>
</div>
</div>
</div>
<div class="side-col col-4">
<div class="cell">
@@ -166,21 +183,6 @@
<div id="mainActions" class='main-actions'>
<?php common::printPreAndNext($preAndNext);?>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php
if(!$doc->deleted)
{
echo "<div class='divider'></div>";
common::printIcon('doc', 'edit', "docID=$doc->id", $doc);
common::printIcon('doc', 'delete', "docID=$doc->id", $doc, 'button', '', 'hiddenwin');
}
else
{
common::printRPN($browseLink);
}
?>
</div>
</div>
<?php include '../../common/view/syntaxhighlighter.html.php';?>
<?php include '../../common/view/footer.html.php';?>
module/entry/view/log.html.php
+1 -1
View File
@@ -17,7 +17,7 @@
</div>
<div class="btn-toolbar pull-right">
<?php common::printLink('admin', 'log', '', "<i class='icon icon-cog'></i> " . $lang->entry->setting, '', "class='btn btn-primary'");?>
<?php echo html::backButton();?>
<?php echo html::backButton('', '' , 'btn');?>
</div>
</div>
<div id='mainContent' class='main-content'>
module/extension/view/install.html.php
+1 -1
View File
@@ -31,7 +31,7 @@
<p class='text-danger'><?php echo $error;?></p>
</div>
<hr>
<?php echo html::commonButton($lang->extension->refreshPage, 'onclick=location.href=location.href');?>
<?php echo html::commonButton($lang->extension->refreshPage, 'onclick=location.href=location.href', 'btn btn-primary');?>
</div>
<?php elseif(isset($license)):?>
<div class='text-left'>
module/extension/view/upload.html.php
+1 -2
View File
@@ -20,9 +20,8 @@
<div class='text-left'>
<div class='container mw-500px'>
<p class='text-danger'><?php echo $error;?></p>
<?php echo html::commonButton($lang->extension->refreshPage, 'onclick=location.href=location.href', 'btn btn-primary');?>
</div>
<hr class='small'>
<?php echo html::commonButton($lang->extension->refreshPage, 'onclick=location.href=location.href');?>
</div>
<?php else:?>
<form method='post' target='hiddenwin' enctype='multipart/form-data' style='padding: 20px 20%'>
module/extension/view/waring.htm.php
+1 -1
View File
@@ -25,7 +25,7 @@
<div class='content'>
<h3><?php echo $lang->extension->waringInstall;?></h3>
<p><?php echo $error;?></p>
<p class='text-center'><?php echo html::commonButton($lang->extension->refreshPage, 'onclick=location.href=location.href');?></p>
<p class='text-center'><?php echo html::commonButton($lang->extension->refreshPage, 'onclick=location.href=location.href', 'btn btn-primary');?></p>
</div>
</div>
<?php endif;?>
module/group/view/manageview.html.php
+1 -1
View File
@@ -70,7 +70,7 @@
<tr>
<td colspan='2' class='form-actions text-center'>
<?php echo html::submitButton('', "onclick='setNoChecked()'");?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
<?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 class='form-actions'>
<?php echo html::submitButton('', "onclick='setNoChecked()'");?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
<?php echo html::hidden('noChecked'); // Save the value of no checked.?>
</td>
</tr>
@@ -122,7 +122,7 @@
</th>
<td class='form-actions'>
<?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
<?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 form-actions' colspan='3'>
<?php echo html::submitButton('', "onclick='setNoChecked()'");?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
<?php echo html::hidden('foo'); // Just make $_POST not empty..?>
</td>
</tr>
module/message/view/setting.html.php
+1 -1
View File
@@ -70,7 +70,7 @@
</tbody>
<tfoot>
<tr>
<td colspan='<?php echo count($lang->message->typeList) + 1?>' class='text-center form-actions'><?php echo html::submitButton();?> <?php echo html::backButton('', '', 'btn btn-wide');?></td>
<td colspan='<?php echo count($lang->message->typeList) + 1?>' class='text-center form-actions'><?php echo html::submitButton();?> <?php echo html::backButton();?></td>
</tr>
</tfoot>
</table>
module/my/view/changepassword.html.php
+1 -1
View File
@@ -44,7 +44,7 @@
<td><?php echo html::password('password2', '', "class='form-control'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::backButton('', '', 'btn btn-wide');?></td>
<td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::backButton();?></td>
</tr>
</table>
<?php if(!empty($this->app->user->modifyPasswordReason)):?>
module/my/view/editprofile.html.php
+1 -1
View File
@@ -103,7 +103,7 @@
</td>
</tr>
</table>
<div class='text-center form-actions'><?php echo html::submitButton() . html::backButton('', '', 'btn btn-wide');?></div>
<div class='text-center form-actions'><?php echo html::submitButton() . html::backButton();?></div>
</form>
<?php echo html::hidden('verifyRand', $rand);?>
</div>
module/my/view/task.html.php
+5 -8
View File
@@ -55,7 +55,7 @@
<th class='c-hours'> <?php common::printOrderLink('left', $orderBy, $vars, $lang->task->leftAB);?></th>
<th class='c-date'> <?php common::printOrderLink('deadline', $orderBy, $vars, $lang->task->deadlineAB);?></th>
<th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='c-actions-4'><?php echo $lang->actions;?></th>
<th class='c-actions-6'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -94,17 +94,14 @@
}
else
{
if($task->status == 'wait') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
if($task->status != 'pause') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
if($task->status == 'pause') common::printIcon('task', 'restart', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
if($task->status == 'done' or $task->status == 'cancel' or $task->status == 'closed') common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
if($task->status == 'doing') common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true);
common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list');
if(empty($task->team) or empty($task->children))
{
common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children);
}
common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children);
}
?>
</td>
module/product/css/index.css
-11
View File
@@ -1,11 +0,0 @@
.btn-toolbar>.angle-btn:first-child {border-color: #0c64eb;}
.btn-toolbar>.angle-btn:first-child:after, .btn-toolbar>.angle-btn:first-child:before {border-color: transparent transparent transparent #0c64eb;}
.btn-toolbar>.angle-btn:first-child:after {border-color: transparent transparent transparent #fff;}
.btn-toolbar>.angle-btn:first-child .btn {color: #0c64eb;}
.btn-toolbar>.angle-btn:last-child {border-color: #000;}
.btn-toolbar>.angle-btn:last-child:after, .btn-toolbar>.angle-btn:last-child:before {border-color: transparent transparent transparent #000;}
.btn-toolbar>.angle-btn:last-child:after {border-color: transparent transparent transparent #fff;}
.btn-toolbar>.angle-btn:last-child .btn {color: #000;}
.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after, .btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:before {border-color: transparent transparent transparent #000;}
.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after {border-color: transparent transparent transparent #fff;}
module/product/model.php
+4 -4
View File
@@ -65,7 +65,7 @@ class productModel extends model
}
else
{
$pageNav = '<div class="btn-group angle-btn"><div class="btn-group"><button data-toggle="dropdown" type="button" class="btn">' . $label . ' <span class="caret"></span></button>';
$pageNav = '<div class="btn-group angle-btn' . ($currentMethod == 'index' ? ' active' : '') . '"><div class="btn-group"><button data-toggle="dropdown" type="button" class="btn">' . $label . ' <span class="caret"></span></button>';
$pageNav .= '<ul class="dropdown-menu">';
if($this->config->global->flow == 'full' && common::hasPriv('product', 'index')) $pageNav .= '<li>' . html::a(helper::createLink('product', 'index', 'locate=no'), '<i class="icon icon-home"></i> ' . $this->lang->product->index) . '</li>';
if(common::hasPriv('product', 'all')) $pageNav .= '<li>' . html::a(helper::createLink('product', 'all'), '<i class="icon icon-cards-view"></i> ' . $this->lang->product->all) . '</li>';
@@ -684,9 +684,9 @@ class productModel extends model
/**
* Slice roadmap.
*
* @param string $roadmap
* @param int $count
*
* @param string $roadmap
* @param int $count
* @access public
* @return array
*/
module/product/view/batchedit.html.php
+1 -1
View File
@@ -73,7 +73,7 @@
<tr>
<td colspan="<?php echo count($visibleFields) + 4?>" class="text-center form-actions">
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', "btn btn-wide");?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/product/view/browse.html.php
-1
View File
@@ -159,7 +159,6 @@
$vars = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
if($useDatatable) include '../../common/view/datatable.html.php';
$setting = $this->datatable->getSetting('product');
$widths = $this->datatable->setFixedFieldWidth($setting);
$columns = 0;
module/product/view/create.html.php
+1 -1
View File
@@ -84,7 +84,7 @@
<tr>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</tbody>
module/product/view/view.html.php
+23 -21
View File
@@ -11,7 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<div class="main-row">
<div id='mainContent' class="main-row">
<div class="col-8 main-col">
<div class="row">
<div class="col-sm-6">
@@ -57,7 +57,7 @@
</nav>
</div>
<div class="panel-body">
<ul class="timeline timeline-tag-left">
<ul class="timeline timeline-tag-left no-margin">
<?php foreach($dynamics as $action):?>
<li <?php if($action->major) echo "class='active'";?>>
<div>
@@ -75,6 +75,27 @@
<?php include '../../common/view/action.html.php';?>
</div>
</div>
<div class='main-actions'>
<div class="btn-toolbar">
<?php
$params = "product=$product->id";
$browseLink = $this->session->productList ? $this->session->productList : inlink('browse', "productID=$product->id");
common::printBack($browseLink);
if(!$product->deleted)
{
echo "<div class='divider'></div>";
if($product->status != 'closed')
{
common::printIcon('product', 'close', $params, $product, 'button', '', '', 'iframe', true);
echo "<div class='divider'></div>";
}
common::printIcon('product', 'edit', $params, $product);
common::printIcon('product', 'delete', $params, $product, 'button', '', 'hiddenwin');
}
?>
</div>
</div>
</div>
<div class="col-4 side-col">
<div class="row">
@@ -213,24 +234,5 @@
<div id="mainActions" class='main-actions'>
<nav class="container"></nav>
<div class="btn-toolbar">
<?php
$params = "product=$product->id";
$browseLink = $this->session->productList ? $this->session->productList : inlink('browse', "productID=$product->id");
common::printBack($browseLink);
if(!$product->deleted)
{
echo "<div class='divider'></div>";
if($product->status != 'closed')
{
common::printIcon('product', 'close', $params, $product, 'button', '', '', 'iframe', true);
echo "<div class='divider'></div>";
}
common::printIcon('product', 'edit', $params, $product);
common::printIcon('product', 'delete', $params, $product, 'button', '', 'hiddenwin');
}
?>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>
module/productplan/view/batchedit.html.php
+1 -1
View File
@@ -42,7 +42,7 @@
<tr>
<td colspan='5' class="text-center form-actions">
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', "btn btn-wide");?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/productplan/view/create.html.php
+1 -1
View File
@@ -59,7 +59,7 @@
<tr>
<td colspan='4' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
<?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 form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
<?php echo html::hidden('product', $product->id);?>
</td>
</tr>
module/project/css/index.css
-11
View File
@@ -1,11 +0,0 @@
.btn-toolbar>.angle-btn:first-child {border-color: #0c64eb;}
.btn-toolbar>.angle-btn:first-child:after, .btn-toolbar>.angle-btn:first-child:before {border-color: transparent transparent transparent #0c64eb;}
.btn-toolbar>.angle-btn:first-child:after {border-color: transparent transparent transparent #fff;}
.btn-toolbar>.angle-btn:first-child .btn {color: #0c64eb;}
.btn-toolbar>.angle-btn:last-child {border-color: #000;}
.btn-toolbar>.angle-btn:last-child:after, .btn-toolbar>.angle-btn:last-child:before {border-color: transparent transparent transparent #000;}
.btn-toolbar>.angle-btn:last-child:after {border-color: transparent transparent transparent #fff;}
.btn-toolbar>.angle-btn:last-child .btn {color: #000;}
.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after, .btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:before {border-color: transparent transparent transparent #000;}
.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after {border-color: transparent transparent transparent #fff;}
module/project/css/tree.css
+4 -5
View File
@@ -6,7 +6,7 @@
#taskTree li.selected > a {background-color: #E8F3FC;}
#taskTree li.selected > a > span.title {color: #006AF1;}
#taskTree .label-id {border-color: #cbd0db; color: #7d8599}
#taskTree .label.label-type {background: #fff; border: 1px solid #ddd;}
#taskTree .label.label-type {background: #fff; border: 1px solid #7d8599; color:#7d8599}
#taskTree li > a > span.title {color: #3C4353; white-space: nowrap; max-width: 60%; overflow: hidden; text-overflow: ellipsis; vertical-align: middle;}
#taskTree li > a > span.user {color: #838a9d;}
@@ -51,7 +51,6 @@ h2.detail-title .label-id, h2.detail-title .label {top: -1px}
details .btn-comment.pull-right {right: 30px;}
.modal-comment .modal-dialog {min-width: 600px;}
#itemContent .label-product, #taskTree .item-product > a > .label-type {border-color: #89de8b; color: #89de8b; }
#itemContent .label-story, #taskTree .item-story > a > .label-type {border-color: #01a9fc; color: #01a9fc;}
#itemContent .label-module, #taskTree .item-module > a > .label-type {border-color: #52CEDD; color: #52CEDD;}
#itemContent .label-task, #taskTree .item-task > a > .label-type {border-color: #066ff1; color: #066ff1}
#itemContent .label-product, #taskTree .item-product > a > .label-type {border-color: #7d8599; color: #7d8599; }
#itemContent .label-story, #taskTree .item-story > a > .label-type {border-color: #7d8599; color: #7d8599;}
#itemContent .label-task, #taskTree .item-task > a > .label-type {border-color: #7d8599; color: #7d8599}
module/project/js/tree.js
+4
View File
@@ -79,6 +79,10 @@ $(function()
$itemContent.find('.histories').histories();
$itemContent.find('.iframe').modalTrigger();
$.zui.store.set('project/tree/showItem', url);
var scrollTop = $(document).scrollTop() - 140;
if(scrollTop < 0) scrollTop = 0;
$itemContent.closest('.cell').css('margin-top', scrollTop);
},
error: function()
{
module/project/model.php
+3 -3
View File
@@ -89,7 +89,7 @@ class projectModel extends model
}
else
{
$projectIndex = '<div class="btn-group angle-btn"><div class="btn-group"><button data-toggle="dropdown" type="button" class="btn">' . $label . ' <span class="caret"></span></button>';
$projectIndex = '<div class="btn-group angle-btn' . ($methodName == 'index' ? ' active' : '') . '"><div class="btn-group"><button data-toggle="dropdown" type="button" class="btn">' . $label . ' <span class="caret"></span></button>';
$projectIndex .= '<ul class="dropdown-menu">';
if(common::hasPriv('project', 'index')) $projectIndex .= '<li>' . html::a(helper::createLink('project', 'index', 'locate=no'), '<i class="icon icon-home"></i> ' . $this->lang->project->index) . '</li>';
if(common::hasPriv('project', 'all')) $projectIndex .= '<li>' . html::a(helper::createLink('project', 'all', 'status=all'), '<i class="icon icon-cards-view"></i> ' . $this->lang->project->allProjects) . '</li>';
@@ -2784,7 +2784,7 @@ class projectModel extends model
case 'task':
$link = helper::createLink('project', 'treeTask', "taskID={$tree->id}");
$html .= '<li class="item-task">';
$html .= '<a class="tree-link" href="' . $link . '"><span class="label label-id">' . $tree->id . '</span><span class="label label-type">' . (empty($tree->parent) ? $this->lang->task->common : $this->lang->task->children) . "</span><span class='title' title='{$tree->title}'>" . $tree->title . '</span> <span class="user"><i class="icon icon-person"></i> ' . (empty($tree->assignedTo) ? $tree->openedBy : $tree->assignedTo) . '</span></a>';
$html .= '<a class="tree-link" href="' . $link . '"><span class="label label-type">' . (empty($tree->parent) ? $this->lang->task->common : $this->lang->task->children) . "</span><span class='title' title='{$tree->title}'>" . $tree->title . '</span> <span class="user"><i class="icon icon-person"></i> ' . (empty($tree->assignedTo) ? $tree->openedBy : $tree->assignedTo) . '</span><span class="label label-id">' . $tree->id . '</span></a>';
break;
case 'product':
$this->app->loadLang('product');
@@ -2795,7 +2795,7 @@ class projectModel extends model
$this->app->loadLang('story');
$link = helper::createLink('project', 'treeStory', "storyID={$tree->storyId}");
$html .= '<li class="item-story">';
$html .= '<a class="tree-link" href="' . $link . '"><span class="label label-id">' . $tree->storyId . '</span><span class="label label-type">' . $this->lang->story->common . "</span><span class='title' title='{$tree->title}'>" . $tree->title . '</span> <span class="user"><i class="icon icon-person"></i> ' . (empty($tree->assignedTo) ? $tree->openedBy : $tree->assignedTo) . '</span></a>';
$html .= '<a class="tree-link" href="' . $link . '"><span class="label label-type">' . $this->lang->story->common . "</span><span class='title' title='{$tree->title}'>" . $tree->title . '</span> <span class="user"><i class="icon icon-person"></i> ' . (empty($tree->assignedTo) ? $tree->openedBy : $tree->assignedTo) . '</span><span class="label label-id">' . $tree->storyId . '</span></a>';
break;
case 'branch':
$this->app->loadLang('branch');
module/project/view/create.html.php
+1 -1
View File
@@ -147,7 +147,7 @@
<tr>
<td colspan='4' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</table>
module/project/view/edit.html.php
+1 -1
View File
@@ -158,7 +158,7 @@
<th><?php echo $lang->project->whitelist;?></th>
<td colspan='2'><?php echo html::checkbox('whitelist', $groups, $project->whitelist, '', '', 'inline');?></td>
</tr>
<tr><td colspan='3' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::backButton('', '', 'btn btn-wide');?></td></tr>
<tr><td colspan='3' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::backButton();?></td></tr>
</table>
</form>
</div>
module/project/view/importbug.html.php
+1 -1
View File
@@ -76,7 +76,7 @@ var browseType = '<?php echo $browseType;?>';
<?php echo html::submitButton('<i class="icon icon-import icon-sm"></i> ' . $lang->import, '', 'btn btn-secondary');?>
</div>
<div class='btn-toolbar'>
<?php echo html::backButton();?>
<?php echo html::backButton('', '', 'btn');?>
</div>
<?php $pager->show('right', 'pagerjs');?>
</div>
module/project/view/managemembers.html.php
+1 -1
View File
@@ -120,7 +120,7 @@
<?php $i ++; $memberCount ++;?>
<?php endfor;?>
</tbody>
<tfoot><tr><td colspan='6' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::backButton('', '', 'btn btn-wide'); ?></td></tr></tfoot>
<tfoot><tr><td colspan='6' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::backButton(); ?></td></tr></tfoot>
</table>
<?php js::set('i', $i);?>
</form>
module/project/view/view.html.php
+24 -22
View File
@@ -11,7 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<div class="main-row">
<div id='mainContent' class="main-row">
<div class="col-8 main-col">
<div class="row">
<div class="col-sm-6">
@@ -47,7 +47,7 @@
</nav>
</div>
<div class="panel-body">
<ul class="timeline timeline-tag-left">
<ul class="timeline timeline-tag-left no-margin">
<?php foreach($dynamics as $action):?>
<li <?php if($action->major) echo "class='active'";?>>
<div class='text-ellipsis'>
@@ -144,6 +144,28 @@
<?php include '../../common/view/action.html.php';?>
</div>
</div>
<div class='main-actions'>
<div class="btn-toolbar">
<?php
$params = "project=$project->id";
$browseLink = $this->session->projectList ? $this->session->projectList : inlink('browse', "projectID=$project->id");
common::printBack($browseLink);
if(!$project->deleted)
{
echo "<div class='divider'></div>";
common::printIcon('project', 'start', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
common::printIcon('project', 'activate', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
common::printIcon('project', 'putoff', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
common::printIcon('project', 'suspend', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
common::printIcon('project', 'close', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
echo "<div class='divider'></div>";
common::printIcon('project', 'edit', $params, $project);
common::printIcon('project', 'delete', $params, $project, 'button', '', 'hiddenwin');
}
?>
</div>
</div>
</div>
<div class="col-4 side-col">
<div class="row">
@@ -277,26 +299,6 @@
<div id="mainActions" class='main-actions'>
<nav class="container"></nav>
<div class="btn-toolbar">
<?php
$params = "project=$project->id";
$browseLink = $this->session->projectList ? $this->session->projectList : inlink('browse', "projectID=$project->id");
common::printBack($browseLink);
if(!$project->deleted)
{
echo "<div class='divider'></div>";
common::printIcon('project', 'start', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
common::printIcon('project', 'activate', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
common::printIcon('project', 'putoff', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
common::printIcon('project', 'suspend', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
common::printIcon('project', 'close', "projectID=$project->id", $project, 'button', '', '', 'iframe', true);
echo "<div class='divider'></div>";
common::printIcon('project', 'edit', $params, $project);
common::printIcon('project', 'delete', $params, $project, 'button', '', 'hiddenwin');
}
?>
</div>
<script>
$(function()
{
module/qa/css/index.css
-11
View File
@@ -1,11 +0,0 @@
.btn-toolbar>.angle-btn:first-child {border-color: #0c64eb;}
.btn-toolbar>.angle-btn:first-child:after, .btn-toolbar>.angle-btn:first-child:before {border-color: transparent transparent transparent #0c64eb;}
.btn-toolbar>.angle-btn:first-child:after {border-color: transparent transparent transparent #fff;}
.btn-toolbar>.angle-btn:first-child .btn {color: #0c64eb;}
.btn-toolbar>.angle-btn:last-child {border-color: #000;}
.btn-toolbar>.angle-btn:last-child:after, .btn-toolbar>.angle-btn:last-child:before {border-color: transparent transparent transparent #000;}
.btn-toolbar>.angle-btn:last-child:after {border-color: transparent transparent transparent #fff;}
.btn-toolbar>.angle-btn:last-child .btn {color: #000;}
.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after, .btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:before {border-color: transparent transparent transparent #000;}
.btn-toolbar>.angle-btn+.angle-btn:last-child>.btn-group:first-child:after {border-color: transparent transparent transparent #fff;}
module/qa/model.php
+2 -1
View File
@@ -34,7 +34,8 @@ class qaModel extends model
}
else
{
$productIndex = '<div class="btn-group angle-btn"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
$currentMethod = $this->app->getMethodName();
$productIndex = '<div class="btn-group angle-btn' . ($currentMethod == 'index' ? ' active' : '') . '"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
$productIndex .= $selectHtml;
}
module/release/view/create.html.php
+1 -1
View File
@@ -50,7 +50,7 @@
<tr>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</tbody>
module/release/view/edit.html.php
+1 -1
View File
@@ -58,7 +58,7 @@
<tr>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
<?php echo html::hidden('product', $release->product);?>
</td>
</tr>
module/story/view/batchclose.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
<tr>
<td colspan='5' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</table>
module/story/view/batchcreate.html.php
+1 -1
View File
@@ -94,7 +94,7 @@
<tr>
<td colspan="<?php echo count($visibleFields) + 3?>" class="text-center form-actions">
<?php echo html::submitButton($lang->save);?>
<?php echo html::backButton('', '', "btn btn-wide");?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/story/view/batchedit.html.php
+1 -1
View File
@@ -150,7 +150,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();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/story/view/create.html.php
+1 -1
View File
@@ -193,7 +193,7 @@
<tr>
<td colspan="5" class="text-center form-actions">
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/story/view/view.html.php
+47 -45
View File
@@ -57,6 +57,53 @@
<?php $actionFormLink = $this->createLink('action', 'comment', "objectType=story&objectID=$story->id");?>
<?php include '../../common/view/action.html.php';?>
</div>
<div class='main-actions'>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php if(!isonlybody()) echo "<div class='divider'></div>";?>
<?php if(!$story->deleted):?>
<?php
common::printIcon('story', 'change', "storyID=$story->id", $story, 'button', '', '', 'showinonlybody');
common::printIcon('story', 'review', "storyID=$story->id", $story, 'button', '', '', 'showinonlybody');
if($story->status != 'closed' and !isonlybody())
{
$misc = "class='btn' data-toggle='modal' data-type='iframe' data-width='95%'";
$link = $this->createLink('story', 'batchCreate', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", '', true);
if(common::hasPriv('story', 'batchCreate')) echo html::a($link, "<i class='icon icon-sitemap'></i> " . $lang->story->subdivide, '', $misc);
}
common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
if($config->global->flow != 'onlyStory' and !isonlybody() and (common::hasPriv('testcase', 'create') or common::hasPriv('testcase', 'batchCreate')))
{
$this->app->loadLang('testcase');
echo "<div class='btn-group dropup'>";
echo "<button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><i class='icon icon-sitemap'></i> " . $lang->testcase->common . " <span class='caret'></span></button>";
echo "<ul class='dropdown-menu' id='createCaseActionMenu'>";
$misc = "data-toggle='modal' data-type='iframe' data-width='95%'";
$link = $this->createLink('testcase', 'create', "productID=$story->product&branch=$story->branch&moduleID=0&from=&param=0&storyID=$story->id", '', true);
if(common::hasPriv('testcase', 'create', $story)) echo "<li>" . html::a($link, $lang->testcase->create, '', $misc) . "</li>";
$misc = "data-toggle='modal' data-type='iframe' data-width='95%'";
$link = $this->createLink('testcase', 'batchCreate', "productID=$story->product&branch=$story->branch&moduleID=0&storyID=$story->id", '', true);
if(common::hasPriv('testcase', 'batchCreate')) echo "<li>" . html::a($link, $lang->testcase->batchCreate, '', $misc) . "</li>";
echo "</ul>";
echo "</div>";
}
if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'smile', '', 'showinonlybody');
echo "<div class='divider'></div>";
common::printIcon('story', 'edit', "storyID=$story->id", $story);
common::printIcon('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", $story, 'button', 'copy', '', 'iframe showinonlybody', true, "data-width='1050'");
common::printIcon('story', 'delete', "storyID=$story->id", $story, 'button', '', 'hiddenwin');
?>
<?php endif;?>
</div>
</div>
</div>
<div class="side-col col-4">
<div class="cell">
@@ -329,51 +376,6 @@
<div id="mainActions" class='main-actions'>
<?php common::printPreAndNext($preAndNext);?>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php if(!isonlybody()) echo "<div class='divider'></div>";?>
<?php if(!$story->deleted):?>
<?php
common::printIcon('story', 'change', "storyID=$story->id", $story, 'button', '', '', 'showinonlybody');
common::printIcon('story', 'review', "storyID=$story->id", $story, 'button', '', '', 'showinonlybody');
if($story->status != 'closed' and !isonlybody())
{
$misc = "class='btn' data-toggle='modal' data-type='iframe' data-width='95%'";
$link = $this->createLink('story', 'batchCreate', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", '', true);
if(common::hasPriv('story', 'batchCreate')) echo html::a($link, "<i class='icon icon-sitemap'></i> " . $lang->story->subdivide, '', $misc);
}
common::printIcon('story', 'close', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
if($config->global->flow != 'onlyStory' and !isonlybody() and (common::hasPriv('testcase', 'create') or common::hasPriv('testcase', 'batchCreate')))
{
$this->app->loadLang('testcase');
echo "<div class='btn-group dropup'>";
echo "<button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><i class='icon icon-sitemap'></i> " . $lang->testcase->common . " <span class='caret'></span></button>";
echo "<ul class='dropdown-menu' id='createCaseActionMenu'>";
$misc = "data-toggle='modal' data-type='iframe' data-width='95%'";
$link = $this->createLink('testcase', 'create', "productID=$story->product&branch=$story->branch&moduleID=0&from=&param=0&storyID=$story->id", '', true);
if(common::hasPriv('testcase', 'create', $story)) echo "<li>" . html::a($link, $lang->testcase->create, '', $misc) . "</li>";
$misc = "data-toggle='modal' data-type='iframe' data-width='95%'";
$link = $this->createLink('testcase', 'batchCreate', "productID=$story->product&branch=$story->branch&moduleID=0&storyID=$story->id", '', true);
if(common::hasPriv('testcase', 'batchCreate')) echo "<li>" . html::a($link, $lang->testcase->batchCreate, '', $misc) . "</li>";
echo "</ul>";
echo "</div>";
}
if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'smile', '', 'showinonlybody');
echo "<div class='divider'></div>";
common::printIcon('story', 'edit', "storyID=$story->id", $story);
common::printIcon('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", $story, 'button', 'copy', '', 'iframe showinonlybody', true, "data-width='1050'");
common::printIcon('story', 'delete', "storyID=$story->id", $story, 'button', '', 'hiddenwin');
?>
<?php endif;?>
</div>
</div>
<?php
js::set('canCreate', common::hasPriv('story', 'story'));
module/task/config.php
+1 -1
View File
@@ -197,5 +197,5 @@ $config->task->datatable->fieldList['lastEditedDate']['required'] = 'no';
$config->task->datatable->fieldList['actions']['title'] = 'actions';
$config->task->datatable->fieldList['actions']['fixed'] = 'right';
$config->task->datatable->fieldList['actions']['width'] = '130';
$config->task->datatable->fieldList['actions']['width'] = '170';
$config->task->datatable->fieldList['actions']['required'] = 'yes';
module/task/model.php
+4 -7
View File
@@ -2508,17 +2508,14 @@ class taskModel extends model
break;
}
if($task->status == 'wait') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
if($task->status != 'pause') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
if($task->status == 'pause') common::printIcon('task', 'restart', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
if($task->status == 'done' or $task->status == 'cancel' or $task->status == 'closed') common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
if($task->status == 'doing') common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'iframe', true);
common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true);
common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list');
if(empty($task->team) or empty($task->children))
{
common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children);
}
common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'plus', '', '', '', '', $this->lang->task->children);
break;
}
echo '</td>';
module/task/view/batchcreate.html.php
+1 -1
View File
@@ -138,7 +138,7 @@
<tr>
<td colspan='<?php echo $colspan?>' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/task/view/batchedit.html.php
+1 -1
View File
@@ -118,7 +118,7 @@
<tr>
<td colspan='<?php echo count($visibleFields) + 3;?>' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/task/view/create.html.php
+1 -1
View File
@@ -173,7 +173,7 @@
<tr>
<td colspan='4' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</table>
module/task/view/edit.html.php
+1 -1
View File
@@ -77,7 +77,7 @@
<?php echo html::hidden('lastEditedDate', $task->lastEditedDate);?>
<?php echo html::hidden('consumed', $task->consumed);?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</div>
<?php include '../../common/view/action.html.php';?>
</div>
module/task/view/editestimate.html.php
+1 -1
View File
@@ -38,7 +38,7 @@
<td colspan='2'><?php echo html::textarea('work', $estimate->work, "class=form-control");?></td>
</tr>
<tr>
<td colspan='3' class='text-center form-actions'><?php echo html::submitButton() . html::backButton('', '', 'btn btn-wide');?></td>
<td colspan='3' class='text-center form-actions'><?php echo html::submitButton() . html::backButton();?></td>
</tr>
</table>
</form>
module/task/view/view.html.php
+27 -25
View File
@@ -135,6 +135,33 @@
<?php $actionFormLink = $this->createLink('action', 'comment', "objectType=task&objectID=$task->id");?>
<?php include '../../common/view/action.html.php';?>
</div>
<div class='main-actions'>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php if(!isonlybody()) echo "<div class='divider'></div>";?>
<?php if(!$task->deleted):?>
<?php
common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', empty($task->team) ? $lang->task->assignTo : $lang->task->transfer);
common::printIcon('task', 'start', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'restart', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'pause', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'finish', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody text-success', true);
common::printIcon('task', 'activate', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody text-success', true);
common::printIcon('task', 'close', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'cancel', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
if(!isonlybody()) echo "<div class='divider'></div>";
if(empty($task->team) or empty($task->children)) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'button','plus','','','','',' ');
common::printIcon('task', 'edit', "taskID=$task->id", $task);
common::printIcon('task', 'create', "productID=0&storyID=0&moduleID=0&taskID=$task->id", $task, 'button', 'copy');
common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", $task, 'button', '', 'hiddenwin');
if(!empty($task->parent)) echo html::a(helper::createLink('task', 'view', "taskID=$task->parent"), "<i class='icon icon-chevron-double-up'></i>", '', "class='btn btn-link' title='{$lang->task->parent}'");
?>
<?php endif;?>
</div>
</div>
</div>
<div class="side-col col-4">
<div class="cell">
@@ -337,31 +364,6 @@
<div id="mainActions" class='main-actions'>
<?php common::printPreAndNext($preAndNext);?>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php if(!isonlybody()) echo "<div class='divider'></div>";?>
<?php if(!$task->deleted):?>
<?php
common::printIcon('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', empty($task->team) ? $lang->task->assignTo : $lang->task->transfer);
common::printIcon('task', 'start', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'restart', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'pause', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'finish', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody text-success', true);
common::printIcon('task', 'activate', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody text-success', true);
common::printIcon('task', 'close', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'cancel', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true);
if(!isonlybody()) echo "<div class='divider'></div>";
if(empty($task->team) or empty($task->children)) common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id", $task, 'button','plus','','','','',' ');
common::printIcon('task', 'edit', "taskID=$task->id", $task);
common::printIcon('task', 'create', "productID=0&storyID=0&moduleID=0&taskID=$task->id", $task, 'button', 'copy');
common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", $task, 'button', '', 'hiddenwin');
if(!empty($task->parent)) echo html::a(helper::createLink('task', 'view', "taskID=$task->parent"), "<i class='icon icon-chevron-double-up'></i>", '', "class='btn btn-link' title='{$lang->task->parent}'");
?>
<?php endif;?>
</div>
</div>
<?php include '../../common/view/syntaxhighlighter.html.php';?>
<?php include '../../common/view/footer.html.php';?>
module/testcase/config.php
+1 -1
View File
@@ -204,6 +204,6 @@ $config->testcase->datatable->fieldList['stepNumber']['name'] = $lang->testc
$config->testcase->datatable->fieldList['actions']['title'] = 'actions';
$config->testcase->datatable->fieldList['actions']['fixed'] = 'right';
$config->testcase->datatable->fieldList['actions']['width'] = '180';
$config->testcase->datatable->fieldList['actions']['width'] = '140';
$config->testcase->datatable->fieldList['actions']['required'] = 'yes';
$config->testcase->datatable->fieldList['actions']['sort'] = 'no';
module/testcase/model.php
-1
View File
@@ -1352,7 +1352,6 @@ class testcaseModel extends model
switch($id)
{
case 'id':
//echo $mode == 'table' ? html::checkbox('caseIDList', array($case->id => sprintf('%03d', $case->id))) : sprintf('%03d', $case->id);
echo html::checkbox('caseIDList', array($case->id => sprintf('%03d', $case->id)));
break;
case 'pri':
module/testcase/view/batchcreate.html.php
+1 -1
View File
@@ -106,7 +106,7 @@
<tr>
<td colspan='<?php echo $colspan?>' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/testcase/view/batchedit.html.php
+1 -1
View File
@@ -116,7 +116,7 @@
<tr>
<td colspan='<?php echo $branchProduct ? (count($visibleFields) + 3) : (count($visibleFields) + 2);?>' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/testcase/view/browse.html.php
+2
View File
@@ -67,6 +67,8 @@ js::set('suiteID', $suiteID);
if($useDatatable) include '../../common/view/datatable.html.php';
else include '../../common/view/tablesorter.html.php';
if($config->testcase->needReview or !empty($config->testcase->forceReview)) $config->testcase->datatable->fieldList['actions']['width'] = '170';
$setting = $this->datatable->getSetting('testcase');
$widths = $this->datatable->setFixedFieldWidth($setting);
$columns = 0;
module/testcase/view/create.html.php
+1 -1
View File
@@ -219,7 +219,7 @@
<tr>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/testcase/view/showimport.html.php
+1 -1
View File
@@ -107,7 +107,7 @@
{
echo html::submitButton();
}
echo ' &nbsp; ' . html::backButton('', '', 'btn btn-wide');
echo ' &nbsp; ' . html::backButton();
?>
</td>
</tr>
module/testcase/view/view.html.php
+25 -23
View File
@@ -88,6 +88,31 @@
<?php echo $this->fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?>
<?php include '../../common/view/action.html.php';?>
</div>
<div class='main-actions'>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php if(!$case->deleted):?>
<?php if(!isonlybody()) echo "<div class='divider'></div>";?>
<?php
if(!$isLibCase)
{
if(!isonlybody()) echo "<div class='divider'></div>";
common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', '', '', 'runCase', false, "data-width='95%'");
common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'results', false, "data-width='95%'");
if($caseFails > 0) common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=$runID", $case, 'button', 'bug', '', 'iframe', '', "data-width='90%'");
}
if($config->testcase->needReview or !empty($config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'button', '', '', 'iframe');
?>
<?php
common::printIcon('testcase', 'edit',"caseID=$case->id", $case);
if(!$isLibCase) common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$case->id", $case, 'button', 'copy');
if($isLibCase and common::hasPriv('testsuite', 'createCase')) echo html::a($this->createLink('testsuite', 'createCase', "libID=$case->lib&moduleID=$case->module&param=$case->id", $case), "<i class='icon-copy'></i>", '', "class='btn' title='{$lang->testcase->copy}'");
common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', '', 'hiddenwin');
?>
<?php endif;?>
</div>
</div>
</div>
<div class='side-col col-4'>
<div class="cell">
@@ -281,28 +306,5 @@
</div>
<div id="mainActions" class='main-actions'>
<?php common::printPreAndNext($preAndNext);?>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php if(!$case->deleted):?>
<?php if(!isonlybody()) echo "<div class='divider'></div>";?>
<?php
if(!$isLibCase)
{
if(!isonlybody()) echo "<div class='divider'></div>";
common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", $case, 'button', '', '', 'runCase', false, "data-width='95%'");
common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", $case, 'button', '', '', 'results', false, "data-width='95%'");
if($caseFails > 0) common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=$runID", $case, 'button', 'bug', '', 'iframe', '', "data-width='90%'");
}
if($config->testcase->needReview or !empty($config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'button', '', '', 'iframe');
?>
<?php
common::printIcon('testcase', 'edit',"caseID=$case->id", $case);
if(!$isLibCase) common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$case->id", $case, 'button', 'copy');
if($isLibCase and common::hasPriv('testsuite', 'createCase')) echo html::a($this->createLink('testsuite', 'createCase', "libID=$case->lib&moduleID=$case->module&param=$case->id", $case), "<i class='icon-copy'></i>", '', "class='btn' title='{$lang->testcase->copy}'");
common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', '', 'hiddenwin');
?>
</div>
<?php endif;?>
</div>
<?php include '../../common/view/footer.html.php';?>
module/testreport/view/create.html.php
+1 -1
View File
@@ -87,7 +87,7 @@
<tr>
<td class='text-center form-actions' colspan='4'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</table>
module/testreport/view/edit.html.php
+1 -1
View File
@@ -84,7 +84,7 @@
<tr>
<td class='text-center form-actions' colspan='4'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</table>
module/testsuite/view/batchcreatecase.html.php
+1 -1
View File
@@ -68,7 +68,7 @@
<?php endfor;?>
</tbody>
<tfoot>
<tr><td colspan='8' class='text-center form-actions'><?php echo html::submitButton()?> <?php echo html::backButton('', '', 'btn btn-wide');?></td></tr>
<tr><td colspan='8' class='text-center form-actions'><?php echo html::submitButton()?> <?php echo html::backButton();?></td></tr>
</tfoot>
</table>
</form>
module/testsuite/view/create.html.php
+1 -1
View File
@@ -35,7 +35,7 @@
<th></th>
<td class='text-left form-actions' colspan='2'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</table>
module/testsuite/view/createcase.html.php
+1 -1
View File
@@ -192,7 +192,7 @@
<tr>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/testsuite/view/createlib.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
<tr>
<td class='text-center form-actions' colspan='2'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</table>
module/testsuite/view/edit.html.php
+2 -2
View File
@@ -35,8 +35,8 @@
<?php endif;?>
<tr>
<td class='text-center form-actions' colspan='2'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::submitButton();?>
<?php echo html::backButton();?>
</td>
</tr>
</table>
module/testsuite/view/showimport.html.php
+1 -1
View File
@@ -93,7 +93,7 @@
{
echo html::submitButton();
}
echo ' &nbsp; ' . html::backButton('', '', 'btn btn-wide')
echo ' &nbsp; ' . html::backButton();
?>
</td>
</tr>
module/testtask/model.php
+2 -9
View File
@@ -1170,7 +1170,7 @@ class testtaskModel extends model
$id = $col->id;
if($col->show)
{
$class = '';
$class = "c-$id ";
if($id == 'status') $class .= $run->status;
if($id == 'title') $class .= ' text-left';
if($id == 'id') $class .= ' cell-id';
@@ -1182,14 +1182,7 @@ class testtaskModel extends model
switch ($id)
{
case 'id':
//if($mode == 'table')
//{
echo html::checkbox('caseIDList', array($run->case => sprintf('%03d', $run->case)));
//}
//else
//{
// echo $canView ? html::a($caseLink, sprintf('%03d', $run->case)) : sprintf('%03d', $run->case);
//}
echo html::checkbox('caseIDList', array($run->case => sprintf('%03d', $run->case)));
break;
case 'pri':
echo "<span class='label-pri label-pri-" . $run->pri . "' title='" . zget($this->lang->testcase->priList, $run->pri, $run->pri) . "'>";
module/testtask/view/cases.html.php
+2 -2
View File
@@ -33,7 +33,7 @@
<nav class="btn-toolbar pull-right"></nav>
</div>
<?php
$vars = "taskID=$task->id&browseType=$browseType&param=$param&orderBy=%s&recToal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
$vars = "taskID=$task->id&browseType=$browseType&param=$param&orderBy=%s&recToal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
$canBatchEdit = common::hasPriv('testcase', 'batchEdit');
$canBatchUnlink = common::hasPriv('testtask', 'batchUnlinkCases');
@@ -45,7 +45,7 @@
if(!$useDatatable) include '../../common/view/tablesorter.html.php';
$config->testcase->datatable->defaultField = $config->testtask->datatable->defaultField;
$config->testcase->datatable->fieldList['actions']['width'] = '140';
$config->testcase->datatable->fieldList['actions']['width'] = '120';
$setting = $this->datatable->getSetting('testtask');
$widths = $this->datatable->setFixedFieldWidth($setting);
module/testtask/view/create.html.php
+1 -1
View File
@@ -89,7 +89,7 @@
<tr>
<td class='text-center form-actions' colspan='3'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</table>
module/testtask/view/edit.html.php
+1 -1
View File
@@ -82,7 +82,7 @@
<tr>
<td class='text-center form-actions' colspan='3'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</table>
module/testtask/view/view.html.php
+29 -27
View File
@@ -42,6 +42,27 @@
<?php $actionFormLink = $this->createLink('action', 'comment', "objectType=testtask&objectID=$task->id");?>
<?php include '../../common/view/action.html.php';?>
</div>
<div class='main-content'>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php if(!$task->deleted):?>
<div class='divider'></div>
<?php
common::printIcon('testtask', 'start', "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
common::printIcon('testtask', 'close', "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
common::printIcon('testtask', 'block', "taskID=$task->id", $task, 'button', 'pause', '', 'iframe', true);
common::printIcon('testtask', 'activate', "taskID=$task->id", $task, 'button', 'magic', '', 'iframe', true);
common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'button', 'sitemap');
common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'button', 'link');
?>
<div class='divider'></div>
<?php
common::printIcon('testtask', 'edit', "taskID=$task->id", $task);
common::printIcon('testtask', 'delete', "taskID=$task->id", $task, 'button', '', 'hiddenwin');
?>
<?php endif;?>
</div>
</div>
</div>
<div class="col-4 side-col">
<div class="cell">
@@ -53,36 +74,36 @@
<tr>
<th class='w-60px'><?php echo $lang->testtask->project;?></th>
<td><?php echo html::a($this->createLink('project', 'story', "projectID=$task->project"), $task->projectName, '', "title='{$task->projectName}'");?></td>
</tr>
</tr>
<?php endif;?>
<tr>
<th><?php echo $lang->testtask->build;?></th>
<td><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName, '', "title='{$task->buildName}'"));?></td>
</tr>
</tr>
<tr>
<th><?php echo $lang->testtask->owner;?></th>
<td><?php echo zget($users, $task->owner);?></td>
</tr>
</tr>
<tr>
<th><?php echo $lang->testtask->mailto;?></th>
<td><?php $mailto = explode(',', str_replace(' ', '', $task->mailto)); foreach($mailto as $account) echo ' ' . zget($users, $account, $account);?></td>
<td><?php $mailto = explode(',', str_replace(' ', '', $task->mailto)); foreach($mailto as $account) echo ' ' . zget($users, $account, $account);?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->pri;?></th>
<td><?php echo $task->pri;?></td>
</tr>
</tr>
<tr>
<th><?php echo $lang->testtask->begin;?></th>
<td><?php echo $task->begin;?></td>
</tr>
</tr>
<tr>
<th><?php echo $lang->testtask->end;?></th>
<td><?php echo $task->end;?></td>
</tr>
</tr>
<tr>
<th><?php echo $lang->testtask->status;?></th>
<td class='task-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
</tr>
</tr>
</table>
</div>
</div>
@@ -92,24 +113,5 @@
<div id='mainActions'>
<?php common::printPreAndNext($browseLink);?>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php if(!$task->deleted):?>
<div class='divider'></div>
<?php
common::printIcon('testtask', 'start', "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
common::printIcon('testtask', 'close', "taskID=$task->id", $task, 'button', '', '', 'iframe', true);
common::printIcon('testtask', 'block', "taskID=$task->id", $task, 'button', 'pause', '', 'iframe', true);
common::printIcon('testtask', 'activate', "taskID=$task->id", $task, 'button', 'magic', '', 'iframe', true);
common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'button', 'sitemap');
common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'button', 'link');
?>
<div class='divider'></div>
<?php
common::printIcon('testtask', 'edit', "taskID=$task->id", $task);
common::printIcon('testtask', 'delete', "taskID=$task->id", $task, 'button', '', 'hiddenwin');
?>
<?php endif;?>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>
module/todo/view/batchcreate.html.php
+1 -1
View File
@@ -83,7 +83,7 @@
<?php endfor;?>
</tbody>
<tfoot>
<tr><td class='text-center form-actions' colspan='<?php echo isset($visibleFields['beginAndEnd']) ? $columns + 1 : $columns;?>'><?php echo html::submitButton() . html::backButton('', '', 'btn btn-wide');?></td></tr>
<tr><td class='text-center form-actions' colspan='<?php echo isset($visibleFields['beginAndEnd']) ? $columns + 1 : $columns;?>'><?php echo html::submitButton() . html::backButton();?></td></tr>
</tfoot>
</table>
<div class="hidden">
module/todo/view/batchedit.html.php
+1 -1
View File
@@ -97,7 +97,7 @@
<tr>
<td colspan='<?php echo $columns?>' class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>
module/todo/view/create.html.php
+1 -1
View File
@@ -132,7 +132,7 @@
</tr>
<tr>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton() . html::backButton('', '', 'btn btn-wide');?>
<?php echo html::submitButton() . html::backButton();?>
</td>
</tr>
</table>
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();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::backButton();?>
</div>
</div>
</form>
module/todo/view/view.html.php
+49 -47
View File
@@ -37,6 +37,55 @@
</div>
<?php include '../../common/view/action.html.php';?>
</div>
<div class='main-actions'>
<div class="btn-toolbar">
<?php
if($todo->status == 'done' || $todo->status == 'closed') common::printLink('todo', 'activate', "todoID=$todo->id", "<i class='icon icon-magic'></i>", 'hiddenwin', "title='{$lang->todo->activate}' class='btn showinonlybody'");
if($todo->status == 'done') common::printLink('todo', 'close', "todoID=$todo->id", "<i class='icon icon-off'></i>", 'hiddenwin', "title='{$lang->todo->close}' class='btn showinonlybody'");
common::printLink('todo', 'edit', "todoID=$todo->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->todo->edit}' class='btn showinonlybody'");
common::printLink('todo', 'delete', "todoID=$todo->id", "<i class='icon icon-close'></i>", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'");
echo html::a('#commentModal', '<i class="icon-chat-line"></i>', '', "title='{$lang->comment}' data-toggle='modal' class='btn'");
if($this->session->todoList)
{
$browseLink = $this->session->todoList;
}
elseif($todo->account == $app->user->account)
{
$browseLink = $this->createLink('my', 'todo');
}
else
{
$browseLink = $this->createLink('user', 'todo', "account=$todo->account");
}
if($todo->status != 'done' && $todo->status != 'closed')
{
echo "<div class='btn-group dropup'>";
echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), "<i class='icon icon-checked'></i>", 'hiddenwin', "title='{$lang->todo->finish}' class='btn showinonlybody btn-success'");
$createStoryPriv = common::hasPriv('story', 'create');
$createTaskPriv = common::hasPriv('task', 'create');
$createBugPriv = common::hasPriv('bug', 'create');
if($createStoryPriv or $createTaskPriv or $createBugPriv)
{
$isonlybody = isonlybody();
unset($_GET['onlybody']);
echo "<button type='button' class='btn btn-success dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
echo "<ul class='dropdown-menu pull-right' role='menu'>";
if($createStoryPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['story'], '', "data-toggle='modal' data-target='#productModal' data-backdrop='false' data-moveable='true' data-position='center' id='toStoryLink'") . '</li>';
if($createTaskPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['task'], '', "data-toggle='modal' data-target='#projectModal' data-backdrop='false' data-moveable='true' data-position='center' id='toTaskLink'") . '</li>';
if($createBugPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['bug'], '', "data-toggle='modal' data-target='#productModal' data-backdrop='false' data-moveable='true' data-position='center' id='toBugLink'") . '</li>';
echo "</ul>";
if($isonlybody) $_GET['onlybody'] = 'yes';
}
echo "</div>";
}
common::printRPN($browseLink);
?>
</div>
</div>
</div>
<div class='side-col col-4'>
<div class='cell'>
@@ -121,53 +170,6 @@
</div>
<div id="mainActions" class='main-actions'>
<div class="container"></div>
<div class="btn-toolbar">
<?php
if($todo->status == 'done' || $todo->status == 'closed') common::printLink('todo', 'activate', "todoID=$todo->id", "<i class='icon icon-magic'></i>", 'hiddenwin', "title='{$lang->todo->activate}' class='btn showinonlybody'");
if($todo->status == 'done') common::printLink('todo', 'close', "todoID=$todo->id", "<i class='icon icon-off'></i>", 'hiddenwin', "title='{$lang->todo->close}' class='btn showinonlybody'");
common::printLink('todo', 'edit', "todoID=$todo->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->todo->edit}' class='btn showinonlybody'");
common::printLink('todo', 'delete', "todoID=$todo->id", "<i class='icon icon-close'></i>", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'");
echo html::a('#commentModal', '<i class="icon-chat-line"></i>', '', "title='{$lang->comment}' data-toggle='modal' class='btn'");
if($this->session->todoList)
{
$browseLink = $this->session->todoList;
}
elseif($todo->account == $app->user->account)
{
$browseLink = $this->createLink('my', 'todo');
}
else
{
$browseLink = $this->createLink('user', 'todo', "account=$todo->account");
}
if($todo->status != 'done' && $todo->status != 'closed')
{
echo "<div class='btn-group dropup'>";
echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), "<i class='icon icon-checked'></i>", 'hiddenwin', "title='{$lang->todo->finish}' class='btn showinonlybody btn-success'");
$createStoryPriv = common::hasPriv('story', 'create');
$createTaskPriv = common::hasPriv('task', 'create');
$createBugPriv = common::hasPriv('bug', 'create');
if($createStoryPriv or $createTaskPriv or $createBugPriv)
{
$isonlybody = isonlybody();
unset($_GET['onlybody']);
echo "<button type='button' class='btn btn-success dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
echo "<ul class='dropdown-menu pull-right' role='menu'>";
if($createStoryPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['story'], '', "data-toggle='modal' data-target='#productModal' data-backdrop='false' data-moveable='true' data-position='center' id='toStoryLink'") . '</li>';
if($createTaskPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['task'], '', "data-toggle='modal' data-target='#projectModal' data-backdrop='false' data-moveable='true' data-position='center' id='toTaskLink'") . '</li>';
if($createBugPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['bug'], '', "data-toggle='modal' data-target='#productModal' data-backdrop='false' data-moveable='true' data-position='center' id='toBugLink'") . '</li>';
echo "</ul>";
if($isonlybody) $_GET['onlybody'] = 'yes';
}
echo "</div>";
}
common::printRPN($browseLink);
?>
</div>
</div>
<div class="modal fade" id="commentModal">
<div class="modal-dialog mw-600px">
module/tree/view/browse.html.php
+1 -1
View File
@@ -142,7 +142,7 @@
<?php endif;?>
<td colspan="2" class="form-actions">
<?php echo html::submitButton();?>
<?php echo $this->session->{$viewType . 'List'} ? html::linkButton($this->lang->goback, $this->session->{$viewType .'List'}, 'self', '', 'btn btn-wide') : html::backButton('', '', 'btn btn-wide');?>
<?php echo $this->session->{$viewType . 'List'} ? html::linkButton($this->lang->goback, $this->session->{$viewType .'List'}, 'self', '', 'btn btn-wide') : html::backButton();?>
<?php echo html::hidden('parentModuleID', $currentModuleID);?>
<?php echo html::hidden('maxOrder', $maxOrder);?>
</td>
module/tree/view/browsetask.html.php
+1 -1
View File
@@ -110,7 +110,7 @@
<td colspan='2' class="form-actions">
<?php
echo html::submitButton();
echo $this->session->taskList ? html::linkButton($this->lang->goback, $this->session->taskList, '', '', 'btn btn-wide') : html::backButton('', '', 'btn btn-wide');
echo $this->session->taskList ? html::linkButton($this->lang->goback, $this->session->taskList, '', '', 'btn btn-wide') : html::backButton();
echo html::hidden('parentModuleID', $currentModuleID);
echo html::hidden('maxOrder', $maxOrder);
?>
module/upgrade/model.php
+3 -2
View File
@@ -2412,7 +2412,7 @@ class upgradeModel extends model
*/
public function removeCustomMenu()
{
$customMenuMain = $this->dao->select('*')->from(TABLE_CONFIG)->where('module')->eq('common')->andWhere('section')->eq('customMenu')->andWhere('`key`')->eq('full_main')->fetchAll('id');
$customMenuMain = $this->dao->select('*')->from(TABLE_CONFIG)->where('module')->eq('common')->andWhere('section')->eq('customMenu')->andWhere("(`key`='full_main' OR `key`='onlyTask_main' OR `key`='onlyStory_main' OR `key`='onlyTest_main')")->fetchAll('id');
foreach($customMenuMain as $mainMenu)
{
$mainMenuValue = json_decode($mainMenu->value);
@@ -2429,7 +2429,8 @@ class upgradeModel extends model
}
}
$this->dao->delete()->from(TABLE_CONFIG)->where('module')->eq('common')->andWhere('section')->eq('customMenu')->andWhere('key')->eq('full_project')->exec();
$this->dao->delete()->from(TABLE_CONFIG)->where('module')->eq('common')->andWhere('section')->eq('customMenu')->andWhere('`key`')->eq('full_project')->exec();
$this->dao->delete()->from(TABLE_CONFIG)->where('module')->eq('common')->andWhere('section')->eq('customMenu')->andWhere('`key`')->eq('onlyTask_project')->exec();
return !dao::isError();
}
module/user/view/batchcreate.html.php
+1 -1
View File
@@ -104,7 +104,7 @@
<tr>
<td colspan="<?php echo count($visibleFields) + 6?>" class="text-center form-actions">
<?php echo html::submitButton($lang->save);?>
<?php echo html::backButton('', '', "btn btn-wide");?>
<?php echo html::backButton();?>
</td>
</tr>
</tfoot>

Some files were not shown because too many files have changed in this diff Show More