mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #485 from nextcloud/stable10-reenable-help-section 

[Stable10] reenable help section
This commit is contained in:
Morris Jobke 2016-07-21 09:18:50 +02:00 committed by GitHub
parent db5a709885 ed21916999
commit d8b9672ad8
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/legacy/app.php
View File

@ -421,9 +421,7 @@ class OC_App {
$settings = array();
// by default, settings only contain the help menu
/*
* FIXME: Add help sidebar back once documentation is properly branded.
if (OC_Util::getEditionString() === '' &&
if (OC_Util::getEditionString() === '' &&
\OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true) == true
) {
$settings = array(
@ -435,7 +433,7 @@ class OC_App {
"icon" => $urlGenerator->imagePath("settings", "help.svg")
)
);
}*/
}
// if the user is logged-in
if (OC_User::isLoggedIn()) {

8
settings/templates/help.php
View File

@ -16,19 +16,19 @@
<?php } ?>
<li>
<a href="https://owncloud.org/support" target="_blank" rel="noreferrer">
<a href="https://docs.nextcloud.org" target="_blank" rel="noreferrer">
<?php p($l->t('Online documentation')); ?> ↗
</a>
</li>
<li>
<a href="https://forum.owncloud.org" target="_blank" rel="noreferrer">
<a href="https://help.nextcloud.com" target="_blank" rel="noreferrer">
<?php p($l->t('Forum')); ?> ↗
</a>
</li>
<?php if($_['admin']) { ?>
<li>
<a href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md"
<a href="https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md"
target="_blank" rel="noreferrer">
<?php p($l->t('Issue tracker')); ?> ↗
</a>
@ -36,7 +36,7 @@
<?php } ?>
<li>
<a href="https://owncloud.com/subscriptions/" target="_blank" rel="noreferrer">
<a href="https://nextcloud.com/enterprise/" target="_blank" rel="noreferrer">
<?php p($l->t('Commercial support')); ?> ↗
</a>
</li>