diff options
author | Julius Härtl <jus@bitgrid.net> | 2020-05-27 15:41:14 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-27 15:41:14 +0300 |
commit | 32bd3b9dd6ec62f4aada242d6c807c803b5a46f9 (patch) | |
tree | fd3a01e0e9acbb76bc25ad939d256d220c04c5ed /src | |
parent | cf7108481e06a95adef7bce4631f8d14538d1550 (diff) | |
parent | c6e94aed03bef9256b1f9abcd3cb2f0ed858f6f4 (diff) |
Merge pull request #990 from mrkara/master
Diffstat (limited to 'src')
-rw-r--r-- | src/components/AdminSettings.vue | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue index a7ba8ec7..1d23ae1b 100644 --- a/src/components/AdminSettings.vue +++ b/src/components/AdminSettings.vue @@ -27,7 +27,11 @@ <p>{{ t('richdocuments', 'Collabora Online is a powerful LibreOffice-based online office suite with collaborative editing, which supports all major documents, spreadsheet and presentation file formats and works together with all modern browsers.') }}</p> <div v-if="settings.wopi_url && settings.wopi_url !== ''"> - <div v-if="serverError == 2" id="security-warning-state-failure"> + <div v-if="serverError == 2 && isNginx && serverMode === 'builtin'" id="security-warning-state-failure"> + <span class="icon icon-close-white" /><span class="message">{{ t('richdocuments', 'Could not establish connection to the Collabora Online server. This might be due to a missing configuration of your web server. For more information, please visit: ') }}<a title="Connecting Collabora Online Single Click with Nginx" href="https://www.collaboraoffice.com/online/connecting-collabora-online-single-click-with-nginx/" target="_blank" + rel="noopener" class="external">{{ t('richdocuments', 'Connecting Collabora Online Single Click with Nginx') }}</a></span> + </div> + <div v-else-if="serverError == 2" id="security-warning-state-failure"> <span class="icon icon-close-white" /><span class="message">{{ t('richdocuments', 'Could not establish connection to the Collabora Online server.') }}</span> </div> <div v-else-if="serverError == 1" id="security-warning-state-failure"> @@ -264,6 +268,7 @@ export default { hostErrors: [window.location.host === 'localhost' || window.location.host === '127.0.0.1', window.location.protocol !== 'https:', false], demoServers: null, CODEInstalled: 'richdocumentscode' in OC.appswebroots, + isNginx: false, approvedDemoModal: false, updating: false, groups: [], @@ -332,6 +337,10 @@ export default { this.uiVisible.external_apps = !!(this.settings.external_apps && this.settings.external_apps !== '') this.demoServers = this.initial.demo_servers + + if (this.initial.web_server && this.initial.web_server.length > 0) { + this.isNginx = this.initial.web_server.indexOf('nginx') !== -1 + } this.checkIfDemoServerIsActive() }, methods: { |