github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 01:47:22 +08:00
Code Issues Actions 1 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

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