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

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
hufangzhou
2021-04-08 15:19:30 +08:00
parent e5dd0e98fc ba89a45150
commit 27931276a2
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+1
View File
@@ -551,6 +551,7 @@ class commonModel extends model
if($openApp == 'product') $currentMethod = 'all';
}
if($config->systemMode == 'classic' and $openApp == 'execution') $icon = zget($lang->navIcons, 'project', '');
$link = ($openApp != 'execution' or ($config->systemMode == 'classic')) ? helper::createLink($currentModule, $currentMethod) : '';
$html = $link ? html::a($link, "$icon {$lang->$openApp->common}", '', "class='btn'") : "$icon {$lang->$openApp->common}";
module/doc/control.php
+1 -1
View File
@@ -956,7 +956,7 @@ class doc extends control
{
$libs = $this->doc->getLibsByObject('book', 0);
$this->app->rawMethod = 'book';
if($libID == 0) $libID = reset($libs)->id;
if($libID == 0 and !empty($libs)) $libID = reset($libs)->id;
$this->lang->modulePageNav = $this->doc->select($type, $objects, $objectID, $libs, $libID);
if(!$docID) $docID = $this->dao->select('id')->from(TABLE_DOC)
module/execution/view/all.html.php
+1 -1
View File
@@ -21,7 +21,7 @@
.table td.has-child > .plan-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform:rotate(-90deg); -moz-transform:rotate(-90deg); -o-transform:rotate(-90deg); -webkit-transform:rotate(-90deg); transform: rotate(-90deg);}
.table td.has-child > .plan-toggle > .icon:before {text-align: left;}
.table td.has-child > .plan-toggle.collapsed > .icon {-ms-transform:rotate(90deg); -moz-transform:rotate(90deg); -o-transform:rotate(90deg); -webkit-transform:rotate(90deg); transform: rotate(90deg);}
.table td.hours {padding-right: 12px;}
.table td.hours {padding-right: 20px;}
.main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
@-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;}}
www/theme/default/style.css
+1
View File
@@ -47,6 +47,7 @@ a.showMoreImage:hover {opacity: 1;}
#header #toolbar a {color: #3c4353; font-size: 13px;}
#header #toolbar a:hover, .selected a {color: #fff!important;}
#header #toolbar i {font-size: 16px;}
#header .header-btn i {font-size: 16px;}
#toolbar {top: 0px; height: 50px;}
#userNav {float: none; margin: 0;}