diff --git a/config/zentaopms.php b/config/zentaopms.php index fe193d98ca..0fbc294f6b 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -98,8 +98,8 @@ $config->hourPointCommonList['vi'][0] = 'giờ'; $config->hourPointCommonList['vi'][1] = 'điểm'; $config->hourPointCommonList['vi'][2] = 'function point'; -$config->manualUrl['home'] = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao'; -$config->manualUrl['int'] = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html?fullScreen=zentao'; +$config->manualUrl['home'] = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao&theme=' . $_COOKIE['theme']; +$config->manualUrl['int'] = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html?fullScreen=zentao&theme=' . $_COOKIE['theme']; /* Supported charsets. */ $config->charsets['zh-cn']['utf-8'] = 'UTF-8'; diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php index 36a70f8d2d..13c9cef5ba 100644 --- a/module/doc/view/tablecontents.html.php +++ b/module/doc/view/tablecontents.html.php @@ -104,13 +104,16 @@ if(empty($type)) $type = 'product'; echo $html; ?> doc->manageBook, '', "class='btn btn-info btn-wide'"); - } - elseif(!empty($libs)) - { - common::printLink('tree', 'browse', "rootID=$libID&view=doc", $lang->doc->manageType, '', "class='btn btn-info btn-wide iframe'", '', true); + if($type == 'book') + { + common::printLink('doc', 'manageBook', "bookID=$libID", $lang->doc->manageBook, '', "class='btn btn-info btn-wide'"); + } + else + { + common::printLink('tree', 'browse', "rootID=$libID&view=doc", $lang->doc->manageType, '', "class='btn btn-info btn-wide iframe'", '', true); + } } ?> diff --git a/module/index/js/index.js b/module/index/js/index.js index 68d7a52f2e..edad5856cc 100644 --- a/module/index/js/index.js +++ b/module/index/js/index.js @@ -463,7 +463,7 @@ { var $item = $(this); var isDivider = $item.hasClass('divider'); - var height = isDivider ? 17 : 40; + var height = isDivider ? 17 : $item.outerHeight(); currentHeight += height; if(currentHeight > maxHeight) { diff --git a/module/my/model.php b/module/my/model.php index 352101ce2f..c491dfc7f4 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -114,7 +114,7 @@ class myModel extends model if(isset($stories[$product->id])) $product->stories = $stories[$product->id]; if(isset($executions[$product->id])) $product->executions = $executions[$product->id]; } - $data['chargeProducts'] = $products; + $data['chargeProducts'] = array_values($products); /* All projects. */ $projects = $this->loadModel('project')->getOverviewList('byStatus', 'all', 'order_asc'); @@ -126,7 +126,7 @@ class myModel extends model $projects[$key]->progress = ($workhour->totalConsumed + $workhour->totalLeft) ? floor($workhour->totalConsumed / ($workhour->totalConsumed + $workhour->totalLeft) * 1000) / 1000 * 100 : 0; } } - $data['projects'] = $projects; + $data['projects'] = array_values($projects); /* Todo list. */ if(common::hasPriv('todo', 'view')) $hasViewPriv['todo'] = true; diff --git a/module/project/view/browsebycard.html.php b/module/project/view/browsebycard.html.php index 2616caf375..84bdf0bf2e 100644 --- a/module/project/view/browsebycard.html.php +++ b/module/project/view/browsebycard.html.php @@ -146,13 +146,13 @@ teamMembers as $key => $member):?> 2) continue;?>
- +
teamCount > 3):?>
- teamMembers), '')) ? html::image(zget($usersAvatar, end($project->teamMembers))) : strtoupper($member[0]);?> + teamMembers)]) ? html::image(zget($usersAvatar, end($project->teamMembers))) : strtoupper($member[0]);?>