[PATCH 2 of 2] issue1337: fix. Let theme not inherit from longitudinal_section, as this

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1375364237 -7200
# Node ID e5fc8c18bed58244c0740dfdf15216e14c53e1b6
# Parent  0db5f36423358e550ae47702c3130e23cf6b4c3b
issue1337: fix. Let theme not inherit from longitudinal_section, as this
defines a default color.

diff -r 0db5f3642335 -r e5fc8c18bed5 artifacts/doc/conf/themes/default.xml
--- a/artifacts/doc/conf/themes/default.xml	Thu Aug 01 15:16:32 2013 +0200
+++ b/artifacts/doc/conf/themes/default.xml	Thu Aug 01 15:37:17 2013 +0200
@@ -834,11 +834,26 @@
     <!-- MIDDLE BED HEIGHT -->
     <theme name="MiddleBedHeightSingle">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="MinMaxPoints" />
+            <inherit from="Label" />
         </inherits>
         <fields>
+            <field name="showlines" type="boolean" display="Linie anzeigen"
+                default="true" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="1" />
+            <field name="linetype" type="Dash" display="Linienart"
+                default="10" />
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" />
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>
 
diff -r 0db5f3642335 -r e5fc8c18bed5 artifacts/doc/conf/themes/second.xml
--- a/artifacts/doc/conf/themes/second.xml	Thu Aug 01 15:16:32 2013 +0200
+++ b/artifacts/doc/conf/themes/second.xml	Thu Aug 01 15:37:17 2013 +0200
@@ -834,11 +834,26 @@
     <!-- MIDDLE BED HEIGHT -->
     <theme name="MiddleBedHeightSingle">
         <inherits>
-            <inherit from="LongitudinalSection" />
+            <inherit from="Lines" />
+            <inherit from="Points" />
+            <inherit from="MinMaxPoints" />
+            <inherit from="Label" />
         </inherits>
         <fields>
+            <field name="showlines" type="boolean" display="Linie anzeigen"
+                default="true" />
+            <field name="linesize" type="int" display="Liniendicke"
+                default="2" />
+            <field name="linetype" type="Dash" display="Linienart"
+                default="10" />
             <field name="linecolor" type="Color" display="Linienfarbe"
-                default="204, 204, 204" />
+                />
+            <field name="showlinelabel" type="boolean"
+                display="Beschriftung anzeigen" default="false" />
+            <field name="showpoints" type="boolean" display="Punkte anzeigen"
+                default="false" />
+            <field name="showpointlabel" type="boolean"
+                display="Punktbeschriftung anzeigen" default="false" hints="hidden" />
         </fields>
     </theme>