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 80c8c0e49a9b36de2547185a017991861daf523f..179e1b2f687b0d09a48d39ef33ae87d6c139de4c 100644 (file)
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -84,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.file? %>
-        <table id="accountImage">
-          <tr>
-            <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>
-          <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 /><%= 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>
-      <% 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 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>
 


@@ -120,19 +130,10 @@
       <% content_for :head do %>
         <%= javascript_include_tag "user" %>
       <% end %>
       <% content_for :head do %>
         <%= javascript_include_tag "user" %>
       <% end %>

-      <%
-         home = @user.home_lat && @user.home_lon
-         data = {
-           :lon => @user.home_lon || 0,
-           :lat => @user.home_lat || 20,
-           :zoom => home ? 12 : 1,
-           :marker => !!home
-         }
-      %>
-      <%= content_tag "div", "", :id => "map", :class => "user_map set_location", :data => data %>
+      <%= 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>