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:
liugang
2018-05-11 16:08:28 +08:00
parent 0eeaeb1219 266c114dac
commit 9ae6d0f9b8
40 changed files with 306 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/view/checkweak.html.php
+1 -1
View File
@@ -18,7 +18,7 @@
</div>
</div>
<div id='mainContent' class='main-content'>
<div class='center-block mw-800px main-table pd-0'>
<div class='main-table pd-0'>
<table class='table table-condensed table-hover table-striped table-fixed'>
<thead>
<th class='w-id'><?php echo $lang->idAB;?></th>
module/api/view/debug.html.php
+40 -44
View File
@@ -3,50 +3,46 @@
<div class='main-header'>
<div class='heading'><i class='icon-terminal'></i> &nbsp;<strong><?php echo $method->post ? 'GET/POST ' . $filePath : 'GET ' . $filePath?></strong></div>
</div>
<div class='main-content'>
<div class='cell'>
<div class='detail'>
<div class='detail-title'><?php echo $lang->api->position;?></div>
<div class='detail-content'><code><?php printf($lang->api->startLine, $method->fileName, $method->startLine);?></code></div>
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->api->desc;?></div>
<div class='detail-content'><pre><?php echo str_replace("\n", "<br />", $method->comment);?></pre></div>
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->api->debug;?></div>
<div class='detail-content'>
<form method='post' id='apiForm' class='form-condensed'>
<?php if($method->parameters):?>
<table class='table table-form'>
<?php foreach($method->parameters as $param):?>
<tr>
<th class='w-80px'><?php echo $param->name?></th>
<td><?php echo html::input("$param->name", $param->isOptional() ? $param->getDefaultValue() : '', "class='form-control' autocomplete='off'")?></td>
</tr>
<?php endforeach;?>
<tr>
<td align='center' colspan="2">
<?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);?>
<?php endif;?>
<?php if($method->post) echo "<p>{$lang->api->post}</p>"?>
</form>
</div>
</div>
<div id="result" class="detail hidden">
<div class='detail-title'><?php echo $lang->api->url?>:</div>
<div class='detail-content'>
<div class="url"></div>
<h5><?php echo $lang->api->result?>:</h5>
<p><?php echo $lang->api->status?>: <code class="status"></code></p>
<p><?php echo $lang->api->data?>: <pre class="data"></pre></p>
</div>
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->api->position;?></div>
<div class='detail-content'><code><?php printf($lang->api->startLine, $method->fileName, $method->startLine);?></code></div>
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->api->desc;?></div>
<div class='detail-content'><pre><?php echo str_replace("\n", "<br />", $method->comment);?></pre></div>
</div>
<div class='detail'>
<div class='detail-title'><?php echo $lang->api->debug;?></div>
<div class='detail-content'>
<form method='post' id='apiForm' class='form-condensed'>
<?php if($method->parameters):?>
<table class='table table-form'>
<?php foreach($method->parameters as $param):?>
<tr>
<th class='w-80px'><?php echo $param->name?></th>
<td><?php echo html::input("$param->name", $param->isOptional() ? $param->getDefaultValue() : '', "class='form-control' autocomplete='off'")?></td>
</tr>
<?php endforeach;?>
<tr>
<td align='center' colspan="2">
<?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);?>
<?php endif;?>
<?php if($method->post) echo "<p>{$lang->api->post}</p>"?>
</form>
</div>
</div>
<div id="result" class="detail hidden">
<div class='detail-title'><?php echo $lang->api->url?>:</div>
<div class='detail-content'>
<div class="url"></div>
<h5><?php echo $lang->api->result?>:</h5>
<p><?php echo $lang->api->status?>: <code class="status"></code></p>
<p><?php echo $lang->api->data?>: <pre class="data"></pre></p>
</div>
</div>
<?php include '../../common/view/footer.lite.html.php';?>
module/backup/lang/en.php
+2 -2
View File
@@ -5,10 +5,10 @@ $lang->backup->history = 'History';
$lang->backup->delete = 'Delete';
$lang->backup->backup = 'Backup';
$lang->backup->restore = 'Restore';
$lang->backup->change = 'Modify days';
$lang->backup->change = 'Modify expiration';
$lang->backup->changeAB = 'Modify';
$lang->backup->time = 'Backup Time';
$lang->backup->time = 'Date';
$lang->backup->files = 'Files';
$lang->backup->size = 'Size';
module/backup/view/index.html.php
+4 -8
View File
@@ -30,6 +30,10 @@
<?php echo $lang->backup->history?>
<span class='label label-info'><?php echo $lang->backup->restoreTip;?></span>
</h2>
<div class='pull-right'>
<?php printf($lang->backup->holdDays, $config->backup->holdDays)?>
<?php if(common::hasPriv('backup', 'change')) echo html::a(inlink('change'), $lang->backup->changeAB, '', "class='iframe btn btn-sm btn-info' data-width='300'");?>
</div>
</div>
<table class='table table-condensed table-bordered active-disabled table-fixed'>
<thead>
@@ -64,14 +68,6 @@
<?php endforeach;?>
<?php endforeach;?>
</tbody>
<tfoot>
<tr>
<td colspan='4'>
<?php printf($lang->backup->holdDays, $config->backup->holdDays)?>
<?php if(common::hasPriv('backup', 'change')) echo html::a(inlink('change'), $lang->backup->changeAB, '', "class='iframe btn btn-sm btn-info' data-width='300'");?>
</td>
</tr>
</tfoot>
</table>
</div>
<div class="modal fade" id="waitting" tabindex="-1" role="dialog" aria-hidden="true">
module/common/lang/en.php
+1 -1
View File
@@ -464,7 +464,7 @@ $lang->noResultsMatch = "No results match!";
$lang->searchMore = "More results：";
$lang->chooseUsersToMail = "Choose users that will be notified.";
$lang->browserNotice = 'Your current browser might not show the best effect. Please use Chrome, Firefox, IE9+, Opera or Safari.';
$lang->noticePasteImg = "Support pasting images.";
$lang->noticePasteImg = "Paste images here.";
/* 时间格式设置。*/
if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s');
module/cron/view/create.html.php
+5 -5
View File
@@ -12,18 +12,18 @@
?>
<?php include '../../common/view/header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='center-block mw-700px'>
<div class='center-block mw-800px'>
<div class='main-header'>
<h2>
<?php echo $lang->cron->common?>
<small class'text-muted'> <?php echo $lang->cron->create?></small>
<small class'text-muted'> <?php echo $lang->arrow . $lang->cron->create?></small>
</h2>
</div>
<form method='post' id='dataform' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='rowhead w-80px'><?php echo $lang->cron->m;?></th>
<td class='w-p20'><?php echo html::input('m', '', "class='form-control' autocomplete='off'")?></td>
<th class='w-80px'><?php echo $lang->cron->m;?></th>
<td class='w-150px'><?php echo html::input('m', '', "class='form-control' autocomplete='off'")?></td>
<td><?php echo $lang->cron->notice->m;?></td>
</tr>
<tr>
@@ -60,7 +60,7 @@
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton()?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td>
</tr>
</table>
</form>
module/cron/view/edit.html.php
+5 -5
View File
@@ -12,18 +12,18 @@
?>
<?php include '../../common/view/header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='center-block mw-700px'>
<div class='center-block mw-800px'>
<div class='main-header'>
<h2>
<?php echo $lang->cron->common?>
<small class'text-muted'> <?php echo $lang->cron->edit?></small>
<small class'text-muted'> <?php echo $lang->arrow . $lang->cron->edit?></small>
<h2>
</div>
<form method='post' id='dataform' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='rowhead w-80px'><?php echo $lang->cron->m;?></th>
<td class='w-p20'><?php echo html::input('m', $cron->m, "class='form-control' autocomplete='off'")?></td>
<th class='w-80px'><?php echo $lang->cron->m;?></th>
<td class='w-150px'><?php echo html::input('m', $cron->m, "class='form-control' autocomplete='off'")?></td>
<td><?php echo $lang->cron->notice->m;?></td>
</tr>
<tr>
@@ -60,7 +60,7 @@
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton()?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
</tr>
</table>
</form>
module/cron/view/index.html.php
+2 -2
View File
@@ -37,8 +37,8 @@
<th class='w-50px'><?php echo $lang->cron->mon?></th>
<th class='w-50px'><?php echo $lang->cron->dow?></th>
<th><?php echo $lang->cron->command?></th>
<th class='w-160px'><?php echo $lang->cron->remark?></th>
<th class='w-120px'><?php echo $lang->cron->lastTime?></th>
<th class='w-200px'><?php echo $lang->cron->remark?></th>
<th class='w-130px'><?php echo $lang->cron->lastTime?></th>
<th class='w-60px'><?php echo $lang->cron->status?></th>
<th class='w-100px'><?php echo $lang->actions;?></th>
</tr>
module/custom/js/working.js
+4
View File
@@ -0,0 +1,4 @@
$(function()
{
$('#mainMenu #workingTab').addClass('btn-active-text');
})
module/custom/view/flow.html.php
+10 -4
View File
@@ -11,12 +11,18 @@
*/
?>
<?php include 'header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div id='mainContent' class='main-row'>
<div class='side-col' id='sidebar'></div>
<div class='main-col main-content'>
<form method='post' target='hiddenwin'>
<div class='main-header'>
<div class='heading'>
<strong><?php echo $lang->custom->flow?></strong>
</div>
</div>
<table class='table table-form'>
<tr>
<th class='w-150px text-top'><?php echo $lang->custom->select;?></th>
<th class='w-120px text-top'><?php echo $lang->custom->select;?></th>
<?php $checkedKey = isset($config->custom->productProject) ? $config->custom->productProject : '0_0' ?>
<td>
<?php foreach($lang->custom->productProject->relation as $key => $value):?>
@@ -24,7 +30,7 @@
<?php endforeach;?>
</td>
</tr>
<tr><td></td><td><?php echo html::submitButton()?></td></tr>
<tr><td></td><td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></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
+4 -6
View File
@@ -15,7 +15,7 @@
<div class='side-col' id='sidebar'>
<div class='cell'>
<div class='list-group'>
<?php
<?php
foreach($config->custom->requiredModules as $requiredModule)
{
$requiredModuleName = zget($lang->custom->moduleName, $requiredModule, $lang->$requiredModule->common);
@@ -38,7 +38,7 @@
<th class='w-100px'>
<?php
$fields = $this->custom->getFormFields($moduleName, $method);
if($moduleName == 'testsuite' and $method == 'createlib') $method = 'createLib';
if($moduleName == 'testsuite' and $method == 'createcase')
{
@@ -56,10 +56,8 @@
<tr>
<td></td>
<td>
<?php
echo html::submitButton();
if(common::hasPriv('custom', 'resetRequired')) echo html::a(inlink('resetRequired', "module=$moduleName"), $lang->custom->restore, 'hiddenwin', "class='btn'");
?>
<?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>
</tr>
</table>
module/custom/view/score.html.php
+19 -9
View File
@@ -10,20 +10,30 @@
*/
?>
<?php include 'header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='center-block mw-400px'>
<div class='main-header'>
<h2><?php echo $lang->custom->score;?></h2>
</div>
<div id='mainContent' class='main-row'>
<div class='side-col' id='sidebar'></div>
<div class='main-col main-content'>
<form method='post' target='hiddenwin'>
<div class='main-header'>
<div class='heading'>
<strong><?php echo $lang->custom->score?></strong>
</div>
</div>
<table class='table table-form'>
<tr>
<td><?php echo html::radio('score', $lang->custom->scoreStatus, isset($config->global->scoreStatus) ? $config->global->scoreStatus : 0, '', 'block');?></td>
<th class='w-100px text-top'><?php echo $lang->custom->score;?></th>
<td>
<?php $checkedKey = isset($config->global->scoreStatus) ? $config->global->scoreStatus : 0;?>
<?php foreach($lang->custom->scoreStatus as $key => $value):?>
<p><label class="radio-inline"><input type="radio" name="flow" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="flow<?php echo $key;?>"><?php echo $value;?></label></p>
<?php endforeach;?>
</td>
</tr>
<tr>
<td class='text-center'>
<?php echo html::submitButton();?>
<?php common::printLink('score', 'reset', '', "<i class='icon-refresh'></i> " . $lang->custom->scoreReset, '', ' id="scoreRefresh" class="btn iframe" data-width="480"', true, true);?>
<th></th>
<td>
<?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>
</tr>
</table>
module/custom/view/set.html.php
+9 -9
View File
@@ -35,7 +35,7 @@ EOT;
<div class='side-col' id='sidebar'>
<div class='cell'>
<div class='list-group'>
<?php
<?php
foreach($lang->custom->{$module}->fields as $key => $value)
{
echo html::a(inlink('set', "module=$module&field=$key"), $value, '', " id='{$key}Tab'");
@@ -72,7 +72,7 @@ EOT;
<?php endif;?>
<tr>
<td></td>
<td><?php echo html::submitButton();?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
</tr>
</table>
<?php elseif($module == 'task' and $field == 'hours'):?>
@@ -88,7 +88,7 @@ EOT;
</tr>
<tr>
<td></td>
<td><?php echo html::submitButton();?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
</tr>
</table>
<?php elseif($module == 'bug' and $field == 'longlife'):?>
@@ -101,7 +101,7 @@ EOT;
<span class='input-group-addon'><?php echo $lang->day?></span>
</div>
</td>
<td><?php echo html::submitButton();?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
</tr>
</table>
<div class='alert alert-info alert-block'><?php echo $lang->custom->notice->longlife;?></div>
@@ -113,7 +113,7 @@ EOT;
</tr>
<tr>
<td></td>
<td><?php echo html::submitButton();?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
</tr>
</table>
<?php elseif($module == 'user' and $field == 'deleted'):?>
@@ -124,7 +124,7 @@ EOT;
</tr>
<tr>
<td></td>
<td><?php echo html::submitButton();?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?></td>
</tr>
</table>
<?php else:?>
@@ -151,11 +151,11 @@ EOT;
<?php endforeach;?>
<tr>
<td colspan='<?php $canAdd ? print(3) : print(2);?>' class='text-center'>
<?php
<?php
$appliedTo = array($currentLang => $lang->custom->currentLang, 'all' => $lang->custom->allLang);
echo html::radio('lang', $appliedTo, $lang2Set);
echo html::submitButton();
if(common::hasPriv('custom', 'restore')) echo html::linkButton($lang->custom->restore, inlink('restore', "module=$module&field=$field"), 'hiddenwin');
echo html::submitButton('', '', 'btn btn-primary btn-wide');
if(common::hasPriv('custom', 'restore')) echo html::linkButton($lang->custom->restore, inlink('restore', "module=$module&field=$field"), 'hiddenwin', '', 'btn btn-wide');
?>
</td>
</tr>
module/custom/view/working.html.php
+17 -12
View File
@@ -11,23 +11,28 @@
*/
?>
<?php include 'header.html.php';?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<form method='post' class='form-condensed' target='hiddenwin'>
<div id='mainContent' class='main-row'>
<div class='side-col' id='sidebar'></div>
<div class='main-col main-content'>
<form method='post' target='hiddenwin'>
<div class='main-header'>
<div class='heading'>
<strong><?php echo $lang->custom->working?></strong>
</div>
</div>
<table class='table table-form'>
<tr>
<th class='w-100px text-top'><?php echo $lang->custom->working;?></th>
<td><?php echo html::radio('flow', $lang->custom->workingList, isset($config->global->flow) ? $config->global->flow : 'full', '', 'block');?></td>
<th class='w-150px text-top'><?php echo $lang->custom->working;?></th>
<td>
<?php $checkedKey = isset($config->global->flow) ? $config->global->flow : 'full';?>
<?php foreach($lang->custom->workingList as $key => $value):?>
<p><label class="radio-inline"><input type="radio" name="flow" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="flow<?php echo $key;?>"><?php echo $value;?></label></p>
<?php endforeach;?>
</td>
</tr>
<tr><td></td><td><?php echo html::submitButton()?></td></tr>
<tr><td></td><td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td></tr>
</table>
</form>
</div>
</div>
<script>
$(function()
{
$('#mainMenu #workingTab').addClass('btn-active-text');
})
</script>
<?php include '../../common/view/footer.html.php';?>
module/datatable/lang/en.php
+1 -1
View File
@@ -7,7 +7,7 @@ $lang->datatable->hide = 'Hide';
$lang->datatable->reset = 'Reset';
$lang->datatable->custom = 'Custom Columns';
$lang->datatable->customTip = 'Check Columns to Display';
$lang->datatable->customTip = 'Check Columns to Display，Drag Column name to Sort';
$lang->datatable->table = 'Switch to Common Table';
$lang->datatable->datatable = 'Switch to Advanced Table';
$lang->datatable->required = 'Required';
module/datatable/lang/zh-cn.php
+1 -1
View File
@@ -7,7 +7,7 @@ $lang->datatable->hide = '隐藏';
$lang->datatable->reset = '恢复默认';
$lang->datatable->custom = '自定义列';
$lang->datatable->customTip = '勾选需要显示的列';
$lang->datatable->customTip = '勾选需要显示的列，拖动列名进行排序。';
$lang->datatable->table = '简单表格';
$lang->datatable->datatable = '高级表格';
$lang->datatable->required = '必选';
module/datatable/lang/zh-tw.php
+1 -1
View File
@@ -7,7 +7,7 @@ $lang->datatable->hide = '隱藏';
$lang->datatable->reset = '恢復預設';
$lang->datatable->custom = '自定義列';
$lang->datatable->customTip = '勾選需要顯示的列';
$lang->datatable->customTip = '勾選需要顯示的列，拖動列名進行排序。';
$lang->datatable->table = '簡單表格';
$lang->datatable->datatable = '高級表格';
$lang->datatable->required = '必選';
module/datatable/view/ajaxcustom.html.php
+26 -18
View File
@@ -12,10 +12,12 @@
?>
<style>
.cols-list {margin-bottom: 10px;}
.cols-list .col {border: 1px solid #ddd; height: 30px; line-height: 29px; padding: 0 10px; border-bottom: none; background: #fff; float:none}
.cols-list .col {border: 1px solid #ddd; height: 30px; line-height: 29px; padding: 0 10px; border-bottom: none; background: #fff; float:none; padding-left: 6px;}
.cols-list .checkbox-primary {display: inline-block; position: relative; top: -1px;}
.cols-list .checkbox-primary > label {padding: 0; width: 21px;}
.cols-list .col.drag-shadow {border: 1px solid #ddd;}
.cols-list {border-bottom: 1px solid #ddd}
.cols-list .col:hover {background: #edf3fe}
.cols-list .col:hover {background: #E9F2FB}
.cols-list .col.require:hover {background: none}
.cols-list .col .actions {line-height: 30px; vertical-align: top;}
.cols-list .col .form-control {display: inline-block; width: 50px; padding: 0px 5px; height: 20px; line-height: 20px; border-color: transparent; position: relative; top: -2px}
@@ -26,7 +28,7 @@
.cols-list .col .btn.show-hide {font-size: 13px}
.cols-list .col .title {cursor: pointer; display: inline-block; width: 500px;}
.cols-list .col .title-bar {white-space:nowrap; cursor: pointer; display: inline-block; width: 300px; background: #f1f1f1; border-left: 1px solid #ddd; border-right: 1px solid #ddd; padding-left: 6px; position: relative; max-width: 500px; min-width: 30px}
.cols-list .col .title .icon-move {position: absolute; left: -26px; background: #fff; top: 5px; width: 20px; height: 20px; line-height: 20px; text-align: center; border-radius: 5px;}
.cols-list .col .title .icon-move {width: 20px; height: 20px; line-height: 20px; text-align: center; position: relative; left: 3px;}
.cols-list .col:hover .title-bar {background: #eee; transition: width 0.3s;}
.cols-list .col.require .title {cursor: default;}
.cols-list .col.disabled .title {opacity: 0.5;}
@@ -39,20 +41,25 @@
.cols-list .col.drop-to, .cols-list .col.drag-from {opacity: 0.5; visibility: visible; background: #e5e5e5}
.cols-list .col .btn.disabled, .cols-list .col.disabled .btn.disabled, .cols-list .col .btn.disabled .label-hide {border: none; color: #aaa; cursor: not-allowed; background: none}
.cols-list .col .icon-move {opacity: 0; transition:all 0.2s; cursor: move;}
.cols-list .col:hover .icon-move {opacity: 1}
.cols-list .col:hover .icon-move {opacity: 0.7;}
.cols-list.sort-disabled .icon-move {display: none;}
#customDatatable .form-actions {margin-top: 10px;}
#customDatatable .form-actions .checkbox-primary {margin-bottom: 10px; margin-left: 7px;}
</style>
<div class='modal-dialog' id='customDatatable' style='width: 800px'>
<div class='modal-content'>
<div class='modal-header'>
<button class="close" data-dismiss="modal">&times;</button>
<h4 class='modal-title'><?php echo $lang->datatable->custom?></h4>
<button class="close" data-dismiss="modal"><i class="icon icon-close"></i></button>
<h4 class='modal-title'>
<?php echo $lang->datatable->custom?>
&nbsp; <small><?php echo $lang->datatable->customTip ?></small>
</h4>
</div>
<div class='modal-body'>
<div id='colsFixedLeft' class='cols-list'></div>
<div id='colsFixedFlex' class='cols-list'></div>
<div id='colsFixedRight' class='cols-list'></div>
<div class='cols-list cols-list-origin'>
<div class='cols-list template' id="originCols">
<?php foreach ($cols as $key => $col):?>
<?php
$required = $col['required'] == 'yes';
@@ -63,17 +70,17 @@
<div class='actions pull-right'>
<?php if(isset($col['name'])) echo html::hidden('name', $col['name'])?>
<span><span class='text-muted'><?php echo $lang->datatable->width?></span> <input type='text' id='width' class='form-control' value='<?php echo $col['width']?>'><?php echo $autoWidth ? '&nbsp;' : 'px' ?></span>
<button type='button' class='btn btn-link show-hide<?php echo $required ? ' disabled' : '' ?>'><span class='label-show'><?php echo $lang->datatable->show?></span><span class='text-muted'>/</span><span class='label-hide'><?php echo $lang->datatable->hide?></span></button>
</div>
<i class='icon-ok'></i> &nbsp;<span class='title'><span class='title-bar'><strong><?php echo $col['title']?></strong><i class='icon-move'></i></span></span> <?php if($required) echo "<span class='text-muted'>({$lang->datatable->required})</span>"?>
<div class="checkbox-primary"><label></label></div>
<span class='title'><span class='title-bar'><strong><?php echo $col['title']?></strong><i class='icon-move'></i></span></span> <?php if($required) echo "<span class='text-muted'>({$lang->datatable->required})</span>"?>
</div>
<?php endforeach;?>
</div>
<div class='actions text-left'>
<div class='form-actions text-left'>
<?php if(common::hasPriv('datatable', 'setGlobal')) echo html::checkbox('global', array(1 => $lang->datatable->setGlobal));?>
<button type='button' class='btn btn-primary btn-save' id='btnSaveCustom'><?php echo $lang->save ?></button>
<button type='button' class='btn btn-default' data-dismiss='modal'><?php echo $lang->close ?></button>
<button type='button' class='btn btn-default' id='resetBtn'><?php echo $lang->datatable->reset ?></button>
<button type='button' class='btn' data-dismiss='modal'><?php echo $lang->close ?></button>
<button type='button' class='btn' id='resetBtn'><?php echo $lang->datatable->reset ?></button>
</div>
</div>
</div>
@@ -87,11 +94,11 @@ $(function()
{
var setting = JSON.parse('<?php echo $setting;?>');
var $cols = $('.col').addClass('disabled');
var $cols = $('#originCols .col').addClass('disabled');
$cols.filter('.fixed-left').appendTo('#colsFixedLeft');
$cols.filter('.fixed-flex, .fixed-no').appendTo('#colsFixedFlex');
$cols.filter('.fixed-right').appendTo('#colsFixedRight');
$('.cols-list-origin').remove();
$('#originCols').remove();
if(typeof setting[0] === 'string')
{
@@ -124,14 +131,15 @@ $(function()
col = {id: col, disabled: false};
}
var $col = $cols.filter('[data-key=' + col.id + ']');
$col.toggleClass('disabled', !col.show);
$col.attr('data-order', col.order);
$col.toggleClass('disabled', !col.show).attr('data-order', col.order);
$col.find('.checkbox-primary').toggleClass('checked', !!col.show);
if(col.width) $col.find('input#width').val(col.width.replace('px', ''));
}
$('.cols-list').on('click', '.col:not(.require) .show-hide, .col:not(.require) .title', function()
$('.cols-list').on('click', '.col:not(.require) .title, .col:not(.require) .checkbox-primary', function()
{
$(this).closest('.col').toggleClass('disabled');
var $col = $(this).closest('.col').toggleClass('disabled');
$col.find('.checkbox-primary').toggleClass('checked', !$col.hasClass('disabled'));
}).each(function()
{
var $list = $(this),
module/mail/view/detect.html.php
+1 -1
View File
@@ -16,7 +16,7 @@
<div class='main-header'>
<h2>
<?php echo $lang->mail->common;?>
<small class='text-muted'> <?php echo $lang->mail->detect;?> <?php echo html::icon('cog');?></small>
<small class='text-muted'> <?php echo $lang->arrow . $lang->mail->detect;?></small>
</h2>
</div>
<form class='pdt-20' method='post' target='hiddenwin'>
module/mail/view/edit.html.php
+1 -1
View File
@@ -16,7 +16,7 @@
<div class='main-header'>
<h2>
<?php echo $lang->mail->common;?>
<small class='text-muted'> <?php echo $lang->mail->edit;?> <?php echo html::icon('pencil');?></small>
<small class='text-muted'> <?php echo $lang->arrow . $lang->mail->edit;?></small>
</h2>
</div>
<form method='post' action='<?php echo inlink('save');?>' id='dataform'>
module/mail/view/sendcloud.html.php
+1 -1
View File
@@ -16,7 +16,7 @@
<div class='main-header'>
<h2>
<?php echo $lang->mail->common;?>
<small class='text-muted'> <?php echo $lang->mail->edit;?> <?php echo html::icon('pencil');?></small>
<small class='text-muted'> <?php echo $lang->arrow . $lang->mail->edit;?></small>
</h2>
</div>
<form method='post' target='hiddenwin' id='dataform'>
module/mail/view/test.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
<div class='main-header'>
<h2>
<?php echo $lang->mail->common;?>
<small class='text-muted'> <?php echo $lang->mail->test;?> <?php echo html::icon($lang->icons['test']);?></small>
<small class='text-muted'> <?php echo $lang->arrow . $lang->mail->test;?></small>
</h2>
<div class='pull-right btn-toolbar'><div class='text text-info'><?php echo $lang->mail->sendmailTips;?></div></div>
</div>
module/mail/view/ztcloud.html.php
+11 -11
View File
@@ -27,9 +27,8 @@
<?php else:?>
<div class='main-header'>
<h2>
<span class='prefix'><?php echo html::icon($lang->icons['mail']);?></span>
<?php echo $lang->mail->common;?>
<small class='text-muted'> <?php echo $lang->mail->edit;?> <?php echo html::icon('pencil');?></small>
<small class='text-muted'> <?php echo $lang->arrow . $lang->mail->edit;?></small>
</h2>
</div>
<form method='post' target='hiddenwin' id='dataform'>
@@ -61,15 +60,16 @@
</td>
</tr>
<tr>
<td colspan='2' class='text-center'>
<?php
echo html::submitButton();
if($this->config->mail->turnon and $mailExist) echo html::linkButton($lang->mail->test, inlink('test'));
echo html::linkButton($lang->mail->reset, inlink('reset'));
if(common::hasPriv('mail', 'browse') and !empty($config->mail->async) and !empty($config->global->cron)) echo html::linkButton($lang->mail->browse, inlink('browse'));
?>
</td>
</tr>
<td></td>
<td colspan='4' class='text-left'>
<?php
echo html::submitButton('', '', 'btn btn-primary btn-wide');
if($this->config->mail->turnon and $mailExist) echo html::linkButton($lang->mail->test, inlink('test'), '', '', 'btn btn-wide');
echo html::linkButton($lang->mail->reset, inlink('reset'), '', '', 'btn btn-wide');
if(common::hasPriv('mail', 'browse') and !empty($config->mail->async) and !empty($config->global->cron)) echo html::linkButton($lang->mail->browse, inlink('browse'), '', '', 'btn btn-wide');
?>
</td>
</tr>
</table>
</form>
<?php endif;?>
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'><?php echo html::submitButton() . html::backButton();?></td>
<td colspan='<?php echo count($lang->message->typeList) + 1?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-default btn-wide');?></td>
</tr>
</tfoot>
</table>
module/product/lang/en.php
+11 -11
View File
@@ -52,7 +52,7 @@ $lang->product->unResolvedBugs = 'Unresolved Bug';
$lang->product->assignToNullBugs = 'Unassigned Bug';
$lang->product->confirmDelete = " Do you want to delete {$lang->productCommon}?";
$lang->product->errorNoProduct = "{$lang->productCommon} is not created yet!";
$lang->product->errorNoProduct = "No {$lang->productCommon} is created yet!";
$lang->product->accessDenied = "You have no access to {$lang->productCommon}.";
$lang->product->id = 'ID';
@@ -72,20 +72,20 @@ $lang->product->whitelist = 'Whitelist';
$lang->product->branch = '%s';
$lang->product->qa = 'QA';
$lang->product->release = 'Release';
$lang->product->latestDynamic = 'Latest Dynamic';
$lang->product->latestDynamic = 'Dynamic';
$lang->product->iteration = 'Iteration';
$lang->product->iterationInfo = 'Iterate %s times';
$lang->product->iterationView = 'Iteration View';
$lang->product->iterationInfo = '%s Iterations';
$lang->product->iterationView = 'Details';
$lang->product->searchStory = 'Search';
$lang->product->assignedToMe = 'Assigned To Me';
$lang->product->openedByMe = 'Created By Me';
$lang->product->reviewedByMe = 'Reviewed By Me';
$lang->product->assignedToMe = 'AssignedToMe';
$lang->product->openedByMe = 'CreatedByMe';
$lang->product->reviewedByMe = 'ReviewedByMe';
$lang->product->closedByMe = 'ClosedByMe';
$lang->product->draftStory = 'Draft';
$lang->product->activeStory = 'Activated';
$lang->product->changedStory = 'Changed';
$lang->product->willClose = 'ToBeClose';
$lang->product->willClose = 'ToBeClosed';
$lang->product->closedStory = 'Closed';
$lang->product->unclosed = 'Open';
$lang->product->unplan = 'Wait';
@@ -100,8 +100,8 @@ $lang->product->typeList['branch'] = 'Multi Branch';
$lang->product->typeList['platform'] = 'Multi Platform';
$lang->product->typeTips = array();
$lang->product->typeTips['branch'] = '(Divide the custom content.)';
$lang->product->typeTips['platform'] = '(Divide IOS, Android, PC, etc.)';
$lang->product->typeTips['branch'] = '(for the custom content)';
$lang->product->typeTips['platform'] = '(for IOS, Android, PC, etc.)';
$lang->product->branchName['normal'] = '';
$lang->product->branchName['branch'] = 'Branch';
@@ -111,7 +111,7 @@ $lang->product->statusList[''] = '';
$lang->product->statusList['normal'] = 'Normal';
$lang->product->statusList['closed'] = 'Closed';
$lang->product->aclList['open'] = "Default (User with {$lang->productCommon} View privilege have access to it)";
$lang->product->aclList['open'] = "Default (User with privilege to {$lang->productCommon} can access to it.)";
$lang->product->aclList['private'] = "Private {$lang->productCommon} ({$lang->projectCommon} team members only)";
$lang->product->aclList['custom'] = 'Custom (Team members and Whitelist members have access to it.)';
module/task/view/batchcreate.html.php
+4 -6
View File
@@ -26,6 +26,7 @@
<?php endif;?>
</h2>
<div class="pull-right btn-toolbar">
<button type='button' data-toggle="importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=task&section=custom&key=batchCreateFields')?>
<?php include '../../common/view/customfield.html.php';?>
</div>
@@ -58,17 +59,14 @@
<?php if($project->type != 'ops'):?>
<th class='w-200px<?php echo zget($visibleFields, 'story', ' hidden') . zget($requiredFields, 'story', ' required'); echo $hiddenStory;?>'><?php echo $lang->task->story;?></th>
<?php endif;?>
<th class='required has-btn'>
<?php echo $lang->task->name;?></span>
<button type='button' data-toggle="importLinesModal" class="btn btn-info"><?php echo $lang->pasteText;?></button>
</th>
<th class='required has-btn'><?php echo $lang->task->name;?></span></th>
<th class='w-80px required'><?php echo $lang->typeAB;?></span></th>
<th class='w-150px<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', ' required');?>'><?php echo $lang->task->assignedTo;?></th>
<th class='w-50px<?php echo zget($visibleFields, 'estimate', ' hidden') . zget($requiredFields, 'estimate', ' required');?>'><?php echo $lang->task->estimateAB;?></th>
<th class='w-60px<?php echo zget($visibleFields, 'estimate', ' hidden') . zget($requiredFields, 'estimate', ' required');?>'><?php echo $lang->task->estimateAB;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'estStarted', ' hidden') . zget($requiredFields, 'estStarted', ' required');?>'><?php echo $lang->task->estStarted;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', ' required');?>'><?php echo $lang->task->deadline;?></th>
<th class='<?php echo zget($visibleFields, 'desc', ' hidden') . zget($requiredFields, 'desc', ' required');?>'><?php echo $lang->task->desc;?></th>
<th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', ' required');?>'><?php echo $lang->task->pri;?></th>
<th class='w-80px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', ' required');?>'><?php echo $lang->task->pri;?></th>
</tr>
</thead>
<tbody>
module/user/css/login.css
+15 -23
View File
@@ -1,23 +1,15 @@
body{background-color: #036}
#container{margin: 10% auto 0 auto}
#login-panel{margin: 0 auto;width: 540px;min-height: 280px;background-color: #fff;border: 1px solid #dfdfdf;-moz-border-radius:3px; -webkit-border-radius:3px; border-radius:3px;-moz-box-shadow:0px 0px 30px rgba(0,0,0,0.75); -webkit-box-shadow:0px 0px 30px rgba(0,0,0,0.75); box-shadow:0px 0px 30px rgba(0,0,0,0.75)}
#login-panel .panel-head{min-height: 70px;background-color: #edf3fe;border-bottom: 1px solid #dfdfdf;position: relative}
#login-panel .panel-head h4{margin: 0 0 0 20px;padding: 0;line-height: 70px; font-size: 14px}
#login-panel .panel-actions{float: right;position: absolute;right: 15px;top: 18px;padding: 0}
#login-panel .panel-actions .dropdown {display: inline-block; margin-right: 2px}
#mobile {font-size: 28px; padding: 1px 12px; line-height: 28px}
#mobile i {font-size: 28px;}
#login-panel .panel-content{padding-left: 150px;background:url('theme/default/images/main/zt-logo.png') 50px top no-repeat; min-height: 161px}
#login-panel .panel-content table{border: none;width: 300px;margin: 20px auto}
#login-panel .panel-content .button-s{width: 80px}
#login-panel .panel-content .button-c{width: 88px;margin-right: 0}
#login-panel .panel-foot{text-align: center;padding: 15px;line-height: 2em;background-color: #e5e5e5;border-top: 1px solid #dfdfdf}
#poweredby{float: none; color: #eee;text-align: center;margin: 10px auto}
#poweredby a{color: #fff}
#keeplogin label {font-weight: normal}
.popover {max-width: 500px}
.popover-content {padding: 0; width: 297px}
.btn-submit {min-width: 70px}
.body-modal #container {margin: 0;}
.body-modal {padding: 40px 0 25px;}
body {background: #00B1FD linear-gradient(-90deg, #0072F3 0%, #00B1FD 100%);}
#main {}
#login {max-width: 540px; margin: 0 auto; margin-top: 5%;}
#loginPanel {background: #fff; overflow: hidden; box-shadow: 0 0 20px 0 rgba(0,0,0,.1); border-radius: 3px;}
#loginPanel > header {padding: 20px; border-bottom: 1px #eee solid; position: relative;}
#loginPanel > header > h2 {font-size: 16px; margin: 0; line-height: 32px;}
#loginPanel > header > .actions {position: absolute; right: 20px; top: 20px;}
#loginPanel > .table-row {margin: 20px 0;}
#loginPanel .table-form > tbody > tr > th {width: 80px;}
#loginPanel form {margin-right: 40px;}
#loginPanel > footer {background: #eee; padding: 20px; color: #838a9d}
#loginPanel > footer a {display: inline-block; margin-left: 5px;}
#info {margin-top: 10px; color: #fff;}
#info .btn + .btn {margin-left: 5px;}
.alert-info {color: #00a9fc;}
module/user/js/login.js
+10 -8
View File
@@ -4,6 +4,15 @@ if(window.self !== window.top) window.top.location.href = window.location.href;
function setForm(){}
$(document).ready(function()
{
var $login = $('#login');
var adjustPanelPos = function()
{
var bestTop = Math.max(0, Math.floor($(window).height() - $login.outerHeight())/2);
$login.css('margin-top', bestTop);
};
adjustPanelPos();
$(window).on('resize', adjustPanelPos);
$('#account').focus();
$("#langs li > a").click(function()
@@ -11,14 +20,7 @@ $(document).ready(function()
selectLang($(this).data('value'));
});
var mBtn = $('#mobile');
mBtn.popover({html: true, container: 'body'}).click(function(event)
{
event.stopPropagation();
$(document).one('click', function(){$('#mobile').popover('hide');});
});
mBtn.attr('title', mBtn.attr('data-original-title'));
$('#login-form form').submit(function()
$('#loginPanel #submit').click(function()
{
var password = $('input:password').val();
var rand = $('input#verifyRand').val();
module/user/lang/en.php
+2 -2
View File
@@ -38,7 +38,7 @@ $lang->user->phone = 'Phone';
$lang->user->address = 'Address';
$lang->user->zipcode = 'Zip Code';
$lang->user->join = 'Join Date';
$lang->user->visits = 'Visit Count';
$lang->user->visits = 'Visits';
$lang->user->ip = 'Last IP';
$lang->user->last = 'Last Login';
$lang->user->ranzhi = 'Zdoo Account';
@@ -100,7 +100,7 @@ $lang->user->weakPassword = "Your password does not meet the setting requirement
$lang->user->roleList[''] = '';
$lang->user->roleList['dev'] = 'Developer';
$lang->user->roleList['qa'] = 'Tester';
$lang->user->roleList['qa'] = 'QA';
$lang->user->roleList['pm'] = 'Project Manager';
$lang->user->roleList['po'] = 'Product Owner';
$lang->user->roleList['td'] = 'Technical Manager';
module/user/view/login.html.php
+72 -62
View File
@@ -11,73 +11,83 @@
include '../../common/view/header.lite.html.php';
if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
?>
<div id='container'>
<div id='login-panel'>
<div class='panel-head'>
<h4><?php printf($lang->welcome, $app->company->name);?></h4>
<div class='panel-actions'>
<div class='dropdown' id='langs'>
<button class='btn' data-toggle='dropdown' title='Change Language/更换语言/更換語言'><?php echo $config->langs[$this->app->getClientLang()]; ?> <span class="caret"></span></button>
<ul class='dropdown-menu'>
<main id="main">
<div class="container" id="login">
<div id="loginPanel">
<header>
<h2><?php printf($lang->welcome, $app->company->name);?></h2>
<div class="actions dropdown dropdown-hover" id='langs'>
<button type='button' class='btn' title='Change Language/更换语言/更換語言'><?php echo $config->langs[$this->app->getClientLang()]; ?> <span class="caret"></span></button>
<ul class="dropdown-menu">
<?php foreach($config->langs as $key => $value):?>
<li class="<?php echo $key==$this->app->getClientLang()?'active':''; ?>"><a href="###" data-value="<?php echo $key; ?>"><?php echo $value; ?></a></li>
<li><a class="switch-lang" data-value="<?php echo $key; ?>"><?php echo $value; ?></a></li>
<?php endforeach;?>
</ul>
</div>
</header>
<div class="table-row">
<div class="col-4 text-center text-middle">
<img src="<?php echo $config->webRoot . 'theme/default/images/main/zt-logo.png';?>" alt="">
</div>
<div class="col-8">
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tbody>
<tr>
<th><?php echo $lang->user->account;?></th>
<td><input class='form-control' type='text' name='account' id='account' autofocus /></td>
</tr>
<tr>
<th><?php echo $lang->user->password;?></th>
<td><input class='form-control' type='password' name='password' /></td>
</tr>
<tr>
<th></th>
<td id="keeplogin"><?php echo html::checkBox('keepLogin', $lang->user->keepLogin, $keepLogin);?></td>
</tr>
<tr>
<th></th>
<td class="form-actions">
<?php
echo html::submitButton($lang->login);
if($app->company->guest) echo html::linkButton($lang->user->asGuest, $this->createLink($config->default->module));
echo html::hidden('referer', $referer);
echo html::a(inlink('reset'), $lang->user->resetPassword);
?>
</td>
</tr>
</tbody>
</table>
</form>
</div>
</div>
<?php if(isset($demoUsers)):?>
<footer>
<span><?php echo $lang->user->loginWithDemoUser;?></span>
<?php
$password = md5('123456');
$link = inlink('login');
$link .= strpos($link, '?') !== false ? '&' : '?';
foreach($demoUsers as $demoAccount => $demoUser)
{
if($demoUser->password != $password) continue;
echo html::a($link . "account={$demoAccount}&password=" . md5($password . $this->session->rand), $demoUser->realname, 'hiddenwin');
}
?>
</footer>
<?php endif;?>
</div>
<div id="info" class="table-row">
<div class="table-col text-middle text-center">
<div id="poweredby">
<?php if($config->checkVersion):?>
<?php $siteURL = $this->app->getClientLang() == 'en' ? 'http://api.zentao.pm' : 'http://api.zentao.net';?>
<iframe id='updater' class='hidden' frameborder='0' width='100%' scrolling='no' allowtransparency='true' src="<?php echo $siteURL;?>/updater-isLatest-<?php echo $config->version;?>-<?php echo $s;?>.html?lang=<?php echo str_replace('-', '_', $this->app->getClientLang())?>"></iframe>
<?php endif;?>
<?php echo html::hidden('verifyRand', $rand);?>
</div>
</div>
</div>
<div class="panel-content" id="login-form">
<form method='post' target='hiddenwin' class='form-condensed'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->user->account;?></th>
<td><input class='form-control' type='text' name='account' id='account' /></td>
</tr>
<tr>
<th><?php echo $lang->user->password;?></th>
<td><input class='form-control' type='password' name='password' /></td>
</tr>
<tr>
<th></th>
<td id="keeplogin"><?php echo html::checkBox('keepLogin', $lang->user->keepLogin, $keepLogin);?></td>
</tr>
<tr>
<th></th>
<td>
<?php
echo html::submitButton($lang->login);
if($app->company->guest) echo '&nbsp; ' . html::linkButton($lang->user->asGuest, $this->createLink($config->default->module));
echo '&nbsp; ' . html::hidden('referer', $referer);
echo '&nbsp; ' . html::a(inlink('reset'), $lang->user->resetPassword);
?>
</td>
</tr>
</table>
</form>
</div>
<?php if(isset($demoUsers)):?>
<div id='demoUsers' class="panel-foot">
<span><?php echo $lang->user->loginWithDemoUser; ?></span>
<?php
$password = md5('123456');
$link = inlink('login');
$link .= strpos($link, '?') !== false ? '&' : '?';
foreach($demoUsers as $demoAccount => $demoUser)
{
if($demoUser->password != $password) continue;
echo html::a($link . "account={$demoAccount}&password=" . md5($password . $this->session->rand), $demoUser->realname, 'hiddenwin');
}
?>
</div>
<?php endif;?>
</div>
<div id="poweredby">
<?php if($config->checkVersion):?>
<?php $siteURL = $this->app->getClientLang() == 'en' ? 'http://api.zentao.pm' : 'http://api.zentao.net';?>
<iframe id='updater' class='hidden' frameborder='0' width='100%' scrolling='no' allowtransparency='true' src="<?php echo $siteURL;?>/updater-isLatest-<?php echo $config->version;?>-<?php echo $s;?>.html?lang=<?php echo str_replace('-', '_', $this->app->getClientLang())?>"></iframe>
<?php endif;?>
<?php echo html::hidden('verifyRand', $rand);?>
</div>
</div>
</main>
<?php include '../../common/view/footer.lite.html.php';?>
module/webhook/css/browse.css
-1
View File
@@ -1 +0,0 @@
.text {overflow: hidden; text-overflow: ellipsis;}
module/webhook/view/browse.html.php
+2 -2
View File
@@ -5,7 +5,7 @@
* @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Gang Liu <liugang@cnezsoft.com>
* @package webhook
* @package webhook
* @version $Id$
* @link http://www.zentao.net
*/
@@ -33,7 +33,7 @@
<td class='text' title='<?php echo $webhook->name;?>'><?php echo $webhook->name;?></td>
<td class='text' title='<?php echo $webhook->url;?>'><?php echo $webhook->url;?></td>
<td class='c-actions'>
<?php
<?php
common::printIcon('webhook', 'log', "webhookID=$id", '', 'list', 'file-text');
common::printIcon('webhook', 'edit', "webhookID=$id", '', 'list');
if(common::hasPriv('webhook', 'delete'))
module/webhook/view/create.html.php
+2 -2
View File
@@ -5,7 +5,7 @@
* @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Gang Liu <liugang@cnezsoft.com>
* @package webhook
* @package webhook
* @version $Id$
* @link http://www.zentao.net
*/
@@ -65,7 +65,7 @@
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton() . html::backButton();?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-default btn-wide');?></td>
</tr>
</table>
</form>
module/webhook/view/edit.html.php
+2 -2
View File
@@ -5,7 +5,7 @@
* @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Gang Liu <liugang@cnezsoft.com>
* @package webhook
* @package webhook
* @version $Id$
* @link http://www.zentao.net
*/
@@ -68,7 +68,7 @@
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton() . html::backButton();?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-default btn-wide')?></td>
</tr>
</table>
</form>
www/js/my.full.js
+15
View File
@@ -1712,4 +1712,19 @@ $(document).ready(function()
}
})
})
$.extend({'closeModal':function(callback, location)
{
$ajaxModal = $('.modal-iframe');
$ajaxModal.on('hidden.zui.modal', function()
{
if(location && (!$ajaxModal.data('cancel-reload')))
{
if(location == 'this') window.location.reload();
else window.location = location;
}
if(callback && $.isFunction(callback)) callback();
});
$ajaxModal.modal('hide');
}});
});
www/theme/zui/css/min.css
+2 -2
View File
File diff suppressed because one or more lines are too long
www/theme/zui/fonts/ZentaoIcon.eot
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.svg
+1
View File
@@ -91,6 +91,7 @@
<glyph unicode="&#xe949;" glyph-name="cards-view" d="M170.667 682.666h284.444v-341.333h-341.333v284.444c0 31.419 25.47 56.889 56.889 56.889zM113.778 227.555h341.333v-341.333h-284.444c-31.419 0-56.889 25.47-56.889 56.889v284.444zM568.889 682.666h284.444c31.419 0 56.889-25.47 56.889-56.889v-284.444h-341.333v341.333zM568.889 227.555h341.333v-284.444c0-31.419-25.47-56.889-56.889-56.889h-284.444v341.333z" />
<glyph unicode="&#xe94a;" glyph-name="star-empty" d="M470.699 732.995l0.544-0.792c-0.184 0.262-0.365 0.526-0.544 0.792zM77.153 423.114l0.508-0.728c-0.167 0.244-0.336 0.487-0.508 0.728zM200.729-145.098l0.941 0.325c-0.315-0.105-0.629-0.213-0.941-0.325zM824.385-145.389c-0.338 0.12-0.676 0.237-1.014 0.35l1.014-0.35zM757.134-190.319l-0.003 0.953c-0.003-0.318-0.002-0.636 0.003-0.953zM644.954 479.437l-132.36 192.597-148.368-215.689-251.154-84.722 155.067-222.304-0.080-26.96-0.725-244.475 244.818 84.478 244.785-84.475-0.794 271.434 155.064 222.292-250.146 84.389zM841.552 122.612l0.915-312.681c0.18-12.182-5.080-22.937-13.389-29.807-11.038-7.887-22.398-9.799-33.372-5.883l-283.557 97.851-283.585-97.855c-10.969-3.918-22.318-2.005-31.082 4.146-10.595 8.595-15.848 19.364-15.681 31.547l0.923 312.681-175.56 251.683c-6.94 9.732-8.716 21.66-5.859 32.304 4.526 13.219 12.658 21.795 23.75 25.386l284.967 96.134 173.667 252.467c6.679 9.949 16.966 15.422 27.534 15.858 13.34-0.428 23.602-5.89 30.286-15.831l173.77-252.844 283.926-95.786c11.092-3.585 19.228-12.167 22.879-22.577 3.737-13.442 1.965-25.367-4.973-35.116l-175.56-251.68z" />
<glyph unicode="&#xe94b;" glyph-name="star" d="M841.552 122.612l0.915-312.681c0.18-12.182-5.080-22.937-13.389-29.807-11.038-7.887-22.398-9.799-33.372-5.883l-283.557 97.851-283.585-97.855c-10.969-3.918-22.318-2.005-31.082 4.146-10.595 8.595-15.848 19.364-15.681 31.547l0.923 312.681-175.56 251.683c-6.94 9.732-8.716 21.66-5.859 32.304 4.526 13.219 12.658 21.795 23.75 25.386l284.967 96.134 173.667 252.467c6.679 9.949 16.966 15.422 27.534 15.858 13.34-0.428 23.602-5.89 30.286-15.831l173.77-252.844 283.926-95.786c11.092-3.585 19.228-12.167 22.879-22.577 3.737-13.442 1.965-25.367-4.973-35.116l-175.56-251.68z" />
<glyph unicode="&#xe94c;" glyph-name="move" d="M963.488 267.876c4.142 8.283 4.142 20.711 0 33.136-4.142 4.142-4.142 8.283-8.283 12.426l-124.263 124.263c-16.568 16.568-41.421 16.568-57.99 0s-16.568-41.421 0-57.99l53.848-53.848h-273.378v273.378l53.848-53.848c8.283-8.283 16.568-12.426 28.995-12.426s20.711 4.142 28.995 12.426c16.568 16.568 16.568 41.421 0 57.99l-124.263 124.263c-4.142 4.142-8.283 8.283-12.426 8.283-8.283 4.142-20.711 4.142-33.136 0-4.142-4.142-8.283-4.142-12.426-8.283l-124.263-124.263c-16.568-16.568-16.568-41.421 0-57.99s41.421-16.568 57.99 0l53.848 53.848v-273.378h-273.378l53.848 53.848c16.568 16.568 16.568 41.421 0 57.99s-41.421 16.568-57.99 0l-124.263-124.263c-4.142-4.142-8.283-8.283-8.283-12.426-4.142-8.283-4.142-20.711 0-33.136 4.142-4.142 4.142-8.283 8.283-12.426l124.263-124.263c8.283-8.283 16.568-12.426 28.995-12.426s20.711 4.142 28.995 12.426c16.568 16.568 16.568 41.421 0 57.99l-53.848 53.848h273.378v-273.378l-53.848 53.848c-16.568 16.568-41.421 16.568-57.99 0s-16.568-41.421 0-57.99l124.263-124.263c4.142-4.142 8.283-8.283 12.426-8.283 4.142-4.142 12.426-4.142 16.568-4.142s12.426 0 16.568 4.142c4.142 4.142 8.283 4.142 12.426 8.283l124.263 124.263c16.568 16.568 16.568 41.421 0 57.99s-41.421 16.568-57.99 0l-53.848-53.848v273.378h273.378l-53.848-53.848c-16.568-16.568-16.568-41.421 0-57.99 8.283-8.283 20.711-12.426 28.995-12.426s20.711 4.142 28.995 12.426l124.263 124.263c4.142 4.142 8.283 8.283 8.283 12.426z" />
<glyph unicode="&#xe952;" glyph-name="arrow-left" d="M810.667 327.111h-494.933l226.133 226.133c17.067 17.067 17.067 42.667 0 59.733s-42.667 17.067-59.733 0l-298.667-298.667c-4.267-4.267-8.533-8.533-8.533-12.8-4.267-8.533-4.267-21.333 0-34.133 4.267-4.267 4.267-8.533 8.533-12.8l298.667-298.667c8.533-8.533 21.333-12.8 29.867-12.8s21.333 4.267 29.867 12.8c17.067 17.067 17.067 42.667 0 59.733l-226.133 226.133h494.933c25.6 0 42.667 17.067 42.667 42.667s-17.067 42.667-42.667 42.667z" />
<glyph unicode="&#xe957;" glyph-name="code" d="M632.794 70.731l213.713 213.713-213.713 213.713 65.043 65.043 278.756-278.756-278.756-278.756-65.043 65.043zM391.206 70.731l-213.713 213.713 213.713 213.713-65.043 65.043-278.756-278.756 278.756-278.756 65.043 65.043z" />
<glyph unicode="&#xe958;" glyph-name="home" d="M426.667-56.889v256h170.667v-256h213.333v341.333h128l-426.667 384-426.667-384h128v-341.333h213.333z" />
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 78 KiB

After

Width:  |  Height:  |  Size: 79 KiB

www/theme/zui/fonts/ZentaoIcon.ttf
BIN
View File
Binary file not shown.
www/theme/zui/fonts/ZentaoIcon.woff
BIN
View File
Binary file not shown.