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 
*delete a
This commit is contained in:
reneteng
2018-06-26 15:19:25 +08:00
parent 73ff01c889 de0f38f3f5
commit eeb9e29fe7
17 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
10.0.beta
10.0.stable
module/block/control.php
+4 -4
View File
@@ -872,6 +872,10 @@ class block extends control
{
if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die();
$this->app->loadLang('task');
$this->app->loadLang('story');
$this->app->loadLang('bug');
$status = isset($this->params->type) ? $this->params->type : '';
$orderBy = isset($this->params->orderBy) ? $this->params->orderBy : 'id_asc';
$num = isset($this->params->num) ? (int)$this->params->num : 0;
@@ -977,10 +981,6 @@ class block extends control
$projects[$project->id]->bugProgress = $project->totalBugs ? round(($project->totalBugs - $project->activeBugs) / $project->totalBugs, 2) * 100 : 0;
}
$this->app->loadLang('task');
$this->app->loadLang('story');
$this->app->loadLang('bug');
$this->view->projects = $projects;
}
module/block/lang/zh-tw.php
+1
View File
@@ -42,6 +42,7 @@ $lang->block->myProject = '進行中的' . $lang->projectCommon;
$lang->block->myProduct = '未關閉的' . $lang->productCommon;
$lang->block->delayed = '已延期';
$lang->block->noData = '當前統計類型下暫無數據';
$lang->block->emptyTip = '暫無信息';
$lang->block->params = new stdclass();
$lang->block->params->name = '參數名稱';
module/common/view/datatable.fix.html.php
+1 -3
View File
@@ -1,8 +1,6 @@
<?php $datatableId = $this->moduleName . ucfirst($this->methodName);?>
<style>
#setShowModule {margin-left: 30px;}
#tableCustomBtn {padding: 6px 3px 6px 0;}
#tableCustomBtn > .icon-cog {position: relative; left: 3px;}
</style>
<script>
$(function()
@@ -16,7 +14,7 @@ $(function()
if($btnToolbar.length > 0)
{
<?php $mode = isset($config->datatable->$datatableId->mode) ? $config->datatable->$datatableId->mode : 'table';?>
var $dropdown = $('<div class="dropdown"><button id="tableCustomBtn" type="button" class="btn btn-link" data-toggle="dropdown"><i class="icon-cog"></i><span class="caret"></span></button></div>');
var $dropdown = $('<div class="dropdown"><button id="tableCustomBtn" type="button" class="btn btn-link" data-toggle="dropdown"><i class="icon-cog"></i></button></div>');
var $dropmenu = $('<ul class="dropdown-menu pull-right"></ul>');
$dropmenu.append("<li><a href='<?php echo $this->createLink('datatable', 'ajaxCustom', 'id=' . $this->moduleName . '&method=' . $this->methodName)?>' data-toggle='modal' data-type='ajax'><?php echo $lang->datatable->custom?></a></li>");
$dropmenu.append("<li><a href='javascript:saveDatatableConfig(\"mode\", \"<?php echo $mode == 'table' ? 'datatable' : 'table';?>\", true);' id='switchToDatatable'><?php echo $mode == 'table' ? $lang->datatable->switchToDatatable : $lang->datatable->switchToTable;?></a></li>");
module/common/view/datatable.html.php
+1
View File
@@ -30,6 +30,7 @@
.datatable .fixed-right tbody>tr>td {padding-left: 5px!important;}
.datatable .c-actions {white-space: nowrap;}
.datatable.head-fixed {padding-top: 41px;}
.datatable .table>thead>tr>th.col-hover {background: rgba(0,0,0,.075);}
</style>
<script>
<?php $datatableId = $this->moduleName . ucfirst($this->methodName);?>
module/custom/control.php
+1
View File
@@ -409,6 +409,7 @@ class custom extends control
{
if($this->config->global->flow == 'full') $this->loadModel('project')->setMenu(array(), 0);
if($this->config->global->flow == 'onlyTest') $this->loadModel('testcase')->setMenu(array(), 0);
if($this->config->global->flow == 'onlyTest') $this->loadModel('bug')->setMenu(array(), 0);
if($this->config->global->flow == 'onlyTask') $this->loadModel('project')->setMenu(array(), 0);
if($type === 'all')
{
module/custom/js/ajaxmenu.js
+8 -24
View File
@@ -6,13 +6,13 @@ $(function()
$subNavbar = $('#subNavbar'),
$mainMenu = $('#mainMenu'),
$loadingIcon = $('#loadingIcon'),
$menuEditor = $('#menuEditor');
var menuConfig =
{
'main': null,
'module': {},
'feature': {}
};
$menuEditor = $('#menuEditor'),
menuConfig =
{
'main': null,
'module': {},
'feature': {}
};
var updateConfig = function($menu)
{
@@ -47,23 +47,7 @@ $(function()
$a.data('menu', item).append('<i class="item-hidden-icon icon icon-eye-off"></i>');
$('<li/>').attr('data-id', item.name).toggleClass('right', item.float === 'right').toggleClass('menu-hidden', !!item.hidden).append($a).appendTo($nav);
var $dropmenu = $a.find('.dropdown-menu').empty();
if ($dropmenu.length && item.subMenu)
{
$.each(item.subMenu, function(subIdx, subItem)
{
subItem.order = subIdx + 1;
var $subA = $('<a href="#"/>').append(subItem.text);
$subA.data('menu', subItem).append('<i class="item-hidden-icon icon icon-eye-off"></i>');
$('<li/>').attr('data-id', subItem.name).toggleClass('right', subItem.float === 'right').toggleClass('menu-hidden', !!subItem.hidden).append($subA).appendTo($dropmenu);
});
var $aInner = $a.children('a');
if ($aInner.length)
{
$aInner.replaceWith($('<span>' + $aInner.text() + ' <span class="caret"></span></span>'));
$a.addClass('dropdown-hover');
}
}
if(!$dropmenu.children().length) $dropmenu.remove();
return $dropmenu.remove(); // Disable custom submenu, full function see https://github.com/easysoft/zentaopms/blob/c7fdbddfc074ddd7ddf539b1d3b5f108ab13ec7b/module/custom/js/ajaxmenu.js
});
$nav.sortable({finish: function(e)
{
module/datatable/lang/zh-tw.php
+8 -8
View File
@@ -6,14 +6,14 @@ $lang->datatable->show = '顯示';
$lang->datatable->hide = '隱藏';
$lang->datatable->reset = '恢復預設';
$lang->datatable->custom = '自定義列';
$lang->datatable->customTip = '勾選需要顯示的列，拖動列名進行排序。';
$lang->datatable->table = '簡單表格';
$lang->datatable->datatable = '高級表格';
$lang->datatable->required = '必選';
$lang->datatable->confirmReset = '是否恢復預設設置？';
$lang->datatable->setGlobal = '全局';
$lang->datatable->resetGlobal = '全局恢復預設';
$lang->datatable->custom = '自定義列';
$lang->datatable->customTip = '勾選需要顯示的列，拖動列名進行排序。';
$lang->datatable->switchToTable = '切換到簡單表格';
$lang->datatable->switchToDatatable = '切換到高級表格';
$lang->datatable->required = '必選';
$lang->datatable->confirmReset = '是否恢復預設設置？';
$lang->datatable->setGlobal = '全局';
$lang->datatable->resetGlobal = '全局恢復預設';
$lang->datatable->branch = '分支';
$lang->datatable->platform = '平台';
module/doc/css/common.css
+1
View File
@@ -25,6 +25,7 @@ d.split-row > .side-col,
.col-sm-size .table .c-num,
.col-md-size .table .c-datetime {display: none;}
.table-files .btn {padding:0 6px;}
.table-files .c-actions .btn > .icon {opacity: 0;}
.table-files .c-actions .btn > .icon.text-yellow,
.table-files tr:hover .c-actions .btn > .icon {opacity: 1;}
module/doc/view/browse.html.php
+3 -1
View File
@@ -45,7 +45,7 @@ var browseType = '<?php echo $browseType;?>';
</div>
</nav>
</div>
<?php if(empty($docs)):?>
<?php if(empty($docs) and empty($modules)):?>
<div class="table-empty-tip">
<p>
<?php if($libID):?>
@@ -115,8 +115,10 @@ var browseType = '<?php echo $browseType;?>';
</tbody>
</table>
</div>
<?php if(empty($docs) and empty($modules)):?>
<div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
<?php endif;?>
<?php endif;?>
</div>
</div>
<?php endif;?>
module/doc/view/browsebygrid.html.php
+3 -1
View File
@@ -9,7 +9,7 @@
</div>
</nav>
</div>
<?php if(empty($docs)):?>
<?php if(empty($docs) and empty($modules)):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->doc->noDoc;?></span> <?php common::printLink('doc', 'create', "libID={$libID}", "<i class='icon icon-plus'></i> " . $lang->doc->create, '', "class='btn btn-info'");?></p>
</div>
@@ -48,7 +48,9 @@
<?php endforeach;?>
</div>
</div>
<?php if(empty($docs) and empty($modules)):?>
<div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
<?php endif;?>
<?php endif;?>
</div>
</div>
module/project/control.php
+1
View File
@@ -25,6 +25,7 @@ class project extends control
{
$this->projects = $this->project->getPairs('nocode');
if(!$this->projects and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('project', 'create'));
if(!$this->projects and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() == 'mhtml') $this->locate($this->createLink('project', 'index'));
}
}
module/project/model.php
+7 -1
View File
@@ -173,10 +173,16 @@ class projectModel extends model
$replace .= "<li $active>" . html::a(helper::createLink($subMenuModule, $subMenuMethod, sprintf($subMenuParams, $projectID)), $subMenuName) . '</li>';
if($active) $hasActive = true;
$link = array();
$link['module'] = $subMenuModule;
$link['method'] = $subMenuMethod;
$link['vars'] = $subMenuParams;
$menu = new stdclass();
$menu->name = $subMenuKey;
$menu->hidden = false;
$menu->link = $link;
$menu->text = $subMenuName;
$menu->hidden = false;
$subMenu[] = $menu;
}
$replace .= '</ul>';
module/upgrade/lang/zh-tw.php
+1
View File
@@ -136,3 +136,4 @@ $lang->upgrade->fromVersions['9_8_1'] = '9.8.1';
$lang->upgrade->fromVersions['9_8_2'] = '9.8.2';
$lang->upgrade->fromVersions['9_8_3'] = '9.8.3';
$lang->upgrade->fromVersions['10_0_alpha'] = '10.0.alpha';
$lang->upgrade->fromVersions['10_0_beta'] = '10.0.beta';
www/js/datatable/min.js
+2 -2
View File
File diff suppressed because one or more lines are too long
www/js/zui/min.js
+3 -3
View File
File diff suppressed because one or more lines are too long
www/theme/zui/css/min.css
+2 -2
View File
File diff suppressed because one or more lines are too long