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:
Catouse
2018-09-19 16:47:47 +08:00
parent 232eb30f5c 40d662e996
commit 576752be69
194 changed files with 268 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/front/front.class.php
+1 -1
View File
@@ -87,7 +87,7 @@ class html extends baseHTML
* @access public
* @return string the submit button tag.
*/
public static function submitButton($label = '', $misc = '', $class = 'btn btn-primary')
public static function submitButton($label = '', $misc = '', $class = 'btn btn-wide btn-primary')
{
return parent::submitButton($label, $class, $misc);
}
module/admin/view/bind.html.php
+1 -1
View File
@@ -36,7 +36,7 @@
<tr>
<td colspan='2' class="text-center">
<?php
echo html::submitButton('', '', 'btn btn-wide btn-primary');
echo html::submitButton();
echo html::hidden('sn', $sn) . html::hidden('site', common::getSysURL());
?>
</td>
module/admin/view/certifyztemail.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<td><?php echo html::input('captcha', '', "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
</tr>
</table>
</form>
module/admin/view/certifyztmobile.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<td><?php echo html::input('captcha', '', "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
</tr>
</table>
</form>
module/admin/view/register.html.php
+2 -2
View File
@@ -84,7 +84,7 @@
</tr>
<tr>
<td colspan='2' class='text-center'>
<?php echo html::submitButton($lang->admin->register->submit, '', 'btn btn-wide btn-primary') . html::hidden('sn', $sn) . html::hidden('bindSite', common::getSysURL());?>
<?php echo html::submitButton($lang->admin->register->submit) . html::hidden('sn', $sn) . html::hidden('bindSite', common::getSysURL());?>
</td>
</tr>
</table>
@@ -109,7 +109,7 @@
<td><?php echo html::password('password', '', "class='form-control'");?></td>
</tr>
<tr>
<td colspan='2' class="text-center"><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::hidden('sn', $sn) . html::hidden('site', common::getSysURL());?></td>
<td colspan='2' class="text-center"><?php echo html::submitButton() . html::hidden('sn', $sn) . html::hidden('site', common::getSysURL());?></td>
</tr>
</table>
</form>
module/admin/view/safe.html.php
+1 -1
View File
@@ -48,7 +48,7 @@
</tr>
<tr>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
module/admin/view/sso.html.php
+1 -1
View File
@@ -42,7 +42,7 @@
</tr>
<tr>
<td colspan='2' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
module/admin/view/ztcompany.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
</tr>
<?php endforeach;?>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
</tr>
</table>
</form>
module/api/view/debug.html.php
+2 -2
View File
@@ -25,12 +25,12 @@
<?php endforeach;?>
<tr>
<td align='center' colspan="2">
<?php echo html::submitButton($lang->api->submit, '', 'btn btn-primary btn-wide')?>
<?php echo html::submitButton($lang->api->submit)?>
</td>
</tr>
</table>
<?php else:?>
<?php echo html::hidden('noparam', '0') . $lang->api->noParam . html::submitButton($lang->api->submit, '', 'btn btn-primary btn-wide');?>
<?php echo html::hidden('noparam', '0') . $lang->api->noParam . html::submitButton($lang->api->submit);?>
<?php endif;?>
<?php if($method->post) echo "<p>{$lang->api->post}</p>"?>
</form>
module/backup/view/change.html.php
+1 -1
View File
@@ -24,7 +24,7 @@
<strong class='input-group-addon'><?php echo $lang->day;?></strong>
</div>
</td>
<td><?php echo html::submitButton();?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary');?></td>
</tr>
</table>
</form>
module/block/lang/en.php
-2
View File
@@ -68,7 +68,6 @@ $lang->block->default['product']['1']['grid'] = 8;
$lang->block->default['product']['1']['params']['orderBy'] = 'id_desc';
$lang->block->default['product']['1']['params']['type'] = 'all';
$lang->block->default['product']['1']['params']['num'] = 5;
$lang->block->default['product']['2']['title'] = $lang->productCommon . ' Overview';
$lang->block->default['product']['2']['block'] = 'overview';
@@ -95,7 +94,6 @@ $lang->block->default['project']['1']['grid'] = 8;
$lang->block->default['project']['1']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['1']['params']['type'] = 'all';
$lang->block->default['project']['1']['params']['num'] = 5;
$lang->block->default['project']['2']['title'] = $lang->projectCommon . ' Overview';
$lang->block->default['project']['2']['block'] = 'overview';
module/block/lang/zh-cn.php
-2
View File
@@ -68,7 +68,6 @@ $lang->block->default['product']['1']['grid'] = 8;
$lang->block->default['product']['1']['params']['orderBy'] = 'id_desc';
$lang->block->default['product']['1']['params']['type'] = 'all';
$lang->block->default['product']['1']['params']['num'] = 5;
$lang->block->default['product']['2']['title'] = $lang->productCommon . '总览';
$lang->block->default['product']['2']['block'] = 'overview';
@@ -95,7 +94,6 @@ $lang->block->default['project']['1']['grid'] = 8;
$lang->block->default['project']['1']['params']['orderBy'] = 'id_desc';
$lang->block->default['project']['1']['params']['type'] = 'all';
$lang->block->default['project']['1']['params']['num'] = 5;
$lang->block->default['project']['2']['title'] = $lang->projectCommon . '总览';
$lang->block->default['project']['2']['block'] = 'overview';
module/block/view/bugblock.html.php
-1
View File
@@ -51,7 +51,6 @@
<td class='c-name' style='color: <?php echo $bug->color?>' title='<?php echo $bug->title?>'><?php echo $bug->title?></td>
<td class='c-status' title='<?php echo zget($lang->bug->statusList, $bug->status)?>'>
<span class="status-<?php echo $bug->status?>">
<span class="label label-dot hide-in-sm"></span>
<span class='status-text'><?php echo zget($lang->bug->statusList, $bug->status);?></span>
</span>
</td>
module/block/view/caseblock.html.php
-4
View File
@@ -19,11 +19,8 @@
.block-cases.block-sm .c-status{text-align:center}
.block-cases.block-sm .c-status .status-text{display:none;}
.case-status-normal {color: #a6aab8;}
.case-status-normal > .label-dot {background-color: #006af1;}
.case-status-blocked { color: #a6aab8; }
.case-status-blocked > .label-dot { background-color: #00da88; }
.case-status-investigate {color: #a6aab8;}
.case-status-investigate > .label-dot {background-color: #006af1;}
</style>
<table class='table table-borderless table-hover table-fixed-head tablesorter block-cases <?php if(!$longBlock) echo 'block-sm';?>'>
<thead>
@@ -58,7 +55,6 @@
<?php endif;?>
<td class='c-status' title='<?php echo zget($lang->testcase->statusList, $case->status)?>'>
<span class="case-status-<?php echo $case->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->testcase->statusList, $case->status);?></span>
</span>
</td>
module/block/view/projectblock.html.php
+2 -2
View File
@@ -44,9 +44,9 @@
<?php if($longBlock):?>
<td class="c-status">
<?php if(isset($project->delay)):?>
<span class="status-delayed"><span class="label label-dot"></span> <?php echo $lang->project->delayed;?></span>
<span class="status-delayed"><?php echo $lang->project->delayed;?></span>
<?php else:?>
<span class="status-<?php echo $project->status?>"><span class="label label-dot"></span> <?php echo zget($lang->project->statusList, $project->status, '');?></span>
<span class="status-<?php echo $project->status?>"><?php echo zget($lang->project->statusList, $project->status, '');?></span>
<?php endif;?>
</td>
<td class="c-hours"><?php echo $project->hours->totalEstimate;?></td>
module/block/view/releaseblock.html.php
-1
View File
@@ -47,7 +47,6 @@
<td class='text-center'><?php echo $release->date?></td>
<td class='c-status' title='<?php echo zget($lang->release->statusList, $release->status);?>'>
<span class="status-<?php echo $release->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->release->statusList, $release->status);?></span>
</span>
</td>
module/block/view/storyblock.html.php
-2
View File
@@ -21,7 +21,6 @@
.block-stories .c-stage {width: 80px;}
.block-stories.block-sm .estimate,
.block-stories.block-sm .c-stage,
.block-stories.block-sm .c-status .label-dot {display: none;}
.block-stories.block-sm .c-status {text-align: center;}
</style>
<div class='panel-body has-table scrollbar-hover'>
@@ -59,7 +58,6 @@
<?php endif;?>
<td class='c-status' title='<?php echo zget($lang->story->statusList, $story->status);?>'>
<span class="status-<?php echo $story->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->story->statusList, $story->status);?></span>
</span>
</td>
module/block/view/taskblock.html.php
-1
View File
@@ -51,7 +51,6 @@
<?php endif;?>
<td class='c-status' title='<?php echo zget($lang->task->statusList, $task->status)?>'>
<span class="status-<?php echo $task->status?>">
<span class="label label-dot hide-in-sm"></span>
<span class='status-text'><?php echo zget($lang->task->statusList, $task->status);?></span>
</span>
</td>
module/branch/view/manage.html.php
+1 -1
View File
@@ -47,7 +47,7 @@
<td></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?> </td><td></td>
<td colspan='2' class='text-center'><?php echo html::submitButton();?> </td><td></td>
</tr>
</table>
</form>
module/bug/css/create.css
+1 -1
View File
@@ -43,4 +43,4 @@
.title-group.required > .required:after {display: block; right: 29px; top: 5px;}
.title-group .chosen-container {width: 1%!important; min-width: 70px;}
.title-group #severity + .chosen-container > .chosen-single {border-radius: 0!important;}
.title-group #pri + .chosen-container > .chosen-single {border-top-left-radius: 0!important; border-bottom-left-radius: 0!important;}
.title-group #pri + .chosen-container > .chosen-single {border-top-left-radius: 0!important; border-bottom-left-radius: 0!important;}
module/bug/model.php
+3 -6
View File
@@ -2527,7 +2527,7 @@ class bugModel extends model
echo zget($this->lang->bug->typeList, $bug->type);
break;
case 'status':
echo "<span class='status-{$bug->status}'><span class='label label-dot'></span><span class='status-text'>";
echo "<span class='status-{$bug->status}'><span class='status-text'>";
echo zget($this->lang->bug->statusList, $bug->status);
echo '</span></span>';
break;
@@ -2584,13 +2584,9 @@ class bugModel extends model
}
break;
case 'assignedTo':
$btnTextClass = '';
$assignedToText = !empty($bug->assignedTo) ? zget($users, $bug->assignedTo) : $this->lang->bug->noAssigned;
$btnTextClass = 'text-primary';
if($bug->assignedTo == $account) $btnTextClass = 'text-red';
$btnClass = $assignedToText == 'closed' ? ' disabled' : '';
echo html::a(helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true), "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='iframe btn btn-sm btn-icon-left{$btnClass}'");
echo "<span class='{$btnTextClass}'>" . zget($users, $bug->assignedTo) . "</span>";
break;
case 'assignedDate':
echo substr($bug->assignedDate, 5, 11);
@@ -2624,6 +2620,7 @@ class bugModel extends model
break;
case 'actions':
$params = "bugID=$bug->id";
common::printIcon('bug', 'assignTo', $params, $bug, 'list', '', '', 'iframe', true);
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true);
common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true);
module/bug/view/activate.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
<td colspan='2' class='text-left'><?php echo $this->fetch('file', 'buildform');?></td>
</tr>
<tr>
<td class='text-center' colspan='3'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->bugList, 'self', '', 'btn btn-wide');?></td>
<td class='text-center' colspan='3'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList, 'self', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/bug/view/assignto.html.php
+1 -1
View File
@@ -43,7 +43,7 @@ js::set('page', 'assignedto');
<td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<td colspan='3' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?></td>
<td colspan='3' class='text-center form-actions'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/bug/view/batchactivate.html.php
+1 -1
View File
@@ -38,7 +38,7 @@
<?php endforeach;?>
</tbody>
<tfoot>
<tr><td colspan='5' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td></tr>
<tr><td colspan='5' class='text-center'><?php echo html::submitButton();?></td></tr>
</tfoot>
</table>
</form>
module/bug/view/batchcreate.html.php
+1 -1
View File
@@ -163,7 +163,7 @@
<tfoot>
<tr>
<td colspan='<?php echo count($visibleFields) + 3?>' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
module/bug/view/batchedit.html.php
+1 -1
View File
@@ -141,7 +141,7 @@
<tfoot>
<tr>
<td colspan='<?php echo $branchProduct ? $columns : ($columns - 1);?>' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
module/bug/view/close.html.php
+1 -1
View File
@@ -31,7 +31,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->bugList, 'self', '', 'btn btn-wide');?></td>
<td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList, 'self', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/bug/view/confirmbug.html.php
+1 -1
View File
@@ -54,7 +54,7 @@ js::set('page', 'confirmbug');
<td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p94'");?></td>
</tr>
<tr>
<td class='text-center form-actions' colspan='3'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?></td>
<td class='text-center form-actions' colspan='3'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/bug/view/create.html.php
+2 -2
View File
@@ -298,7 +298,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
<tfoot>
<tr>
<td colspan="3" class="text-center form-actions">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('case', (int)$caseID) . html::hidden('caseVersion', (int)$version);?>
<?php echo html::hidden('result', (int)$runID) . html::hidden('testtask', (int)$testtask);?>
@@ -322,7 +322,7 @@ js::set('confirmDeleteTemplate', $lang->bug->confirmDeleteTemplate);
<?php if(common::hasPriv('bug', 'setPublic')):?>
<span class='input-group-addon'><?php echo html::checkbox('public', array('1' => $lang->public))?></span>
<?php endif;?>
<span class='input-group-btn'><?php echo html::submitButton()?></span>
<span class='input-group-btn'><?php echo html::submitButton('', '', 'btn btn-primary')?></span>
</div>
</div>
</div>
module/bug/view/edit.html.php
+1 -1
View File
@@ -70,7 +70,7 @@ js::set('oldResolvedBuild' , $bug->resolvedBuild);
<div class='actions form-actions text-center'>
<?php
echo html::hidden('lastEditedDate', $bug->lastEditedDate);
echo html::submitButton('', '', 'btn btn-wide btn-primary');
echo html::submitButton();
$browseLink = $app->session->bugList != false ? $app->session->bugList : inlink('browse', "productID=$bug->product");
echo html::linkButton($lang->goback, $browseLink, 'self', '', "btn btn-wide");
?>
module/bug/view/resolve.html.php
+1 -1
View File
@@ -82,7 +82,7 @@ js::set('productID' , $bug->product);
<td colspan='3'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
</tr>
<tr>
<td class='text-center form-actions' colspan='4'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->bugList, 'self', '', 'btn btn-wide');?></td>
<td class='text-center form-actions' colspan='4'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->bugList, 'self', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/bug/view/view.html.php
+1 -1
View File
@@ -16,7 +16,7 @@
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<?php if(!isonlybody()):?>
<?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-link'");?>
<?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-primary'");?>
<div class="divider"></div>
<?php endif;?>
<div class="page-title">
module/build/view/create.html.php
+1 -1
View File
@@ -74,7 +74,7 @@
</tr>
<tr>
<td colspan="3" class="text-center form-actions">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
module/build/view/edit.html.php
+1 -1
View File
@@ -68,7 +68,7 @@
</tr>
<tr>
<td colspan="3" class="text-center form-actions">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo $config->global->flow != 'onlyTest' ? html::hidden('project', $build->project) : '';?>
</td>
module/build/view/linkbug.html.php
-1
View File
@@ -49,7 +49,6 @@
<td style='overflow:visible;padding-top:1px;padding-bottom:1px;'><?php echo ($bug->status == 'resolved' or $bug->status == 'closed') ? $users[$bug->resolvedBy] : html::select("resolvedBy[{$bug->id}]", $users, $this->app->user->account, "class='form-control chosen'");?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
module/build/view/linkstory.html.php
-1
View File
@@ -52,7 +52,6 @@
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-<?php echo $story->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->story->statusList[$story->status];?>
</span>
</td>
module/build/view/view.html.php
-3
View File
@@ -127,7 +127,6 @@ tbody tr td:first-child input{display:none;}
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-<?php echo $story->status;?>'>
<span class='label label-dot'></span>
<?php echo $lang->story->statusList[$story->status];?>
</span>
</td>
@@ -199,7 +198,6 @@ tbody tr td:first-child input{display:none;}
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='iframe' data-width='1000'");?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
@@ -260,7 +258,6 @@ tbody tr td:first-child input{display:none;}
<td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($bugLink, $bug->title, '', "class='iframe' data-width='1000'");?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
module/common/lang/menuOrder.php
+8 -9
View File
@@ -89,15 +89,14 @@ $lang->report->menuOrder[15] = 'test';
$lang->report->menuOrder[20] = 'staff';
/* company menu order. */
$lang->company->menuOrder[5] = 'name';
$lang->company->menuOrder[10] = 'browseUser';
$lang->company->menuOrder[15] = 'dept';
$lang->company->menuOrder[20] = 'browseGroup';
$lang->company->menuOrder[25] = 'dynamic';
$lang->company->menuOrder[30] = 'view';
$lang->company->menuOrder[35] = 'addGroup';
$lang->company->menuOrder[40] = 'batchAddUser';
$lang->company->menuOrder[45] = 'addUser';
$lang->company->menuOrder[5] = 'browseUser';
$lang->company->menuOrder[10] = 'dept';
$lang->company->menuOrder[15] = 'browseGroup';
$lang->company->menuOrder[20] = 'dynamic';
$lang->company->menuOrder[25] = 'view';
$lang->company->menuOrder[30] = 'addGroup';
$lang->company->menuOrder[35] = 'batchAddUser';
$lang->company->menuOrder[40] = 'addUser';
$lang->dept->menuOrder = $lang->company->menuOrder;
$lang->group->menuOrder = $lang->company->menuOrder;
$lang->user->menuOrder = $lang->company->menuOrder;
module/common/view/action.html.php
+1 -1
View File
@@ -74,7 +74,7 @@
<?php echo html::textarea('lastComment', htmlspecialchars($action->comment), "rows='8' autofocus='autofocus'");?>
</div>
<div class="form-group form-actions">
<?php echo html::submitButton($lang->save, '', 'btn btn-primary btn-wide');?>
<?php echo html::submitButton($lang->save);?>
<?php echo html::commonButton($lang->close, '', 'btn btn-wide btn-hide-form');?>
</div>
</form>
module/company/view/dynamic.html.php
+3 -1
View File
@@ -57,9 +57,11 @@
<span class="timeline-tag"><?php echo $action->time?></span>
<span class="timeline-text">
<?php echo zget($users, $action->actor) . ' ' . $action->actionLabel;?>
<?php if($action->action != 'login' and $action->action != 'logout'):?>
<span class="text-muted"><?php echo $action->objectLabel;?></span>
<span class="label label-id"><?php echo $action->objectID;?></span>
<?php echo html::a($action->objectLink, $action->objectName);?>
<span class="label label-id"><?php echo $action->objectID;?></span>
<?php endif;?>
</span>
</div>
</li>
module/company/view/edit.html.php
+1 -1
View File
@@ -54,7 +54,7 @@
<th><?php echo $lang->company->guest;?></th>
<td><?php echo html::radio('guest', $lang->company->guestOptions, $company->guest);?></td>
</tr>
<tr><td class='text-center' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
<tr><td class='text-center' colspan='2'><?php echo html::submitButton();?></td></tr>
</table>
</form>
</div>
module/cron/view/create.html.php
+1 -1
View File
@@ -59,7 +59,7 @@
<td><?php echo html::select('type', $lang->cron->typeList, 'system', "class='form-control'")?></td>
</tr>
<tr>
<td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td>
<td colspan='3' class='text-center'><?php echo html::submitButton()?></td>
</tr>
</table>
</form>
module/cron/view/edit.html.php
+1 -1
View File
@@ -59,7 +59,7 @@
<td><?php echo html::select('type', $lang->cron->typeList, $cron->type, "class='form-control'")?></td>
</tr>
<tr>
<td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td colspan='3' class='text-center'><?php echo html::submitButton();?></td>
</tr>
</table>
</form>
module/custom/view/flow.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<?php endforeach;?>
</td>
</tr>
<tr><td></td><td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td></tr>
<tr><td></td><td><?php echo html::submitButton()?></td></tr>
<tr>
<td colspan='2' class='pd-0'>
<div class='alert alert-info alert-block'><strong><?php echo $lang->custom->productProject->notice?></strong></div>
module/custom/view/required.html.php
+1 -1
View File
@@ -57,7 +57,7 @@
<?php endforeach;?>
<tr>
<td colspan='2' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
<?php echo html::submitButton();?>
<?php if(common::hasPriv('custom', 'resetRequired')) echo html::a(inlink('resetRequired', "module=$moduleName"), $lang->custom->restore, 'hiddenwin', "class='btn btn-wide'");?>
</td>
</tr>
module/custom/view/score.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
<tr>
<th></th>
<td class='form-actions'>
<?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
<?php echo html::submitButton();?>
<?php common::printLink('score', 'reset', '', "<i class='icon-refresh'></i> " . $lang->custom->scoreReset, '', ' id="scoreRefresh" class="btn btn-wide iframe" data-width="480"', true, true);?>
</td>
</tr>
module/custom/view/set.html.php
+6 -6
View File
@@ -71,7 +71,7 @@ EOT;
</tr>
<?php endif;?>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
</tr>
</table>
<?php elseif($module == 'task' and $field == 'hours'):?>
@@ -86,7 +86,7 @@ EOT;
<td><?php echo html::radio('weekend', $lang->custom->weekendList, $weekend);?></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
</tr>
</table>
<?php elseif($module == 'bug' and $field == 'longlife'):?>
@@ -99,7 +99,7 @@ EOT;
<span class='input-group-addon'><?php echo $lang->day?></span>
</div>
</td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td><?php echo html::submitButton();?></td>
</tr>
</table>
<div class='alert alert-info alert-block'><?php echo $lang->custom->notice->longlife;?></div>
@@ -110,7 +110,7 @@ EOT;
<td><?php echo html::select('closed[]', $blockPairs, $closedBlock, "class='form-control chosen' multiple");?></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
</tr>
</table>
<?php elseif($module == 'user' and $field == 'deleted'):?>
@@ -121,7 +121,7 @@ EOT;
</tr>
<tr>
<td></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td><?php echo html::submitButton();?></td>
</tr>
</table>
<?php else:?>
@@ -151,7 +151,7 @@ EOT;
<?php
$appliedTo = array($currentLang => $lang->custom->currentLang, 'all' => $lang->custom->allLang);
echo html::radio('lang', $appliedTo, $lang2Set);
echo html::submitButton('', '', 'btn btn-primary btn-wide');
echo html::submitButton();
if(common::hasPriv('custom', 'restore')) echo html::linkButton($lang->custom->restore, inlink('restore', "module=$module&field=$field"), 'hiddenwin', '', 'btn btn-wide');
?>
</td>
module/custom/view/working.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<?php endforeach;?>
</td>
</tr>
<tr><td></td><td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td></tr>
<tr><td></td><td><?php echo html::submitButton()?></td></tr>
</table>
</form>
</div>
module/dept/view/browse.html.php
+1 -1
View File
@@ -65,7 +65,7 @@
<tr>
<td></td>
<td class='form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('maxOrder', $maxOrder);?>
<?php echo html::hidden('parentDeptID', $deptID);?>
module/dept/view/edit.html.php
+1 -1
View File
@@ -37,7 +37,7 @@ $jsRoot = $webRoot . "js/";
</tr>
<tr>
<td colspan='2' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
</td>
</tr>
</table>
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('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide') . html::hidden('lib', $libID);?>
<?php echo html::submitButton() . ' ' . html::backButton('', '', 'btn btn-wide') . html::hidden('lib', $libID);?>
</td>
</tr>
</tbody>
module/doc/view/createlib.html.php
+1 -1
View File
@@ -55,7 +55,7 @@
</td>
</tr>
<tr>
<td class='text-center form-actions' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
<td class='text-center form-actions' colspan='2'><?php echo html::submitButton();?></td>
</tr>
</table>
</form>
module/doc/view/edit.html.php
+1 -1
View File
@@ -76,7 +76,7 @@
<td colspan='3' class='text-center form-actions'>
<?php
echo html::hidden('editedDate', $doc->editedDate);
echo html::submitButton('', '', 'btn btn-wide btn-primary');
echo html::submitButton();
echo html::backButton('', '', 'btn btn-wide');
?>
</td>
module/doc/view/editlib.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
</td>
</tr>
<tr>
<td class='text-center form-actions' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
<td class='text-center form-actions' colspan='2'><?php echo html::submitButton();?></td>
</tr>
</table>
</form>
module/doc/view/objectlibs.html.php
+1 -1
View File
@@ -46,7 +46,7 @@
<?php endforeach;?>
</div>
<div>
<?php echo html::submitButton($lang->save);?> &nbsp;
<?php echo html::submitButton($lang->save, '', 'btn btn-primary');?> &nbsp;
<?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
</div>
</form>
module/doc/view/objectlibsbylist.html.php
+1 -1
View File
@@ -26,7 +26,7 @@
<?php endforeach;?>
</div>
<div>
<?php echo html::submitButton($lang->save);?> &nbsp;
<?php echo html::submitButton($lang->save, '', 'btn btn-primary');?> &nbsp;
<?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
</div>
</form>
module/editor/view/edit.html.php
+1 -1
View File
@@ -72,7 +72,7 @@
<?php endif;?>
</td>
</tr>
<tr><td align='center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td></tr>
<tr><td align='center'><?php echo html::submitButton()?></td></tr>
</table>
</div>
</form>
module/editor/view/newpage.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
?>
</td>
</tr>
<tr><td colspan='2' align='center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td></tr>
<tr><td colspan='2' align='center'><?php echo html::submitButton()?></td></tr>
</table>
</div>
</form>
module/entry/view/create.html.php
+1 -1
View File
@@ -60,7 +60,7 @@
<tr>
<th></th>
<td>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::a($config->entry->help, $lang->entry->help, '_blank', "class='help'");?>
</td>
<td></td>
module/entry/view/edit.html.php
+1 -1
View File
@@ -58,7 +58,7 @@
<tr>
<th></th>
<td>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::a($config->entry->help, $lang->entry->help, '_blank', "class='help'");?>
</td>
</tr>
module/extension/view/upload.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<form method='post' target='hiddenwin' enctype='multipart/form-data' style='padding: 20px 20%'>
<div class='input-group'>
<input type='file' name='file' class='form-control' />
<span class='input-group-btn'><?php echo html::submitButton($lang->extension->install);?></span>
<span class='input-group-btn'><?php echo html::submitButton($lang->extension->install, '', 'btn btn-primary');?></span>
</div>
</form>
<?php endif;?>
module/file/view/export.html.php
+1 -1
View File
@@ -214,7 +214,7 @@ if($isCustomExport)
<tr>
<th></th>
<td>
<?php echo html::submitButton($lang->export, "onclick='setDownloading();' ");?>
<?php echo html::submitButton($lang->export, "onclick='setDownloading();'", 'btn btn-primary');?>
</td>
</tr>
</tbody>
module/group/view/copy.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
<td><?php echo html::checkbox('options', $lang->group->copyOptions, '', '', 'inline');?></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
</tr>
</table>
</form>
module/group/view/create.html.php
+1 -1
View File
@@ -26,7 +26,7 @@
<td><?php echo html::textarea('desc', '', "rows=5 class=form-control");?></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
</tr>
</table>
</form>
module/group/view/edit.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
<td><?php echo html::textarea('desc', $group->desc, "rows='5' class='form-control'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
<td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
</tr>
</table>
</form>
module/group/view/managemember.html.php
+1 -1
View File
@@ -61,7 +61,7 @@
<tr>
<td class='text-center form-actions' colspan='2'>
<?php
echo html::submitButton('', '', 'btn btn-wide btn-primary');
echo html::submitButton();
echo html::linkButton($lang->goback, $this->createLink('group', 'browse'));
echo html::hidden('foo'); // Just a var, to make sure $_POST is not empty.
?>
module/group/view/manageview.html.php
+1 -1
View File
@@ -69,7 +69,7 @@
</tr>
<tr>
<td colspan='2' class='form-actions text-center'>
<?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
<?php echo html::submitButton('', "onclick='setNoChecked()'");?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('foo'); // Just a hidden var, to make sure $_POST is not empty.?>
</td>
module/group/view/privbygroup.html.php
+1 -1
View File
@@ -37,7 +37,7 @@
<tr>
<th class='text-right'></th>
<td class='form-actions'>
<?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
<?php echo html::submitButton('', "onclick='setNoChecked()'");?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('noChecked'); // Save the value of no checked.?>
</td>
module/group/view/privbymodule.html.php
+1 -1
View File
@@ -41,7 +41,7 @@
</tr>
<tr>
<td class='text-center form-actions' colspan='3'>
<?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
<?php echo html::submitButton('', "onclick='setNoChecked()'");?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('foo'); // Just make $_POST not empty..?>
</td>
module/mail/view/browse.html.php
+2 -2
View File
@@ -45,8 +45,8 @@
<div class="checkbox-primary">
<input type='checkbox' name='mailIDList[]' value='<?php echo $queue->id;?>'/>
<label></label>
<?php echo $queue->id?>
</div>
<?php echo $queue->id?>
</td>
<td><?php echo zget($users, $queue->toList, $queue->toList)?></td>
<td class='text-left'><?php echo $queue->subject?></td>
@@ -69,7 +69,7 @@
<div class='table-footer'>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<div class="table-actions btn-toolbar">
<?php if(common::hasPriv('mail', 'batchDelete')) echo html::submitButton($lang->delete);?>
<?php if(common::hasPriv('mail', 'batchDelete')) echo html::submitButton($lang->delete, '', 'btn btn-primary');?>
</div>
<?php $pager->show('right', 'pagerjs');?>
</div>
module/mail/view/detect.html.php
+1 -1
View File
@@ -21,7 +21,7 @@
</div>
<form class='pdt-20' method='post' target='hiddenwin'>
<table class='table table-form'>
<tr><th style='width:140px'><?php echo $lang->mail->inputFromEmail; ?></th><td class='w-p50'><?php echo html::input('fromAddress', $fromAddress, "class='form-control' autocomplete='off'");?></td><td><?php echo html::submitButton($lang->mail->nextStep);?></td></tr>
<tr><th style='width:140px'><?php echo $lang->mail->inputFromEmail; ?></th><td class='w-p50'><?php echo html::input('fromAddress', $fromAddress, "class='form-control' autocomplete='off'");?></td><td><?php echo html::submitButton($lang->mail->nextStep, '', 'btn btn-primary');?></td></tr>
</table>
</form>
</div>
module/mail/view/test.html.php
+1 -1
View File
@@ -32,7 +32,7 @@
<td><?php echo html::select('to', $users, $app->user->account, "class='form-control chosen'");?></td>
<td class='text-left'>
<?php
echo html::submitButton($lang->mail->test);
echo html::submitButton($lang->mail->test, '', 'btn btn-primary');
$mta = $config->mail->mta;
echo html::linkButton($lang->mail->edit, inlink(($mta == 'sendcloud' or $mta == 'ztcloud') ? $mta : 'edit'));
?>
module/mail/view/ztcloud.html.php
+1 -1
View File
@@ -61,7 +61,7 @@
</tr>
<tr>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
<?php echo html::submitButton();?>
<?php
if($config->mail->turnon and $mailExist) echo html::a(inlink('test'), $lang->mail->test, '', "class='btn btn-wide'");
echo html::a(inlink('reset'), $lang->mail->reset, '', "class='btn btn-wide'");
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('', '', 'btn btn-primary btn-wide');?> <?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('', '', 'btn btn-wide');?></td>
</tr>
</tfoot>
</table>
module/my/view/bug.html.php
+3 -8
View File
@@ -50,7 +50,7 @@
<th class='w-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->bug->assignedTo);?></th>
<th class='w-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedByAB);?></th>
<th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='c-actions-5'> <?php echo $lang->actions;?></th>
<th class='c-actions-6'> <?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -70,19 +70,14 @@
<td><?php echo zget($lang->bug->typeList, $bug->type, '');?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?></td>
<td><?php echo zget($users, $bug->openedBy);?></td>
<td>
<?php
$assignedToText = !empty($bug->assignedTo) ? zget($users, $bug->assignedTo) : $this->lang->bug->noAssigned;
$btnTextClass = 'text-red';
$btnClass = $assignedToText == 'closed' ? ' disabled' : '';
echo html::a(helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true), "<i class='icon icon-hand-right'></i> <span class='{$btnTextClass}'>{$assignedToText}</span>", '', "class='iframe btn btn-sm btn-icon-left{$btnClass}'");
?>
<td><?php echo "<span class='text-red'>" . zget($users, $bug->assignedTo) . "</span>";?>
</td>
<td><?php echo zget($users, $bug->resolvedBy);?></td>
<td><?php echo zget($lang->bug->resolutionList, $bug->resolution);?></td>
<td class='c-actions'>
<?php
$params = "bugID=$bug->id";
common::printIcon('bug', 'assignTo', $params, $bug, 'list', '', '', 'iframe', true);
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true);
common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true);
common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true);
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('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
<td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::backButton('', '', 'btn btn-wide');?></td>
</tr>
</table>
<?php if(!empty($this->app->user->modifyPasswordReason)):?>
module/my/view/dynamic.html.php
+3 -1
View File
@@ -54,9 +54,11 @@
<span class="timeline-tag"><?php echo $action->time?></span>
<span class="timeline-text">
<?php echo $app->user->realname . ' ' . $action->actionLabel;?>
<?php if($action->action != 'login' and $action->action != 'logout'):?>
<span class="text-muted"><?php echo $action->objectLabel;?></span>
<span class="label label-id"><?php echo $action->objectID;?></span>
<?php echo html::a($action->objectLink, $action->objectName);?>
<span class="label label-id"><?php echo $action->objectID;?></span>
<?php endif;?>
</span>
</div>
</li>
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('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></div>
<div class='text-center form-actions'><?php echo html::submitButton() . html::backButton('', '', 'btn btn-wide');?></div>
</form>
<?php echo html::hidden('verifyRand', $rand);?>
</div>
module/my/view/managecontacts.html.php
+1 -1
View File
@@ -87,7 +87,7 @@
<tr>
<td></td>
<td class="form-actions">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::hidden('mode', $mode);?>
<?php echo html::submitButton() . html::hidden('mode', $mode);?>
<?php if($mode == 'edit') echo html::a(inlink('deleteContacts', "listID=$listID"), $lang->delete, 'hiddenwin', "class='btn btn-danger btn-wide'");?>
</td>
</tr>
module/my/view/project.html.php
+2 -2
View File
@@ -56,9 +56,9 @@
<td><?php echo $project->end;?></td>
<td class="c-status">
<?php if(isset($project->delay)):?>
<span class="status-delayed"><span class="label label-dot"></span> <?php echo $lang->project->delayed;?></span>
<span class="status-delayed"> <?php echo $lang->project->delayed;?></span>
<?php else:?>
<span class="status-<?php echo $project->status?>"><span class="label label-dot"></span> <?php echo zget($lang->project->statusList, $project->status, '');?></span>
<span class="status-<?php echo $project->status?>"> <?php echo zget($lang->project->statusList, $project->status, '');?></span>
<?php endif;?>
</td>
<td><?php echo $project->role;?></td>
module/my/view/story.html.php
+1 -1
View File
@@ -75,7 +75,7 @@
<td class='c-plan'><?php echo $story->planTitle;?></td>
<td class='c-user'><?php echo $users[$story->openedBy];?></td>
<td class='c-hours'><?php echo $story->estimate;?></td>
<td class='c-status'><span class='status-<?php echo $story->status;?>'><span class="label label-dot"></span> <?php echo zget($lang->story->statusList, $story->status);?></span></td>
<td class='c-status'><span class='status-<?php echo $story->status;?>'> <?php echo zget($lang->story->statusList, $story->status);?></span></td>
<td class='c-stage'><?php echo zget($lang->story->stageList, $story->stage);?></td>
<td class='c-actions'>
<?php
module/my/view/task.html.php
+1 -6
View File
@@ -78,12 +78,7 @@
<?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name, null, "style='color: $task->color'");?>
</td>
<td class='c-user'><?php echo zget($users, $task->openedBy);?></td>
<td class="c-assign">
<?php
$btnTextClass = 'text-red';
echo "<span class='$btnTextClass'>" . zget($users, $task->assignedTo) . "</span>";
?>
</td>
<td class="c-assign"><?php echo "<span class='text-red'>" . zget($users, $task->assignedTo) . "</span>";?></td>
<td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
<td class='c-hours'><?php echo $task->estimate;?></td>
<td class='c-hours'><?php echo $task->consumed;?></td>
module/product/view/batchedit.html.php
+1 -1
View File
@@ -72,7 +72,7 @@
<tfoot>
<tr>
<td colspan="<?php echo count($visibleFields) + 4?>" class="text-center form-actions">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', "btn btn-wide");?>
</td>
</tr>
module/product/view/close.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
</tr>
<tr>
<td colspan='2' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?>
</td>
</tr>
module/product/view/create.html.php
+1 -1
View File
@@ -83,7 +83,7 @@
</tr>
<tr>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
module/product/view/edit.html.php
+1 -1
View File
@@ -72,7 +72,7 @@
</tr>
<tr>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
module/productplan/view/batchedit.html.php
+1 -1
View File
@@ -41,7 +41,7 @@
<tfoot>
<tr>
<td colspan='5' class="text-center form-actions">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', "btn btn-wide");?>
</td>
</tr>
module/productplan/view/create.html.php
+1 -1
View File
@@ -58,7 +58,7 @@
</tr>
<tr>
<td colspan='4' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('product', $product->id);?>
</td>
module/productplan/view/edit.html.php
+1 -1
View File
@@ -58,7 +58,7 @@
</tr>
<tr>
<td colspan='4' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('product', $product->id);?>
</td>
module/productplan/view/linkbug.html.php
-1
View File
@@ -48,7 +48,6 @@
<td><?php echo $users[$bug->assignedTo];?></td>
<td>
<span class='status-<?php echo $bug->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->bug->statusList[$bug->status];?>
</span>
</td>
module/productplan/view/linkstory.html.php
-1
View File
@@ -55,7 +55,6 @@
<td><?php echo $story->estimate;?></td>
<td>
<span class='status-<?php echo $story->status?>'>
<span class='label label-dot'></span>
<?php echo $lang->story->statusList[$story->status];?>
</span>
</td>
module/productplan/view/view.html.php
+1 -1
View File
@@ -19,7 +19,7 @@
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php $browseLink = $this->session->productPlanList ? $this->session->productPlanList : inlink('browse', "planID=$plan->id");?>
<?php common::printBack($browseLink, 'btn btn-link');?>
<?php common::printBack($browseLink, 'btn btn-primary');?>
<div class='divider'></div>
<div class='page-title'>
<span class='label label-id'><?php echo $plan->id;?></span>
module/project/view/activate.html.php
+1 -1
View File
@@ -54,7 +54,7 @@
<td colspan='5'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<td class='text-center form-actions' colspan='6'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
<td class='text-center form-actions' colspan='6'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
</tr>
</table>
</form>
module/project/view/ajaxkanbansetting.html.php
+1 -1
View File
@@ -51,7 +51,7 @@ form {padding: 30px 0 40px;}
<tr>
<td colspan='2' class='form-actions text-center'>
<?php
echo html::submitButton('', '', 'btn btn-wide btn-primary');
echo html::submitButton();
echo '&nbsp;' . html::a(inlink('ajaxResetKanban', "projectID=$projectID"), $lang->project->resetKanban, 'hiddenwin', "class='btn btn-wide'");
?>
</td>
module/project/view/all.html.php
-1
View File
@@ -80,7 +80,6 @@
<td><?php echo $project->end;?></td>
<td class='c-status' title='<?php echo zget($lang->project->statusList, $project->status);?>'>
<span class="status-<?php echo $project->status?>">
<span class="label label-dot"></span>
<span class='status-text'><?php echo zget($lang->project->statusList, $project->status);?></span>
</span>
</td>
module/project/view/batchedit.html.php
+1 -1
View File
@@ -85,7 +85,7 @@
<?php endforeach;?>
</tbody>
<tfoot>
<tr><td colspan='<?php echo count($visibleFields) + 6?>' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
<tr><td colspan='<?php echo count($visibleFields) + 6?>' class='text-center form-actions'><?php echo html::submitButton();?></td></tr>
</tfoot>
</table>
</div>
module/project/view/bug.html.php
+4 -8
View File
@@ -59,7 +59,7 @@
<th class='w-110px'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
<th class='w-user'> <?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
<th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='c-actions text-center'><?php echo $lang->actions;?></th>
<th class='c-actions-5 text-center'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
@@ -77,19 +77,15 @@
<td class='text-left' title="<?php echo $bug->title?>"><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color'");?></td>
<td><?php echo zget($users, $bug->openedBy, $bug->openedBy);?></td>
<td class='c-assignedTo has-btn text-left'>
<?php $assignedTo = zget($users, $bug->assignedTo, $bug->assignedTo);?>
<?php $params = "bugID=$bug->id";?>
<?php $class = $bug->assignedTo == $this->app->user->account ? 'text-red' : 'text-primary';?>
<?php if(common::hasPriv('bug', 'assignTo')):?>
<?php echo html::a($this->createLink('bug', 'assignTo', $params, '', 'true'), "<i class='icon icon-hand-right'></i> <span class='$class'>$assignedTo</span>", '', "class='iframe btn btn-icon-left btn-sm'");?>
<?php else:?>
<?php echo $assignedTo;?>
<?php endif;?>
<?php echo "<span class='$class'>" . zget($users, $bug->assignedTo, $bug->assignedTo) . "</span>";?>
</td>
<td><?php echo zget($users, $bug->resolvedBy, $bug->resolvedBy);?></td>
<td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
<td class='c-actions'>
<?php
$params = "bugID=$bug->id";
common::printIcon('bug', 'assignTo', $params, $bug, 'list', '', '', 'iframe', true);
if($bug->status == 'active') common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'confirm', '', 'iframe', true);
if($bug->status == 'active') common::printIcon('bug', 'resolve', $params, $bug, 'list', 'check', '', 'iframe', true);
if($bug->status != 'active') common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true);
module/project/view/close.html.php
+1 -1
View File
@@ -30,7 +30,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<td class='text-center form-actions' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
<td class='text-center form-actions' colspan='2'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
</tr>
</tbody>
</table>
module/project/view/create.html.php
+1 -1
View File
@@ -146,7 +146,7 @@
</tr>
<tr>
<td colspan='4' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
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('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide');?></td></tr>
<tr><td colspan='3' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::backButton('', '', 'btn btn-wide');?></td></tr>
</table>
</form>
</div>

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