From 6bd19c36de5d93c8f2f9a6946f5b0ceb3761e439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Thu, 19 Nov 2015 11:28:50 +0100
Subject: [PATCH] misc: always include custom texts in a <div> (#9027)

---
 tests/test_texts.py       | 12 ++++++------
 wcs/qommon/admin/texts.py |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/test_texts.py b/tests/test_texts.py
index f708db3..b31da46 100644
--- a/tests/test_texts.py
+++ b/tests/test_texts.py
@@ -27,19 +27,19 @@ def test_get_html_text_unset():
 
 def test_get_html_text_default():
     TextsDirectory.register('foo2', 'Foo', default='Foo...')
-    assert TextsDirectory.get_html_text('foo2') == 'Foo...'
+    assert TextsDirectory.get_html_text('foo2') == '<div class="text-foo2">Foo...</div>'
 
 def test_get_html_text_set():
     TextsDirectory.register('foo3', 'Foo', default='Foo...')
     pub.cfg['texts'] = {'text-foo3': None}
     pub.write_cfg()
-    assert TextsDirectory.get_html_text('foo3') == 'Foo...'
+    assert TextsDirectory.get_html_text('foo3') == '<div class="text-foo3">Foo...</div>'
     pub.cfg['texts'] = {'text-foo3': 'Bar...'}
     pub.write_cfg()
-    assert TextsDirectory.get_html_text('foo3') == '<p>Bar...</p>'
+    assert TextsDirectory.get_html_text('foo3') == '<div class="text-foo3"><p>Bar...</p></div>'
     pub.cfg['texts'] = {'text-foo3': '<div>Bar...</div>'}
     pub.write_cfg()
-    assert TextsDirectory.get_html_text('foo3') == '<div>Bar...</div>'
+    assert TextsDirectory.get_html_text('foo3') == '<div class="text-foo3"><div>Bar...</div></div>'
 
 def test_get_html_subst():
     # test for variable substitution
@@ -47,8 +47,8 @@ def test_get_html_subst():
     pub.substitutions.feed(MockSubstitutionVariables())
     pub.cfg['texts'] = {'text-foo4': '[bar]'}
     pub.write_cfg()
-    assert TextsDirectory.get_html_text('foo4') == '<p>Foobar</p>'
+    assert TextsDirectory.get_html_text('foo4') == '<div class="text-foo4"><p>Foobar</p></div>'
 
     pub.cfg['texts'] = {'text-foo4': '[foo]'}
     pub.write_cfg()
-    assert TextsDirectory.get_html_text('foo4') == '<p>1 &lt; 3</p>'
+    assert TextsDirectory.get_html_text('foo4') == '<div class="text-foo4"><p>1 &lt; 3</p></div>'
diff --git a/wcs/qommon/admin/texts.py b/wcs/qommon/admin/texts.py
index 964001f..1caf2dc 100644
--- a/wcs/qommon/admin/texts.py
+++ b/wcs/qommon/admin/texts.py
@@ -64,12 +64,12 @@ class TextsDirectory(Directory):
             get_response().add_javascript_code('var LIVE_EDIT_TOOLTIP = "%s";\n' % \
                     _('Double click to edit the text'))
             get_response().add_css_include('../js/smoothness/jquery-ui-1.10.0.custom.min.css')
-            return htmltext('<div class="block-edit-custom-text">'\
+            return htmltext('<div class="block-edit-custom-text text-%s">'\
                             '<a class="edit-custom-text" href="%sbackoffice/settings/texts/%s">%s</a>'\
                             '<div class="block-custom-text">'\
                             '%s'\
-                            '</div></div>' % (root_url, key, _('Edit This Text'), text))
-        return htmltext(text)
+                            '</div></div>' % (key, root_url, key, _('Edit This Text'), text))
+        return htmltext('<div class="text-%s">%s</div>' % (key, text))
     get_html_text = classmethod(get_html_text)
 
     def register(cls, key, description, hint=None, default=None,
-- 
2.6.2