upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-25 18:52:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #65 from nextcloud/add-nextcloud-docs

Browse source 
Add nextcloud docs
This commit is contained in:
Lukas Reschke 2016-06-12 19:48:30 +02:00 committed by GitHub
commit fe5a50a21f
5 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/doc/admin/index.html
View file

@ -1,2 +1,2 @@
Here goes the admin documentation.
In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
In the meantime go to <a href="https://docs.nextcloud.org/server/9/admin_manual/" target="_blank">docs.nextcloud.org</a>

4
core/doc/user/index.html
View file

@ -1,2 +1,2 @@
Here goes the user documentation
In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
Here goes the user documentation.
In the meantime go to <a href="https://docs.nextcloud.org/server/9/user_manual/" target="_blank">docs.nextcloud.org</a>

6
lib/private/app.php
View file

@ -381,9 +381,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(
@ -395,7 +393,7 @@ class OC_App {
"icon" => $urlGenerator->imagePath("settings", "help.svg")
)
);
}*/
}
// if the user is logged-in
if (OC_User::isLoggedIn()) {

4
lib/private/defaults.php
View file

@ -59,8 +59,8 @@ class OC_Defaults {
$this->defaultiOSClientUrl = 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8';
$this->defaultiTunesAppId = '543672169';
$this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.owncloud.android';
$this->defaultDocBaseUrl = 'https://doc.owncloud.org';
$this->defaultDocVersion = $version[0] . '.' . $version[1]; // used to generate doc links
$this->defaultDocBaseUrl = 'https://docs.nextcloud.org';
$this->defaultDocVersion = $version[0]; // used to generate doc links
$this->defaultSlogan = $this->l->t('a safe home for all your data');
$this->defaultLogoClaim = '';
$this->defaultMailHeaderColor = '#0082c9'; /* header color of mail notifications */

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>