Update bundle

[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 8ad5af9ddac518207104718425245d4c622d00d0..9ade68121aab29d9e7bac8f9bdcde705c87ac81c 100644 (file)
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -1,40 +1,37 @@
-<% if current_user == @message.recipient %>
-  <% content_for :heading do %>
-    <h2><%= h(@message.title) %></h2>
-  <% end %>
+<% content_for :heading do %>
+  <h1><%= @message.title %></h1>
+<% end %>

 
 

+<% if current_user == @message.recipient %>

   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.sender %>
   <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>
 
     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>
   </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 class="richtext text-break"><%= @message.body.to_html %></div>

 
 

+  <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-danger" %>
+    <%= link_to t(".back"), inbox_messages_path, :class => "btn btn-link" %>
+  </div>

 <% else %>
 <% else %>

-
-  <h2><%= h(@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='message-buttons buttons'>
+  <div class="richtext text-break"><%= @message.body.to_html %></div>

 
 

-<% end %>
-
-  <%= link_to t(".back"), outbox_messages_path, :class => "button deemphasize" %>
+  <div>
+    <%= link_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "btn btn-danger" %>
+    <%= link_to t(".back"), outbox_messages_path, :class => "btn btn-link" %>

   </div>
   </div>

+<% end %>