Update Potlatch 2 to 2.3-534-g63a3364 build

[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 fbc1487bbdf0928f0887b3084df486e0837cd7e5..179e1b2f687b0d09a48d39ef33ae87d6c139de4c 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>


@@ -80,27 +84,37 @@
     <td class="fieldName">
       <%= t 'user.account.image' %>
     </td>
     <td class="fieldName">
       <%= 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 %>
-        <table id="accountImage">
-          <tr>
-            <td rowspan="3" valign="top"><%= image_tag url_for_file_column(@user, "image"), :class => "user_image" %></td>
-            <td><%= radio_button_tag "image_action", "keep", true %></td>
-            <td><%= t 'user.account.keep image' %></td>
-          </tr>
-          <tr>
-            <td><%= radio_button_tag "image_action", "delete" %></td>
-            <td><%= t 'user.account.delete image' %></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').prop('checked', true)" %><br /><span class="minorNote"><%= t 'user.account.image size hint' %></span></td>
-          </tr>
-        </table>
-      <% end %>
+    <td class="accountImage">
+      <%= user_image @user %>
+      <table>
+        <% if @user.image.file? %>
+        <tr>
+          <td><%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %></td>
+          <td><%= t 'user.account.keep image' %></td>
+        </tr>
+        <% end %>
+        <% if @user.image.file? || @user.image_use_gravatar? %>
+        <tr>
+          <td><%= radio_button_tag "image_action", "delete" %></td>
+          <td><%= t 'user.account.delete image' %></td>
+        </tr>
+        <% end %>
+        <% if @user.image.file? %>
+        <tr>
+          <td><%= radio_button_tag "image_action", "new" %></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>
+        <% else %>
+        <tr>
+          <td><%= radio_button_tag "image_action", "new" %></td>
+          <td><%= t 'user.account.new 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>
+        <% end %>
+        <tr>
+          <td><%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %></td>
+          <td><%= t 'user.account.gravatar.gravatar' %> <span class="minorNote">(<a href="<%= t 'user.account.gravatar.link' %>" target="_new"><%= t 'user.account.gravatar.link text' %></a>)</span></td>
+        </tr>
+      </table>

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


@@ -113,10 +127,13 @@
     <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>

-  
+

   <tr>
     <td></td>
     <td class="submitButton"><%= submit_tag t('user.account.save changes button') %></td>
   <tr>
     <td></td>
     <td class="submitButton"><%= submit_tag t('user.account.save changes button') %></td>


@@ -124,16 +141,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>
 <%= raw t 'user.account.public editing note.text' %>
   <%= button_to t('user.account.make edits public button'), :action => :go_public %>
 <% end %>
 <% unless @user.data_public? %>
 <a name="public"></a>
 <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/>