Modal form abstraction and cleanup. Bug fixes.

Modal forms now inherit from a _modal_form.html template,
and the guts of form presentation are abstracted to
_form_fields.html to be more DRY.

Converts nova/containers, nova/floating_ips, nova/images
and nova/instances to use the new style.

Fixed image ownership bug. Fixed server descriptions bug.

Change-Id: Ib1604665d9a0c4d9fe971af9c22ff6c09bbb35ea
This commit is contained in:
Gabriel Hurley
2011-11-15 14:31:04 -08:00
parent de01161928
commit ec59def397
72 changed files with 300 additions and 406 deletions

View File

@@ -1,9 +1,9 @@
{% extends 'syspanel/flavors/_form.html' %}
{%load i18n%}
{% block form_url %}{% url horizon:syspanel:users:create %}{% endblock %}
{% block form_action %}{% url horizon:syspanel:users:create %}{% endblock %}
{% block submit %}
{% block modal-footer %}
<div class="modal-footer">
<input class="btn primary pull-right" type="submit" value="{%trans "Create Flavor"%}" />
<a href="#" class="btn secondary cancel close">Cancel</a>

View File

@@ -1,5 +1,5 @@
{%load i18n%}
<form action="{% block form_url %}{% endblock %}" method="post">
<form action="{% block form_action %}{% endblock %}" method="post">
{% csrf_token %}
<fieldset>
{% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
</div>
</div>
{% endfor %}
{% block submit %}
{% block modal-footer %}
<input type="submit" value="{%trans "Create Flavor" %}" />
{% endblock %}
</fieldset>

View File

@@ -1,5 +1,5 @@
{%load i18n%}
<form action="{% block form_url %}{% endblock %}" method="post">
<form action="{% block form_action %}{% endblock %}" method="post">
{% csrf_token %}
<fieldset>
{% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
</div>
</div>
{% endfor %}
{% block submit %}
{% block modal-footer %}
<input type="submit" value="{%trans "Update Image" %}" />
{% endblock %}
</fieldset>

View File

@@ -1,9 +1,9 @@
{% extends 'syspanel/images/_form.html' %}
{%load i18n%}
{% block form_url %}{% url horizon:syspanel:images:update image.id %}{% endblock %}
{% block form_action %}{% url horizon:syspanel:images:update image.id %}{% endblock %}
{% block submit %}
{% block modal-footer %}
<div class="modal-footer">
<input class="btn primary pull-right" type="submit" value="{%trans "Update Image"%}" />
<a href="#" class="btn secondary cancel close">Cancel</a>

View File

@@ -1,9 +1,9 @@
{% extends 'syspanel/images/_form.html' %}
{%load i18n%}
{% block form_url %}{% url horizon:syspanel:tenants:create %}{% endblock %}
{% block form_action %}{% url horizon:syspanel:tenants:create %}{% endblock %}
{% block submit %}
{% block modal-footer %}
<div class="modal-footer">
<input class="btn primary pull-right" type="submit" value="{%trans "Create Tenant"%}" />
<a href="#" class="btn secondary cancel close">Cancel</a>

View File

@@ -1,6 +1,6 @@
{% extends "syspanel/tenants/_form.html" %}
{%load i18n%}
{% block submit %}
{% block modal-footer %}
<input type="submit" value="{% trans "Create Tenant"%}" class="large-rounded" />
{% endblock %}

View File

@@ -1,5 +1,5 @@
{%load i18n%}
<form action="{% block form_url %}{% endblock %}" method="post">
<form action="{% block form_action %}{% endblock %}" method="post">
{% csrf_token %}
<fieldset>
{% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
</div>
</div>
{% endfor %}
{% block submit %}
{% block modal-footer %}
<input type="submit" value="{%trans "Update Tenant" %}" />
{% endblock %}
</fieldset>

View File

@@ -6,7 +6,7 @@
{{ field.errors }}
{{ field }}
{% endfor %}
{% block submit %}
{% block modal-footer %}
{% endblock %}
</form>

View File

@@ -1,9 +1,9 @@
{% extends 'syspanel/images/_form.html' %}
{%load i18n%}
{% block form_url %}{% url horizon:syspanel:tenants:update tenant_id %}{% endblock %}
{% block form_action %}{% url horizon:syspanel:tenants:update tenant_id %}{% endblock %}
{% block submit %}
{% block modal-footer %}
<div class="modal-footer">
<input class="btn primary pull-right" type="submit" value="{%trans "Update Tenant"%}" />
<a href="#" class="btn secondary cancel close">Cancel</a>

View File

@@ -1,6 +1,6 @@
{% extends "syspanel/tenants/_form.html" %}
{%load i18n%}
{% block submit %}
{% block modal-footer %}
<input type="submit" value="{% trans "Update Tenant"%}" class="large-rounded" />
{% endblock %}

View File

@@ -1,9 +1,9 @@
{% extends 'syspanel/images/_form.html' %}
{%load i18n%}
{% block form_url %}{% url horizon:syspanel:tenants:quotas tenant_id %}{% endblock %}
{% block form_action %}{% url horizon:syspanel:tenants:quotas tenant_id %}{% endblock %}
{% block submit %}
{% block modal-footer %}
<div class="modal-footer">
<input class="btn primary pull-right" type="submit" value="{%trans "Update Quotas"%}" />
<a href="#" class="btn secondary cancel close">Cancel</a>

View File

@@ -1,6 +1,6 @@
{% extends "syspanel/tenants/_quotas_form.html" %}
{%load i18n%}
{% block submit %}
{% block modal-footer %}
<input type="submit" value="{% trans "Update Quotas"%}" class="large-rounded" />
{% endblock %}

View File

@@ -1,9 +1,9 @@
{% extends "syspanel/users/_form.html" %}
{%load i18n%}
{% block form_url %}{% url horizon:syspanel:users:create %}{% endblock %}
{% block form_action %}{% url horizon:syspanel:users:create %}{% endblock %}
{% block submit %}
{% block modal-footer %}
<div class="modal-footer">
<input class="btn primary pull-right" type="submit" value="{%trans "Create Tenant"%}" />
<a href="#" class="btn secondary cancel close">Cancel</a>

View File

@@ -1,7 +1,7 @@
{% extends "syspanel/users/_form.html" %}
{%load i18n%}
{% block submit %}
{% block modal-footer %}
<input type="submit" value="{% trans "Create User"%}" class="large-rounded" />
{% endblock %}

View File

@@ -1,5 +1,5 @@
{%load i18n%}
<form action="{% block form_url %}{% endblock %}" method="post">
<form action="{% block form_action %}{% endblock %}" method="post">
{% csrf_token %}
<fieldset>
{% for hidden in form.hidden_fields %}
@@ -19,7 +19,7 @@
</div>
</div>
{% endfor %}
{% block submit %}
{% block modal-footer %}
<input type="submit" value="{%trans "Update Tenant" %}" />
{% endblock %}
</fieldset>

View File

@@ -1,9 +1,9 @@
{% extends "syspanel/users/_form.html" %}
{%load i18n%}
{% block form_url %}{% url horizon:syspanel:users:create %}{% endblock %}
{% block form_action %}{% url horizon:syspanel:users:create %}{% endblock %}
{% block submit %}
{% block modal-footer %}
<div class="modal-footer">
<input class="btn primary pull-right" type="submit" value="{%trans "Update User"%}" />
<a href="#" class="btn secondary cancel close">Cancel</a>

View File

@@ -1,7 +1,7 @@
{% extends "syspanel/users/_form.html" %}
{%load i18n%}
{% block submit %}
{% block modal-footer %}
<input type="submit" value="{% trans "Update User"%}" class="large-rounded" />
{% endblock %}