Move profile-related settings to their own form

[rails.git] / app / views / messages / show.html.erb

diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index e3634e232807a9600e6157d41a017e5ffed93784..3631467fd249277fa9c43af99c41ab53cd7826f7 100644 (file)
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -1,11 +1,11 @@
 <% if current_user == @message.recipient %>
   <% content_for :heading do %>
 <% if current_user == @message.recipient %>
   <% content_for :heading do %>

-    <h2><%= h(@message.title) %></h2>
+    <h2><%= @message.title %></h2>

   <% end %>
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.sender %>
   <% end %>
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.sender %>

-    <%= link_to h(@message.sender.display_name), user_path(@message.sender) %></td>
+    <%= link_to @message.sender.display_name, user_path(@message.sender) %></td>

     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>
     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>


@@ -13,28 +13,29 @@
 
   <div class="richtext"><%= @message.body.to_html %></div>
 
 
   <div class="richtext"><%= @message.body.to_html %></div>
 

-  <div class='message-buttons buttons'>
-    <%= button_to t('.reply_button'), message_reply_path(@message), :class => 'reply-button' %>
-    <%= button_to t('.unread_button'), message_mark_path(@message, :mark => 'unread'), :class => 'mark-unread-button' %>
-    <%= button_to t('.destroy_button'), message_path(@message), :method => 'delete', :class => 'destroy-button' %>
+  <div>
+    <%= link_to t(".reply_button"), message_reply_path(@message), :class => "btn btn-primary" %>
+    <%= link_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :method => "post", :class => "btn btn-primary" %>
+    <%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-primary" %>
+    <%= link_to t(".back"), inbox_messages_path, :class => "btn btn-link" %>
+  </div>

 
 <% else %>
 
 
 <% else %>
 

-  <h2><%= h(@message.title) %></h2>
+  <h2><%= @message.title %></h2>

 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.recipient %>
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.recipient %>

-    <%= link_to h(@message.recipient.display_name), user_path(@message.recipient) %></td>
+    <%= link_to @message.recipient.display_name, user_path(@message.recipient) %></td>

     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>
   </div>
 
     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>
   </div>
 

-  <div class="richtext"><%= @message.body.to_html %></div>
+  <div class="richtext text-break"><%= @message.body.to_html %></div>

 
 

-  <div class='message-buttons buttons'>
+  <div>
+    <%= link_to t(".back"), outbox_messages_path, :class => "btn btn-link" %>
+  </div>

 
 <% end %>
 
 <% end %>

-
-  <%= link_to t('.back'), outbox_messages_path, :class => "button deemphasize" %>
-  </div>