-<h2><%= t 'user.account.my settings' %></h2>
-<%= error_messages_for 'user' %>
-<% form_for :user, @user do |f| %>
-<table id="accountForm">
- <tr><td class="fieldName"><%= t 'user.new.display name' %></td><td><%= f.text_field :display_name %></td></tr>
- <tr><td class="fieldName"><%= t 'user.new.email address' %></td><td><%= f.text_field :email, {:size => 50, :maxlength => 255} %> <span class="minorNote"><%= t 'user.account.email never displayed publicly' %></span></td></tr>
- <tr><td class="fieldName" style="padding-bottom:0px;"><%= t 'user.new.password' %></td><td style="padding-bottom:0px;"><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255} %></td></tr>
- <tr><td class="fieldName"><%= t 'user.new.confirm password' %></td><td><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255} %></td></tr>
-
- <tr>
- <td class="fieldName" valign="top"><%= t 'user.account.public editing.heading' %></td>
- <td>
-<% if @user.data_public? %>
- <%= t 'user.account.public editing.enabled' %> <span class="minorNote">(<a href="<%= t 'user.account.public editing.enabled link' %>" target="_new"><%= t 'user.account.public editing.enabled link text' %></a>)</span>
-<% else %>
- <%= t 'user.account.public editing.disabled' %><span class="minorNote">(<a href="#public"><%= t 'user.account.public editing.disabled link text' %></a>)</span>
+<% content_for :heading do %>
+ <h2><%= t 'user.account.my settings' %></h2>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %></li>
+ <li><%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
+ </ul>
<% end %>
- </td>
- </tr>
- <tr><td class="fieldName" valign="top"><%= t 'user.account.profile description' %></td><td><%= f.text_area :description, :rows => '5', :cols => '60' %></td></tr>
+<%= error_messages_for 'user' %>
+<%= form_for :user, :html => { :multipart => true, :id => 'accountForm',:class => 'standard-form' } do |f| %>
+ <fieldset class="form-row">
+ <label class="standard-label"><%= t 'user.new.display name' %></label>
+ <%= f.text_field :display_name %>
+ </fieldset>
+
+ <fieldset class="form-row">
+ <label class="standard-label"><%= t 'user.account.current email address' %></label>
+ <input type="email" size="30" disabled value="<%= @user.email %>" />
+ <p class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></p>
+ </fieldset>
+
+ <fieldset class="form-row">
+ <label class="standard-label"><%= t 'user.account.new email address' %></label>
+ <%= f.email_field :new_email %>
+ <p class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></p>
+ </fieldset>
+
+ <fieldset class="form-row">
+ <label class="standard-label"><%= t 'user.new.password' %></label>
+ <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %>
+ </fieldset>
+
+ <fieldset class="form-row">
+ <label class="standard-label"><%= t 'user.new.confirm password' %></label>
+ <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %>
+ </fieldset>
+
+ <fieldset class="form-row">
+ <label class="standard-label"><%= t 'user.account.openid.openid' %></label>
+ <%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %>
+ <p class="form-help deemphasize">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</p>
+ </fieldset>
+
+ <div class="form-row">
+ <label class="standard-label"><%= t 'user.account.public editing.heading' %></label>
+ <p class="form-help deemphasize">
+ <% if @user.data_public? %>
+ <%= t 'user.account.public editing.enabled' %>
+ (<a href="<%= t 'user.account.public editing.enabled link' %>" target="_new"><%= t 'user.account.public editing.enabled link text' %></a>)
+ <% else %>
+ <%= t 'user.account.public editing.disabled' %>
+ (<a href="#public"><%= t 'user.account.public editing.disabled link text' %></a>)
+ <% end %>
+ </p>
+ </div>
+
+ <fieldset class="form-row">
+ <label class="standard-label"><%= t 'user.account.contributor terms.heading' %></label>
+ <p class="form-help deemphasize">
+ <% if @user.terms_agreed? %>
+ <%= t 'user.account.contributor terms.agreed' %>
+ (<a href="<%= t 'user.account.contributor terms.link' %>" target="_new"><%= t 'user.account.contributor terms.link text' %></a>)
+ <% if @user.consider_pd? %>
+ <%= t 'user.account.contributor terms.agreed_with_pd' %>
+ <% end %>
+ <% else %>
+ <%= t 'user.account.contributor terms.not yet agreed' %>
+ <%= link_to t('user.account.contributor terms.review link text'), :controller => 'user', :action => 'terms' %>
+ <% end %>
+ </p>
+ </fieldset>
+
+ <fieldset class="form-row">
+ <label class="standard-label"><%= t 'user.account.profile description' %></label>
+ <%= richtext_area :user, :description, :rows => '15', :cols => '80' %>
+ </fieldset>
+
+ <fieldset class="form-row">
+ <label class="standard-label"><%= t 'user.account.preferred languages' %></label>
+ <%= f.text_field :languages %>
+ </fieldset>
+
+ <fieldset class="form-row">
+ <label class="standard-label"><%= t 'user.account.preferred editor' %></label>
+ <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
+ </fieldset>
- <tr><td class="fieldName" valign="top"><%= t 'user.account.preferred languages' %></td><td><%= f.text_field :languages %></td></tr>
+ <fieldset class="form-row">
+ <label class="standard-label"><%= t 'user.account.image' %></label>
+ <div class="accountImage">
+ <%= user_image @user %>
+ <fieldset class="accountImage-options">
+ <% if @user.image.file? %>
+ <div class="form-row">
+ <%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %>
+ <%= t 'user.account.keep image' %>
+ </div>
+ <% end %>
+ <% if @user.image.file? || @user.image_use_gravatar? %>
+ <div class="form-row">
+ <%= radio_button_tag "image_action", "delete" %>
+ <%= t 'user.account.delete image' %>
+ </div>
+ <% end %>
+ <% if @user.image.file? %>
+ <div>
+ <div class="form-row">
+ <%= radio_button_tag "image_action", "new" %>
+ <%= t 'user.account.replace image' %>
+ </div>
+ <div class="form-row">
+ <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %>
+ <p class="form-help deemphasize"><%= t 'user.account.image size hint' %></p>
+ </div>
+ </div>
+ <% else %>
+ <div class="form-row">
+ <%= radio_button_tag "image_action", "new" %>
+ <%= t 'user.account.new image' %>
+ </div>
+ <div class="form-row">
+ <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %>
+ <p class="form-help deemphasize"><%= t 'user.account.image size hint' %></p>
+ </div>
+ <% end %>
+ <div class="form-row">
+ <%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %>
+ <%= t 'user.account.gravatar.gravatar' %>
+ <p class="form-help deemphasize">(<a href="<%= t 'user.account.gravatar.link' %>" target="_new"><%= t 'user.account.gravatar.link text' %></a>)</p>
+ </div>
+ </fieldset>
+ </div>
+ </fieldset>
- <tr id="homerow" <% unless @user.home_lat and @user.home_lon %> class="nohome" <%end%> ><td class="fieldName"><%= t 'user.account.home location' %></td><td><em class="message"><%= t 'user.account.no home location' %></em><span class="location"><%= t 'user.account.latitude' %> <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %><%= t 'user.account.longitude' %><%= f.text_field :home_lon, :size => 20, :id => "home_lon" %></span></td></tr>
+<fieldset>
+ <p class="form-help"><%= t 'user.account.home location' %></p>
+ <div id="homerow" <% unless @user.home_lat and @user.home_lon %>class="nohome"<%end%> >
+ <p class="message form-help deemphasize"><%= t 'user.account.no home location' %></p>
+ <div class="location">
+ <label class="standard-label"><%= t 'user.account.latitude' %></label>
+ <%= f.text_field :home_lat, :id => "home_lat" %>
+ <label class="standard-label"><%= t 'user.account.longitude' %></label>
+ <%= f.text_field :home_lon, :id => "home_lon" %>
+ </div>
+ </div>
- <tr><td></td><td>
- <p><%= t 'user.account.update home location on click' %> <input type="checkbox" value="1" <% unless @user.home_lat and @user.home_lon %> checked="checked" <% end %> id="updatehome" /> </p>
- <div id="map" style="border:1px solid black; position:relative; width:500px; height:400px;"></div>
- </td></tr>
-
- <tr><td></td><td align=right><br/><%= submit_tag t('user.account.save changes button') %></td></tr>
-</table>
-<br/>
+ <div class="form-row">
+
<p><%= t 'user.account.update home location on click' %> <input type="checkbox" value="1" <% unless @user.home_lat and @user.home_lon %> checked="checked" <% end %> id="updatehome" /> </p>
+ <% content_for :head do %>
+ <%= javascript_include_tag "user" %>
+ <% end %>
+ <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
+ </div>
+</fieldset>
+ <%= submit_tag t('user.account.save changes button') %>
<% end %>
-<%= render :partial => 'friend_map' %>
<% unless @user.data_public? %>
<a name="public"></a>
-<h2>Public editing</h2>
- Currently your edits are anonymous and people can't 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="http://wiki.openstreetmap.org/wiki/Anonymous_edits">find out why</a>).<br />
- Your email address will not be revealed by becoming public.<br />
- This action cannot be reversed and all new users are now public by default.<br />
- <br /><br />
- <%= button_to t('user.account.make all my edits public button'), :action => :go_public %>
+<h2><%= t 'user.account.public editing note.heading' %></h2>
+<%= raw t 'user.account.public editing note.text' %>
+ <%= button_to t('user.account.make edits public button'), :action => :go_public %>
<% end %>
-<br/>
-<br/>
-<%= link_to t('user.account.return to profile'), :controller => 'user', :action => @user.display_name %>
-<br/>
-<br/>
projects / rails.git / blobdiff