open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use individual verification popover dialogs instead of one

Browse Source 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
pull/3869/head
Jan-Christoph Borchardt 8 years ago committed by Morris Jobke
parent 6a48548755
commit 59e8a19cc8
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
2 changed files with 29 additions and 17 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      settings/css/settings.css
  2. 32
      settings/templates/personal.php

14
settings/css/settings.css
Unescape View File

@ -142,21 +142,23 @@ input#openid, input#webdav { width:20em; }
/* verify accounts */ /* verify accounts */
#personal-settings-container .verify { #personal-settings-container .verify {
position: relative; position: relative;
padding: 10px; padding: 12px 6px;
float: right; float: right;
} }
#personal-settings-container .verify, #personal-settings-container .verify,
#personal-settings-container .verify-action { #personal-settings-container .verify-action {
cursor: pointer; cursor: pointer;
} }
#verification-dialog { .verification-dialog {
right: 0; display: none;
top: 0; right: -9px;
top: 40px;
width: 200px;
} }
#verification-dialog p { .verification-dialog p {
padding: 10px; padding: 10px;
} }
#verification-dialog .verificationCode { .verification-dialog .verificationCode {
font-family: monospace; font-family: monospace;
white-space: nowrap; white-space: nowrap;
display: block; display: block;

32
settings/templates/personal.php
Unescape View File

@ -8,17 +8,6 @@
/** @var \OCP\Defaults $theme */ /** @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"> <div id="app-navigation">
<ul class="with-icon"> <ul class="with-icon">
<?php foreach($_['forms'] as $form) { <?php foreach($_['forms'] as $form) {
@ -123,6 +112,13 @@
print_unescaped('src="' . image_path('core', 'actions/verify.svg') . '" title="' . \OC::$server->getL10N()->t('Verify') . '"'); 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> </div>
<input type="email" name="email" id="email" value="<?php p($_['email']); ?>" <input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?> <?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"'); 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> </div>
<input type="text" name="website" id="website" value="<?php p($_['website']); ?>" <input type="text" name="website" id="website" value="<?php p($_['website']); ?>"
placeholder="<?php p($l->t('Your 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"'); 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> </div>
<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>" <input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
placeholder="<?php p($l->t('Your Twitter handle')); ?>" placeholder="<?php p($l->t('Your Twitter handle')); ?>"

Write Preview
Loading…
Cancel
Save