-<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 :head do %>
+ <%= javascript_include_tag "user" %>
<% 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>
+<% content_for :heading do %>
+ <h1><%= t 'user.account.my settings' %></h1>
+ <ul class='secondary-actions clearfix'>
+ <li><%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => current_user.display_name %></li>
+ <li><%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
+ </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="form-row">
+ <label class="standard-label"><%= t 'user.new.display name' %></label>
+ <%= f.text_field :display_name %>
+ </div>
+ </fieldset>
+
+ <fieldset>
+ <div class="form-row">
+ <label class="standard-label"><%= t 'user.account.current email address' %></label>
+ <input type="email" disabled value="<%= current_user.email %>" />
+ <span class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></span>
+ </div>
+
+ <div class="form-row">
+ <label class="standard-label"><%= t 'user.account.new email address' %></label>
+ <%= f.email_field :new_email, :autocomplete => :off %>
+ <span class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></span>
+ </div>
+ </fieldset>
+
+ <fieldset>
+ <div class="form-row">
+ <label class="standard-label"><%= t 'user.new.password' %></label>
+ <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %>
+ </div>
+
+ <div class="form-row">
+ <label class="standard-label"><%= t 'user.new.confirm password' %></label>
+ <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %>
+ </div>
+ </fieldset>
+
+ <fieldset>
+ <div class="form-row">
+ <label class="standard-label"><%= t 'user.account.external auth' %></label>
+ <%= f.select :auth_provider, Auth::PROVIDERS %>
+ <%= f.text_field :auth_uid %>
+ <span class="form-help deemphasize">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
+ </diV>
+ </fieldset>
- <tr><td class="fieldName" valign="top"><%= t 'user.account.preferred languages' %></td><td><%= f.text_field :languages %></td></tr>
+ <fieldset class="form-divider">
+ <div class="form-row">
+ <label class="standard-label"><%= t 'user.account.public editing.heading' %></label>
+ <span class="form-help deemphasize">
+ <% if current_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 %>
+ </span>
+ </div>
- <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>
+ <div class="form-row">
+ <label class="standard-label"><%= t 'user.account.contributor terms.heading' %></label>
+ <span class="form-help deemphasize">
+ <% if current_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 current_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 %>
+ </span>
+ </div>
+ <div 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] } %>
+ </div>
+ </fieldset>
- <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/>
+ <fieldset class="form-divider">
+ <div class='form-row'>
+ <label class="standard-label"><%= t 'user.account.profile description' %></label>
+ <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
+ </div>
+ <div class="form-row">
+ <label class="standard-label"><%= t 'user.account.preferred languages' %></label>
+ <%= f.text_field :languages %>
+ </div>
+
+ <div class='form-row accountImage'>
+ <label class="standard-label"><%= t 'user.account.image' %></label>
+ <%= user_image current_user %>
+ <ul class='form-list accountImage-options'>
+ <% if current_user.image.file? %>
+ <li>
+ <%= radio_button_tag "image_action", "keep", !current_user.image_use_gravatar %>
+ <label class='standard-label' for='image_action_keep'><%= t 'user.account.keep image' %></label>
+ </li>
+ <% end %>
+ <% if current_user.image.file? || current_user.image_use_gravatar? %>
+ <li>
+ <%= radio_button_tag "image_action", "delete" %>
+ <label class='standard-label' for='image_action_delete'><%= t 'user.account.delete image' %></label>
+ </li>
+ <% end %>
+ <% if current_user.image.file? %>
+ <li>
+ <%= radio_button_tag "image_action", "new" %>
+ <label class='standard-label' for='image_action_new'>
+ <%= t 'user.account.replace image' %>
+ <span class="form-help deemphasize"><%= t 'user.account.image size hint' %></span>
+ </label>
+ <%= f.file_field :image %>
+ </li>
+ <% else %>
+ <li>
+ <%= radio_button_tag "image_action", "new" %>
+ <label class='standard-label' for='image_action_new'>
+ <%= t 'user.account.new image' %>
+ <span class="form-help deemphasize"><%= t 'user.account.image size hint' %></span>
+ </label>
+ <%= f.file_field :image %>
+ </li>
+ <% end %>
+ <li>
+ <%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %>
+ <label class='standard-label' for='image_action_gravatar'>
+ <%= t 'user.account.gravatar.gravatar' %>
+ <span class='form-help deemphasize'> (<a href="<%= t 'user.account.gravatar.link' %>" target="_new"><%= t 'user.account.gravatar.link text' %></a>)</span>
+ </label>
+ </li>
+ </ul>
+ </div>
+ </fieldset>
+
+ <fieldset class="form-divider">
+ <div class='form-row location clearfix'>
+ <label class="standard-label"><%= t 'user.account.home location' %></label>
+ <div id="homerow" <% unless current_user.home_lat and current_user.home_lon %>class="nohome"<%end%> >
+ <p class="message form-help deemphasize"><%= t 'user.account.no home location' %></p>
+ <div class='form-column'>
+ <label class="standard-label secondary"><%= t 'user.account.latitude' %></label>
+ <%= f.text_field :home_lat, :id => "home_lat" %>
+ </div>
+ <div class='form-column'>
+ <label class="standard-label secondary"><%= t 'user.account.longitude' %></label>
+ <%= f.text_field :home_lon, :id => "home_lon" %>
+ </div>
+ </div>
+ </div>
+
+ <div class="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 'user.account.update home location on click' %></label>
+ </div>
+ <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
+ </fieldset>
+
+ <%= submit_tag t('user.account.save changes button') %>
<% end %>
-<%= render :partial => 'friend_map' %>
-<% unless @user.data_public? %>
+<% unless current_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 %>
-<% end %>
-<h2><%= t 'user.account.my apps' %></h2>
-<% if @tokens.empty? %>
-<p><%= t 'oauth.token.none' %></p>
-<% else %>
-<table>
- <tr><th><%= t 'oauth.token.application' %></th><th><%= t 'oauth.token.issued' %></th><th> </th></tr>
- <% @tokens.each do |token|%>
- <% content_tag_for :tr, token do %>
- <td><%= link_to token.client_application.name, token.client_application.url %></td>
- <td><%= token.authorized_at %></td>
- <td>
- <% form_tag :controller => 'oauth', :action => 'revoke' do %>
- <%= hidden_field_tag 'token', token.token %>
- <%= submit_tag t('oauth.token.revoke') %>
- <% end %>
- </td>
- <% end %>
- <% end %>
-</table>
-<% end %>
-<h2><%= t 'user.account.developers' %></h2>
-<% if @user.client_applications.empty? %>
-<p><%= t 'user.account.dev_intro', :link => "<a href=\"http://oauth.net\">OAuth</a>" %></p>
-<p><%= link_to t('user.account.register_app'), :controller => 'oauth_clients', :action => :new %></p>
-<% else %>
-<p><%= t 'user.account.apps_registered' %></p>
-<ul><% @user.client_applications.each do |client| %>
- <li><% div_for client do %>
- <%= link_to client.name, :controller => 'oauth_clients', :action => :show, :id => client.id %>
- <% end %></li>
-<% end %></ul>
-<p><%= link_to t('user.account.register_another_app'), :controller => 'oauth_clients', :action => :new %></p>
+<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