diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-07-21 09:19:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 09:19:11 +0200 |
| commit | ca6c2c785513f4d748a91b0ffc4a29b0ceed30d8 (patch) | |
| tree | 8e78248807de134eae88607eab22176574675916 | |
| parent | 167caa1295246f0de0c4dc8ca8a58454f1c48d2e (diff) | |
| parent | 14b1edeb5d1ed85dce5989163fbd06355f6bd6d8 (diff) | |
| download | nextcloud-server-ca6c2c785513f4d748a91b0ffc4a29b0ceed30d8.tar.gz nextcloud-server-ca6c2c785513f4d748a91b0ffc4a29b0ceed30d8.zip | |
Merge pull request #484 from nextcloud/reenable-help-section
[master] Reenable help section
| -rw-r--r-- | lib/private/legacy/app.php | 6 | ||||
| -rw-r--r-- | settings/templates/help.php | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 37ceea35ac0..9753e2efd50 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -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()) { diff --git a/settings/templates/help.php b/settings/templates/help.php index 79584aba84d..11726d60387 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -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> |