From 999f5bbde3c611f6fdd67657f69bb6bad70f4202 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 9 Jun 2016 16:01:03 +0200
Subject: [PATCH] Improves styles for direct messages

---
 app/views/direct_messages/show.html.erb | 23 ++++++++++++++++++-----
 app/views/users/show.html.erb           | 10 +++++++---
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/views/direct_messages/show.html.erb b/app/views/direct_messages/show.html.erb
index 81303c494..30a771a39 100644
--- a/app/views/direct_messages/show.html.erb
+++ b/app/views/direct_messages/show.html.erb
@@ -1,5 +1,18 @@
-<div>
-  <p><%= @direct_message.title %></p>
-  <p><%= @direct_message.body %></p>
-  <p><%= @direct_message.receiver.name %></p>
-</div>
\ No newline at end of file
+<div class="row">
+  <div class="small-12 medium-9 column">
+    <%= link_to user_path(@direct_message.receiver), class: "back" do %>
+      <span class="icon-angle-left"></span>
+      <%= t("shared.back") %>
+    <% end %>
+
+    <div class="clear"></div>
+
+    <div class="margin-top">
+      <span><strong><%= t("users.direct_messages.show.receiver",
+      receiver: @direct_message.receiver.name) %></strong></span>
+    </div>
+
+    <h1><%= @direct_message.title %></h1>
+    <p><%= @direct_message.body %></p>
+  </div>
+</div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index be62aef5d..6adb97b37 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -2,7 +2,13 @@
   <div class="activity row margin-top">
     <div class="small-12 column">
 
-      <h2>
+      <% if @user != current_user %>
+        <%= link_to t("users.show.send_private_message"),
+                    new_user_direct_message_path(@user),
+                    class: "button hollow float-right" %>
+      <% end %>
+
+      <h2 class="inline-block">
         <%= avatar_image(@user, seed: @user.id, size: 60) %>
         <%= @user.name %>
         <% if current_administrator? %>
@@ -10,8 +16,6 @@
         <% end %>
       </h2>
 
-      <p><%= link_to "Enviar un mensaje privado", new_user_direct_message_path(@user) %></p>
-
       <% if @user.public_activity || @authorized_current_user %>
         <ul class="menu simple margin-top">
           <% @valid_filters.each do |filter| %>