From 31f7f50ff1fe569eb8537b03b58d235a0e3ff1af Mon Sep 17 00:00:00 2001
From: Christian Berendt
Date: Mon, 19 Jan 2015 20:58:15 +0100
Subject: [PATCH] Unify the syntax used for the {% ... %} delimter in Jinja2
templates
According to the Jinja2 documentation the preferred usage for
the syntax of the {% ... %} delimter is {% ... %}. This patch
changes all occurcens of {%... and ...%} to {% ... %}.
Change-Id: I49243a16b71237bea47bc29f11508e16e77e3621
---
horizon/templates/horizon/common/_data_table_cell.html | 4 ++--
.../horizon/common/_data_table_row_actions_dropdown.html | 4 ++--
horizon/templates/horizon/common/_formset_table_row.html | 2 +-
horizon/templates/horizon/common/_limit_summary.html | 2 +-
.../access_and_security/security_groups/_update.html | 2 +-
.../templates/data_processing.job_executions/_details.html | 2 +-
.../databases/templates/databases/_launch_network_help.html | 2 +-
.../firewalls/templates/firewalls/_firewall_details.html | 2 +-
.../instances/templates/instances/_decryptpassword.html | 2 +-
.../instances/templates/instances/_detail_overview.html | 2 +-
.../network_topology/templates/network_topology/iframe.html | 2 +-
.../network_topology/templates/network_topology/index.html | 4 ++--
.../project/stacks/templates/stacks/_change_template.html | 2 +-
.../volumes/templates/volumes/volumes/_detail_overview.html | 2 +-
.../project/volumes/templates/volumes/volumes/_extend.html | 2 +-
15 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/horizon/templates/horizon/common/_data_table_cell.html b/horizon/templates/horizon/common/_data_table_cell.html
index bbcb98e3c8..bd573eda35 100644
--- a/horizon/templates/horizon/common/_data_table_cell.html
+++ b/horizon/templates/horizon/common/_data_table_cell.html
@@ -25,7 +25,7 @@
- {%if cell.wrap_list %}
{% endif %}{{ cell.value }}{%if cell.wrap_list %}
{% endif %}
+ {% if cell.wrap_list %}
{% endif %}{{ cell.value }}{% if cell.wrap_list %}
{% endif %}
@@ -34,6 +34,6 @@
{% else %}
-
{%if cell.wrap_list %}
{% endif %}{{ cell.value }}{%if cell.wrap_list %}
{% endif %}
+
{% if cell.wrap_list %}
{% endif %}{{ cell.value }}{% if cell.wrap_list %}
{% endif %}
{% endif %}
{% endif %}
diff --git a/horizon/templates/horizon/common/_data_table_row_actions_dropdown.html b/horizon/templates/horizon/common/_data_table_row_actions_dropdown.html
index 0e2e11e554..c63929fe36 100644
--- a/horizon/templates/horizon/common/_data_table_row_actions_dropdown.html
+++ b/horizon/templates/horizon/common/_data_table_row_actions_dropdown.html
@@ -21,7 +21,7 @@
{% endfor %}
{% endif %}
-{% if row_actions|length == 1%}
- {% include "horizon/common/_data_table_row_action_dropdown.html" with action=row_actions.0%}
+{% if row_actions|length == 1 %}
+ {% include "horizon/common/_data_table_row_action_dropdown.html" with action=row_actions.0 %}
{% endif %}
{% endspaceless %}
diff --git a/horizon/templates/horizon/common/_formset_table_row.html b/horizon/templates/horizon/common/_formset_table_row.html
index 40b095218a..f5c4dfcf1a 100644
--- a/horizon/templates/horizon/common/_formset_table_row.html
+++ b/horizon/templates/horizon/common/_formset_table_row.html
@@ -5,7 +5,7 @@
{% if cell.field %}
{{ cell.field }}
{% else %}
- {%if cell.wrap_list %}
{% endif %}{{ cell.value }}{%if cell.wrap_list %}
{% endif %}
+ {% if cell.wrap_list %}
{% endif %}{{ cell.value }}{% if cell.wrap_list %}
{% endif %}
{% endif %}
{% if forloop.first %}
{% for field in row.form.hidden_fields %}
diff --git a/horizon/templates/horizon/common/_limit_summary.html b/horizon/templates/horizon/common/_limit_summary.html
index 9a9be64fd1..93f5d6d494 100644
--- a/horizon/templates/horizon/common/_limit_summary.html
+++ b/horizon/templates/horizon/common/_limit_summary.html
@@ -33,7 +33,7 @@
{% trans "Security Groups" %}
- {% blocktrans with used=usage.limits.totalSecurityGroupsUsed|intcomma available=usage.limits.maxSecurityGroups|quotainf|intcomma%}Used {{ used }} of {{ available }} {% endblocktrans %}
+ {% blocktrans with used=usage.limits.totalSecurityGroupsUsed|intcomma available=usage.limits.maxSecurityGroups|quotainf|intcomma %}Used {{ used }} of {{ available }} {% endblocktrans %}
{% for group, vals in job_execution.job_configs.iteritems %}
{% blocktrans %}{{ group }}:{% endblocktrans %}
- {%if group == "args" %}
+ {% if group == "args" %}
{% for val in vals %}
{{ val }}
{% endfor %}
{% else %}
{% for key, val in vals.iteritems %}
{{ key }} = {{ val }}
{% endfor %}
diff --git a/openstack_dashboard/dashboards/project/databases/templates/databases/_launch_network_help.html b/openstack_dashboard/dashboards/project/databases/templates/databases/_launch_network_help.html
index afbdbc35aa..03bd86054d 100644
--- a/openstack_dashboard/dashboards/project/databases/templates/databases/_launch_network_help.html
+++ b/openstack_dashboard/dashboards/project/databases/templates/databases/_launch_network_help.html
@@ -5,5 +5,5 @@
Move networks from 'Available Networks' to 'Selected Networks' by
clicking the button, or dragging and dropping. You can change the
NIC order by dragging and dropping as well.
- {% endblocktrans%}
+ {% endblocktrans %}