x/tuskar-ui
Code Issues Proposed changes

Merge "Style the Deployment Confirmation dialog"

Browse Source
This commit is contained in:
Jenkins 2014-10-22 11:03:50 +00:00 committed by Gerrit Code Review
commit 610b303ff5
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tuskar_ui/infrastructure/static/infrastructure/scss/_individual_pages.scss
View File

@ -104,7 +104,7 @@ $link-color: #428bca;
} }
#detail__overview { #detail__overview, #collapseParameters {
ul { ul {
list-style: disc; list-style: disc;
margin: 0 0 9px 25px; margin: 0 0 9px 25px;

26
tuskar_ui/infrastructure/templates/infrastructure/overview/_deploy_confirmation.html
View File

@ -10,12 +10,24 @@
{% block modal-body %} {% block modal-body %}
<div> <div>
<p>{% trans "You are about deploy your overcloud" %} <p>{% trans "You are about deploy your overcloud." %}</p>
</p> {% if autogenerated_parameters %}
{% if autogenerated_parameters %} <i class="fa fa-info-circle"></i> &nbsp;
<strong>These parameters will be randomly generated before the deployment:</strong> {{ autogenerated_parameters|length }} parameters will be randomly generated.
<p>{{ autogenerated_parameters|join:", " }}</p> <a data-toggle="collapse" href="#collapseParameters">
{% endif %} <span class="caret"></span>
<p>{% trans "This operation cannot be undone. Are you sure you want to do that?" %}</p> </a>
<div id="collapseParameters" class="panel-collapse collapse">
<ul><li>
{{ autogenerated_parameters|join:"</li><li>" }}
</li></ul>
</div>
{% endif %}
<br /><br />
<div class="alert alert-warning">
<i class="fa fa-exclamation-triangle fa-3x pull-left text-warning"></i>
<p>{% trans "This operation cannot be undone." %}</p>
<p>{% trans "Are you sure you want to deploy changes?" %}</p>
</div>
</div> </div>
{% endblock %} {% endblock %}