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

Merge branch 'master' of https://git.zcorp.cc/zentaopms

Browse Source
This commit is contained in:
sgm0422
2021-02-01 15:57:48 +08:00
parent 750e6ea3fc 3a43cf09a3
commit 4e4106dbac
9 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/de.php
+1 -1
View File
@@ -367,7 +367,7 @@ $lang->project->menu->more = array('link' => 'More|project|whitelist|project
$lang->project->subMenu = new stdclass();
$lang->project->subMenu->view = new stdclass();
$lang->project->subMenu->view->groupTask = 'Gruppenansicht|project|groupTask|projectID=%s';
$lang->project->subMenu->view->groupTask = 'Gruppenansicht|project|grouptask|projectID=%s';
$lang->project->subMenu->view->tree = 'Baumansicht|project|tree|projectID=%s';
$lang->project->subMenu->qa = new stdclass();
module/common/lang/en.php
+1 -1
View File
@@ -367,7 +367,7 @@ $lang->project->menu->more = array('link' => 'More|project|whitelist|project
$lang->project->subMenu = new stdclass();
$lang->project->subMenu->view = new stdclass();
$lang->project->subMenu->view->groupTask = 'Group View|project|groupTask|projectID=%s';
$lang->project->subMenu->view->groupTask = 'Group View|project|grouptask|projectID=%s';
$lang->project->subMenu->view->tree = 'Tree View|project|tree|projectID=%s';
$lang->project->subMenu->qa = new stdclass();
module/common/lang/fr.php
+1 -1
View File
@@ -367,7 +367,7 @@ $lang->project->menu->more = array('link' => 'More|project|whitelist|project
$lang->project->subMenu = new stdclass();
$lang->project->subMenu->view = new stdclass();
$lang->project->subMenu->view->groupTask = 'Vision Groupée|project|groupTask|projectID=%s';
$lang->project->subMenu->view->groupTask = 'Vision Groupée|project|grouptask|projectID=%s';
$lang->project->subMenu->view->tree = 'Arborescence|project|tree|projectID=%s';
$lang->project->subMenu->qa = new stdclass();
module/common/lang/vi.php
+1 -1
View File
@@ -367,7 +367,7 @@ $lang->project->menu->more = array('link' => 'More|project|whitelist|project
$lang->project->subMenu = new stdclass();
$lang->project->subMenu->view = new stdclass();
$lang->project->subMenu->view->groupTask = 'Xem theo nhóm|project|groupTask|projectID=%s';
$lang->project->subMenu->view->groupTask = 'Xem theo nhóm|project|grouptask|projectID=%s';
$lang->project->subMenu->view->tree = 'Xem theo cây|project|tree|projectID=%s';
$lang->project->subMenu->qa = new stdclass();
module/common/lang/zh-cn.php
+1 -1
View File
@@ -367,7 +367,7 @@ $lang->project->menu->more = array('link' => '更多|project|whitelist|proje
$lang->project->subMenu = new stdclass();
$lang->project->subMenu->view = new stdclass();
$lang->project->subMenu->view->groupTask = '分组视图|project|groupTask|projectID=%s';
$lang->project->subMenu->view->groupTask = '分组视图|project|grouptask|projectID=%s';
$lang->project->subMenu->view->tree = '树状图|project|tree|projectID=%s';
$lang->project->subMenu->qa = new stdclass();
module/common/lang/zh-tw.php
+1 -1
View File
@@ -367,7 +367,7 @@ $lang->project->menu->more = array('link' => '更多|project|whitelist|proje
$lang->project->subMenu = new stdclass();
$lang->project->subMenu->view = new stdclass();
$lang->project->subMenu->view->groupTask = '分組視圖|project|groupTask|projectID=%s';
$lang->project->subMenu->view->groupTask = '分組視圖|project|grouptask|projectID=%s';
$lang->project->subMenu->view->tree = '樹狀圖|project|tree|projectID=%s';
$lang->project->subMenu->qa = new stdclass();
module/index/css/index.css
+1 -1
View File
@@ -55,7 +55,7 @@ body.menu-hide {padding-left: 0;}
#userNav>li>.dropdown-menu a{color: #fff}
#userNav>li>.dropdown-menu .dropdown-menu{left: 100%; text-align: left; background: #3c495c}
#userNav>li .top .dropdown-menu{top: -60px}
#userNav .dropdown-menu>li>a>.icon { position: initial; display: inline;}
#userNav .dropdown-menu>li>a>.icon {position: relative; top: 0; display: inline;}
#userNav li.open>a{background:#0c64eb}
#userNav li.divider{opacity: .24; border-top: 1px solid; height: 2px;}
#userNav .dropdown-submenu:focus > a, #userNav .dropdown-submenu:hover > a {background-color: rgba(0,0,0,.2);}
module/tree/control.php
+1
View File
@@ -231,6 +231,7 @@ class tree extends control
$this->view->currentModuleID = $currentModuleID;
$this->view->parentModules = $parentModules;
$this->view->branch = $branch;
$this->view->from = $from;
$this->view->tree = $this->tree->getProductStructure($rootID, $viewType);
$this->view->canBeChanged = isset($canBeChanged) ? $canBeChanged : true;
$this->display();
module/tree/view/browse.html.php
+3 -3
View File
@@ -93,10 +93,10 @@ li.tree-item-story > .tree-actions .tree-action[data-type=delete]{display:none;}
<?php if($viewType != 'line' && $viewType != 'trainskill' && $viewType != 'trainpost'):?>
<td class="text-middle text-right with-padding">
<?php
echo "<span>" . html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType"), empty($root->name) ? '' : $root->name) . "<i class='icon icon-angle-right muted'></i></span>";
echo "<span>" . html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType&currentModuleID=0&branch=0&from=$from"), empty($root->name) ? '' : $root->name) . "<i class='icon icon-angle-right muted'></i></span>";
foreach($parentModules as $module)
{
echo "<span>" . html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType&moduleID=$module->id"), $module->name) . " <i class='icon icon-angle-right muted'></i></span>";
echo "<span>" . html::a($this->createLink('tree', 'browse', "root=$rootID&viewType=$viewType&currentModuleID=$module->id&branch=0&from=$from"), $module->name) . " <i class='icon icon-angle-right muted'></i></span>";
}
?>
</td>
@@ -194,7 +194,7 @@ $(function()
},
itemCreator: function($li, item)
{
var link = (item.id !== undefined && item.type != 'line') ? ('<a href="' + createLink('tree', 'browse', 'rootID=<?php echo $rootID ?>&viewType=<?php echo $viewType ?>&moduleID={0}&branch={1}'.format(item.id, item.branch)) + '">' + item.name + '</a>') : ('<span class="tree-toggle">' + item.name + '</span>');
var link = (item.id !== undefined && item.type != 'line') ? ('<a href="' + createLink('tree', 'browse', 'rootID=<?php echo $rootID ?>&viewType=<?php echo $viewType ?>&moduleID={0}&branch={1}&from=<?php echo $from;?>'.format(item.id, item.branch)) + '">' + item.name + '</a>') : ('<span class="tree-toggle">' + item.name + '</span>');
var $toggle = $('<span class="module-name" data-id="' + item.id + '">' + link + '</span>');
if(item.type === 'bug') $toggle.append('&nbsp; <span class="text-muted">[B]</span>');
if(item.type === 'case') $toggle.append('&nbsp; <span class="text-muted">[C]</span>');