forked from forem/forem
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Co-authored-by: Nick Taylor <[email protected]>
- Loading branch information
1 parent
03f97d4
commit a1e8f29
Showing
31 changed files
with
996 additions
and
318 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
module Constants | ||
module Settings | ||
TAB_LIST = %w[ | ||
Profile | ||
Customization | ||
Notifications | ||
Account | ||
Billing | ||
Organization | ||
Extensions | ||
].freeze | ||
end | ||
end |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
<ul> | ||
<% authentication_enabled_providers_for_user.each do |provider| %> | ||
<li><a href="<%= provider.settings_url %>"><%= provider.official_name %> profile settings</a></li> | ||
<li><a href="<%= provider.settings_url %>"><%= t("views.settings.account.provider_profile", provider: provider.official_name) %></a></li> | ||
<% end %> | ||
</ul> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,25 @@ | ||
<div class="crayons-card crayons-card--content-rows"> | ||
<header> | ||
<h2 class="crayons-subtitle-1"> | ||
Set new password | ||
<%= t("views.settings.password.heading") %> | ||
</h2> | ||
<p class="color-base-70"> | ||
If your account was created using social account authentication, you may prefer to add an email | ||
log in. If you signed up with a social media account, <a href="<%= new_user_password_path %>"> | ||
please reset the password</a> for your primary email address (<%= current_user.email %>) in | ||
order to enable this. Please note that email login is in addition to social login rather than | ||
a replacement for it, so your authenticated social account will continue to be linked to your | ||
account. | ||
<%= t("views.settings.password.desc_html", path: new_user_password_path, email: current_user.email) %> | ||
</p> | ||
</header> | ||
<%= form_with(url: user_update_password_path, data: { testid: "update-password-form" }) do |f| %> | ||
<div class="crayons-field mb-4"> | ||
<%= f.label :current_password, class: "crayons-field__label" %> | ||
<%= f.label :current_password, t("views.settings.password.current"), class: "crayons-field__label" %> | ||
<%= f.password_field :current_password, class: "crayons-textfield", autocomplete: "off", required: true %> | ||
</div> | ||
<div class="crayons-field mb-4"> | ||
<%= f.label :password, class: "crayons-field__label" %> | ||
<%= f.label :password, t("views.settings.password.new"), class: "crayons-field__label" %> | ||
<%= f.password_field :password, class: "crayons-textfield", autocomplete: "off", required: true %> | ||
</div> | ||
<div class="crayons-field mb-4"> | ||
<%= f.label :password_confirmation, "Confirm new password", class: "crayons-field__label" %> | ||
<%= f.label :password_confirmation, t("views.settings.password.confirm"), class: "crayons-field__label" %> | ||
<%= f.password_field :password_confirmation, autocomplete: "off", class: "crayons-textfield", required: true %> | ||
</div> | ||
<button class="crayons-btn crayon-btn--secondary" type="submit">Set New Password</button> | ||
<button class="crayons-btn crayon-btn--secondary" type="submit"><%= t("views.settings.password.submit") %></button> | ||
<% end %> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.