diff --git a/pywps/templates/1.0.0/execute/main.xml b/pywps/templates/1.0.0/execute/main.xml
index e21e6b506..047b39aab 100644
--- a/pywps/templates/1.0.0/execute/main.xml
+++ b/pywps/templates/1.0.0/execute/main.xml
@@ -10,7 +10,7 @@
{% if wsdl %}
{% endif %}
-
+
{% if status.status == "accepted" %}
{{ status.message }}
@@ -29,39 +29,39 @@
{% endif %}
-
+
{% if lineage %}
{% if input_definitions %}
-
+
{% for input in input_definitions %}
-
+
{{ input.identifier }}
{{ get_translation(input, "title", language) }}
{{ get_translation(input, "abstract", language) }}
{% if input.type == "complex" %}
-
+
{{ input.data | safe }}
-
+
{% elif input.type == "literal" %}
-
+
{{ input.data }}
-
+
{% elif input.type == "bbox" %}
-
+
{% for c in input.ll %} {{ c }} {% endfor %}
{% for c in input.ur %} {{ c }} {% endfor %}
-
+
{% elif input.type == "reference" %}
{% endif %}
-
+
{% endfor %}
-
+
{% endif %}
{% if output_definitions %}
-
+
{% for output in output_definitions %}
{% if output.type in ["complex", "reference"] %}
@@ -71,38 +71,38 @@
{{ output.identifier }}
{{ get_translation(output, "title", language) }}
{{ get_translation(output, "abstract", language) }}
-
+
{% endfor %}
-
+
{% endif %}
{% endif %}
{% if outputs %}
-
+
{% for output in outputs %}
-
+
{{ output.identifier }}
{{ get_translation(output, "title", language) }}
{{ get_translation(output, "abstract", language) }}
{% if output.type == "reference" %}
{% elif output.type == "complex" %}
-
+
{{ output.data | safe }}
-
+
{% elif output.type == "literal" %}
-
+
{{ output.data }}
-
+
{% elif output.type == "bbox" %}
-
+
{% for c in output.ll %} {{ c }} {% endfor %}
{% for c in output.ur %} {{ c }} {% endfor %}
-
+
{% endif %}
-
+
{% endfor %}
-
+
{% endif %}
diff --git a/pywps/templates/2.0.0/capabilities/main.xml b/pywps/templates/2.0.0/capabilities/main.xml
index fadc9399b..3f17fef57 100644
--- a/pywps/templates/2.0.0/capabilities/main.xml
+++ b/pywps/templates/2.0.0/capabilities/main.xml
@@ -1,24 +1,24 @@
-
+
{{ title }}
{{ abstract }}
{% for keyword in keywords %}
{{ keyword }}{% endfor %}
-
- WPS
- 2.0.0
+
+ WPS
+ 2.0.0
{{ fees }}
{% for ac in accessconstraints %}{{ ac }} {% endfor %}
-
-
+
+
{{ provider.name }}
-
+
{{ provider.individual }}
{{ provider.position }}
-
+
{{ provider.voice }}
{{ provider.fascimile }}
@@ -31,76 +31,76 @@
{{ provider.address.country }}
{{ provider.address.email }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
{% for process in processes %}
- process.title
- process.identifier
+ process.title
+ process.identifier
{{ process.abstract }}{% for metadata in process.metadata %}
- {% endfor %}
+ {% if metadata.href != None %}
+ xlink:href="{{ metadata.href }}"
+ {% endif %}
+ {% if metadata.role != None %}
+ xlink:role="{{ metadata.role }}"
+ {% endif %}
+ />
+ {% endfor %}
{% for keyword in process.keywords %}
{{ keyword }}{% endfor %}
{% endfor %}
-
+