Small message group improvements

plugins/messages/app/views/admin/messagegroups/index.html.haml

@@ -5,6 +5,7 @@
 
 - content_for :sidebar do
   %p= t('.first_paragraph', url: link_to(t('.new_messagegroups'), new_admin_messagegroup_path)).html_safe
+  %p= t '.second_paragraph'
 .well.well-small
   = form_tag admin_messagegroups_path, :method => :get, :remote => true,
     'data-submit-onchange' => true, class: 'form-search' do

plugins/messages/app/views/message_threads/index.html.haml

@@ -1,8 +1,6 @@
 - title t('.title')
 
-- content_for :actionbar do
-  = link_to t('.messages'), messages_path, class: 'btn'
-  = link_to t('.new'), new_message_path, class: 'btn btn-primary'
+= render 'messages/actionbar', active: 'message_threads'
 
 = render 'groupmessage_threads', group: nil, name: t('.other'), id: 0
 

plugins/messages/app/views/messagegroups/index.html.haml

@@ -1,5 +1,5 @@
 - title t('.title')
 
-= t('.body').html_safe
+%p= t('.body')
 
 = render :partial => "messagegroup", :collection => @messagegroups

plugins/messages/app/views/messages/_actionbar.haml

@@ -0,0 +1,8 @@
+- content_for :actionbar do
+  .btn-group
+    = link_to message_threads_path, class: "btn #{'active' if active == 'message_threads'}" do
+      %i.icon.icon-align-left{title: t('.message_threads')}
+    = link_to messages_path, class: "btn #{'active' if active == 'messages'}" do
+      %i.icon.icon-align-justify{title: t('.messages')}
+  = link_to t('.messagegroups'), messagegroups_path, class: 'btn'
+  = link_to t('.new'), new_message_path, class: 'btn btn-primary'

plugins/messages/app/views/messages/index.html.haml

@@ -1,7 +1,6 @@
 - title t('.title')
 
-- content_for :actionbar do
-  = link_to t('.message_threads'), message_threads_path, class: 'btn'
-  = link_to t('.new'), new_message_path, class: 'btn btn-primary'
+= render 'actionbar', active: 'messages'
+
 #messages
   = render 'messages', messages: @messages, pagination: true