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

FIX: Move tips into instructions div

Browse Source
This commit is contained in:
Joe 2018-05-25 20:11:22 +08:00 committed by GitHub
parent a8901efafe
commit 9e546e9ddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/assets/javascripts/discourse/templates/modal/create-account.hbs
View File

@ -1,13 +1,9 @@
{{#create-account email=accountEmail disabled=submitDisabled action="createAccount"}} {{#create-account email=accountEmail disabled=submitDisabled action="createAccount"}}
{{#unless complete}} {{#unless complete}}
{{#d-modal-body title="create_account.title"}} {{#d-modal-body title="create_account.title"}}
{{#unless hasAuthOptions}}
{{login-buttons externalLogin="externalLogin"}}
{{/unless}}
{{#if showCreateForm}} {{#if showCreateForm}}
<div> <div class="login-form">
<form> <form>
<table> <table>
@ -15,11 +11,12 @@
<td class="label"><label for='new-account-email'>{{i18n 'user.email.title'}}</label></td> <td class="label"><label for='new-account-email'>{{i18n 'user.email.title'}}</label></td>
<td> <td>
{{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}} {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
&nbsp;{{input-tip validation=emailValidation}}
</td> </td>
</tr> </tr>
<tr class="instructions create-account-email"> <tr class="instructions create-account-email">
<td></td> <td></td>
{{input-tip validation=emailValidation}}
<td><label>{{i18n 'user.email.instructions'}}</label></td> <td><label>{{i18n 'user.email.instructions'}}</label></td>
</tr> </tr>
@ -28,11 +25,11 @@
<td class="label"><label for='new-account-username'>{{i18n 'user.username.title'}}</label></td> <td class="label"><label for='new-account-username'>{{i18n 'user.username.title'}}</label></td>
<td> <td>
{{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="off"}} {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="off"}}
&nbsp;{{input-tip validation=usernameValidation id="username-validation"}}
</td> </td>
</tr> </tr>
<tr class="instructions"> <tr class="instructions">
<td></td> <td></td>
{{input-tip validation=usernameValidation id="username-validation"}}
<td><label>{{i18n 'user.username.instructions'}}</label></td> <td><label>{{i18n 'user.username.instructions'}}</label></td>
</tr> </tr>
{{/if}} {{/if}}
@ -43,11 +40,12 @@
<label for='new-account-name'>{{i18n 'user.name.title'}}</label> <label for='new-account-name'>{{i18n 'user.name.title'}}</label>
</td> </td>
<td> <td>
{{text-field value=accountName id="new-account-name"}}&nbsp;{{input-tip validation=nameValidation}} {{text-field value=accountName id="new-account-name"}}
</td> </td>
</tr> </tr>
<tr class="instructions"> <tr class="instructions">
<td></td> <td></td>
{{input-tip validation=nameValidation}}
<td><label>{{nameInstructions}}</label></td> <td><label>{{nameInstructions}}</label></td>
</tr> </tr>
{{/if}} {{/if}}
@ -63,14 +61,14 @@
<td class="label"><label for='new-account-password'>{{i18n 'user.password.title'}}</label></td> <td class="label"><label for='new-account-password'>{{i18n 'user.password.title'}}</label></td>
<td> <td>
{{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}} {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
&nbsp;{{input-tip validation=passwordValidation}}
</td> </td>
</tr> </tr>
<tr class="instructions"> <tr class="instructions">
<td></td> <td></td>
{{input-tip validation=passwordValidation}}
<td> <td>
<label>{{passwordInstructions}}</label> <label>{{passwordInstructions}}</label>
<div class="caps-lock-warning {{unless capsLockOn 'invisible'}}"> <div class="caps-lock-warning {{unless capsLockOn 'hidden'}}">
{{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div> {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
</td> </td>
</tr> </tr>
@ -97,6 +95,10 @@
</form> </form>
</div> </div>
{{/if}} {{/if}}
{{#unless hasAuthOptions}}
{{login-buttons externalLogin="externalLogin"}}
{{/unless}}
{{/d-modal-body}} {{/d-modal-body}}
{{#if showCreateForm}} {{#if showCreateForm}}