github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-03 02:50:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: semantic form on login modal

Browse Source 
cf. https://meta.discourse.org/t/improve-semantics-of-orphaned-form-elements-such-as-buttons/72936
This commit is contained in:
Régis Hanol 2017-10-27 19:14:25 +02:00
parent 9112d2da3b
commit f2219138e1
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
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"}}
{{#d-modal-body title="login.title" class="login-modal"}} <form id='login-form' method='post'>
{{login-buttons action="externalLogin"}} {{#d-modal-body title="login.title" class="login-modal"}}
{{#if canLoginLocal}} {{login-buttons action="externalLogin"}}
<form id='login-form' method='post'> {{#if canLoginLocal}}
<div> <div>
<table> <table>
<tr> <tr>
@ -32,32 +32,30 @@
</tr> </tr>
</table> </table>
</div> </div>
</form>
{{/if}}
{{authMessage}}
<div id='login-alert' class={{alertClass}}>{{alert}}</div>
{{/d-modal-body}}
<div class="modal-footer">
{{#if canLoginLocal}}
<button class="btn btn-large btn-primary"
disabled={{loginDisabled}}
{{action "login"}}>
{{d-icon "unlock"}} &nbsp;{{loginButtonText}}
</button>
{{#if showSignupLink}}
&nbsp;
<button class="btn btn-large" id="new-account-link" {{action "createAccount"}}>
{{i18n 'create_account.title'}}
</button>
{{/if}} {{/if}}
{{/if}} {{authMessage}}
<div id='login-alert' class={{alertClass}}>{{alert}}</div>
{{/d-modal-body}}
{{#if authenticate}} <div class="modal-footer">
&nbsp; {{i18n 'login.authenticating'}} {{#if canLoginLocal}}
{{/if}} <button class="btn btn-large btn-primary" type="submit" disabled={{loginDisabled}} {{action "login"}}>
{{d-icon "unlock"}} &nbsp;{{loginButtonText}}
</button>
{{conditional-loading-spinner condition=showSpinner size="small"}} {{#if showSignupLink}}
</div> &nbsp;
<button class="btn btn-large" id="new-account-link" {{action "createAccount"}}>
{{i18n 'create_account.title'}}
</button>
{{/if}}
{{/if}}
{{#if authenticate}}
&nbsp; {{i18n 'login.authenticating'}}
{{/if}}
{{conditional-loading-spinner condition=showSpinner size="small"}}
</div>
</form>
{{/login-modal}} {{/login-modal}}