From b76e85be2e31f30e662885072c5bf9b8356107b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 9 Mar 2019 17:10:34 +0100 Subject: [PATCH] Add size attribute to image tag issue8146 review49781002 --- CHANGELOG | 1 + doc/topics/views/index.rst | 2 ++ trytond/ir/ui/form.rnc | 2 ++ trytond/ir/ui/form.rng | 8 ++++++++ 4 files changed, 13 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d23802d550..b35236f890 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Add size attribute on image tag * Allow to use channel to synchronize Cache * Display ids and rule names on access error * Move field definition from Model to Field diff --git a/doc/topics/views/index.rst b/doc/topics/views/index.rst index 93ed62a93c..0ad74602d8 100644 --- a/doc/topics/views/index.rst +++ b/doc/topics/views/index.rst @@ -291,6 +291,8 @@ Display an image. * ``colspan``: see in common-attributes-colspan_. + * ``size``: the size of the image in pixels. The default value is 48. + * ``states``: see in common-attributes-states_. * ``help``: see in common-attributes-help_. diff --git a/trytond/ir/ui/form.rnc b/trytond/ir/ui/form.rnc index 6849efcbf1..ca69e714c4 100644 --- a/trytond/ir/ui/form.rnc +++ b/trytond/ir/ui/form.rnc @@ -113,6 +113,8 @@ attlist.image &= attlist.image &= [ a:defaultValue = "0" ] attribute yfill { "0" | "1" }? attlist.image &= [ a:defaultValue = "0" ] attribute xexpand { "0" | "1" }? +attlist.image &= + [ a:defaultValue = "48" ] attribute size {text }? attlist.image &= [ a:defaultValue = "0" ] attribute xfill { "0" | "1" }? attlist.image &= attribute help { text }? attlist.image &= attribute states { text }? diff --git a/trytond/ir/ui/form.rng b/trytond/ir/ui/form.rng index f8e09056d7..f2f8452b5f 100644 --- a/trytond/ir/ui/form.rng +++ b/trytond/ir/ui/form.rng @@ -528,6 +528,14 @@ + + + + size + + + +