Merge pull request #7915 from owncloud/replace-personalblock

Replace personalblock with .section

2 files changed, 113 insertions, 119 deletions

diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
index 231a68b6a58..cf676c445ce 100644
--- a/apps/files_encryption/templates/settings-admin.php
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -1,63 +1,60 @@
-<form id="encryption">
-	<fieldset class="personalblock">
+<form id="encryption" class="section">
+	<h2><?php p($l->t('Encryption')); ?></h2>
 
-		<h2><?php p($l->t('Encryption')); ?></h2>
+	<p>
+		<?php p($l->t("Enable recovery key (allow to recover users files in case of password loss):")); ?>
+		<br/>
+		<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'
+			name='adminEnableRecovery'
+			value='1'
+			<?php echo($_["recoveryEnabled"] === '1' ? 'checked="checked"' : 'disabled'); ?> />
+		<?php p($l->t("Enabled")); ?>
+		<br/>
 
-		<p>
-			<?php p($l->t("Enable recovery key (allow to recover users files in case of password loss):")); ?>
-			<br/>
-			<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'
-				name='adminEnableRecovery'
-				value='1'
-				<?php echo($_["recoveryEnabled"] === '1' ? 'checked="checked"' : 'disabled'); ?> />
-			<?php p($l->t("Enabled")); ?>
-			<br/>
+		<input
+			type='radio'
+			name='adminEnableRecovery'
+			value='0'
+			<?php echo($_["recoveryEnabled"] === '0' ? 'checked="checked"' : 'disabled'); ?> />
+		<?php p($l->t("Disabled")); ?>
+	</p>
+	<br/><br/>
 
-			<input
-				type='radio'
-				name='adminEnableRecovery'
-				value='0'
-				<?php echo($_["recoveryEnabled"] === '0' ? 'checked="checked"' : 'disabled'); ?> />
-			<?php p($l->t("Disabled")); ?>
-		</p>
+	<p name="changeRecoveryPasswordBlock" <?php if ($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
+		<strong><?php p($l->t("Change recovery key password:")); ?></strong>
 		<br/><br/>
-
-		<p name="changeRecoveryPasswordBlock" <?php if ($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
-			<strong><?php p($l->t("Change recovery key password:")); ?></strong>
-			<br/><br/>
-			<input
-				type="password"
-				name="changeRecoveryPassword"
-				id="oldEncryptionRecoveryPassword"
-			<label for="oldEncryptionRecoveryPassword"><?php p($l->t("Old Recovery key password")); ?></label>
-			<br/>
-			<br/>
-			<input
-				type="password"
-				name="changeRecoveryPassword"
-				id="newEncryptionRecoveryPassword"
-			<label for="newEncryptionRecoveryPassword"><?php p($l->t("New Recovery key password")); ?></label>
-			<br/>
-			<input
-				type="password"
-				name="changeRecoveryPassword"
-				id="repeatedNewEncryptionRecoveryPassword"
-			<label for="repeatEncryptionRecoveryPassword"><?php p($l->t("Repeat New Recovery key password")); ?></label>
-			<br/>
-			<button
-				type="button"
-				name="submitChangeRecoveryKey"
-				disabled><?php p($l->t("Change Password")); ?>
-			</button>
-			<span class="msg"></span>
-		</p>
-	</fieldset>
+		<input
+			type="password"
+			name="changeRecoveryPassword"
+			id="oldEncryptionRecoveryPassword"
+		<label for="oldEncryptionRecoveryPassword"><?php p($l->t("Old Recovery key password")); ?></label>
+		<br/>
+		<br/>
+		<input
+			type="password"
+			name="changeRecoveryPassword"
+			id="newEncryptionRecoveryPassword"
+		<label for="newEncryptionRecoveryPassword"><?php p($l->t("New Recovery key password")); ?></label>
+		<br/>
+		<input
+			type="password"
+			name="changeRecoveryPassword"
+			id="repeatedNewEncryptionRecoveryPassword"
+		<label for="repeatEncryptionRecoveryPassword"><?php p($l->t("Repeat New Recovery key password")); ?></label>
+		<br/>
+		<button
+			type="button"
+			name="submitChangeRecoveryKey"
+			disabled><?php p($l->t("Change Password")); ?>
+		</button>
+		<span class="msg"></span>
+	</p>
 </form>
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 1b4239d82cd..8139ece1950 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -1,66 +1,63 @@
-<form id="encryption">

-	<fieldset class="personalblock">

-		<h2><?php p( $l->t( 'Encryption' ) ); ?></h2>

+<form id="encryption" class="section">

+	<h2><?php p( $l->t( 'Encryption' ) ); ?></h2>

 

-		<?php if ( $_["initialized"] === '1' ): ?>

-			<p>

-				<a name="changePKPasswd" />

-				<label for="changePrivateKeyPasswd">

-					<?php p( $l->t( "Your private key password no longer match your log-in password:" ) ); ?>

-				</label>

-				<br />

-				<em><?php p( $l->t( "Set your old private key password to your current log-in password." ) ); ?>

-				<?php if (  $_["recoveryEnabledForUser"] ):

-						p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );

-				endif; ?>

-				</em>

-				<br />

-				<input

-					type="password"

-					name="changePrivateKeyPassword"

-					id="oldPrivateKeyPassword" />

-				<label for="oldPrivateKeyPassword"><?php p($l->t( "Old log-in password" )); ?></label>

-				<br />

-				<input

-					type="password"

-					name="changePrivateKeyPassword"

-					id="newPrivateKeyPassword" />

-				<label for="newRecoveryPassword"><?php p($l->t( "Current log-in password" )); ?></label>

-				<br />

-				<button

-					type="button"

-					name="submitChangePrivateKeyPassword"

-					disabled><?php p($l->t( "Update Private Key Password" )); ?>

-				</button>

-				<span class="msg"></span>

-			</p>

-		<?php endif; ?>

-

-		<?php if ( $_["recoveryEnabled"] && $_["privateKeySet"] ): ?>

+	<?php if ( $_["initialized"] === '1' ): ?>

+		<p>

+			<a name="changePKPasswd" />

+			<label for="changePrivateKeyPasswd">

+				<?php p( $l->t( "Your private key password no longer match your log-in password:" ) ); ?>

+			</label>

+			<br />

+			<em><?php p( $l->t( "Set your old private key password to your current log-in password." ) ); ?>

+			<?php if (  $_["recoveryEnabledForUser"] ):

+					p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );

