Skip to content

Polish login flow v2 #17683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 3 commits into from
Oct 31, 2019
Merged

Polish login flow v2 #17683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2108e8b
Add icon-confirm-white to submit button
kesselb Oct 25, 2019
1d82bb5
Move "you can close this window" to newline
kesselb Oct 25, 2019
71c7442
The loading animation is back
kesselb Oct 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions core/js/login/grant.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
jQuery(document).ready(function() {
$('#submit').click(function (e) {
$('#submit + .submit-icon')
.removeClass('icon-confirm-white')
.addClass(OCA.Theming && OCA.Theming.inverted
? 'icon-loading-small'
: 'icon-loading-small-dark');
document.querySelector('form').addEventListener('submit', function(e) {
const wrapper = document.getElementById('submit-wrapper')
if (wrapper === null) {
return
}
wrapper.getElementsByClassName('icon-confirm-white').forEach(function(el) {
el.classList.remove('icon-confirm-white')
el.classList.add(OCA.Theming && OCA.Theming.inverted ? 'icon-loading-small' : 'icon-loading-small-dark')
})
})
})
3 changes: 1 addition & 2 deletions core/templates/loginflow/grant.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
<input type="hidden" name="stateToken" value="<?php p($_['stateToken']) ?>" />
<input type="hidden" name="oauthState" value="<?php p($_['oauthState']) ?>" />
<div id="submit-wrapper">
<input type="submit" id="submit" class="login primary" title="" value="<?php p($l->t('Grant access')); ?>" />
<div class="submit-icon icon-confirm-white"></div>
<input type="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Grant access')); ?>" />
</div>
</form>
</p>
Expand Down
3 changes: 2 additions & 1 deletion core/templates/loginflowv2/done.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
<div class="picker-window">
<h2><?php p($l->t('Account connected')) ?></h2>
<p class="info">
<?php print_unescaped($l->t('Your client should now be connected! You can close this window.')) ?>
<?php p($l->t('Your client should now be connected!')) ?><br/>
<?php p($l->t('You can close this window.')) ?>
</p>

<br/>
Expand Down
4 changes: 2 additions & 2 deletions core/templates/loginflowv2/grant.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*
*/

script('core', 'login/grant');
style('core', 'login/authpicker');

/** @var array $_ */
Expand All @@ -42,8 +43,7 @@
<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
<input type="hidden" name="stateToken" value="<?php p($_['stateToken']) ?>" />
<div id="submit-wrapper">
<input type="submit" id="submit" class="login primary" title="" value="<?php p($l->t('Grant access')); ?>" />
<div class="submit-icon icon-confirm-white"></div>
Copy link
Contributor Author

@kesselb kesselb Oct 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. https://github.com/nextcloud/server/search?q=submit-icon&unscoped_q=submit-icon .submit-icon is used by grant.js but this script is only loaded for loginflow v1.

<input type="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Grant access')); ?>" />
</div>
</form>
</p>
Expand Down