Add an explicit "default editor" option to the user settings

[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 66c303bb664ef32782eefff4bb8d4022e2ccc6b9..7047b5b8213e47cfa92b7b4047a6696b5f038b4a 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -19,12 +19,12 @@
 
   <tr>
     <td class="fieldName" style="padding-bottom:0px;"><%= t 'user.new.password' %></td>
 
   <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>
+    <td style="padding-bottom:0px;"><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %></td>

   </tr>
 
   <tr>
     <td class="fieldName"><%= t 'user.new.confirm password' %></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>
+    <td><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %></td>

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


@@ -38,6 +38,24 @@
     </td>
   </tr>
 
     </td>
   </tr>
 

+  <tr>
+    <td class="fieldName" valign="top"><%= 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" valign="top"><%= t 'user.account.profile description' %></td>
     <td><%= f.text_area :description, :rows => '5', :cols => '60' %></td>
   <tr>
     <td class="fieldName" valign="top"><%= t 'user.account.profile description' %></td>
     <td><%= f.text_area :description, :rows => '5', :cols => '60' %></td>


@@ -48,6 +66,11 @@
     <td><%= f.text_field :languages %></td>
   </tr>
 
     <td><%= f.text_field :languages %></td>
   </tr>
 

+  <tr>
+    <td class="fieldName" valign="top"><%= 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" valign="top">
       <%= t 'user.account.image' %>
   <tr>
     <td class="fieldName" valign="top">
       <%= t 'user.account.image' %>


@@ -85,7 +108,7 @@
     <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>
     <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>
+      <div id="map" class="user_map" style="border:1px solid black; position:relative; width:500px; height:400px;"></div>

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