openstack/horizon
Code Issues Proposed changes

Fixes workflows to work without javascript.

Browse Source 
Fixes bug 1006170.

Change-Id: I8b873f06553208c7b257bd1c013809ed88a0ef60
This commit is contained in:
Gabriel Hurley 2012-09-07 14:47:12 -07:00
parent 5e6d5058a4
commit 34cd3163e4
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,11 @@ horizon.tabs.load_tab = function (evt) {
horizon.addInitFunction(function () { horizon.addInitFunction(function () {
var data = horizon.cookies.read('tabs'); var data = horizon.cookies.read('tabs');
$(".tab-content").find(".js-tab-pane").addClass("tab-pane");
horizon.modals.addModalInitFunction(function (el) {
$(el).find(".js-tab-pane").addClass("tab-pane");
});
$(document).on("show", ".ajax-tabs a[data-loaded='false']", horizon.tabs.load_tab); $(document).on("show", ".ajax-tabs a[data-loaded='false']", horizon.tabs.load_tab);
$(document).on("shown", ".nav-tabs a[data-toggle='tab']", function (evt) { $(document).on("shown", ".nav-tabs a[data-toggle='tab']", function (evt) {

11
horizon/templates/horizon/common/_workflow.html
View File

@ -12,15 +12,18 @@
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
{% for step in workflow.steps %} {% for step in workflow.steps %}
<li class="{% if entry_point == step.slug %}active{% endif %}{% if step.has_errors %} error{% endif %}"> <li class="{% if entry_point == step.slug %}active{% endif %}{% if step.has_errors %} error{% endif %}">
<a data-toggle="tab" data-target="#{{ step.get_id }}">{{ step }}</a> <a href="#{{ step.get_id }}" data-toggle="tab" data-target="#{{ step.get_id }}">{{ step }}</a>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
{% for step in workflow.steps %} {% for step in workflow.steps %}
<fieldset id="{{ step.get_id }}" class="tab-pane{% if entry_point == step.slug %} active{% endif %}"> <fieldset id="{{ step.get_id }}" class="js-tab-pane{% if entry_point == step.slug %} active{% endif %}">
{{ step.render }} {{ step.render }}
</fieldset> </fieldset>
{% if not forloop.last %}
<noscript><hr /></noscript>
{% endif %}
{% endfor %} {% endfor %}
</div> </div>
{% endblock %} {% endblock %}

2
openstack_dashboard/static/dashboard/less/horizon.less
View File

@ -1539,6 +1539,6 @@ label.log-length {
margin-bottom: 9px; margin-bottom: 9px;
} }
.modal-body fieldset .form-field select[data-add-item-url] { .modal-body fieldset .form-field select[data-add-item-url] {
width: 276px; width: 275px;
margin-right: 2px; margin-right: 2px;
} }