Merge pull request #913 from owncloud/fix_settings

cleaning up the settings

5 files changed, 16 insertions, 22 deletions

diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
index 66fec4cd536..0de12edcba5 100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@ -15,11 +15,11 @@
 
 		<input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>'
 			   title="<?php echo $l->t( '0 is unlimited' ); ?>"
-			   <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> />
-		<label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br />
+			   <?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /><br />
+		<em><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </em><br />
 
 		<input type="hidden" value="<?php echo $_['requesttoken']; ?>" name="requesttoken" />
 		<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings"
 			   value="<?php echo $l->t( 'Save' ); ?>"/>
 	</fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
index 75df784e397..268b1a80ccd 100644
--- a/apps/files_encryption/templates/settings.php
+++ b/apps/files_encryption/templates/settings.php
@@ -1,14 +1,14 @@
 <form id="calendar">
 	<fieldset class="personalblock">
-	<strong><?php echo $l->t('Encryption'); ?></strong>
-		<?php echo $l->t('Exclude the following file types from encryption'); ?>
+		<legend><strong><?php echo $l->t('Encryption');?></strong></legend>
+		<input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?>
+			   id='enable_encryption' ></input>
+		<label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label><br />
 		<select id='encryption_blacklist' title="<?php echo $l->t('None')?>" multiple="multiple">
 			<?php foreach ($_['blacklist'] as $type): ?>
 				<option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option>
 			<?php endforeach;?>
-		</select>
-		<input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?>
-			   id='enable_encryption' ></input>
-		<label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label>
+		</select><br />
+		<?php echo $l->t('Exclude the following file types from encryption'); ?>
 	</fieldset>
 </form>
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 50f4a16a5ab..dd537d779a6 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -127,19 +127,14 @@
 	</fieldset>
 </form>
 
+<?php if ( ! $_['isAdminPage']):  ?>
 <form id="files_external"
 	  method="post"
 	  enctype="multipart/form-data"
 	  action="<?php echo OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php'); ?>">
 <fieldset class="personalblock">
-<?php if ( ! $_['isAdminPage']):  ?>
+		<legend><strong><?php echo $l->t('SSL root certificates');?></strong></legend>
 		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
-			<thead>
-				<tr>
-					<th><?php echo $l->t('SSL root certificates'); ?></th>
-					<th>&nbsp;</th>
-				</tr>
-			</thead>
 			<tbody width="100%">
 			<?php foreach ($_['certs'] as $rootCert): ?>
 			<tr id="<?php echo $rootCert ?>">
@@ -156,6 +151,6 @@
 		</table>
 		<input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
 		<input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
-		<?php endif; ?>
 </fieldset>
 </form>
+<?php endif; ?>
diff --git a/apps/files_versions/templates/settings-personal.php b/apps/files_versions/templates/settings-personal.php
index 6d97cea46c3..2b313a07c88 100644
--- a/apps/files_versions/templates/settings-personal.php
+++ b/apps/files_versions/templates/settings-personal.php
@@ -3,12 +3,10 @@
 		<legend>
 			<strong><?php echo $l->t('Versions'); ?></strong>
 		</legend>
-		<p>
-            <?php echo $l->t('This will delete all existing backup versions of your files'); ?>
-        </p>
 		<button id="expireAllBtn">
             <?php echo $l->t('Expire all versions'); ?>
             <img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" />
-        </button>
+            </button>
+            <br /><em><?php echo $l->t('This will delete all existing backup versions of your files'); ?></em>
 	</fieldset>
 </form>
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
index e6ca5d97d3c..62ed45fd278 100755
--- a/apps/user_webdavauth/templates/settings.php
+++ b/apps/user_webdavauth/templates/settings.php
@@ -1,7 +1,8 @@
 <form id="webdavauth" action="#" method="post">
 	<fieldset class="personalblock">
 		<legend><strong>WebDAV Authentication</strong></legend>
-		<p><label for="webdav_url"><?php echo $l->t('WebDAV URL: http://');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label>
+		<p><label for="webdav_url"><?php echo $l->t('URL: http://');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label>
 		<input type="submit" value="Save" />
+		<br /><?php echo $l->t('ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct.'); ?>
 	</fieldset>
 </form>