improved admin settings

1 files changed, 26 insertions, 36 deletions

diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index 59bc4a8ce3d..fe7b0de1837 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -3,13 +3,14 @@
 /** @var OC_L10N $l */
 script('encryption', 'settings-admin');
 script('core', 'multiselect');
+style('encryption', 'settings-admin');
 ?>
 <form id="ocDefaultEncryptionModule" class="sub-section">
 	<?php if(!$_["initStatus"]): ?>
 		<?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>
 	<?php else: ?>
 	<p id="encryptionSetRecoveryKey">
-		<?php p($l->t('Enable recovery key: ')); ?>
+		<?php $_["recoveryEnabled"] === '0' ?  p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
 		<span class="msg"></span>
 		<br/>
 		<em>
@@ -17,54 +18,43 @@ script('core', 'multiselect');
 		to encrypt files. It allows recovery of a user's files if the user forgets their password.")) ?>
 		</em>
 		<br/>
-		<input type="password" name="encryptionRecoveryPassword" id="encryptionRecoveryPassword"/>
-		<label for="recoveryPassword"><?php p($l->t("Recovery key password")); ?></label>
-		<br/>
-		<input type="password" name="encryptionRecoveryPassword" id="repeatEncryptionRecoveryPassword"/>
-		<label for="repeatEncryptionRecoveryPassword"><?php p($l->t("Repeat Recovery key password")); ?></label>
-		<br/>
-		<input
-			type='radio'
-			id='adminEnableRecovery'
-			name='adminEnableRecovery'
-			value='1'
-			<?php echo($_["recoveryEnabled"] === '1' ? 'checked="checked"' : ''); ?> />
-		<label for="adminEnableRecovery"><?php p($l->t("Enable recovery key")); ?></label>
-		<br/>
-
-		<input
-			type='radio'
-			id='adminDisableRecovery'
-			name='adminEnableRecovery'
-			value='0'
-			<?php echo($_["recoveryEnabled"] === '0' ? 'checked="checked"' : ''); ?> />
-		<label for="adminDisableRecovery"><?php p($l->t("Disable recovery key")); ?></label>
+		<input type="password"
+			   name="encryptionRecoveryPassword"
+			   id="encryptionRecoveryPassword"
+			   placeholder="<?php p($l->t("Recovery key password")); ?>"/>
+		<input type="password"
+			   name="encryptionRecoveryPassword"
+			   id="repeatEncryptionRecoveryPassword"
+			   placeholder="<?php p($l->t("Repeat recovery key password")); ?>"/>
+		<input type="button"
+			   name="enableRecoveryKey"
+			   id="enableRecoveryKey"
+			   status="<?php p($_["recoveryEnabled"]) ?>"
+			   value="<?php $_["recoveryEnabled"] === '0' ?  p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/>
 	</p>
 	<br/><br/>
 
-	<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if ($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
-		<strong><?php p($l->t("Change recovery key password:")); ?></strong>
+	<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
+		<?php p($l->t("Change recovery key password:")); ?>
 		<span class="msg"></span>
-		<br/><br/>
+		<br/>
 		<input
 			type="password"
 			name="changeRecoveryPassword"
-			id="oldEncryptionRecoveryPassword" />
-		<label for="oldEncryptionRecoveryPassword"><?php p($l->t("Old Recovery key password")); ?></label>
-		<br/>
-		<br/>
+			id="oldEncryptionRecoveryPassword"
+			placeholder="<?php p($l->t("Old recovery key password")); ?>"/>
+		<br />
 		<input
 			type="password"
 			name="changeRecoveryPassword"
-			id="newEncryptionRecoveryPassword" />
-		<label for="newEncryptionRecoveryPassword"><?php p($l->t("New Recovery key password")); ?></label>
-		<br/>
+			id="newEncryptionRecoveryPassword"
+			placeholder="<?php p($l->t("New recovery key password")); ?>"/>
 		<input
 			type="password"
 			name="changeRecoveryPassword"
-			id="repeatedNewEncryptionRecoveryPassword" />
-		<label for="repeatEncryptionRecoveryPassword"><?php p($l->t("Repeat New Recovery key password")); ?></label>
-		<br/>
+			id="repeatedNewEncryptionRecoveryPassword"
+			placeholder="<?php p($l->t("Repeat new recovery key password")); ?>"/>
+
 		<button
 			type="button"
 			name="submitChangeRecoveryKey">