diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-04-26 14:14:04 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-04-28 23:41:37 -0300 |
| commit | 59e8a19cc8e883a3b7315ccbb3406660b8839438 (patch) | |
| tree | ab220591a15853e877e426bd69a4b22cfa8abd60 /settings | |
| parent | 6a48548755e311677ff6e1964cc18e02823af47f (diff) | |
| download | nextcloud-server-59e8a19cc8e883a3b7315ccbb3406660b8839438.tar.gz nextcloud-server-59e8a19cc8e883a3b7315ccbb3406660b8839438.zip | |
Use individual verification popover dialogs instead of one
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 14 | ||||
| -rw-r--r-- | settings/templates/personal.php | 32 |
2 files changed, 29 insertions, 17 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 058126dd73c..d7fad7e946f 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -142,21 +142,23 @@ input#openid, input#webdav { width:20em; } /* verify accounts */ #personal-settings-container .verify { position: relative; - padding: 10px; + padding: 12px 6px; float: right; } #personal-settings-container .verify, #personal-settings-container .verify-action { cursor: pointer; } -#verification-dialog { - right: 0; - top: 0; +.verification-dialog { + display: none; + right: -9px; + top: 40px; + width: 200px; } -#verification-dialog p { +.verification-dialog p { padding: 10px; } -#verification-dialog .verificationCode { +.verification-dialog .verificationCode { font-family: monospace; white-space: nowrap; display: block; diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 46916478ea4..86979acdd2f 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -8,17 +8,6 @@ /** @var \OCP\Defaults $theme */ ?> -<div id="verification-dialog" class="popovermenu bubble menu hidden"> - - <!-- dialog used to verify personal information such as the users website, email address, etc --> - <div class="verification-dialog-content"> - <p class="explainVerification"></p> - <p class="verificationCode"></p> - <p><?php p(\OC::$server->getL10N('settings')->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> - </div> - -</div> - <div id="app-navigation"> <ul class="with-icon"> <?php foreach($_['forms'] as $form) { @@ -123,6 +112,13 @@ print_unescaped('src="' . image_path('core', 'actions/verify.svg') . '" title="' . \OC::$server->getL10N()->t('Verify') . '"'); } ?>> + <div class="verification-dialog popovermenu bubble menu"> + <div class="verification-dialog-content"> + <p class="explainVerification"></p> + <p class="verificationCode"></p> + <p><?php p(\OC::$server->getL10N('settings')->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> + </div> + </div> </div> <input type="email" name="email" id="email" value="<?php p($_['email']); ?>" <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?> @@ -189,6 +185,13 @@ print_unescaped('src="' . image_path('core', 'actions/verify.svg') . '" title="' . \OC::$server->getL10N()->t('Verify') . '" class="verify-action"'); } ?>> + <div class="verification-dialog popovermenu bubble menu"> + <div class="verification-dialog-content"> + <p class="explainVerification"></p> + <p class="verificationCode"></p> + <p><?php p(\OC::$server->getL10N('settings')->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> + </div> + </div> </div> <input type="text" name="website" id="website" value="<?php p($_['website']); ?>" placeholder="<?php p($l->t('Your website')); ?>" @@ -216,6 +219,13 @@ print_unescaped('src="' . image_path('core', 'actions/verify.svg') . '" title="' . \OC::$server->getL10N()->t('Verify') . '" class="verify-action"'); } ?>> + <div class="verification-dialog popovermenu bubble menu"> + <div class="verification-dialog-content"> + <p class="explainVerification"></p> + <p class="verificationCode"></p> + <p><?php p(\OC::$server->getL10N('settings')->t('It can take up to 24 hours before the account is displayed as verified.'));?></p> + </div> + </div> </div> <input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>" placeholder="<?php p($l->t('Your Twitter handle')); ?>" |