Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Email verification indicator added #7923

Merged
merged 4 commits into from
Aug 30, 2017
Merged

[FIX] Email verification indicator added #7923

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d77e3f9
[BUG]Email verification indicator added
aditya-kumawat Aug 27, 2017
ef2a1e6
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
aditya-kumawat Aug 29, 2017
4cf6e3d
Requested changes made
aditya-kumawat Aug 29, 2017
031f83b
Merge branch 'develop' into email-notification-indicator
rodrigok Aug 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions packages/rocketchat-ui-account/client/accountProfile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,29 @@ <h2 style="flex: 1 1; white-space: nowrap;">{{_ "My Profile"}}</h2>
<div class="rc-form-group rc-grid">
{{#with canChange=allowEmailChange}}
<div class="rc-input rc-w50 padded {{#if emailInvalid}}rc-input--error{{/if}}">
<label class="rc-input__label">
<div class="rc-input__title">{{_ "Email"}}</div>
<div class="rc-input__wrapper">
<input name="email" type="text" class="rc-input__element" placeholder="Type channel name" value="{{email}}" autocomplete="false" {{ifThenElse canChange '' 'disabled'}}>
</div>
</label>
{{# unless canChange}}
<div class="rc-input__description">{{_ 'Email_Change_Disabled'}}</div>
{{/unless}}
<label class="rc-input__label">
<div class="rc-input__title">{{_ "Email"}}</div>
<div class="rc-input__wrapper">
<input name="email" type="text" class="rc-input__element" placeholder="Type channel name" value="{{email}}" autocomplete="false" {{ifThenElse canChange '' 'disabled'}}>
{{#unless emailVerified}}
<div class="rc-input__icon rc-input__icon--right">
{{> icon block="rc-input__icon-svg" icon="cross-circled"}}
</div>
{{else}}
<div class="rc-input__icon rc-input__icon--right">
{{> icon block="rc-input__icon-svg" icon="checkmark-circled"}}
</div>
{{/unless}}
</div>
</label>
{{#unless canChange}}
<div class="rc-input__description">{{_ 'Email_Change_Disabled'}}</div>
{{/unless}}
{{#unless emailVerified}}
<div class="rc-input__error">
<button class="rc-button rc-button--small" id="resend-verification-email">{{_ "Resend_verification_mail"}}</button>
</div>
{{/unless}}
</div>
{{/with}}
<div class="rc-input rc-w50 padded">
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-ui-master/public/icons.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.