Use paragraphs and style select input

Signed-off-by: Julius Härtl <jus@bitgrid.net>

1 files changed, 38 insertions, 38 deletions

diff --git a/templates/admin.php b/templates/admin.php
index 88dd8820..16673d7a 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -9,46 +9,45 @@ script('files', 'jquery.fileupload');
 	<h2>
 		<?php p($l->t('Collabora Online')) ?>
 	</h2>
-	<br/>
-	<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 a seperate server acting as a WOPI-Client to provide 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>
+	<p>
+		<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>
+	</p>
+	<p>
+		<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'])?>"><button type="button" id="wopi_apply"><?php p($l->t('Apply')) ?></button>
+		<span id="documents-admin-msg" class="msg"></span>
+		<br />
+		<em><?php p($l->t('Collabora Online requires a seperate server acting as a WOPI-Client to provide editing capabilities.')) ?></em>
+	</p>
+	<p>
+		<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><br />
 		<em><?php p($l->t('Enable if your Collabora Online server uses a self signed certificate')) ?></em>
-	</div>
-	<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/>
+	</p>
+	<p>
+		<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><br />
+		<input type="hidden" id="use_group_select" value="<?php p($_['use_groups'])?>" title="<?php p($l->t('All')); ?>">
+	</p>
+	<p>
+		<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><br />
+		<input type="hidden" id="edit_group_select" value="<?php p($_['edit_groups'])?>" title="<?php p($l->t('All')); ?>">
+	</p>
+
 	<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 Office Open XML (OOXML) instead of OpenDocument Format (ODF) by default for new files')) ?></label>
-	<br/>
-	<br/>
+	<p>
+		<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 Office Open XML (OOXML) instead of OpenDocument Format (ODF) by default for new files')) ?></label>
+	</p>
+	<p>
 	<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>
 	<div id="enable-external-apps-section" class="indent <?php if ($_['external_apps'] == '') p('hidden') ?>" >
@@ -60,8 +59,8 @@ script('files', 'jquery.fileupload');
 		<button type="button" id="external-apps-add-button"><?php p($l->t('Add')) ?></button>
 		<span id="enable-external-apps-section-msg" class="msg"></span>
 	</div>
-	<br/>
-	<br/>
+	</p>
+	<p>
 	<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') ?>" >
@@ -69,6 +68,7 @@ script('files', 'jquery.fileupload');
 		<br/>
 		<p class="rd-settings-documentation"><em><?php p($l->t('Canonical webroot, in case there are multiple, for Collabora to use. Provide the one with least restrictions. Eg: Use non-shibbolized webroot if this instance is accessed by both shibbolized and non-shibbolized webroots. You can ignore this setting if only one webroot is used to access this instance.')) ?></em></p>
 	</div>
+	</p>
 </div>
 <?php if ($_['templatesAvailable'] === true) { ?>
 <form class="section" id="richdocuments-templates" method="post" action="/template/">