From 2827d8ad812850815a0af7c423dcbe58203e5816 Mon Sep 17 00:00:00 2001
From: Saman Bemel-Benrud <samanpwbb@gmail.com>
Date: Mon, 29 Jul 2013 19:46:07 -0400
Subject: [PATCH] Succint button copy + force single line grouped buttons

---
 app/assets/stylesheets/common.css.scss | 3 +++
 app/views/message/new.html.erb         | 2 +-
 app/views/message/read.html.erb        | 2 +-
 config/locales/en.yml                  | 3 +--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index b2343795f..6e86e7f32 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1748,6 +1748,9 @@ a.button {
     min-width: 100px;
     max-width: 150px;
     border-right:1px solid white;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
   }
   input:first-child,
   .button:first-child {
diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb
index 3dc16acc0..32344a3e9 100644
--- a/app/views/message/new.html.erb
+++ b/app/views/message/new.html.erb
@@ -16,7 +16,7 @@
     </div>
     <div class='buttons'>
       <%= submit_tag t('message.new.send_button') %>
-      <%= link_to t('message.new.back_to_inbox'), { :controller => 'message', :action => 'inbox', :display_name => @user.display_name }, :class => 'deemphasize button' %>
+      <%= link_to t('message.new.back'), { :controller => 'message', :action => 'inbox', :display_name => @user.display_name }, :class => 'deemphasize button' %>
     </div>
   </fieldset>
 <% end %>
diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb
index eeacd5b39..0c9b622e8 100644
--- a/app/views/message/read.html.erb
+++ b/app/views/message/read.html.erb
@@ -35,5 +35,5 @@
 
 <% end %>
 
-  <%= link_to t('message.read.back_to_outbox'), {:controller => 'message', :action => 'outbox', :display_name => @user.display_name }, :class => "button deemphasize" %>
+  <%= link_to t('message.read.back'), {:controller => 'message', :action => 'outbox', :display_name => @user.display_name }, :class => "button deemphasize" %>
   </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7e4d15aaf..06944ce4e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1291,9 +1291,8 @@ en:
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"
-      back_to_inbox: "Back to inbox"
+      back: "Back"
       to: "To"
-      back_to_outbox: "Back to outbox"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
     sent_message_summary:
       delete_button: "Delete"
-- 
2.43.2