1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
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
--- 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;
+
+ 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">
</iframe>
+<?php } else { ?>
+ <div class="section">
+ <h2>Local documentation is not installed</h2>
+ <p>Please use
+ <a href="<?php print_unescaped($_['url']); ?>" target="_blank" rel="noreferrer">
+ <?php p($l->t('online documentation')); ?> ↗
+ </a>
+ </p>
+ </div>
+<?php } ?>
</div>
|
