summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src/xml/editor.xml
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2015-07-22 16:17:54 +0200
committerChristophe Simonis <chs@odoo.com>2015-07-22 16:17:54 +0200
commit2cf91d16a5f844a2a3d5d22c025c180a6615bab8 (patch)
treea7bc3974a9c349ae1575fd3b10bbb25d9b74b9ab /addons/web_editor/static/src/xml/editor.xml
parentd74e0c3e9d9cd80bf532ba90f7c634ff55881b51 (diff)
parent63e92cbc9621813a276e340b7d961cbd8f8b97c4 (diff)
[MERGE] forward port of branch saas-6 up to 63e92cb
Diffstat (limited to 'addons/web_editor/static/src/xml/editor.xml')
-rw-r--r--addons/web_editor/static/src/xml/editor.xml8
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 7b73f9e3e16..111e91343b1 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -217,9 +217,11 @@
</t>
<t t-name="web_editor.dialog.font-icons.icons">
<t t-foreach="iconsParser" t-as="data">
- <span t-foreach="data.icons" t-as="icon"
- t-attf-class="#{data.base} font-icons-icon #{icon}"
- t-att-data-id="icon"/>
+ <span t-foreach="data.cssData" t-as="cssData"
+ t-attf-class="#{data.base} font-icons-icon #{cssData[2]}"
+ t-attf-data-alias=",#{cssData[3]},"
+ t-att-title="cssData[3].join(', ')"
+ t-att-data-id="cssData[2]"/>
</t>
</t>