Skip to content
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.

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

Move log out and backup codes link into 2fa box for better readability #2618

Merged
merged 2 commits into from
Apr 11, 2017

Conversation

ChristophWurst
Copy link
Member

Fixes #2538

Without backup codes

bildschirmfoto von 2016-12-12 10-13-17
bildschirmfoto von 2016-12-12 10-12-09

With backup codes

bildschirmfoto von 2016-12-12 10-17-27
bildschirmfoto von 2016-12-12 10-17-19

@ChristophWurst ChristophWurst added 3. to review Waiting for reviews design Design, UI, UX, etc. labels Dec 12, 2016
@ChristophWurst ChristophWurst added this to the Nextcloud 12.0 milestone Dec 12, 2016
@mention-bot
Copy link

@ChristophWurst, thanks for your PR! By analyzing the history of the files in this pull request, we identified @jancborchardt, @MorrisJobke and @icewind1991 to be potential reviewers.

@ChristophWurst ChristophWurst changed the title Move log out and back codes link into 2fa box for better readability Move log out and backup codes link into 2fa box for better readability Dec 12, 2016
@skjnldsv
Copy link
Member

Could we use buttons for the "cancel login" and "use backup code" ? :)

Otherwise: 👍

@jancborchardt
Copy link
Member

Also, the »Authenticate with a TOTP app« doesn’t look clickable really. We should use a button there, which should be as big as the input field (or button on the log in page).

Then smaller side-by-side buttons for the options below.

@ChristophWurst
Copy link
Member Author

Also, the »Authenticate with a TOTP app« doesn’t look clickable really. We should use a button there, which should be as big as the input field (or button on the log in page).

https://github.com/nextcloud/server/blob/master/core/templates/twofactorselectchallenge.php have fun :-)

Then smaller side-by-side buttons for the options below.

That's what we had before but depending on the language the text can be too long for one line. For example the German translation caused it to break, which looked odd. I'd prefer to have one below the other because that's easier to read IMO.

@ChristophWurst ChristophWurst added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Dec 13, 2016
@ChristophWurst
Copy link
Member Author

@jancborchardt could you please help me with the styling here? I don't know what it should look like :-)

@rullzer
Copy link
Member

rullzer commented Jan 10, 2017

Can we get this in and fix additional styling later or close this?

@skjnldsv
Copy link
Member

@rullzer please wait for my login-update-install css fix.
Then it will be easier :)

@skjnldsv
Copy link
Member

Okay, see #3004

@jancborchardt
Copy link
Member

#3004 is merged, so we can go ahead here? :)

@ChristophWurst just using class="button primary" for the primary button (»Auth with TOTP app«) and class="button" for the other two ones (»Cancel log in« and »Use backup code«) should work nicely. :)

@ChristophWurst
Copy link
Member Author

blocked by #3207

@codecov-io
Copy link

Codecov Report

Merging #2618 into master will increase coverage by -0.01%.

@@             Coverage Diff              @@
##             master    #2618      +/-   ##
============================================
- Coverage     53.99%   53.98%   -0.01%     
  Complexity    21007    21007              
============================================
  Files          1303     1303              
  Lines         80377    80383       +6     
  Branches       1253     1253              
============================================
+ Hits          43396    43397       +1     
- Misses        36981    36986       +5
Impacted Files Coverage Δ Complexity Δ
core/templates/twofactorselectchallenge.php 0% <ø> (ø) 0 <ø> (ø)
core/templates/twofactorshowchallenge.php 0% <ø> (ø) 0 <ø> (ø)
lib/private/Server.php 92.75% <ø> (+0.16%) 119% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fa96b9e...321a026. Read the comment docs.

@MorrisJobke
Copy link
Member

blocked by #3207

Merged -> unblocked 😝

@MorrisJobke
Copy link
Member

@ChristophWurst Any news here? I would love to see this merged ;)

@skjnldsv
Copy link
Member

While you're at it, could you set the default mobile keyboard to number only @ChristophWurst :)
http://mobileinputtypes.com/#tel

Fixes #2538

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst
Copy link
Member Author

@jancborchardt I've changed the links to buttons. Doesn't look good IMO. Could you please help me with the styling? Thanks
bildschirmfoto von 2017-03-06 11-00-46

@rullzer
Copy link
Member

rullzer commented Apr 3, 2017

@jancborchardt please have a look here. Else I'll just merge it and you have to fix master 😉

@ChristophWurst
Copy link
Member Author

@rullzer so… merge? 😉

@LukasReschke LukasReschke merged commit 5ca5ebe into master Apr 11, 2017
@LukasReschke LukasReschke deleted the 2fa-challenge-text branch April 11, 2017 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2. developing Work in progress design Design, UI, UX, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants