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

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

Browse Source
This commit is contained in:
wangyidong
2018-05-15 15:46:36 +08:00
parent cc4c828a1e e522af53b4
commit dbc4f92af2
47 changed files with 87 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/admin.html.php
+1 -1
View File
@@ -40,7 +40,7 @@ include '../../common/view/chosen.html.php';
<div class="form-group form-actions">
<div class="col-sm-7 col-sm-offset-3">
<button type="submit" class="btn btn-wide btn-primary"><?php echo $lang->save;?></button>
<button type="cancel" class="btn btn-wide btn-gray" data-dismiss="modal"><?php echo $lang->cancel;?></button>
<button type="cancel" class="btn btn-wide" data-dismiss="modal"><?php echo $lang->cancel;?></button>
</div>
</div>
</form>
module/bug/model.php
+1 -1
View File
@@ -2422,7 +2422,7 @@ class bugModel extends model
}
break;
case 'severity':
echo "<span class='label-severity' data-severity='{$bug->severity}'></span>";
echo "<span class='label-severity' data-severity='{$bug->severity}' title='" . zget($this->lang->bug->severityList, $bug->severity) . "'></span>";
break;
case 'pri':
echo "<span class='label-pri label-pri-" . $bug->pri . "'>";
module/bug/view/view.html.php
+1 -1
View File
@@ -107,7 +107,7 @@
</tr>
<tr>
<th><?php echo $lang->bug->severity;?></th>
<td><span class='<?php echo 'severity' . zget($lang->bug->severityList, $bug->severity);?>'><?php echo zget($lang->bug->severityList, $bug->severity)?></span></td>
<td><span class='<?php echo 'severity severity-' . $bug->severity;?>'><?php echo zget($lang->bug->severityList, $bug->severity)?></span></td>
</tr>
<tr>
<th><?php echo $lang->bug->pri;?></th>
module/build/view/create.html.php
+1 -1
View File
@@ -75,7 +75,7 @@
<tr>
<td colspan="3" class="text-center">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/build/view/edit.html.php
+1 -1
View File
@@ -69,7 +69,7 @@
<tr>
<td colspan="3" class="text-center">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo $this->config->global->flow != 'onlyTest' ? html::hidden('project', $build->project) : '';?>
</td>
</tr>
module/common/view/customfield.html.php
+1 -1
View File
@@ -26,7 +26,7 @@
</div>
<div>
<?php echo html::submitButton($lang->save);?>
<?php echo html::commonButton($lang->cancel, '', "btn btn-gray close-dropdown");?>
<?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
</div>
</form>
</div>
module/dept/view/browse.html.php
+1 -1
View File
@@ -66,7 +66,7 @@
<td></td>
<td>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('maxOrder', $maxOrder);?>
<?php echo html::hidden('parentDeptID', $deptID);?>
</td>
module/doc/model.php
+1 -1
View File
@@ -157,7 +157,7 @@ class docModel extends model
if(isset($menu['link']))
{
list($menuLabel, $module, $method, $vars) = explode('|', $menu['link']);
$actions .= html::a(helper::createLink($module, $method, $vars), $menuLabel, '', "class='btn btn-gray'");
$actions .= html::a(helper::createLink($module, $method, $vars), $menuLabel, '', "class='btn'");
}
}
module/doc/view/browse.html.php
+2 -2
View File
@@ -40,8 +40,8 @@ var browseType = '<?php echo $browseType;?>';
</div>
<nav class="panel-actions btn-toolbar">
<div class="btn-group">
<?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-gray btn-icon text-primary'");?>
<?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-gray btn-icon'");?>
<?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
<?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
</div>
</nav>
</div>
module/doc/view/browsebygrid.html.php
+2 -2
View File
@@ -4,8 +4,8 @@
<div class="panel-title font-normal"><i class="icon icon-folder-open-o text-muted"></i> <?php echo $title;?></div>
<nav class="panel-actions btn-toolbar">
<div class="btn-group">
<?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-gray btn-icon'");?>
<?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-gray btn-icon text-primary'");?>
<?php echo html::a('javascript:setBrowseType("bygrid")', "<i class='icon icon-cards-view'></i>", '', "title='{$lang->doc->browseTypeList['grid']}' class='btn btn-icon'");?>
<?php echo html::a('javascript:setBrowseType("bylist")', "<i class='icon icon-bars'></i>", '', "title='{$lang->doc->browseTypeList['list']}' class='btn btn-icon text-primary'");?>
</div>
</nav>
</div>
module/doc/view/create.html.php
+1 -1
View File
@@ -77,7 +77,7 @@
</tr>
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray') . html::hidden('lib', $libID);?>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide') . html::hidden('lib', $libID);?>
</td>
</tr>
</tbody>
module/doc/view/edit.html.php
+1 -1
View File
@@ -74,7 +74,7 @@
</tr>
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/doc/view/objectlibs.html.php
+2 -2
View File
@@ -23,7 +23,7 @@
</div>
<nav class="panel-actions btn-toolbar">
<div class="dropdown">
<button type="button" title="<?php echo $lang->customConfig;?>" class="btn btn-gray btn-icon" data-toggle="dropdown"><i class="icon icon-cog"></i></button>
<button type="button" title="<?php echo $lang->customConfig;?>" class="btn btn-icon" data-toggle="dropdown"><i class="icon icon-cog"></i></button>
<div class="dropdown-menu pull-right col-lg" id="pageSetting">
<form class='with-padding load-indicator' id='pageSettingForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('custom', 'ajaxSaveCustomFields', 'module=doc&section=custom&key=objectLibs');?>'>
<div><?php echo $lang->customConfig;?></div>
@@ -40,7 +40,7 @@
</div>
<div>
<?php echo html::submitButton($lang->save);?>
<?php echo html::commonButton($lang->cancel, '', "btn btn-gray close-dropdown");?>
<?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
</div>
</form>
</div>
module/doc/view/showfiles.html.php
+2 -2
View File
@@ -39,8 +39,8 @@
</form>
</div>
<div class="btn-group">
<?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=list"), "<i class='icon icon-bars'></i>" , '', "title={$lang->doc->browseTypeList['list']} class='btn btn-gray btn-icon text-primary'");?>
<?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=card"), "<i class='icon icon-cards-view'></i>", '', "title={$lang->doc->browseTypeList['grid']} class='btn btn-gray btn-gray btn-icon'");?>
<?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=list"), "<i class='icon icon-bars'></i>" , '', "title={$lang->doc->browseTypeList['list']} class='btn btn-icon text-primary'");?>
<?php echo html::a(inlink('showFiles', "type=$type&objectID=$objectID&viewType=card"), "<i class='icon icon-cards-view'></i>", '', "title={$lang->doc->browseTypeList['grid']} class='btn btn-icon'");?>
</div>
</nav>
</div>
module/file/view/buildform.html.php
+1 -1
View File
@@ -8,7 +8,7 @@
<input type="text" name="labels[]" class="form-control file-editbox" placeholder="<?php echo $lang->file->title;?>">
<div class="input-group-btn">
<button type="button" class="btn btn-success file-name-confirm"><i class="icon icon-check"></i></button>
<button type="button" class="btn btn-gray file-name-cancel"><i class="icon icon-close"></i></button>
<button type="button" class="btn file-name-cancel"><i class="icon icon-close"></i></button>
</div>
</div>
<div class="file-input-normal input-group">
module/group/view/manageview.html.php
+1 -1
View File
@@ -65,7 +65,7 @@
<th><span class='hidden'><?php echo html::selectAll('', 'checkbox')?></span></th>
<td colspan='2'>
<?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('foo'); // Just a hidden var, to make sure $_POST is not empty.?>
</td>
</tr>
module/group/view/privbygroup.html.php
+2 -2
View File
@@ -38,7 +38,7 @@
<th class='text-right'></th>
<td>
<?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('noChecked'); // Save the value of no checked.?>
</td>
</tr>
@@ -122,7 +122,7 @@
</th>
<td>
<?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('noChecked'); // Save the value of no checked.?>
</td>
</tr>
module/group/view/privbymodule.html.php
+1 -1
View File
@@ -42,7 +42,7 @@
<tr>
<td class='text-center' colspan='3'>
<?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('foo'); // Just make $_POST not empty..?>
</td>
</tr>
module/product/view/batchedit.html.php
+1 -1
View File
@@ -72,7 +72,7 @@
<tr>
<td colspan="<?php echo count($visibleFields) + 4?>" class="text-center">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
<?php echo html::backButton('', '', "btn btn-wide");?>
</td>
</tr>
</tfoot>
module/product/view/create.html.php
+1 -1
View File
@@ -84,7 +84,7 @@
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tbody>
module/product/view/edit.html.php
+1 -1
View File
@@ -73,7 +73,7 @@
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tbody>
module/productplan/view/batchedit.html.php
+1 -1
View File
@@ -42,7 +42,7 @@
<tr>
<td colspan='5' class="text-center">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
<?php echo html::backButton('', '', "btn btn-wide");?>
</td>
</tr>
</tfoot>
module/productplan/view/create.html.php
+1 -1
View File
@@ -59,7 +59,7 @@
<tr>
<td colspan='4' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('product', $product->id);?>
</td>
</tr>
module/productplan/view/edit.html.php
+1 -1
View File
@@ -59,7 +59,7 @@
<tr>
<td colspan='4' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('product', $product->id);?>
</td>
</tr>
module/project/view/create.html.php
+1 -1
View File
@@ -138,7 +138,7 @@
<td colspan='3'><?php echo html::checkbox('whitelist', $groups, $whitelist, '', '', 'inline');?></td>
</tr>
<tr>
<td colspan='4' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray');?></td>
<td colspan='4' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/project/view/edit.html.php
+1 -1
View File
@@ -145,7 +145,7 @@
<th><?php echo $lang->project->whitelist;?></th>
<td colspan='2' id='whitelistBox'><?php echo html::checkbox('whitelist', $groups, $project->whitelist, '', '', 'inline');?></td>
</tr>
<tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray');?></td></tr>
<tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td></tr>
</table>
</form>
</div>
module/release/view/create.html.php
+1 -1
View File
@@ -50,7 +50,7 @@
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tbody>
module/release/view/edit.html.php
+1 -1
View File
@@ -58,7 +58,7 @@
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('product', $release->product);?>
</td>
</tr>
module/search/view/buildform.html.php
+1 -1
View File
@@ -211,7 +211,7 @@ foreach($fieldParams as $fieldName => $param)
if($style != 'simple')
{
if(common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), $lang->save, '', "class='btn-save-form btn btn-secondary btn-wide'") . "&nbsp;";
echo html::commonButton($lang->search->reset, 'onclick=resetForm(this)', 'btn-reset-form btn btn-gray btn-wide');
echo html::commonButton($lang->search->reset, 'onclick=resetForm(this)', 'btn-reset-form btn btn-wide');
}
echo html::commonButton('<i class="icon icon-chevron-double-down"></i>', '', 'btn-expand-form btn btn-info pull-right');
echo html::hidden('formType', 'lite');
module/story/js/batchedit.js
+8 -1
View File
@@ -38,7 +38,14 @@ function loadBranches(product, branch, storyID)
$('#plans' + storyID).parent('td').load(planLink, function(){$('#plans' + storyID).chosen(defaultChosenOptions);});
}
$(document).ready(removeDitto());//Remove 'ditto' in first row.
$(function()
{
//Remove 'ditto' in first row.
removeDitto();
// Init bactch action form
$('#batchEditForm').batchActionForm();
});
$(document).on('click', '.chosen-with-drop', function(){oldValue = $(this).prev('select').val();})//Save old value.
module/story/view/batchclose.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
<tr>
<td colspan='5' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/story/view/batchcreate.html.php
+2 -2
View File
@@ -90,9 +90,9 @@
</tbody>
<tfoot>
<tr>
<td colspan="<?php echo count($visibleFields) + 3?>" class="text-center">
<td colspan="<?php echo count($visibleFields) + 3?>" class="text-center form-actions">
<?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
<?php echo html::backButton('', '', "btn btn-wide");?>
</td>
</tr>
</tfoot>
module/story/view/batchedit.html.php
+27 -13
View File
@@ -16,9 +16,6 @@
<div class='main-header'>
<h2>
<?php echo $lang->story->common . $lang->colon . $lang->story->batchEdit;?>
<?php if($productName):?>
<small class='text-muted'><?php echo html::icon($lang->icons['product']) . ' ' . $lang->story->product . $lang->colon . ' ' . $productName;?></small>
<?php endif;?>
</h2>
<div class='pull-right btn-toolbar'>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=story&section=custom&key=batchEditFields')?>
@@ -35,8 +32,8 @@ foreach(explode(',', $showFields) as $field)
if($field)$visibleFields[$field] = '';
}
?>
<form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "from=storyBatchEdit")?>">
<table class='table table-form table-fixed with-border'>
<form method='post' target='hiddenwin' action="<?php echo inLink('batchEdit', "from=storyBatchEdit")?>" id="batchEditForm">
<table class='table table-form'>
<thead>
<tr>
<th class='w-40px'> <?php echo $lang->idAB;?></th>
@@ -82,31 +79,48 @@ foreach(explode(',', $showFields) as $field)
<tr>
<td><?php echo $storyID . html::hidden("storyIDList[$storyID]", $storyID);?></td>
<?php if($branchProduct):?>
<td class='text-left<?php echo zget($visibleFields, 'branch', ' hidden')?>' style='overflow:visible'>
<td class='text-left<?php echo zget($visibleFields, 'branch', ' hidden')?>'>
<?php $branchProductID = $productID ? $productID : $product->id;?>
<?php $disabled = (isset($product) and $product->type == 'normal') ? "disabled='disabled'" : '';?>
<?php echo html::select("branches[$storyID]", $branches, $story->branch, "class='form-control chosen' onchange='loadBranches($branchProductID, this.value, $storyID);' $disabled");?>
</td>
<?php endif;?>
<td class='text-left<?php echo zget($visibleFields, 'module')?>' style='overflow:visible'>
<td class='text-left<?php echo zget($visibleFields, 'module')?>'>
<?php echo html::select("modules[$storyID]", $modules, $story->module, "class='form-control chosen'");?>
</td>
<td class='text-left<?php echo zget($visibleFields, 'plan', ' hidden')?>' style='overflow:visible'>
<td class='text-left<?php echo zget($visibleFields, 'plan', ' hidden')?>'>
<?php echo html::select("plans[$storyID]", $productPlans, $story->plan, "class='form-control chosen'");?>
</td>
<td style='overflow:visible' title='<?php echo $story->title?>'>
<!-- <td title='<?php echo $story->title?>'>
<div class='input-group'>
<?php echo html::hidden("colors[$storyID]", $story->color, "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->story->colorTag}' data-update-text='#titles\\[{$storyID}\\]'");?>
<?php echo html::input("titles[$storyID]", $story->title, "class='form-control' autocomplete='off'"); ?>
</div>
</td> -->
<td title='<?php echo $story->title?>'>
<div class="input-group">
<div class="input-control has-icon-right">
<?php echo html::input("titles[$storyID]", $story->title, "class='form-control input-story-title' autocomplete='off'"); ?>
<div class="colorpicker">
<button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
<ul class="dropdown-menu clearfix">
<li class="heading"><?php echo $lang->story->colorTag;?><i class="icon icon-close"></i></li>
</ul>
<?php echo html::hidden("colors[$storyID]", $story->color, "class='colorpicker' data-wrapper='input-control-icon-right' data-icon='color' data-btn-tip='{$lang->story->colorTag}' data-update-color='#titles\\[{$storyID}\\]'");?>
<!-- <input type="hidden" class="colorpicker" id="color$id" name="color[$id]" value="" data-icon="color" data-wrapper="input-control-icon-right" data-update-color="#title$id"> -->
</div>
</div>
</div>
</td>
<td <?php echo zget($visibleFields, 'estimate', "class='hidden'")?>><?php echo html::input("estimates[$storyID]", $story->estimate, "class='form-control' autocomplete='off'"); ?></td>
<td <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$storyID]", $priList, $story->pri, 'class=form-control');?></td>
<td class='text-left<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTo[$storyID]", $users, $story->assignedTo, "class='form-control chosen'");?></td>
<td class='text-left<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>'><?php echo html::select("assignedTo[$storyID]", $users, $story->assignedTo, "class='form-control chosen'");?></td>
<td <?php echo zget($visibleFields, 'source', "class='hidden'")?>><?php echo html::select("sources[$storyID]", $sourceList, $story->source, 'class=form-control');?></td>
<td class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
<td <?php echo zget($visibleFields, 'stage', "class='hidden'")?>><?php echo html::select("stages[$storyID]", $stageList, $story->stage, 'class="form-control"' . ($story->status == 'draft' ? ' disabled="disabled"' : ''));?></td>
<td class='text-left<?php echo zget($visibleFields, 'closedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("closedBys[$storyID]", $users, $story->closedBy, "class='form-control" . ($story->status == 'closed' ? " chosen'" : "' disabled='disabled'"));?></td>
<td class='text-left<?php echo zget($visibleFields, 'closedBy', ' hidden')?>'><?php echo html::select("closedBys[$storyID]", $users, $story->closedBy, "class='form-control" . ($story->status == 'closed' ? " chosen'" : "' disabled='disabled'"));?></td>
<?php if($story->status == 'closed'):?>
<td <?php echo zget($visibleFields, 'closedReason', "class='hidden'")?>>
@@ -133,9 +147,9 @@ foreach(explode(',', $showFields) as $field)
</tbody>
<tfoot>
<tr>
<td colspan='<?php echo count($visibleFields) + ($branchProduct ? 3 : 2);?>' class='text-center'>
<td colspan='<?php echo count($visibleFields) + ($branchProduct ? 3 : 2);?>' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tfoot>
module/story/view/create.html.php
+1 -1
View File
@@ -186,7 +186,7 @@
<tr>
<td colspan="5" class="text-center">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tfoot>
module/task/model.php
+1 -1
View File
@@ -2268,7 +2268,7 @@ class taskModel extends model
}
break;
case 'pri':
echo "<span class='label-pri label-pri-" . $task->pri . "'>";
echo "<span class='label-pri label-pri-" . $task->pri . "' title='" . zget($this->lang->task->priList, $task->pri, $task->pri) . "'>";
echo zget($this->lang->task->priList, $task->pri, $task->pri);
echo "</span>";
break;
module/task/view/batchcreate.html.php
+1 -1
View File
@@ -135,7 +135,7 @@
<tr>
<td colspan='<?php echo $colspan?>' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tbody>
module/task/view/batchedit.html.php
+1 -1
View File
@@ -111,7 +111,7 @@
<tr>
<td colspan='<?php echo count($visibleFields) + 3;?>' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</tfoot>
module/task/view/create.html.php
+1 -1
View File
@@ -166,7 +166,7 @@
<tr>
<td colspan='4' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
<?php echo html::backButton('', '', 'btn btn-gray btn-wide');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/todo/view/batchcreate.html.php
+1 -1
View File
@@ -83,7 +83,7 @@
<?php endfor;?>
</tbody>
<tfoot>
<tr><td class='text-center' colspan='<?php echo $columns?>'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray');?></td></tr>
<tr><td class='text-center' colspan='<?php echo $columns?>'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td></tr>
</tfoot>
</table>
<div class="hidden">
module/todo/view/edit.html.php
+1 -1
View File
@@ -138,7 +138,7 @@
<div class="row form-group form-actions">
<div class="col-sm-offset-2 col-sm-10">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</div>
</div>
</form>
module/tree/view/browse.html.php
+1 -1
View File
@@ -126,7 +126,7 @@
<?php endif;?>
<td colspan="2">
<?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
<?php echo $this->session->{$viewType . 'List'} ? html::linkButton($this->lang->goback, $this->session->{$viewType .'List'}, 'btn btn-wide btn-gray') : html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo $this->session->{$viewType . 'List'} ? html::linkButton($this->lang->goback, $this->session->{$viewType .'List'}, 'btn btn-wide') : html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('parentModuleID', $currentModuleID);?>
<?php echo html::hidden('maxOrder', $maxOrder);?>
</td>
module/user/view/batchcreate.html.php
+1 -1
View File
@@ -103,7 +103,7 @@
<tr>
<td colspan="<?php echo count($visibleFields) + 6?>" class="text-center">
<?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
<?php echo html::backButton('', '', "btn btn-wide");?>
</td>
</tr>
</tfoot>
module/user/view/batchedit.html.php
+1 -1
View File
@@ -95,7 +95,7 @@
<tr>
<td colspan="<?php echo count($visibleFields) + 4;?>" class="text-center">
<?php echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', "btn btn-wide btn-gray");?>
<?php echo html::backButton('', '', "btn btn-wide");?>
</td>
</tr>
</tfoot>
module/user/view/create.html.php
+1 -1
View File
@@ -85,7 +85,7 @@
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
module/user/view/edit.html.php
+1 -1
View File
@@ -117,7 +117,7 @@
<tr>
<td colspan='2' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
</table>
www/js/zui/min.js
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/zui/css/min.css
+1 -1
View File
File diff suppressed because one or more lines are too long