</ul>
<% end %>
-<%= error_messages_for current_user %>
-<%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :class => "standard-form", :autocomplete => :off } do |f| %>
- <fieldset>
- <div class="standard-form-row">
- <label class="standard-label"><%= t "users.new.display name" %></label>
- <%= f.text_field :display_name %>
- </div>
- </fieldset>
-
- <fieldset>
- <div class="standard-form-row">
- <label class="standard-label"><%= t ".current email address" %></label>
- <input type="email" disabled value="<%= current_user.email %>" />
- <span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span>
- </div>
-
- <div class="standard-form-row">
- <label class="standard-label"><%= t ".new email address" %></label>
- <%= f.email_field :new_email, :autocomplete => :off %>
- <span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span>
- </div>
- </fieldset>
-
- <fieldset>
- <div class="standard-form-row">
- <label class="standard-label"><%= t "users.new.password" %></label>
- <%= f.password_field :pass_crypt, :value => "", :autocomplete => :off %>
- </div>
-
- <div class="standard-form-row">
- <label class="standard-label"><%= t "users.new.confirm password" %></label>
- <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => :off %>
+<%= bootstrap_form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :autocomplete => :off } do |f| %>
+
+ <%= f.text_field :display_name %>
+ <%= f.email_field :email, :disabled => true, :label => t(".current email address") %>
+ <%= f.email_field :new_email, :autocomplete => :off %>
+ <%= f.password_field :pass_crypt, :value => "", :autocomplete => :off %>
+ <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => :off %>
+
+ <fieldset class="form-group">
+ <label for="user_auth_provider"><%= t(".external auth") %></label>
+ <div class="form-row">
+ <%= f.select(:auth_provider, Auth.providers, :hide_label => "true", :wrapper => { :class => "col-auto mb-0" }) %>
+ <%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }) %>
</div>
+ <small class="form-text text-muted">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</small>
</fieldset>
- <fieldset>
- <div class="standard-form-row">
- <label class="standard-label"><%= t ".external auth" %></label>
- <%= f.select :auth_provider, Auth.providers %>
- <%= f.text_field :auth_uid %>
- <span class="form-help deemphasize">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</span>
- </div>
- </fieldset>
-
- <fieldset class="form-divider">
- <div class="standard-form-row">
- <label class="standard-label"><%= t ".public editing.heading" %></label>
- <span class="form-help deemphasize">
- <% if current_user.data_public? %>
- <%= t ".public editing.enabled" %>
- (<a href="<%= t ".public editing.enabled link" %>" target="_new"><%= t ".public editing.enabled link text" %></a>)
- <% else %>
- <%= t ".public editing.disabled" %>
- (<a href="#public"><%= t ".public editing.disabled link text" %></a>)
- <% end %>
- </span>
- </div>
-
- <div class="standard-form-row">
- <label class="standard-label"><%= t ".contributor terms.heading" %></label>
- <span class="form-help deemphasize">
- <% if current_user.terms_agreed? %>
- <%= t ".contributor terms.agreed" %>
- (<a href="<%= t ".contributor terms.link" %>" target="_new"><%= t ".contributor terms.link text" %></a>)
- <% if current_user.consider_pd? %>
- <%= t ".contributor terms.agreed_with_pd" %>
- <% end %>
- <% else %>
- <%= t ".contributor terms.not yet agreed" %>
- <%= link_to t(".contributor terms.review link text"), :controller => "users", :action => "terms" %>
+ <div class="form-group">
+ <label><%= t ".public editing.heading" %></label>
+ <span class="form-text text-muted">
+ <% if current_user.data_public? %>
+ <%= t ".public editing.enabled" %>
+ (<a href="<%= t ".public editing.enabled link" %>" target="_new"><%= t ".public editing.enabled link text" %></a>)
+ <% else %>
+ <%= t ".public editing.disabled" %>
+ (<a href="#public"><%= t ".public editing.disabled link text" %></a>)
+ <% end %>
+ </span>
+ </div>
+
+ <div class="form-group">
+ <label><%= t ".contributor terms.heading" %></label>
+ <span class="form-text text-muted">
+ <% if current_user.terms_agreed? %>
+ <%= t ".contributor terms.agreed" %>
+ (<a href="<%= t ".contributor terms.link" %>" target="_new"><%= t ".contributor terms.link text" %></a>)
+ <% if current_user.consider_pd? %>
+ <%= t ".contributor terms.agreed_with_pd" %>
<% end %>
- </span>
- </div>
- <div class="standard-form-row">
- <label class="standard-label"><%= t ".preferred editor" %></label>
- <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::AVAILABLE_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
- </div>
- </fieldset>
-
- <fieldset class="form-divider">
- <div class='standard-form-row'>
- <label class="standard-label"><%= t ".profile description" %></label>
- <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
- </div>
-
- <div class="standard-form-row">
- <label class="standard-label"><%= t ".preferred languages" %></label>
- <%= f.text_field :languages %>
- </div>
-
- <div class='standard-form-row accountImage'>
- <label class="standard-label"><%= t ".image" %></label>
+ <% else %>
+ <%= t ".contributor terms.not yet agreed" %>
+ <%= link_to t(".contributor terms.review link text"), :controller => "users", :action => "terms" %>
+ <% end %>
+ </span>
+ </div>
+
+ <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::AVAILABLE_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
+ <%= f.richtext_field :description, :cols => 80, :rows => 20 %>
+ <%= f.text_field :languages %>
+
+ <fieldset class="form-group">
+ <%= f.label t(".image") %>
+ <div class="form-row">
+ <div class="col-sm-2">
<%= user_image current_user %>
- <ul class='form-list accountImage-options'>
+ </div>
+ <div class="col-sm-10">
<% if current_user.avatar.attached? %>
- <li>
- <%= radio_button_tag "avatar_action", "keep", !current_user.image_use_gravatar %>
- <label class='standard-label' for='avatar_action_keep'><%= t ".keep image" %></label>
- </li>
+ <%= f.radio_button "avatar_action", "keep", :name => "avatar_action", :label => t(".keep image"), :checked => !current_user.image_use_gravatar %>
<% end %>
<% if current_user.avatar.attached? || current_user.image_use_gravatar? %>
- <li>
- <%= radio_button_tag "avatar_action", "delete" %>
- <label class='standard-label' for='avatar_action_delete'><%= t ".delete image" %></label>
- </li>
+ <%= f.radio_button "avatar_action", "delete", :name => "avatar_action", :label => t(".delete image"), :checked => false %>
<% end %>
<% if current_user.avatar.attached? %>
- <li>
- <%= radio_button_tag "avatar_action", "new" %>
- <label class='standard-label' for='avatar_action_new'>
- <%= t ".replace image" %>
- <span class="form-help deemphasize"><%= t ".image size hint" %></span>
- </label>
- <%= f.file_field :avatar %>
- </li>
+ <%= f.form_group :help => t(".image size hint"), :class => "mb-0" do %>
+ <%= f.radio_button "avatar_action", "new", :name => "avatar_action", :label => t(".replace image"), :checked => false %>
+ <%= f.file_field :avatar, :hide_label => true, :wrapper => { :class => "mb-0" } %>
+ <% end %>
<% else %>
- <li>
- <%= radio_button_tag "avatar_action", "new" %>
- <label class='standard-label' for='avatar_action_new'>
- <%= t ".new image" %>
- <span class="form-help deemphasize"><%= t ".image size hint" %></span>
- </label>
- <%= f.file_field :avatar %>
- </li>
+ <%= f.form_group :help => t(".image size hint"), :class => "mb-0" do %>
+ <%= f.radio_button "avatar_action", "new", :name => "avatar_action", :label => t(".new image"), :checked => false %>
+ <%= f.file_field :avatar, :hide_label => true, :wrapper => { :class => "mb-0" } %>
+ <% end %>
+ <% end %>
+ <%= f.form_group :help => link_to(t(".gravatar.what_is_gravatar"), t(".gravatar.link")) do %>
+ <%= f.radio_button "avatar_action", "gravatar", :name => "avatar_action", :label => t(".gravatar.gravatar"), :checked => current_user.image_use_gravatar %>
<% end %>
- <li>
- <%= radio_button_tag "avatar_action", "gravatar", current_user.image_use_gravatar %>
- <label class='standard-label' for='avatar_action_gravatar'>
- <%= t ".gravatar.gravatar" %>
- <span class='form-help deemphasize'> (<a href="<%= t ".gravatar.link" %>" target="_new"><%= t ".gravatar.link text" %></a>)</span>
- </label>
- </li>
- </ul>
+ </div>
</div>
</fieldset>
- <fieldset class="form-divider">
- <div class='standard-form-row location clearfix'>
- <label class="standard-label"><%= t ".home location" %></label>
+ <fieldset>
+ <legend><%= t ".home location" -%></legend>
<div id="homerow" <% unless current_user.home_lat and current_user.home_lon %> class="nohome"<% end %>>
<p class="message form-help deemphasize"><%= t ".no home location" %></p>
- <div class='form-column'>
- <label class="standard-label secondary"><%= t ".latitude" %></label>
- <%= f.text_field :home_lat, :id => "home_lat" %>
- </div>
- <div class='form-column'>
- <label class="standard-label secondary"><%= t ".longitude" %></label>
- <%= f.text_field :home_lon, :id => "home_lon" %>
- </div>
+ <div class="form-row">
+ <%= f.text_field :home_lat, :wrapper_class => "col-sm-4", :id => "home_lat" %>
+ <%= f.text_field :home_lon, :wrapper_class => "col-sm-4", :id => "home_lon" %>
</div>
</div>
-
<div class="standard-form-row">
<input type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
<label class="standard-label" for="updatehome"><%= t ".update home location on click" %></label>
<%= tag.div "", :id => "map", :class => "content_map set_location" %>
</fieldset>
- <%= submit_tag t(".save changes button") %>
+ <%= f.primary t(".save changes button") %>
<% end %>
<% unless current_user.data_public? %>
user:
email: "Email"
email_confirmation: "Email Confirmation"
+ new_email: "New Email Address"
active: "Active"
display_name: "Display Name"
- description: "Description"
- languages: "Languages"
+ description: Profile Description
+ home_lat: Latitude
+ home_lon: Longitude
+ languages: Preferred Languages
+ preferred_editor: Preferred Editor
pass_crypt: "Password"
pass_crypt_confirmation: "Confirm Password"
help:
needs_view: Does the user need to log in before this block will be cleared?
user:
email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.'
+ new_email: "(never displayed publicly)"
datetime:
distance_in_words_ago:
about_x_hours:
display name: "Display Name:"
display name description: "Your publicly displayed username. You can change this later in the preferences."
external auth: "Third Party Authentication:"
- password: "Password:"
- confirm password: "Confirm Password:"
use external auth: "Alternatively, use a third party to login"
auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
continue: Sign Up
account:
title: "Edit account"
my settings: My settings
- current email address: "Current Email Address:"
- new email address: "New Email Address:"
- email never displayed publicly: "(never displayed publicly)"
- external auth: "External Authentication:"
+ current email address: "Current Email Address"
+ external auth: "External Authentication"
openid:
link: "https://wiki.openstreetmap.org/wiki/OpenID"
link text: "what is this?"
public editing:
- heading: "Public editing:"
+ heading: "Public editing"
enabled: "Enabled. Not anonymous and can edit data."
enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
enabled link text: "what is this?"
heading: "Public editing"
html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
contributor terms:
- heading: "Contributor Terms:"
+ heading: "Contributor Terms"
agreed: "You have agreed to the new Contributor Terms."
not yet agreed: "You have not yet agreed to the new Contributor Terms."
review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"
link text: "what is this?"
- profile description: "Profile Description:"
- preferred languages: "Preferred Languages:"
- preferred editor: "Preferred Editor:"
- image: "Image:"
+ image: Image
gravatar:
gravatar: "Use Gravatar"
link: "https://wiki.openstreetmap.org/wiki/Gravatar"
- link text: "what is this?"
+ what_is_gravatar: "What is Gravatar?"
disabled: "Gravatar has been disabled."
enabled: "Display of your Gravatar has been enabled."
new image: "Add an image"
delete image: "Remove the current image"
replace image: "Replace the current image"
image size hint: "(square images at least 100x100 work best)"
- home location: "Home Location:"
+ home location: "Home Location"
no home location: "You have not entered your home location."
- latitude: "Latitude:"
- longitude: "Longitude:"
update home location on click: "Update home location when I click on the map?"
save changes button: Save Changes
make edits public button: Make all my edits public
get user_account_path(user)
assert_response :success
assert_template :account
- assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.standard-form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description
+ assert_select "form#accountForm > div.form-group > div#user_description_container > div#user_description_content > textarea#user_description", user.description
# Changing to a invalid editor should fail
user.preferred_editor = "unknown"
assert_response :success
assert_template :account
assert_select ".notice", false
- assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected]", false
+ assert_select "form#accountForm > div.form-group > select#user_preferred_editor > option[selected]", false
# Changing to a valid editor should work
user.preferred_editor = "id"
get user_account_path(user)
assert_response :success
assert_template :account
- assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected][value=?]", "id"
+ assert_select "form#accountForm > div.form-group > select#user_preferred_editor > option[selected][value=?]", "id"
# Changing to the default editor should work
user.preferred_editor = "default"
get user_account_path(user)
assert_response :success
assert_template :account
- assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.standard-form-row > select#user_preferred_editor > option[selected]", false
+ assert_select "form#accountForm > div.form-group > select#user_preferred_editor > option[selected]", false
# Changing to an uploaded image should work
image = Rack::Test::UploadedFile.new("test/gpx/fixtures/a.gif", "image/gif")
get user_account_path(user)
assert_response :success
assert_template :account
- assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.standard-form-row.accountImage input[name=avatar_action][checked][value=?]", "keep"
+ assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-check > input[name=avatar_action][checked][value=?]", "keep"
# Changing to a gravatar image should work
post user_account_path(user), :params => { :avatar_action => "gravatar", :user => user.attributes }
get user_account_path(user)
assert_response :success
assert_template :account
- assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.standard-form-row.accountImage input[name=avatar_action][checked][value=?]", "gravatar"
+ assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-group > div.form-check > input[name=avatar_action][checked][value=?]", "gravatar"
# Removing the image should work
post user_account_path(user), :params => { :avatar_action => "delete", :user => user.attributes }
get user_account_path(user)
assert_response :success
assert_template :account
- assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.standard-form-row.accountImage input[name=avatar_action][checked]", false
+ assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-check > input[name=avatar_action][checked]", false
+ assert_select "form#accountForm > fieldset.form-group > div.form-row > div.col-sm-10 > div.form-group > div.form-check > input[name=avatar_action][checked]", false
# Adding external authentication should redirect to the auth provider
post user_account_path(user), :params => { :user => user.attributes.merge(:auth_provider => "openid", :auth_uid => "gmail.com") }
assert_response :success
assert_template :account
assert_select ".notice", false
- assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
+ assert_select "form#accountForm > div.form-group > input.is-invalid#user_display_name"
# Changing name to one that exists should fail, regardless of case
new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase)
assert_response :success
assert_template :account
assert_select ".notice", false
- assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_display_name"
+ assert_select "form#accountForm > div.form-group > input.is-invalid#user_display_name"
# Changing name to one that doesn't exist should work
new_attributes = user.attributes.dup.merge(:display_name => "new tester")
get user_account_path(:display_name => "new tester")
assert_response :success
assert_template :account
- assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.standard-form-row > input#user_display_name[value=?]", "new tester"
+ assert_select "form#accountForm > div.form-group > input#user_display_name[value=?]", "new tester"
# Record the change of name
user.display_name = "new tester"
assert_response :success
assert_template :account
assert_select ".notice", false
- assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_new_email"
+ assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email"
# Changing email to one that exists should fail, regardless of case
user.new_email = create(:user).email.upcase
assert_response :success
assert_template :account
assert_select ".notice", false
- assert_select "div#errorExplanation"
- assert_select "form#accountForm > fieldset > div.standard-form-row > input.field_with_errors#user_new_email"
+ assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email"
# Changing email to one that doesn't exist should work
user.new_email = "new_tester@example.com"
get user_account_path(user)
assert_response :success
assert_template :account
- assert_select "div#errorExplanation", false
assert_select ".notice", /^User information updated successfully/
- assert_select "form#accountForm > fieldset > div.standard-form-row > input#user_new_email[value=?]", user.new_email
+ assert_select "form#accountForm > div.form-group > input#user_new_email[value=?]", user.new_email
email = ActionMailer::Base.deliveries.first
assert_equal 1, email.to.count
assert_equal user.new_email, email.to.first
projects / rails.git / commitdiff