+			endif; ?>

+			</em>

+			<br />

+			<input

+				type="password"

+				name="changePrivateKeyPassword"

+				id="oldPrivateKeyPassword" />

+			<label for="oldPrivateKeyPassword"><?php p($l->t( "Old log-in password" )); ?></label>

+			<br />

+			<input

+				type="password"

+				name="changePrivateKeyPassword"

+				id="newPrivateKeyPassword" />

+			<label for="newRecoveryPassword"><?php p($l->t( "Current log-in password" )); ?></label>

 			<br />

-			<p>

-				<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>

-				<br />

-				<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em>

-				<br />

-				<input

-				type='radio'

-				name='userEnableRecovery'

-				value='1'

-				<?php echo ( $_["recoveryEnabledForUser"] == 1 ? 'checked="checked"' : '' ); ?> />

-				<?php p( $l->t( "Enabled" ) ); ?>

-				<br />

+			<button

+				type="button"

+				name="submitChangePrivateKeyPassword"

+				disabled><?php p($l->t( "Update Private Key Password" )); ?>

+			</button>

+			<span class="msg"></span>

+		</p>

+	<?php endif; ?>

 

-				<input

-				type='radio'

-				name='userEnableRecovery'

-				value='0'

-				<?php echo ( $_["recoveryEnabledForUser"] == 0 ? 'checked="checked"' : '' ); ?> />

-				<?php p( $l->t( "Disabled" ) ); ?>

-				<div id="recoveryEnabledSuccess"><?php p( $l->t( 'File recovery settings updated' ) ); ?></div>

-				<div id="recoveryEnabledError"><?php p( $l->t( 'Could not update file recovery' ) ); ?></div>

-			</p>

-		<?php endif; ?>

+	<?php if ( $_["recoveryEnabled"] && $_["privateKeySet"] ): ?>

+		<br />

+		<p>

+			<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>

+			<br />

+			<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em>

+			<br />

+			<input

+			type='radio'

+			name='userEnableRecovery'

+			value='1'

+			<?php echo ( $_["recoveryEnabledForUser"] == 1 ? 'checked="checked"' : '' ); ?> />

+			<?php p( $l->t( "Enabled" ) ); ?>

+			<br />

 

-	</fieldset>

+			<input

+			type='radio'

+			name='userEnableRecovery'

+			value='0'

+			<?php echo ( $_["recoveryEnabledForUser"] == 0 ? 'checked="checked"' : '' ); ?> />

+			<?php p( $l->t( "Disabled" ) ); ?>

+			<div id="recoveryEnabledSuccess"><?php p( $l->t( 'File recovery settings updated' ) ); ?></div>

+			<div id="recoveryEnabledError"><?php p( $l->t( 'Could not update file recovery' ) ); ?></div>

+		</p>

+	<?php endif; ?>

 </form>