Allow commenting on, and closing of, notes from the web site

[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 0da8b2530d30edf82979e0ac6ed61dbdf80e9963..6745f1b34fe248c18afac2d8cca5dac7c0db36a7 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -1,4 +1,8 @@
 <h2><%= t 'user.account.my settings' %></h2>
 <h2><%= t 'user.account.my settings' %></h2>

+
+<%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %> |
+<%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %>
+

 <%= error_messages_for 'user' %>
 <%= form_for :user, :html => { :multipart => true } do |f| %>
 <table id="accountForm">
 <%= error_messages_for 'user' %>
 <%= form_for :user, :html => { :multipart => true } do |f| %>
 <table id="accountForm">


@@ -63,7 +67,7 @@
 
   <tr>
     <td class="fieldName"><%= t 'user.account.profile description' %></td>
 
   <tr>
     <td class="fieldName"><%= t 'user.account.profile description' %></td>

-    <td><%= f.text_area :description, :rows => '5', :cols => '60' %></td>
+    <td><%= richtext_area :user, :description, :rows => '15', :cols => '80' %></td>

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


@@ -81,13 +85,10 @@
       <%= t 'user.account.image' %>
     </td>
     <td valign="top">
       <%= t 'user.account.image' %>
     </td>
     <td valign="top">

-      <% if @user.image.nil? %>
-        <%= hidden_field_tag "image_action", "new" %>
-        <%= t 'user.account.new image' %><br /><%= file_column_field "user", "image" %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span>
-      <% else %>
+      <% if @user.image.file? %>

         <table id="accountImage">
           <tr>
         <table id="accountImage">
           <tr>

-            <td rowspan="3" valign="top"><%= image_tag url_for_file_column(@user, "image"), :class => "user_image" %></td>
+            <td rowspan="3" valign="top"><%= user_image @user %></td>

             <td><%= radio_button_tag "image_action", "keep", true %></td>
             <td><%= t 'user.account.keep image' %></td>
           </tr>
             <td><%= radio_button_tag "image_action", "keep", true %></td>
             <td><%= t 'user.account.keep image' %></td>
           </tr>


@@ -97,9 +98,12 @@
           </tr>
           <tr>
             <td><%= radio_button_tag "image_action", "new" %></td>
           </tr>
           <tr>
             <td><%= radio_button_tag "image_action", "new" %></td>

-            <td><%= t 'user.account.replace image' %><br /><%= file_column_field "user", "image", :onchange => "$('image_action_new').checked = true" %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span></td>
+            <td><%= t 'user.account.replace image' %><br /><%= f.file_field :image, :onchange => "$('image_action_new').prop('checked', true)" %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span></td>

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

+      <% else %>
+        <%= hidden_field_tag "image_action", "new" %>
+        <%= t 'user.account.new image' %><br /><%= f.file_field :image %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span>

       <% end %>
     </td>
   </tr>
       <% end %>
     </td>
   </tr>


@@ -113,7 +117,10 @@
     <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" class="user_map"></div>
+      <% content_for :head do %>
+        <%= javascript_include_tag "user" %>
+      <% end %>
+      <%= content_tag "div", "", :id => "map", :class => "user_map set_location" %>

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


@@ -124,16 +131,9 @@
 </table>
 <% end %>
 
 </table>
 <% end %>
 

-<%= 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 %>
   <%= 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/>