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-25 10:02:45 +08:00
parent f8bd140942 a101010468
commit 4205a87992
37 changed files with 134 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/zh-tw.php
+2 -2
View File
@@ -69,7 +69,7 @@ $lang->action->objectTypes['productplan'] = '計劃';
$lang->action->objectTypes['release'] = '發佈';
$lang->action->objectTypes['project'] = $lang->projectCommon;
$lang->action->objectTypes['task'] = '任務';
$lang->action->objectTypes['build'] = 'Build';
$lang->action->objectTypes['build'] = '版本';
$lang->action->objectTypes['bug'] = 'Bug';
$lang->action->objectTypes['case'] = '用例';
$lang->action->objectTypes['caseresult'] = '用例結果';
@@ -231,7 +231,7 @@ $lang->action->search->objectTypeList['user'] = '用戶';
$lang->action->search->objectTypeList['doc'] = '文檔';
$lang->action->search->objectTypeList['doclib'] = '文檔庫';
$lang->action->search->objectTypeList['todo'] = '待辦';
$lang->action->search->objectTypeList['build'] = 'Build';
$lang->action->search->objectTypeList['build'] = '版本';
$lang->action->search->objectTypeList['release'] = '發佈';
$lang->action->search->objectTypeList['productplan'] = '計劃';
$lang->action->search->objectTypeList['branch'] = '分支';
module/block/view/publicform.html.php
+1 -1
View File
@@ -17,6 +17,6 @@
<div class='form-group'>
<label for='grid' class='col-sm-3'><?php echo $lang->block->grid;?></label>
<div class='col-sm-7'>
<?php echo html::select('grid', $lang->block->gridOptions, $block ? $block->grid : 8, "class='form-control chosen chosen-simple'")?>
<?php echo html::select('grid', $lang->block->gridOptions, $block ? $block->grid : 8, "class='form-control chosen'")?>
</div>
</div>
module/block/view/qastatisticblock.html.php
+1
View File
@@ -29,6 +29,7 @@
.block-statistic .nav-stacked {overflow: auto; max-height: 247px;}
.block-statistic .progress-pie .progress-info > strong {font-size: 24px;}
.block-statistic .chosen-single {font-size: 16px; font-weight: bold;}
.block-statistic .chosen-container-single .chosen-single div b {top: -2px}
</style>
<div class="panel-body">
<div class="table-row">
module/block/view/todoblock.html.php
+2 -2
View File
@@ -59,13 +59,13 @@
<div class="form-group">
<label for="todoBegin" class="col-sm-2"><?php echo $lang->todo->beginAndEnd?></label>
<div class="col-sm-4">
<select name="begin" id="todoBegin" class="form-control chosen-simple">
<select name="begin" id="todoBegin" class="form-control">
<option value=""><?php echo $lang->todo->lblDisableDate;?></option>
</select>
</div>
<label class="col-sm-1 text-center hide-empty-begin" for="todoEnd"> ~ </label>
<div class="col-sm-4 hide-empty-begin">
<select name="end" id="todoEnd" class="form-control chosen-simple"></select>
<select name="end" id="todoEnd" class="form-control"></select>
</div>
</div>
<div class="form-group">
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'><?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('', '', 'btn btn-wide btn-primary') . 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' 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('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->server->http_referer, 'self', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/build/view/create.html.php
+1 -1
View File
@@ -73,7 +73,7 @@
<td colspan='2'><?php echo html::textarea('desc', '', "rows='10' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<td colspan="3" class="text-center">
<td colspan="3" class="text-center form-actions">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
module/build/view/edit.html.php
+1 -1
View File
@@ -67,7 +67,7 @@
<td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($build->desc), "rows='10' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<td colspan="3" class="text-center">
<td colspan="3" class="text-center form-actions">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo $this->config->global->flow != 'onlyTest' ? html::hidden('project', $build->project) : '';?>
module/common/view/tablesorter.html.php
+2 -2
View File
@@ -7,8 +7,8 @@ js::import($jsRoot . 'jquery/tablesorter/metadata.js');
.tablesorter-header-inner {cursor: pointer;}
.tablesorter-header-inner:hover {color: #006af1;}
table.tablesorter tr.tablesorter-headerRow .header.tablesorter-headerUnSorted .tablesorter-header-inner:after {font-family: ZentaoIcon; font-weight: normal; content: "\f0dc"; font-size: 14px;}
table.tablesorter tr.tablesorter-headerRow .header.headerSortUp .tablesorter-header-inner:after{font-family: ZentaoIcon; font-weight: normal; content: "\f0d8"; font-size: 14px; color: #03C;}
table.tablesorter tr.tablesorter-headerRow .header.headerSortDown .tablesorter-header-inner:after{font-family: ZentaoIcon; font-weight: normal; content: "\f0d7"; font-size: 14px; color: #03C;}
table.tablesorter tr.tablesorter-headerRow .header.headerSortUp .tablesorter-header-inner:after{font-family: ZentaoIcon; font-weight: normal; content: "\f0d8"; color: #006af1;}
table.tablesorter tr.tablesorter-headerRow .header.headerSortDown .tablesorter-header-inner:after{font-family: ZentaoIcon; font-weight: normal; content: "\f0d7"; color: #006af1;}
table.tablesorter tr.tablesorter-headerRow .header.sorter-false .tablesorter-header-inner:after{content:"";}
</style>
<script>
module/custom/view/required.html.php
+1 -1
View File
@@ -54,7 +54,7 @@
</tr>
<?php endforeach;?>
<tr>
<td colspan='2' class='text-center'>
<td colspan='2' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
<?php if(common::hasPriv('custom', 'resetRequired')) echo html::a(inlink('resetRequired', "module=$moduleName"), $lang->custom->restore, 'hiddenwin', "class='btn btn-wide'");?>
</td>
module/custom/view/score.html.php
+1 -1
View File
@@ -31,7 +31,7 @@
</tr>
<tr>
<th></th>
<td>
<td class='form-actions'>
<?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?>
<?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>
module/custom/view/set.html.php
+1 -1
View File
@@ -147,7 +147,7 @@ EOT;
</tr>
<?php endforeach;?>
<tr>
<td colspan='<?php $canAdd ? print(3) : print(2);?>' class='text-center'>
<td colspan='<?php $canAdd ? print(3) : print(2);?>' class='text-center form-actions'>
<?php
$appliedTo = array($currentLang => $lang->custom->currentLang, 'all' => $lang->custom->allLang);
echo html::radio('lang', $appliedTo, $lang2Set);
module/dept/view/browse.html.php
+5 -5
View File
@@ -64,7 +64,7 @@
</tr>
<tr>
<td></td>
<td>
<td class='form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('maxOrder', $maxOrder);?>
@@ -130,11 +130,11 @@ $(function()
var action = event.action, $target = $(event.target), item = event.item;
if(action.type === 'edit')
{
$target.modalTrigger(
{
new $.zui.ModalTrigger({
type: 'ajax',
url: action.linkTemplate.format(item.id)
}).trigger('click');
url: action.linkTemplate.format(item.id),
keyboard: true
}).show();
}
else if(action.type === 'delete')
{
module/dept/view/edit.html.php
+29 -21
View File
@@ -15,24 +15,32 @@ $webRoot = $this->app->getWebRoot();
$jsRoot = $webRoot . "js/";
?>
<?php include '../../common/view/chosen.html.php';?>
<form action="<?php echo inlink('edit', 'deptID=' . $dept->id);?>" target='hiddenwin' method='post' class='mt-10px' id='dataform'>
<table class='table table-form' style='width:100%'>
<tr>
<th class='w-80px'><?php echo $lang->dept->parent;?></th>
<td><?php echo html::select('parent', $optionMenu, $dept->parent, "class='form-control chosen'");?></td>
</tr>
<tr>
<th class='w-80px'><?php echo $lang->dept->name;?></th>
<td><?php echo html::input('name', $dept->name, "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<th class='w-80px'><?php echo $lang->dept->manager;?></th>
<td><?php echo html::select('manager', $users, $dept->manager, "class='form-control chosen'", true);?></td>
</tr>
<tr>
<td colspan='2' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
</td>
</tr>
</table>
</form>
<div class='modal-dialog w-500px'>
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><i class="icon icon-close"></i></button>
<h4 class="modal-title"><strong><?php echo $lang->dept->edit;?></strong></h4>
</div>
<div class='modal-body'>
<form action="<?php echo inlink('edit', 'deptID=' . $dept->id);?>" target='hiddenwin' method='post' class='mt-10px' id='dataform'>
<table class='table table-form' style='width:100%'>
<tr>
<th class='w-80px'><?php echo $lang->dept->parent;?></th>
<td><?php echo html::select('parent', $optionMenu, $dept->parent, "class='form-control chosen'");?></td>
</tr>
<tr>
<th class='w-80px'><?php echo $lang->dept->name;?></th>
<td><?php echo html::input('name', $dept->name, "class='form-control' autocomplete='off'");?></td>
</tr>
<tr>
<th class='w-80px'><?php echo $lang->dept->manager;?></th>
<td><?php echo html::select('manager', $users, $dept->manager, "class='form-control chosen'", true);?></td>
</tr>
<tr>
<td colspan='2' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
</td>
</tr>
</table>
</form>
</div>
</div>
module/doc/view/create.html.php
+1 -1
View File
@@ -76,7 +76,7 @@
</td>
</tr>
<tr>
<td colspan='3' class='text-center'>
<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);?>
</td>
</tr>
module/doc/view/createlib.html.php
+2 -2
View File
@@ -23,7 +23,7 @@
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->doc->libType?></th>
<td><?php echo html::select('libType', $libTypeList, $type, "class='form-control chosen-simple'")?></td>
<td><?php echo html::select('libType', $libTypeList, $type, "class='form-control'")?></td>
</tr>
<tr class='product'>
<th><?php echo $lang->doc->product?></th>
@@ -55,7 +55,7 @@
</td>
</tr>
<tr>
<td class='text-center' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
<td class='text-center form-actions' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
</tr>
</table>
</form>
module/doc/view/edit.html.php
+1 -1
View File
@@ -73,7 +73,7 @@
</td>
</tr>
<tr>
<td colspan='3' class='text-center'>
<td colspan='3' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
module/doc/view/editlib.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
</td>
</tr>
<tr>
<td class='text-center' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
<td class='text-center form-actions' colspan='2'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td>
</tr>
</table>
</form>
module/file/view/export.html.php
+3 -3
View File
@@ -156,15 +156,15 @@ if($isCustomExport)
</tr>
<tr>
<th><?php echo $lang->file->extension;?></th>
<td><?php echo html::select('fileType', $lang->exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control chosen-simple"');?></td>
<td><?php echo html::select('fileType', $lang->exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control"');?></td>
</tr>
<tr>
<th><?php echo $lang->file->encoding;?></th>
<td><?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "class='form-control chosen-simple'" : "class='form-control chosen-simple'");?></td>
<td><?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "class='form-control'" : "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->file->exportRange;?></th>
<td><?php echo html::select('exportType', $lang->exportTypeList, 'all', "class='form-control chosen-simple'");?></td>
<td><?php echo html::select('exportType', $lang->exportTypeList, 'all', "class='form-control'");?></td>
</tr>
<?php if($isCustomExport):?>
<tr>
module/product/view/create.html.php
+1 -1
View File
@@ -66,7 +66,7 @@
$proudctTypeList = array();
foreach($lang->product->typeList as $key => $type) $productTypeList[$key] = $type . zget($lang->product->typeTips, $key, '');
?>
<?php echo html::select('type', $productTypeList, 'normal', "class='form-control chosen-simple'");?>
<?php echo html::select('type', $productTypeList, 'normal', "class='form-control'");?>
</td><td></td>
</tr>
<tr>
module/productplan/view/edit.html.php
+1 -1
View File
@@ -57,7 +57,7 @@
<td colspan='3'><?php echo html::textarea('desc', htmlspecialchars($plan->desc), "rows='10' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<td colspan='4' class='text-center'>
<td colspan='4' class='text-center form-actions'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
<?php echo html::hidden('product', $product->id);?>
module/project/view/create.html.php
+1 -1
View File
@@ -83,7 +83,7 @@
</tr>
<tr>
<th><?php echo $lang->project->type;?></th>
<td><?php echo html::select('type', $lang->project->typeList, '', "class='form-control chosen-simple' onchange='showTypeTips()'");?></td>
<td><?php echo html::select('type', $lang->project->typeList, '', "class='form-control' onchange='showTypeTips()'");?></td>
<td class='muted' colspan='2'><div class='type-tips'><?php echo $lang->project->typeDesc;?></div></td>
</tr>
<tr <?php if($this->config->global->flow == 'onlyTask') echo "class='hidden'";?>>
module/report/view/workload.html.php
+1 -1
View File
@@ -42,7 +42,7 @@
</div>
</div>
<div class="col-sm-4">
<?php echo html::select('assign', $lang->report->assign, $assign, "class='form-control chosen-simple' onchange='changeParams(this)'");?>
<?php echo html::select('assign', $lang->report->assign, $assign, "class='form-control' onchange='changeParams(this)'");?>
</div>
<div class="col-sm-3">
<?php echo html::submitButton($lang->report->query, '', 'btn btn-primary btn-block');?>
module/story/js/change.js
+18 -16
View File
@@ -1,25 +1,27 @@
$(function()
{
if($('#needNotReview').prop('checked'))
var $assignedTo = $('#assignedTo');
var $needNotReview = $('#needNotReview');
if($needNotReview.prop('checked'))
{
$('#assignedTo').attr('disabled', 'disabled');
$assignedTo.attr('disabled', 'disabled');
}
else
{
$('#assignedTo').removeAttr('disabled');
$assignedTo.removeAttr('disabled');
}
$('#assignedTo').trigger("chosen:updated");
})
$assignedTo.trigger("chosen:updated");
$('#needNotReview').change(function()
{
if($('#needNotReview').prop('checked'))
$needNotReview.change(function()
{
$('#assignedTo').attr('disabled', 'disabled');
}
else
{
$('#assignedTo').removeAttr('disabled');
}
$('#assignedTo').trigger("chosen:updated");
})
if($needNotReview.prop('checked'))
{
$assignedTo.attr('disabled', 'disabled');
}
else
{
$assignedTo.removeAttr('disabled');
}
$assignedTo.trigger("chosen:updated");
})
});
module/story/view/change.html.php
+2 -2
View File
@@ -20,7 +20,7 @@
<small><?php echo $lang->arrow . ' ' . $lang->story->change;?></small>
</h2>
</div>
<form method='post' enctype='multipart/form-data' target='hiddenwin'>
<form class="main-form" method='post' enctype='multipart/form-data' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->story->reviewedBy;?></th>
@@ -61,7 +61,7 @@
</tr>
<tr>
<td></td>
<td class='text-center'>
<td class='text-center form-actions'>
<?php
echo html::hidden('lastEditedDate', $story->lastEditedDate);
echo html::submitButton('', '', 'btn btn-wide btn-primary');
module/story/view/close.html.php
+1 -1
View File
@@ -26,7 +26,7 @@
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->story->closedReason;?></th>
<td class='w-p25-f'><?php echo html::select('closedReason', $lang->story->reasonList, '', 'class="form-control chosen-simple" onchange="setStory(this.value)"');?></td><td></td>
<td class='w-p25-f'><?php echo html::select('closedReason', $lang->story->reasonList, '', 'class="form-control" onchange="setStory(this.value)"');?></td><td></td>
</tr>
<tr id='duplicateStoryBox' style='display:none'>
<th><?php echo $lang->story->duplicateStory;?></th>
module/task/view/create.html.php
+1 -1
View File
@@ -104,7 +104,7 @@
?>
<td colspan='<?php echo $hasCustomPri ? 1 : 3 ?>'>
<?php if($hasCustomPri):?>
<?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control chosen chosen-simple'");?>
<?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control chosen'");?>
<?php else: ?>
<?php echo html::select('pri', (array)$priList, $task->pri, "class='form-control' data-provide='labelSelector'");?>
<?php endif; ?>
module/task/view/recordestimate.html.php
+38 -36
View File
@@ -45,44 +45,46 @@
<th class="w-60px"><?php echo $lang->task->consumedThisTime;?></th>
<th class="w-60px"><?php echo $lang->task->leftThisTime;?></th>
<th><?php echo $lang->comment;?></th>
<th class='w-10px'></th>
<th class='c-actions'><?php echo $lang->actions;?></th>
</tr>
</thead>
<?php if(count($estimates)):?>
<?php foreach($estimates as $estimate):?>
<tr class="text-center">
<td><?php echo $estimate->id;?></td>
<td><?php echo $estimate->date;?></td>
<td><?php echo $estimate->consumed;?></td>
<td><?php echo $estimate->left;?></td>
<td class="text-left"><?php echo $estimate->work;?></td>
<td align='center'>
<?php
if($task->status == 'wait' or $task->status == 'pause' or $task->status == 'doing')
{
common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'pencil', '', 'showinonlybody', true);
common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'remove', 'hiddenwin', 'showinonlybody');
}
?>
</td>
</tr>
<?php endforeach;?>
<?php endif;?>
<?php if(in_array($task->status, array('wait', 'pause', 'doing'))):?>
<?php for($i = 1; $i <= 3; $i++):?>
<tr class="text-center">
<td><?php echo $i . html::hidden("id[$i]", $i);?></td>
<td><?php echo html::input("dates[$i]", '', "class='form-control text-center form-date'");?></td>
<td><?php echo html::input("consumed[$i]", '', "class='form-control text-center' autocomplete='off'");?></td>
<td><?php echo html::input("left[$i]", '', "class='form-control text-center left' autocomplete='off'");?></td>
<td class="text-left"><?php echo html::textarea("work[$i]", '', "class='form-control' style='height:50px;'");?></td>
<td></td>
</tr>
<?php endfor;?>
<?php endif;?>
<tr>
<td colspan='6' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
</tr>
<tbody>
<?php if(count($estimates)):?>
<?php foreach($estimates as $estimate):?>
<tr class="text-center">
<td><?php echo $estimate->id;?></td>
<td><?php echo $estimate->date;?></td>
<td><?php echo $estimate->consumed;?></td>
<td><?php echo $estimate->left;?></td>
<td class="text-left"><?php echo $estimate->work;?></td>
<td align='center' class='c-actions'>
<?php
if($task->status == 'wait' or $task->status == 'pause' or $task->status == 'doing')
{
common::printIcon('task', 'editEstimate', "estimateID=$estimate->id", '', 'list', 'pencil', '', 'showinonlybody', true);
common::printIcon('task', 'deleteEstimate', "estimateID=$estimate->id", '', 'list', 'trash', 'hiddenwin', 'showinonlybody');
}
?>
</td>
</tr>
<?php endforeach;?>
<?php endif;?>
<?php if(in_array($task->status, array('wait', 'pause', 'doing'))):?>
<?php for($i = 1; $i <= 3; $i++):?>
<tr class="text-center">
<td><?php echo $i . html::hidden("id[$i]", $i);?></td>
<td><?php echo html::input("dates[$i]", '', "class='form-control text-center form-date'");?></td>
<td><?php echo html::input("consumed[$i]", '', "class='form-control text-center' autocomplete='off'");?></td>
<td><?php echo html::input("left[$i]", '', "class='form-control text-center left' autocomplete='off'");?></td>
<td class="text-left"><?php echo html::textarea("work[$i]", '', "class='form-control' style='height:50px;'");?></td>
<td></td>
</tr>
<?php endfor;?>
<?php endif;?>
<tr>
<td colspan='6' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td>
</tr>
</tbody>
</table>
</form>
<?php endif;?>
module/testsuite/view/exporttemplet.html.php
+1 -1
View File
@@ -37,7 +37,7 @@ function closeWindow()
</div>
</td>
<td class='w-100px'>
<?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', "class='form-control chosen-simple'");?>
<?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?>
</td>
<td class="w-150px">
<?php echo html::submitButton('', '', 'btn btn-primary btn-block');?>
module/testsuite/view/import.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
<input type='file' name='file' class='form-control'/>
</td>
<td>
<?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', "class='form-control chosen-simple'");?>
<?php echo html::select('encode', $config->charsets[$this->cookie->lang], 'utf-8', "class='form-control'");?>
</td>
<td class="w-150px">
<?php echo html::submitButton('', '', 'btn btn-primary btn-block');?>
module/todo/view/create.html.php
+2 -2
View File
@@ -86,11 +86,11 @@
</tr>
<tr>
<th><?php echo $lang->todo->type;?></th>
<td><?php echo html::select('type', $lang->todo->typeList, '', 'onchange="loadList(this.value);" class="form-control chosen-simple"');?></td>
<td><?php echo html::select('type', $lang->todo->typeList, '', 'onchange="loadList(this.value);" class="form-control"');?></td>
</tr>
<tr>
<th><?php echo $lang->todo->pri;?></th>
<td><?php echo html::select('pri', $lang->todo->priList, '', "class='form-control chosen-simple'");?></td>
<td><?php echo html::select('pri', $lang->todo->priList, '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->todo->name;?></th>
module/todo/view/edit.html.php
+1 -1
View File
@@ -108,7 +108,7 @@
<div class="row form-group">
<label class="col-sm-1"><?php echo $lang->todo->status;?></label>
<div class="col-sm-2">
<?php echo html::select('status', $lang->todo->statusList, $todo->status, "class='form-control chosen-simple'");?>
<?php echo html::select('status', $lang->todo->statusList, $todo->status, "class='form-control'");?>
</div>
</div>
<div class="row form-group">
module/tree/view/browsetask.html.php
+2 -3
View File
@@ -178,12 +178,11 @@ $(function()
var action = event.action, $target = $(event.target), item = event.item;
if(action.type === 'edit')
{
$target.modalTrigger(
{
new $.zui.ModalTrigger({
type: 'ajax',
url: action.linkTemplate.format(item.id),
keyboard: true
}).trigger('click');
}).show();
}
else if(action.type === 'delete')
{
module/tree/view/edit.html.php
+1 -1
View File
@@ -17,7 +17,7 @@ $jsRoot = $webRoot . "js/";
<?php include '../../common/view/chosen.html.php';?>
<div class='modal-dialog w-500px'>
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<button type="button" class="close" data-dismiss="modal"><i class="icon icon-close"></i></button>
<h4 class="modal-title"><strong><?php echo $lang->tree->edit;?></strong></h4>
</div>
<div class='modal-body'>
module/user/css/login.css
+2
View File
@@ -13,3 +13,5 @@ body {background: #00B1FD linear-gradient(-90deg, #0072F3 0%, #00B1FD 100%);}
#info {margin-top: 10px; color: #fff;}
#info .btn + .btn {margin-left: 5px;}
.alert-info {color: #00a9fc;}
#langs > .btn,
#langs > .dropdown-menu {min-width: 0; width: 85px;}