openstack/horizon
Code Issues Proposed changes

Merge "Refactor horizon/common/_modal_form.html template"

Browse Source
This commit is contained in:
Jenkins 2014-12-06 02:03:45 +00:00 committed by Gerrit Code Review
commit 517bde4010
2 changed files with 48 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,21 @@
<div id="{% block modal_id %}{% endblock %}" class="{% block modal_class %}{% if hide %}modal{% else %}static_page{% endif %}{% endblock %}"> <div id="{% block modal_id %}{{ modal_id }}{% endblock %}"
class="{% block modal_class %}{% if hide %}modal{% else %}static_page{% endif %}{% endblock %}">
<div class="{% if hide %}modal-dialog{% endif %}"> <div class="{% if hide %}modal-dialog{% endif %}">
<div class="{% if hide %}modal-content{% endif %}"> <div class="{% if hide %}modal-content{% endif %}">
{% block header %}
<div class="modal-header"> <div class="modal-header">
{% if hide %}<a href="#" class="close" data-dismiss="modal">&times;</a>{% endif %} {% if hide %}<a href="#" class="close" data-dismiss="modal">&times;</a>{% endif %}
<h3>{% block modal-header %}{% endblock %}</h3> <h3>{% block modal-header %}{{ modal_header }}{% endblock %}</h3>
</div> </div>
{% endblock %}
{% block content %}
<div class="modal-body clearfix"> <div class="modal-body clearfix">
{% block modal-body %}{% endblock %} {% block modal-body %}{% endblock %}
</div> </div>
<div class="modal-footer">{% block modal-footer %}{% endblock %}</div> <div class="modal-footer">{% block modal-footer %}{% endblock %}</div>
{% endblock %}
</div> </div>
</div> </div>
</div> </div>
{% block modal-js %}
{% endblock %}

16
horizon/templates/horizon/common/_modal_form.html
View File

@ -1,18 +1,11 @@
<div id="{% block modal_id %}{{ modal_id }}{% endblock %}" {% extends "horizon/common/_modal.html" %}
class="{% block modal_class %}{% if hide %}modal{% else %}static_page{% endif %}{% endblock %}"> {% block content %}
<div class="{% if hide %}modal-dialog{% endif %}">
<div class="{% if hide %}modal-content{% endif %}">
<div class="modal-header">
{% if hide %}<a href="#" class="close" data-dismiss="modal">&times;</a>{% endif %}
<h3>{% block modal-header %}{{ modal_header }}{% endblock %}</h3>
</div>
{% if table %} {% if table %}
<div class="modal-body"> <div class="modal-body">
{{ table.render }} {{ table.render }}
</div> </div>
<hr> <hr>
{% endif %} {% endif %}
<form id="{% block form_id %}{{ form_id }}{% endblock %}" <form id="{% block form_id %}{{ form_id }}{% endblock %}"
ng-controller="{% block ng_controller %}DummyCtrl{% endblock %}" ng-controller="{% block ng_controller %}DummyCtrl{% endblock %}"
name="{% block form_name %}{% endblock %}" name="{% block form_name %}{% endblock %}"
@ -53,9 +46,4 @@
{% endblock %} {% endblock %}
</div> </div>
</form> </form>
</div>
</div>
</div>
{% block modal-js %}
{% endblock %} {% endblock %}