Merge "Siwtch the 'validation' and 'roles' columns"

This commit is contained in:
Jenkins 2015-02-25 12:04:47 +00:00 committed by Gerrit Code Review
commit af62f04147
1 changed files with 11 additions and 11 deletions

View File

@ -27,6 +27,17 @@
{% block main %}
<div class="row">
<div class="col-xs-8">
{% if stack %}
{% if stack.is_deployed and stack.is_initialized %}
{% include "tuskar_boxes/overview/role_nodes_live.html" %}
{% else %}
{% include "tuskar_boxes/overview/role_nodes_status.html" %}
{% endif %}
{% else %}
{% include "tuskar_boxes/overview/role_nodes_edit.html" %}
{% endif %}
</div>
<div class="col-xs-4">
{% if stack %}
{% if stack.is_deleting or stack.is_deploying or stack.is_updating %}
@ -42,17 +53,6 @@
{% include "infrastructure/overview/deployment_plan.html" %}
{% endif %}
</div>
<div class="col-xs-8">
{% if stack %}
{% if stack.is_deployed and stack.is_initialized %}
{% include "tuskar_boxes/overview/role_nodes_live.html" %}
{% else %}
{% include "tuskar_boxes/overview/role_nodes_status.html" %}
{% endif %}
{% else %}
{% include "tuskar_boxes/overview/role_nodes_edit.html" %}
{% endif %}
</div>
</div>
<div class="row">