Deselect note features when the popup is closed

[rails.git] / app / views / user / account.html.erb

diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb
index 0bb41a355b74917dad9c80ac8c9133a783effa57..988cd9121d2981ffff9d5f470163070a9a29aa15 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -1,6 +1,6 @@
 <h2><%= t 'user.account.my settings' %></h2>
 <%= error_messages_for 'user' %>
 <h2><%= t 'user.account.my settings' %></h2>
 <%= error_messages_for 'user' %>

-<% form_for :user, :html => { :multipart => true } do |f| %>
+<%= form_for :user, :html => { :multipart => true } do |f| %>

 <table id="accountForm">
   <tr>
     <td class="fieldName"><%= t 'user.new.display name' %></td>
 <table id="accountForm">
   <tr>
     <td class="fieldName"><%= t 'user.new.display name' %></td>


@@ -14,7 +14,7 @@
 
   <tr>
     <td class="fieldName"><%= t 'user.account.new email address' %></td>
 
   <tr>
     <td class="fieldName"><%= t 'user.account.new email address' %></td>

-    <td><%= f.text_field :new_email, {:size => 50, :maxlength => 255} %> <span class="minorNote"><%= t 'user.account.email never displayed publicly' %></span></td>
+    <td><%= f.email_field :new_email, {:size => 50, :maxlength => 255} %> <span class="minorNote"><%= t 'user.account.email never displayed publicly' %></span></td>

   </tr>
 
   <tr>
   </tr>
 
   <tr>


@@ -26,13 +26,14 @@
     <td class="fieldName"><%= t 'user.new.confirm password' %></td>
     <td><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %></td>
   </tr>
     <td class="fieldName"><%= t 'user.new.confirm password' %></td>
     <td><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %></td>
   </tr>

+

   <tr>
     <td class="fieldName" ><%= t 'user.account.openid.openid' %></td>
   <tr>
     <td class="fieldName" ><%= t 'user.account.openid.openid' %></td>

-    <td style="padding-bottom:0px;"><%= f.text_field :openid_url, {:class => "openid_url"} %> (<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>) </td>
+    <td><%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span></td>

   </tr>
 
   <tr>
   </tr>
 
   <tr>

-    <td class="fieldName" valign="top"><%= t 'user.account.public editing.heading' %></td>
+    <td class="fieldName"><%= 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>
     <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>


@@ -43,17 +44,40 @@
   </tr>
 
   <tr>
   </tr>
 
   <tr>

-    <td class="fieldName" valign="top"><%= t 'user.account.profile description' %></td>
+    <td class="fieldName"><%= t 'user.account.contributor terms.heading' %></td>
+    <td>
+      <% if @user.terms_agreed? %>
+        <%= t 'user.account.contributor terms.agreed' %>
+        <span class="minorNote">(<a href="<%= t 'user.account.contributor terms.link' %>" target="_new"><%= t 'user.account.contributor terms.link text' %></a>)</span>
+        <br />
+        <% if @user.consider_pd? %>
+          <%= t 'user.account.contributor terms.agreed_with_pd' %>
+        <% end %>
+      <% else %>
+        <%= t 'user.account.contributor terms.not yet agreed' %> <br />
+
+        <%= link_to t('user.account.contributor terms.review link text'), :controller => 'user', :action => 'terms' %>
+      <% end %>
+    </td>
+  </tr>
+
+  <tr>
+    <td class="fieldName"><%= t 'user.account.profile description' %></td>

     <td><%= f.text_area :description, :rows => '5', :cols => '60' %></td>
   </tr>
 
   <tr>
     <td><%= f.text_area :description, :rows => '5', :cols => '60' %></td>
   </tr>
 
   <tr>

-    <td class="fieldName" valign="top"><%= t 'user.account.preferred languages' %></td>
+    <td class="fieldName"><%= t 'user.account.preferred languages' %></td>

     <td><%= f.text_field :languages %></td>
   </tr>
 
   <tr>
     <td><%= f.text_field :languages %></td>
   </tr>
 
   <tr>

-    <td class="fieldName" valign="top">
+    <td class="fieldName"><%= t 'user.account.preferred editor' %></td>
+    <td><%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %></td>
+  </tr>
+
+  <tr>
+    <td class="fieldName">

       <%= t 'user.account.image' %>
     </td>
     <td valign="top">
       <%= t 'user.account.image' %>
     </td>
     <td valign="top">


@@ -82,30 +106,30 @@
 
   <tr id="homerow" <% unless @user.home_lat and @user.home_lon %> class="nohome" <%end%> >
     <td class="fieldName"><%= t 'user.account.home location' %></td>
 
   <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>
+    <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>
 
   <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>
   </tr>
 
   <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" class="user_map" style="border:1px solid black; position:relative; width:500px; height:400px;"></div>
+      <div id="map" class="user_map"></div>

     </td>
   </tr>
   
   <tr>
     <td></td>
     </td>
   </tr>
   
   <tr>
     <td></td>

-    <td align=right><br/><%= submit_tag t('user.account.save changes button') %></td>
+    <td class="submitButton"><%= submit_tag t('user.account.save changes button') %></td>

   </tr>
 </table>
 <% end %>
 
   </tr>
 </table>
 <% end %>
 

-<%= render :partial => 'map' %>
+<%= render :partial => 'map', :locals => { :setting_location => true,  :show_other_users => false } %>

 
 <% unless @user.data_public? %>
 <a name="public"></a>
 <h2><%= t 'user.account.public editing note.heading' %></h2>
 
 <% unless @user.data_public? %>
 <a name="public"></a>
 <h2><%= t 'user.account.public editing note.heading' %></h2>

-<%= t 'user.account.public editing note.text' %>
+<%= raw t 'user.account.public editing note.text' %>

   <%= button_to t('user.account.make edits public button'), :action => :go_public %>
 <% end %>
 <br/>
   <%= button_to t('user.account.make edits public button'), :action => :go_public %>
 <% end %>
 <br/>