From 716a6c6c3fdd04f8ce468bb5111e56b1ffb9dd89 Mon Sep 17 00:00:00 2001 From: Rob Cresswell Date: Thu, 14 Jan 2016 12:54:46 +0000 Subject: [PATCH] Revert "Specify element in all pages" This reverts commit 4480055c9160e5773cf2de6edd7f9ff443608a0e. This patch broke pagination from anything other than the first page, as well as breaking links on the theme preview page. Change-Id: I0d4398451601d702abbc33b2497e2c018a338cd9 --- horizon/static/horizon/js/horizon.tabs.js | 2 +- horizon/templates/horizon/common/_data_table.html | 4 ++-- horizon/templates/horizon/common/_tab_group.html | 2 +- openstack_dashboard/templates/base.html | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/horizon/static/horizon/js/horizon.tabs.js b/horizon/static/horizon/js/horizon.tabs.js index 2b48873461..67d0bfcf0b 100644 --- a/horizon/static/horizon/js/horizon.tabs.js +++ b/horizon/static/horizon/js/horizon.tabs.js @@ -29,7 +29,7 @@ horizon.tabs.load_tab = function () { horizon.tabs.initTabLoad(tab_pane); }); } else { - tab_pane.load(window.location + "?tab=" + tab_id.replace('#', ''), function() { + tab_pane.load("?tab=" + tab_id.replace('#', ''), function() { horizon.tabs.initTabLoad(tab_pane); }); } diff --git a/horizon/templates/horizon/common/_data_table.html b/horizon/templates/horizon/common/_data_table.html index dda6898a4a..df3c9c7d38 100644 --- a/horizon/templates/horizon/common/_data_table.html +++ b/horizon/templates/horizon/common/_data_table.html @@ -74,10 +74,10 @@ | {% endif %} {% if table.has_prev_data %} - {% trans "« Prev" %} + {% trans "« Prev" %} {% endif %} {% if table.has_more_data %} - {% trans "Next »" %} + {% trans "Next »" %} {% endif %} diff --git a/horizon/templates/horizon/common/_tab_group.html b/horizon/templates/horizon/common/_tab_group.html index 7b7387ae2f..f09a66e8bc 100644 --- a/horizon/templates/horizon/common/_tab_group.html +++ b/horizon/templates/horizon/common/_tab_group.html @@ -6,7 +6,7 @@ diff --git a/openstack_dashboard/templates/base.html b/openstack_dashboard/templates/base.html index a1ebbc35ea..4efee7dd2b 100644 --- a/openstack_dashboard/templates/base.html +++ b/openstack_dashboard/templates/base.html @@ -15,7 +15,6 @@ {% include "horizon/_conf.html" %} {% include "horizon/client_side/_script_loader.html" %} {% include "horizon/_custom_head_js.html" %} -