Mercurial > dive4elements > river
changeset 2101:d54518bac974
Fix flys/issue439, made annotations available via datacage.
flys-artifacts/trunk@3655 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 11 Jan 2012 14:36:19 +0000 |
| parents | 2f5cb58e662e |
| children | 16e74c5e636f |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/meta-data.xml |
| diffstat | 2 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Wed Jan 11 14:32:50 2012 +0000 +++ b/flys-artifacts/ChangeLog Wed Jan 11 14:36:19 2012 +0000 @@ -1,3 +1,11 @@ +2011-01-11 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + flys/issue439 (Streckenfavoriten lassen sich nicht über den Datenkorb + hinzuladen) + + * doc/conf/meta-data.xml: Made Annotations available via datacage + in longitudinal section, cosmetics. + 2012-01-11 Raimund Renkert <raimund.renkert@intevation.de> * doc/conf/conf.xml:
--- a/flys-artifacts/doc/conf/meta-data.xml Wed Jan 11 14:32:50 2012 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Wed Jan 11 14:36:19 2012 +0000 @@ -348,10 +348,10 @@ <dc:choose> <dc:when test="dc:contains($parameters, 'recommended')"> <dc:comment> - Recommendations. + Recommendations (client shall load immediately). </dc:comment> <dc:if test="dc:contains($artifact-outs, 'w_differences') or (dc:contains($artifact-outs, 'discharge_longitudinal_section'))"> - <dc:call-macro name="annotations"/> + <dc:call-macro name="annotations"/> </dc:if> <dc:if test="dc:contains($artifact-outs, 'cross_section')"> <dc:call-macro name="cross_sections"/> @@ -362,8 +362,8 @@ Non - Recommendations. </dc:comment> <dc:if test="dc:contains($artifact-outs, 'cross_section')"> - <dc:call-macro name="basedata_0"/> - <dc:call-macro name="basedata_1_additionals"/> + <dc:call-macro name="basedata_0"/> + <dc:call-macro name="basedata_1_additionals"/> </dc:if> <dc:if test="dc:contains($artifact-outs, 'discharge_longitudinal_section')"> <dc:call-macro name="basedata_0"/> @@ -380,6 +380,7 @@ <dc:call-macro name="basedata_2_fixations"/> <dc:comment comment=" HOEHENMARKEN ---------------------------"/> <dc:call-macro name="basedata_4_heightmarks-points"/> + <dc:call-macro name="annotations"/> </dc:if> <dc:comment comment="--- non-recommendations---"/> </dc:otherwise>