diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index 7f311f4d7..a8fbb98cc 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -4,41 +4,36 @@ <% for journal in jour%> - - - - + + + +
<%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %> - - - - - - - - - - -
<%=link_to journal.user, user_path(journal.user)%> - <% if @user == User.current%> - <%= l(:label_leave_me_message) %> - <% else %> - <%= l(:label_leave_others_message) %> - <% end %> -

<%= textilizable journal.notes%>

<%= format_time journal.created_on %> - <% if @user == User.current%> - <%= link_to(image_tag('comment.png'), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true, - :method => 'post', :title => l(:button_quote))%><%= link_to(image_tag('delete.png'), {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => user}, - :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) if remove_allowed || journal.jour_id == User.current.id %> - <% else %> - <%= link_to(image_tag('comment.png'), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true, - :method => 'post', :title => l(:button_quote))%> - <% end %> -
<%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %> + + + + + + + + + + + + <% else %> + <%= link_to(image_tag('comment.png'), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true, + :method => 'post', :title => l(:button_quote))%> + <% end %> + +
<%= link_to journal.user, user_path(journal.user)%> <% if @user == User.current %> <%= l(:label_leave_me_message) %> <% else %> <%= l(:label_leave_others_message) %> <% end %>
+

+ <%= textilizable journal.notes%> +

<%= format_time journal.created_on %> <% if @user == User.current %> + <%= link_to(image_tag('comment.png'), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true, + :method => 'post', :title => l(:button_quote))%> + <%= link_to(image_tag('delete.png'), {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => user}, + :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) if remove_allowed || journal.jour_id == User.current.id %>
<% end %> <% end %> - - -