Merge pull request #5667 from nextcloud/5649-stable12

[stable12] fix alignment of radio button and its label in encryption settings
This commit is contained in:
Morris Jobke 2017-07-11 11:31:41 +02:00 committed by GitHub
commit 8fdd9dbb04
2 changed files with 11 additions and 9 deletions

View File

@ -52,19 +52,21 @@ script('core', 'multiselect');
<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em> <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 /> <br />
<input <input
type='radio' type="radio"
id='userEnableRecoveryCheckbox' class="radio"
name='userEnableRecovery' id="userEnableRecoveryCheckbox"
value='1' name="userEnableRecovery"
value="1"
<?php echo ( $_["recoveryEnabledForUser"] ? 'checked="checked"' : '' ); ?> /> <?php echo ( $_["recoveryEnabledForUser"] ? 'checked="checked"' : '' ); ?> />
<label for="userEnableRecoveryCheckbox"><?php p( $l->t( "Enabled" ) ); ?></label> <label for="userEnableRecoveryCheckbox"><?php p( $l->t( "Enabled" ) ); ?></label>
<br /> <br />
<input <input
type='radio' type="radio"
id='userDisableRecoveryCheckbox' class="radio"
name='userEnableRecovery' id="userDisableRecoveryCheckbox"
value='0' name="userEnableRecovery"
value="0"
<?php echo ( $_["recoveryEnabledForUser"] === false ? 'checked="checked"' : '' ); ?> /> <?php echo ( $_["recoveryEnabledForUser"] === false ? 'checked="checked"' : '' ); ?> />
<label for="userDisableRecoveryCheckbox"><?php p( $l->t( "Disabled" ) ); ?></label> <label for="userDisableRecoveryCheckbox"><?php p( $l->t( "Disabled" ) ); ?></label>
</p> </p>

View File

@ -63,7 +63,7 @@
<h3><?php p($l->t('Select default encryption module:')) ?></h3> <h3><?php p($l->t('Select default encryption module:')) ?></h3>
<fieldset id='encryptionModules'> <fieldset id='encryptionModules'>
<?php foreach ($_['encryptionModules'] as $id => $module): ?> <?php foreach ($_['encryptionModules'] as $id => $module): ?>
<input type="radio" id="<?php p($id) ?>" <input type="radio" id="<?php p($id) ?>" class="radio"
name="default_encryption_module" name="default_encryption_module"
value="<?php p($id) ?>" value="<?php p($id) ?>"
<?php if ($module['default']) { <?php if ($module['default']) {