Succint button copy + force single line grouped buttons

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index b2343795f0daa8a566ecffce2e183d524d34d39e..6e86e7f32b75c0f3ae874f91752c683f0ff90309 100644 (file)
--- 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 3dc16acc043954f003dfe74e701434d5c991335c..32344a3e9008edc3d196f9231b12d387056a66cb 100644 (file)
--- 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 eeacd5b39b63c6404b26739a47ca8959f99e4b82..0c9b622e8e11a393e0e9505156f924dfcc4b3e40 100644 (file)
--- 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 7e4d15aaf5d30c2a1e2481c17e3f43eac03070b2..06944ce4e3ee70bd0b0f7c0e87ab2ed279e12be5 100644 (file)
--- 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"