openstack/horizon
Code Issues Proposed changes

Merge "Revert "Specify <base> element in all pages""

Browse Source
This commit is contained in:
Jenkins 2016-01-16 14:16:07 +00:00 committed by Gerrit Code Review
commit 0741ef7ab3
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/static/horizon/js/horizon.tabs.js
View File

@ -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);
});
}

4
horizon/templates/horizon/common/_data_table.html
View File

@ -74,10 +74,10 @@
<span class="spacer">|</span>
{% endif %}
{% if table.has_prev_data %}
<a href="{{ table.get_full_url }}?{{ table.get_prev_pagination_string }}">{% trans "&laquo;&nbsp;Prev" %}</a>
<a href="?{{ table.get_prev_pagination_string }}">{% trans "&laquo;&nbsp;Prev" %}</a>
{% endif %}
{% if table.has_more_data %}
<a href="{{ table.get_full_url }}?{{ table.get_pagination_string }}">{% trans "Next&nbsp;&raquo;" %}</a>
<a href="?{{ table.get_pagination_string }}">{% trans "Next&nbsp;&raquo;" %}</a>
{% endif %}
</td>
</tr>

2
horizon/templates/horizon/common/_tab_group.html
View File

@ -6,7 +6,7 @@
<ul id="{{ tab_group.get_id }}" {{ tab_group.attr_string|safe }}>
{% for tab in tabs %}
<li {{ tab.attr_string|safe }}>
<a href="{{ tab_group.request.path }}?{{ tab_group.param_name }}={{ tab.get_id }}" data-toggle="tab" data-target="#{{ tab.get_id }}" data-loaded='{{ tab.load|yesno:"true,false" }}'>{{ tab.name }}</a>
<a href="?{{ tab_group.param_name }}={{ tab.get_id }}" data-toggle="tab" data-target="#{{ tab.get_id }}" data-loaded='{{ tab.load|yesno:"true,false" }}'>{{ tab.name }}</a>
</li>
{% endfor %}
</ul>

1
openstack_dashboard/templates/base.html
View File

@ -15,7 +15,6 @@
{% include "horizon/_conf.html" %}
{% include "horizon/client_side/_script_loader.html" %}
{% include "horizon/_custom_head_js.html" %}
<base href="{{ WEBROOT }}" />
</head>
<body id="{% block body_id %}{% endblock %}" ng-app='horizon.app' ng-strict-di>
<noscript>