changeset 6260dea933aa in trytond:default
details: https://hg.tryton.org/trytond?cmd=changeset;node=6260dea933aa
description:
Allow configuration of default colors for graph and calendar
issue9435
review300011002
diffstat:
CHANGELOG | 1 +
trytond/ir/ui/calendar.rnc | 6 ++----
trytond/ir/ui/calendar.rng | 4 ++--
trytond/ir/ui/graph.rnc | 5 ++---
trytond/ir/ui/graph.rng | 4 ++--
5 files changed, 9 insertions(+), 11 deletions(-)
diffs (81 lines):
diff -r 3efb05fb9454 -r 6260dea933aa CHANGELOG
--- a/CHANGELOG Thu Jul 09 00:21:48 2020 +0200
+++ b/CHANGELOG Thu Jul 09 00:34:01 2020 +0200
@@ -1,3 +1,4 @@
+* Remove default colors on graph and calendar
* Add model, record and records attributes on Wizard
* Check read access of wizard records
* Add cached_property in tools
diff -r 3efb05fb9454 -r 6260dea933aa trytond/ir/ui/calendar.rnc
--- a/trytond/ir/ui/calendar.rnc Thu Jul 09 00:21:48 2020 +0200
+++ b/trytond/ir/ui/calendar.rnc Thu Jul 09 00:34:01 2020 +0200
@@ -10,10 +10,8 @@
| "week"
| "month" }?
attlist.calendar &= [a:defaultValue = "1" ] attribute editable { "0" | "1" }?
-attlist.calendar &=
- [ a:defaultValue = "black" ] attribute color { text }?
-attlist.calendar &=
- [ a:defaultValue = "lightblue" ] attribute background_color { text }?
+attlist.calendar &= attribute color { text }?
+attlist.calendar &= attribute background_color { text }?
attlist.calendar &=
attribute width { text }?
attlist.calendar &=
diff -r 3efb05fb9454 -r 6260dea933aa trytond/ir/ui/calendar.rng
--- a/trytond/ir/ui/calendar.rng Thu Jul 09 00:21:48 2020 +0200
+++ b/trytond/ir/ui/calendar.rng Thu Jul 09 00:34:01 2020 +0200
@@ -49,7 +49,7 @@
</define>
<define name="attlist.calendar" combine="interleave">
<optional>
- <attribute a:defaultValue="black">
+ <attribute>
<name ns="">color</name>
<text/>
</attribute>
@@ -57,7 +57,7 @@
</define>
<define name="attlist.calendar" combine="interleave">
<optional>
- <attribute a:defaultValue="lightblue">
+ <attribute>
<name ns="">background_color</name>
<text/>
</attribute>
diff -r 3efb05fb9454 -r 6260dea933aa trytond/ir/ui/graph.rnc
--- a/trytond/ir/ui/graph.rnc Thu Jul 09 00:21:48 2020 +0200
+++ b/trytond/ir/ui/graph.rnc Thu Jul 09 00:34:01 2020 +0200
@@ -4,9 +4,8 @@
attlist.graph &=
[ a:defaultValue = "vbar" ]
attribute type { "vbar" | "hbar" | "line" | "pie" }?
-attlist.graph &=
- [ a:defaultValue = "#f5f5f5" ] attribute background { text }?
-attlist.graph &= [ a:defaultValue = "blue" ] attribute color { text }?
+attlist.graph &= attribute background { text }?
+attlist.graph &= attribute color { text }?
attlist.graph &=
[ a:defaultValue = "1" ] attribute legend { "0" | "1" }?
x = element x { attlist.x, field }
diff -r 3efb05fb9454 -r 6260dea933aa trytond/ir/ui/graph.rng
--- a/trytond/ir/ui/graph.rng Thu Jul 09 00:21:48 2020 +0200
+++ b/trytond/ir/ui/graph.rng Thu Jul 09 00:34:01 2020 +0200
@@ -28,7 +28,7 @@
</define>
<define name="attlist.graph" combine="interleave">
<optional>
- <attribute a:defaultValue="#f5f5f5">
+ <attribute>
<name ns="">background</name>
<text/>
</attribute>
@@ -36,7 +36,7 @@
</define>
<define name="attlist.graph" combine="interleave">
<optional>
- <attribute a:defaultValue="blue">
+ <attribute>
<name ns="">color</name>
<text/>
</attribute>
