New administrator settings layout

Signed-off-by: Marius Blüm <marius@lineone.io>

2 files changed, 22 insertions, 10 deletions

diff --git a/templates/admin.php b/templates/admin.php
index 701f7835..b8dad2ba 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -8,35 +8,47 @@ script('files', 'jquery.fileupload');
 <div class="section" id="richdocuments">
 	<h2>
 		<?php p($l->t('Collabora Online')) ?>
-		<a target="_blank" rel="noreferrer" class="icon-info"
-			title="<?php p($l->t('Open documentation'));?>"
-			href="https://nextcloud.github.io/richdocuments/app_settings"></a>
 	</h2>
-
 	<br/>
-	<label for="wopi_url"><?php p($l->t('Collabora Online server')) ?></label>
-	<input type="text" name="wopi_url" id="wopi_url" value="<?php p($_['wopi_url'])?>" style="width: 300px; display: block;">
-	<em><?php p($l->t('URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client.')) ?></em>
+	<em><?php p($l->t('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.')) ?></em>
+	<br/>
+	<br/>
+	<label for="wopi_url"><?php p($l->t('URL (and Port) of Collabora Online-server')) ?></label>
+	<br/>
+	<input type="text" name="wopi_url" id="wopi_url" placeholder="https://office.example.org:9980" value="<?php p($_['wopi_url'])?>" style="width: 300px; display: ;"> <button type="button" id="wopi_apply"><?php p($l->t('Apply')) ?></button>
+	<br/>
+	<em><?php p($l->t('Collabora Online requires an seperate server acting as WOPI-Client and provides editing capabilities.')) ?></em>
+
 	<br/>
 	<input type="checkbox" class="checkbox" id="disable_certificate_verification" <?php p($_['disable_certificate_verification'] === 'yes' ? 'checked' : '') ?> />
 	<label for="disable_certificate_verification"><?php p($l->t('Disable certificate verification (insecure)')) ?></label>
 	<div>
 		<em><?php p($l->t('Enable if your Collabora Online server uses a self signed certificate')) ?></em>
 	</div>
-	<button type="button" id="wopi_apply"><?php p($l->t('Apply')) ?></button>
 	<span id="documents-admin-msg" class="msg"></span>
 	<br/>
 	<br/>
 	<input type="checkbox" class="use-groups-enable checkbox" id="use_groups_enable-richdocuments" />
 	<label for="use_groups_enable-richdocuments"><?php p($l->t('Restrict usage to specific groups')) ?></label>
+	<br/>
+	<em><?php p($l->t('Collabora Online is enabled for all users by default. When this setting is active, only members of the specified groups can use it.')) ?></em>
 	<input type="hidden" id="use_group_select" value="<?php p($_['use_groups'])?>" title="<?php p($l->t('All')); ?>" style="width: 200px; display: block;">
 	<br/>
+	<br/>
 	<input type="checkbox" class="edit-groups-enable checkbox" id="edit_groups_enable-richdocuments" />
 	<label for="edit_groups_enable-richdocuments"><?php p($l->t('Restrict edit to specific groups')) ?></label>
+	<br/>
+	<em><?php p($l->t('All users can edit documents with Collabora Online by default. When this setting is active, only the members of the specified groups can edit and the others can only view documents.')) ?></em>
 	<input type="hidden" id="edit_group_select" value="<?php p($_['edit_groups'])?>" title="<?php p($l->t('All')); ?>" style="width: 200px; display: block;">
 	<br/>
+	<br/>
+	<h3>
+		<?php p($l->t('Advanced Settings')) ?>
+	</h3>
+	<br/>
 	<input type="checkbox" class="doc-format-ooxml checkbox" id="doc_format_ooxml_enable-richdocuments" <?php p($_['doc_format'] === 'ooxml' ? 'checked' : '') ?> />
-	<label for="doc_format_ooxml_enable-richdocuments"><?php p($l->t('Use OOXML by default for new files')) ?></label>
+	<label for="doc_format_ooxml_enable-richdocuments"><?php p($l->t('Use Office Open XML (OOXML) instead of OpenDocument Format (ODF) by default for new files')) ?></label>
+	<br/>
 	<br/>
 	<input type="checkbox" class="checkbox" id="enable_external_apps_cb-richdocuments" <?php p($_['external_apps'] != '' ? 'checked' : '') ?> />
 	<label for="enable_external_apps_cb-richdocuments"><?php p($l->t('Enable access for external apps')) ?></label>
@@ -50,6 +62,7 @@ script('files', 'jquery.fileupload');
 		<span id="enable-external-apps-section-msg" class="msg"></span>
 	</div>
 	<br/>
+	<br/>
 	<input type="checkbox" class="checkbox" id="enable_canonical_webroot_cb-richdocuments" <?php p($_['canonical_webroot'] != '' ? 'checked' : '') ?> />
 	<label for="enable_canonical_webroot_cb-richdocuments"><?php p($l->t('Use Canonical webroot')) ?></label>
 	<div id="enable-canonical-webroot-section" class="indent <?php if ($_['canonical_webroot'] == '') p('hidden') ?>" >
diff --git a/templates/documents.php b/templates/documents.php
index 465bbd7a..e063954e 100644
--- a/templates/documents.php
+++ b/templates/documents.php
@@ -13,7 +13,6 @@
 <?php
 style( 'richdocuments', 'style' );
 script('richdocuments', 'documents');
-script('richdocuments', 'templates');
 ?>
 <div id="documents-content">
 	<ul class="documentslist">