Commit ab123e33 authored by pierre.tremouilhac's avatar pierre.tremouilhac
Browse files

Merge branch '579-one-link-and-page-for-account-settings-and-profile' into 'development'

Combine 'Account Settings' and 'Change Profile'

Closes #579

See merge request ComPlat/chemotion_ELN!820
parents 0b5fe3b9 7be5297e
......@@ -522,10 +522,9 @@ export default class UserAuth extends Component {
<div>
<Nav navbar pullRight>
<NavDropdown title={`${this.state.currentUser.name}`} id="bg-nested-dropdown">
<MenuItem eventKey="1" href="pages/settings" >Account Settings</MenuItem>
<MenuItem eventKey="1" href="pages/settings" >Account &amp; Profile</MenuItem>
{this.state.currentUser.is_templates_moderator ? templatesLink : null}
<MenuItem eventKey="3" href="users/edit" >Change Password</MenuItem>
<MenuItem eventKey="4" href="pages/profiles" >Change Profile</MenuItem>
<MenuItem eventKey="5" href="pages/affiliations" >My Affiliations</MenuItem>
<MenuItem onClick={this.handleShow}>My Groups</MenuItem>
{/* <MenuItem onClick={this.handleSubscriptionShow}>My Subscriptions</MenuItem>
......
.container
%h2
Account Settings
Account &amp; Profile
%br/
......@@ -46,4 +46,23 @@
= render "#{plugin}/home/account"
%br/
.jumbotron
.h2 Sample Title
%br/
.form-horizontal
= form_for current_user.profile, url: pages_update_profiles_path do |f|
.checkbox
= f.check_box :show_external_name, autofocus: true, autocomplete: "off"
= f.label :show_external_name, "Show external names on sample titles?"
%br/
.actions
= f.submit "Update user profiles", class: "btn btn-primary"
%br/
%br/
= link_to "Back", root_path
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment