github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-01 03:35:59 +08:00
Code Issues Actions1 Packages Projects Releases Wiki Activity

UX: better invite accept form ()

Browse Source
This commit is contained in:
Meghna 2022-01-06 16:31:32 +05:30 committed by GitHub
parent 5b6acea56e
commit cc4c7a05e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 19 deletions
app/assets
javascripts/discourse/app/templates/invites
show.hbs
stylesheets/common/base
login.scss

29
app/assets/javascripts/discourse/app/templates/invites/show.hbs

@ -57,47 +57,46 @@
{{#if shouldDisplayForm}}
<form>
{{#if isInviteLink}}
<div class="input email-input">
<label for="new-account-email">
<div class="input email-input input-group">
{{input type="email" value=email id="new-account-email" name="email" class=(value-entered email) autofocus="autofocus" disabled=externalAuthsOnly}}
<label class="alt-placeholder" for="new-account-email">
{{i18n "user.email.title"}}
<span class="required">*</span>
</label>
{{input type="email" value=email id="new-account-email" name="email" autofocus="autofocus" disabled=externalAuthsOnly}}
{{input-tip validation=emailValidation id="account-email-validation"}}
<div class="instructions">{{i18n "user.email.instructions"}}</div>
</div>
{{/if}}
<div class="input username-input">
<label for="new-account-username">
<div class="input username-input input-group">
{{input value=accountUsername class=(value-entered accountUsername) id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
<label class="alt-placeholder" for="new-account-username">
{{i18n "user.username.title"}}
<span class="required">*</span>
</label>
{{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength autocomplete="discourse"}}
{{input-tip validation=usernameValidation id="username-validation"}}
<div class="instructions">{{i18n "user.username.instructions"}}</div>
</div>
{{#if fullnameRequired}}
<div class="input name-input">
<label for="new-account-name">
<div class="input name-input input-group">
{{input value=accountName class=(value-entered accountName) id="new-account-name" name="name"}}
<label class="alt-placeholder" for="new-account-name">
{{i18n "invites.name_label"}}
{{#if siteSettings.full_name_required}}
<span class="required">*</span>
{{/if}}
</label>
{{input value=accountName id="new-account-name" name="name"}}
<div class="instructions">{{nameInstructions}}</div>
</div>
{{/if}}
{{#unless externalAuthsOnly}}
<div class="input password-input">
<label for="new-account-password">
<div class="input password-input input-group">
{{password-field value=accountPassword class=(value-entered accountPassword) type="password" id="new-account-password" capsLockOn=capsLockOn}}
<label class="alt-placeholder" for="new-account-password">
{{i18n "invites.password_label"}}
<span class="required">*</span>
</label>
{{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
{{input-tip validation=passwordValidation}}
<div class="instructions">
{{passwordInstructions}} {{i18n "invites.optional_description"}}
@ -111,7 +110,9 @@
{{#if userFields}}
<div class="user-fields">
{{#each userFields as |f|}}
{{user-field field=f.field value=f.value}}
<div class="input-group">
{{user-field field=f.field value=f.value class=(value-entered f.value)}}
</div>
{{/each}}
</div>
{{/if}}

9
app/assets/stylesheets/common/base/login.scss

@ -117,9 +117,11 @@
// Login Form Styles
.login-modal:not(.hidden),
.create-account {
.create-account,
.invites-show {
#login-form,
.login-form {
.login-form,
.invite-form {
.input-group {
position: relative;
display: flex;
@ -338,9 +340,6 @@
button.btn-primary {
margin-top: 10px;
}
label:not(.checkbox-label) {
font-weight: bold;
}
.controls,
.input {
margin-bottom: 10px;