From e646376ec8d6c070c8e438b00eacd3faf0363f53 Mon Sep 17 00:00:00 2001
From: Gabriel Hurley <gabriel@strikeawe.com>
Date: Tue, 15 Jan 2013 11:57:26 -0800
Subject: [PATCH] Clarify the ambiguity of the "more actions" dropdown.

Adds the word "More" to the dropdown toggle to clearly indicate
what the arrow is for. Also disables line-wrapping between the
primary action and its dropdown toggle. Removes the individual
hacks for the widths of various tables.

Change-Id: I74c03a9cd0655457f85332c9c7d31ef3ae15059e
---
 .../horizon/common/_data_table_row_actions.html     |  5 +++--
 .../static/dashboard/less/horizon.less              | 13 +++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/horizon/templates/horizon/common/_data_table_row_actions.html b/horizon/templates/horizon/common/_data_table_row_actions.html
index 843cf8e9cc..aa06927c09 100644
--- a/horizon/templates/horizon/common/_data_table_row_actions.html
+++ b/horizon/templates/horizon/common/_data_table_row_actions.html
@@ -1,4 +1,4 @@
-{% load horizon %}
+{% load horizon i18n %}
 
 {% spaceless %} {# This makes sure whitespace doesn't affect positioning for dropdown. #}
 {% if row_actions|length > 1 %}
@@ -6,7 +6,8 @@
     {% for action in row_actions %}
         {% if forloop.first %}
           {% include "horizon/common/_data_table_row_action.html" %}
-          <a class="btn dropdown-toggle {{ action.class_string|safe }}" data-toggle="dropdown" href="#">
+          <a class="btn btn-small dropdown-toggle {{ action.class_string|safe }}" data-toggle="dropdown" href="#">
+            {% trans "More" %}
             <span class="caret"></span>
           </a>
           <ul class="dropdown-menu row_actions clearfix">
diff --git a/openstack_dashboard/static/dashboard/less/horizon.less b/openstack_dashboard/static/dashboard/less/horizon.less
index 487aac5946..4a5a2d3f42 100644
--- a/openstack_dashboard/static/dashboard/less/horizon.less
+++ b/openstack_dashboard/static/dashboard/less/horizon.less
@@ -817,17 +817,14 @@ td.select {
 /* Actions dropdown */
 
 td.actions_column {
-  width: 150px;
+  white-space: nowrap;
   padding: 10px;
   position: relative;
-  min-width: 140px;
-  min-height: 20px;
+  width: 200px;
 }
-#floating_ips td.actions_column {
-  width: 180px;
-}
-#instances td.actions_column {
-  width: 175px;
+
+td.actions_column .btn-group {
+  display: inline-block;
 }
 
 td.actions_column .row_actions a,