mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17683 from nextcloud/enh/login-flow-v2-polish 

Polish login flow v2
This commit is contained in:
Roeland Jago Douma 2019-10-31 19:30:28 +01:00 committed by GitHub
parent fd475d4212 71c7442790
commit 4326b03b13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/js/login/grant.js
View File

@ -1,9 +1,10 @@
jQuery(document).ready(function() { document.querySelector('form').addEventListener('submit', function(e) {
$('#submit').click(function (e) { const wrapper = document.getElementById('submit-wrapper')
$('#submit + .submit-icon') if (wrapper === null) {
.removeClass('icon-confirm-white') return
.addClass(OCA.Theming && OCA.Theming.inverted }
? 'icon-loading-small' wrapper.getElementsByClassName('icon-confirm-white').forEach(function(el) {
: 'icon-loading-small-dark'); el.classList.remove('icon-confirm-white')
el.classList.add(OCA.Theming && OCA.Theming.inverted ? 'icon-loading-small' : 'icon-loading-small-dark')
}) })
}) })

3
core/templates/loginflow/grant.php
View File

@ -45,8 +45,7 @@ $urlGenerator = $_['urlGenerator'];
<input type="hidden" name="stateToken" value="<?php p($_['stateToken']) ?>" /> <input type="hidden" name="stateToken" value="<?php p($_['stateToken']) ?>" />
<input type="hidden" name="oauthState" value="<?php p($_['oauthState']) ?>" /> <input type="hidden" name="oauthState" value="<?php p($_['oauthState']) ?>" />
<div id="submit-wrapper"> <div id="submit-wrapper">
<input type="submit" id="submit" class="login primary" title="" value="<?php p($l->t('Grant access')); ?>" /> <input type="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Grant access')); ?>" />
<div class="submit-icon icon-confirm-white"></div>
</div> </div>
</form> </form>
</p> </p>

3
core/templates/loginflowv2/done.php
View File

@ -30,7 +30,8 @@ style('core', 'login/authpicker');
<div class="picker-window"> <div class="picker-window">
<h2><?php p($l->t('Account connected')) ?></h2> <h2><?php p($l->t('Account connected')) ?></h2>
<p class="info"> <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> </p>
<br/> <br/>

4
core/templates/loginflowv2/grant.php
View File

@ -19,6 +19,7 @@
* *
*/ */
script('core', 'login/grant');
style('core', 'login/authpicker'); style('core', 'login/authpicker');
/** @var array $_ */ /** @var array $_ */
@ -42,8 +43,7 @@ $urlGenerator = $_['urlGenerator'];
<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" /> <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
<input type="hidden" name="stateToken" value="<?php p($_['stateToken']) ?>" /> <input type="hidden" name="stateToken" value="<?php p($_['stateToken']) ?>" />
<div id="submit-wrapper"> <div id="submit-wrapper">
<input type="submit" id="submit" class="login primary" title="" value="<?php p($l->t('Grant access')); ?>" /> <input type="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Grant access')); ?>" />
<div class="submit-icon icon-confirm-white"></div>
</div> </div>
</form> </form>
</p> </p>