From 86a597c016bdca9bc6ca25471b1e1a8628fef3ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Thu, 14 Dec 2017 08:02:55 +0100
Subject: [PATCH] backoffice: use {{ }} when displaying varnames (#20670)

---
 tests/test_admin_pages.py           | 6 +++---
 wcs/admin/fields.py                 | 2 +-
 wcs/admin/workflows.py              | 4 ++--
 wcs/qommon/static/css/dc2/admin.css | 3 ++-
 wcs/qommon/substitution.py          | 2 +-
 wcs/wf/export_to_model.py           | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/test_admin_pages.py b/tests/test_admin_pages.py
index 8f2c4b16..3ecef34f 100644
--- a/tests/test_admin_pages.py
+++ b/tests/test_admin_pages.py
@@ -1245,13 +1245,13 @@ def test_form_limit_display_to_page(pub):
 
     app = login(get_app(pub))
     resp = app.get('/backoffice/forms/1/fields/')
-    assert '[form_var_foobar]' in resp.body
+    assert '{{form_var_foobar}}' in resp.body
     assert '2nd page' in resp.body
     resp = resp.click('Limit display to this page', index=0)
     hidden_fields = ''.join(re.findall('display:none.*', resp.body))
     assert 'Display all pages' in resp.body
-    assert '[form_var_foobar]' not in hidden_fields
-    assert '[form_var_baz]' in hidden_fields
+    assert '{{form_var_foobar}}' not in hidden_fields
+    assert '{{form_var_baz}}' in hidden_fields
 
 def test_form_legacy_int_id(pub):
     create_superuser(pub)
diff --git a/wcs/admin/fields.py b/wcs/admin/fields.py
index dab98514..21ef7661 100644
--- a/wcs/admin/fields.py
+++ b/wcs/admin/fields.py
@@ -267,7 +267,7 @@ class FieldsDirectory(Directory):
                             required = ' - ' + _('optional')
                         r += htmltext('<span class="optional">%s</span>') % required
                     if getattr(field, 'varname', None):
-                        r += htmltext(' - <span class="varname">[%s%s]</span>') % (
+                        r += htmltext(' - <span class="varname">{{%s%s}}</span>') % (
                                 self.field_var_prefix, field.varname)
                     r += htmltext('</p>')
                     r += htmltext('<p class="commands">')
diff --git a/wcs/admin/workflows.py b/wcs/admin/workflows.py
index ecb84332..cb15447e 100644
--- a/wcs/admin/workflows.py
+++ b/wcs/admin/workflows.py
@@ -1427,7 +1427,7 @@ class WorkflowPage(Directory):
                         r += htmltext('<li><a href="variables/fields/%s/">%s') % (
                                 field.id, field.label)
                         if not '*' in field.varname:
-                            r += htmltext(' <code class="varname">[form_option_%s]</code>') % field.varname
+                            r += htmltext(' <code class="varname">{{form_option_%s}}</code>') % field.varname
                         r += htmltext('</a></li>')
                 r += htmltext('</ul>')
             r += htmltext('</div>')
@@ -1490,7 +1490,7 @@ class WorkflowPage(Directory):
                     r += htmltext('<li><a href="backoffice-fields/fields/%s/">%s') % (
                             field.id, field.label)
                     if field.varname:
-                        r += htmltext(' <code class="varname">[form_var_%s]</code>') % field.varname
+                        r += htmltext(' <code class="varname">{{form_var_%s}}</code>') % field.varname
                     r += htmltext('</a></li>')
                 r += htmltext('</ul>')
             r += htmltext('</div>')
diff --git a/wcs/qommon/static/css/dc2/admin.css b/wcs/qommon/static/css/dc2/admin.css
index 9c008308..32deb2f1 100644
--- a/wcs/qommon/static/css/dc2/admin.css
+++ b/wcs/qommon/static/css/dc2/admin.css
@@ -51,13 +51,14 @@ ul.biglist li .details,
 li.biglistitem .details {
 	margin: 0;
 	color: #555;
-	font-size: 80%;
+	font-size: 90%;
 	display: inline;
 	padding: 0 1ex;
 }
 
 ul.biglist li .details .varname {
 	font-family: monospace;
+	font-size: 90%;
 }
 
 ul.biglist li p.commands,
diff --git a/wcs/qommon/substitution.py b/wcs/qommon/substitution.py
index 4e6c7e21..9d306048 100644
--- a/wcs/qommon/substitution.py
+++ b/wcs/qommon/substitution.py
@@ -73,7 +73,7 @@ class Substitutions(object):
         vars.sort()
         for category, variable, comment in vars:
             r += htmltext('<tr><td>%s</td><td>%s</td><td>%s</td>' % (
-                category, '[%s]' % variable, comment))
+                category, '{{ %s }}' % variable, comment))
         r += htmltext('</tbody>')
         r += htmltext('</table>')
         return r.getvalue()
diff --git a/wcs/wf/export_to_model.py b/wcs/wf/export_to_model.py
index 4b97a927..ee6e3bf1 100644
--- a/wcs/wf/export_to_model.py
+++ b/wcs/wf/export_to_model.py
@@ -297,7 +297,7 @@ class ExportToModel(WorkflowStatusItem):
                     % _('Available variables')
                 varnames = get_varnames(formdef.fields)
                 for pair in varnames:
-                    hint += htmltext('<li><tt class="varname">[%s]</tt>'
+                    hint += htmltext('<li><tt class="varname">{{%s}}</tt>'
                                      ' <label>%s</label></span></li>') % pair
                 hint += htmltext('</ul>')
                 ids = (formdef.id,) + ids
-- 
2.15.1