diff --git a/horizon/tables/base.py b/horizon/tables/base.py index 79dcf018143..3e701632844 100644 --- a/horizon/tables/base.py +++ b/horizon/tables/base.py @@ -711,7 +711,7 @@ def get_data(self, datum, column, row): form_field_attributes) table._data_cache[column][table.get_object_id(datum)] = data elif column.auto == "actions": - data = table.render_row_actions(datum, pull_right=False) + data = table.render_row_actions(datum) table._data_cache[column][table.get_object_id(datum)] = data else: data = column.get_data(datum) @@ -1454,7 +1454,7 @@ def render_table_actions(self): self.set_multiselect_column_visibility(len(bound_actions) > 0) return table_actions_template.render(context) - def render_row_actions(self, datum, pull_right=True, row=False): + def render_row_actions(self, datum, row=False): """Renders the actions specified in ``Meta.row_actions`` using the current row data. If `row` is True, the actions are rendered in a row of buttons. Otherwise they are rendered in a dropdown box. @@ -1467,8 +1467,7 @@ def render_row_actions(self, datum, pull_right=True, row=False): row_actions_template = template.loader.get_template(template_path) bound_actions = self.get_row_actions(datum) extra_context = {"row_actions": bound_actions, - "row_id": self.get_object_id(datum), - "pull_right": pull_right} + "row_id": self.get_object_id(datum)} context = template.RequestContext(self.request, extra_context) return row_actions_template.render(context) diff --git a/horizon/templates/horizon/common/_data_table_row_actions_dropdown.html b/horizon/templates/horizon/common/_data_table_row_actions_dropdown.html index 9b62e9dd25c..a7841c82981 100644 --- a/horizon/templates/horizon/common/_data_table_row_actions_dropdown.html +++ b/horizon/templates/horizon/common/_data_table_row_actions_dropdown.html @@ -5,7 +5,7 @@ {% if row_actions|length == 1 %} {% include "horizon/common/_data_table_action.html" with action=row_actions.0 is_single=1 %} {% elif row_actions|length > 1 %} -
+
{% for action in row_actions %} {% if forloop.first %} {% include "horizon/common/_data_table_action.html" with is_small=1 is_single=1 %} diff --git a/horizon/templates/horizon/common/_detail_header.html b/horizon/templates/horizon/common/_detail_header.html index ecb5361d496..99a52766a71 100644 --- a/horizon/templates/horizon/common/_detail_header.html +++ b/horizon/templates/horizon/common/_detail_header.html @@ -1,12 +1,12 @@ -