From: Yasin Date: Mon, 19 Jan 2015 17:41:50 +0000 (+0100) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.3~117 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f14b01877d399b176e18a44f1d265358ad27de89;hp=f260b110d674517b272e977e30a43bef4c4f1f03;p=myslice.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab --- diff --git a/portal/templates/fed4fire/fed4fire_slicerequest_view.html b/portal/templates/fed4fire/fed4fire_slicerequest_view.html index 98097dbb..c8fecf63 100644 --- a/portal/templates/fed4fire/fed4fire_slicerequest_view.html +++ b/portal/templates/fed4fire/fed4fire_slicerequest_view.html @@ -4,7 +4,7 @@ {% block content %}
- diff --git a/portal/templates/slice-request-view.html b/portal/templates/slice-request-view.html deleted file mode 100644 index 830c7eeb..00000000 --- a/portal/templates/slice-request-view.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "layout.html" %} -{% load i18n %} - -{% block head %} -{{ wizard.form.media }} - -{% endblock %} - -{% block content %} - - - -
-

Request a Slice

-
- -
-
{% csrf_token %} -
- {% for field in form %} -
- -
{{ field.errors }} {{ field }}
-

{{ field.help_text }}

-
- {% endfor %} - -
-
-
- -{% endblock %}