IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "UX: semantic form on login modal"

Browse Source 
This reverts commit f2219138e1.
This commit is contained in:
Régis Hanol 2017-10-30 15:05:29 +01:00
parent b8e580b0e0
commit 6b344e8a20
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/templates/modal/login.hbs
View File

@ -1,8 +1,8 @@
{{#login-modal screenX=lastX screenY=lastY loginName=loginName loginPassword=loginPassword action="login"}} {{#login-modal screenX=lastX screenY=lastY loginName=loginName loginPassword=loginPassword action="login"}}
<form id='login-form' method='post'>
{{#d-modal-body title="login.title" class="login-modal"}} {{#d-modal-body title="login.title" class="login-modal"}}
{{login-buttons action="externalLogin"}} {{login-buttons action="externalLogin"}}
{{#if canLoginLocal}} {{#if canLoginLocal}}
<form id='login-form' method='post'>
<div> <div>
<table> <table>
<tr> <tr>
@ -32,6 +32,7 @@
</tr> </tr>
</table> </table>
</div> </div>
</form>
{{/if}} {{/if}}
{{authMessage}} {{authMessage}}
<div id='login-alert' class={{alertClass}}>{{alert}}</div> <div id='login-alert' class={{alertClass}}>{{alert}}</div>
@ -39,7 +40,9 @@
<div class="modal-footer"> <div class="modal-footer">
{{#if canLoginLocal}} {{#if canLoginLocal}}
<button class="btn btn-large btn-primary" type="submit" disabled={{loginDisabled}} {{action "login"}}> <button class="btn btn-large btn-primary"
disabled={{loginDisabled}}
{{action "login"}}>
{{d-icon "unlock"}} &nbsp;{{loginButtonText}} {{d-icon "unlock"}} &nbsp;{{loginButtonText}}
</button> </button>
@ -57,5 +60,4 @@
{{conditional-loading-spinner condition=showSpinner size="small"}} {{conditional-loading-spinner condition=showSpinner size="small"}}
</div> </div>
</form>
{{/login-modal}} {{/login-modal}}