Use a root relative URL for the donation button image.

[rails.git] / app / views / user / view.rhtml

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index c5fc6388db6ddeb758d481632b0fc834d6b9c6b6..438de836d463be146c4364213471b9674fb1244c 100644 (file)
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -3,7 +3,7 @@
 <div id="userinformation">
 <% if @user and @this_user.id == @user.id %>
 <%= link_to 'my diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
 <div id="userinformation">
 <% if @user and @this_user.id == @user.id %>
 <%= link_to 'my diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>

-| <%= link_to 'new diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
+| <%= link_to 'new diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>

 | <%= link_to 'my traces', :controller => 'trace', :action=>'mine' %>
 | <%= link_to 'my settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
 <% else %>
 | <%= link_to 'my traces', :controller => 'trace', :action=>'mine' %>
 | <%= link_to 'my settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
 <% else %>


@@ -20,7 +20,10 @@
 
 <h3>User image</h3>
 <% if @this_user.image %>
 
 <h3>User image</h3>
 <% if @this_user.image %>

- <%= image_tag url_for_file_column(@this_user, "image") %>
+  <%= image_tag url_for_file_column(@this_user, "image") %>
+  <% if @user and @this_user.id == @user.id %>
+    <%= button_to 'Delete Image', :action => 'delete_image' %>
+  <% end %>

 <% end %>
 <br />
 
 <% end %>
 <br />
 


@@ -28,7 +31,7 @@
   Upload an image<br />
   <%= form_tag({:action=>'upload_image'}, :multipart => true)%>
     <%= file_column_field 'user', 'image' %>
   Upload an image<br />
   <%= form_tag({:action=>'upload_image'}, :multipart => true)%>
     <%= file_column_field 'user', 'image' %>

-    <input type="submit" name="Upload" />
+    <%= submit_tag 'Add Image' %>

   </form>
 <% end %>
 
   </form>
 <% end %>