diff options
Diffstat (limited to 'user/nextcloud/use-external-docs-if-local-not-avail.patch')
| -rw-r--r-- | user/nextcloud/use-external-docs-if-local-not-avail.patch | 79 |
1 files changed, 35 insertions, 44 deletions
diff --git a/user/nextcloud/use-external-docs-if-local-not-avail.patch b/user/nextcloud/use-external-docs-if-local-not-avail.patch index 19145b5ce..a9c779fef 100644 --- a/user/nextcloud/use-external-docs-if-local-not-avail.patch +++ b/user/nextcloud/use-external-docs-if-local-not-avail.patch @@ -1,53 +1,44 @@ +Forward port of the following to NC 18: + From: Jakub Jirutka <jakub@jirutka.cz> Date: Tue, 27 Jun 2017 02:07:00 +0200 Subject: [PATCH] Show link to external docs if local is not installed ---- a/settings/help.php -+++ b/settings/help.php -@@ -34,22 +34,36 @@ - OC_Util::addStyle( "settings", "settings" ); - \OC::$server->getNavigationManager()->setActiveEntry('help'); - -+$localDocs = true; - - if(isset($_GET['mode']) and $_GET['mode'] === 'admin') { -- $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' ); -+ if (file_exists(\OC::$SERVERROOT . '/core/doc/admin/index.html')) { -+ $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' ); -+ } else { -+ $url=\OC::$server->query(\OCP\Defaults::class)->buildDocLinkToKey('admin-manual'); -+ $localDocs=false; -+ } - $style1=''; - $style2=' active'; - }else{ - $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' ); -+ if (file_exists( \OC::$SERVERROOT . '/core/doc/user/index.html' )) { -+ $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' ); -+ } else { -+ $url=\OC::$server->query(\OCP\Defaults::class)->buildDocLinkToKey('user-manual'); -+ $localDocs=false; -+ } - $style1=' active'; - $style2=''; - } - +--- nextcloud/apps/settings/lib/Controller/HelpController.php 2020-03-11 09:52:40.000000000 -0500 ++++ nextcloud/apps/settings/lib/Controller/HelpController.php 2020-03-30 21:25:34.840255846 -0500 +@@ -75,9 +75,16 @@ class HelpController extends Controller + $mode = 'user'; + } + +- $documentationUrl = $this->urlGenerator->getAbsoluteURL( +- $this->urlGenerator->linkTo('core', 'doc/' . $mode . '/index.html') +- ); ++ $localDocs = true; + - $url1=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user'; - $url2=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin'; - - $tmpl = new OC_Template( "settings", "help", "user" ); - $tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser())); -+$tmpl->assign( "localDocs", $localDocs ); - $tmpl->assign( "url", $url ); - $tmpl->assign( "url1", $url1 ); - $tmpl->assign( "url2", $url2 ); - ---- a/settings/templates/help.php -+++ b/settings/templates/help.php -@@ -42,6 +42,17 @@ ++ if (file_exists(\OC::$SERVERROOT . '/core/doc/'. $mode . '/index.html')) { ++ $documentationUrl = $this->urlGenerator->getAbsoluteURL( ++ $this->urlGenerator->linkTo('core', 'doc/' . $mode . '/index.html') ++ ); ++ } else { ++ $localDocs = false; ++ $documentationUrl=\OC::$server->query(\OCP\Defaults::class)->buildDocLinkToKey($mode . "-manual"); ++ } + + $urlUserDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'user']); + $urlAdminDocs = $this->urlGenerator->linkToRoute('settings.Help.help', ['mode' => 'admin']); +@@ -88,6 +95,7 @@ class HelpController extends Controller + 'urlUserDocs' => $urlUserDocs, + 'urlAdminDocs' => $urlAdminDocs, + 'mode' => $mode, ++ 'localDocs' => $localDocs, + ]); + $policy = new ContentSecurityPolicy(); + $policy->addAllowedFrameDomain('\'self\''); +--- nextcloud/apps/settings/templates/help.php 2020-03-11 09:52:40.000000000 -0500 ++++ nextcloud/apps/settings/templates/help.php 2020-03-30 21:23:06.980254262 -0500 +@@ -31,6 +31,17 @@ </div> - + <div id="app-content" class="help-includes"> +<?php if ($_['localDocs']) { ?> <iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe"> |