Mercurial > dive4elements > gnv-client
changeset 568:f21ad239c748
Repaired step-back history.
gnv/trunk@683 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Fri, 12 Feb 2010 11:16:33 +0000 |
| parents | 83ff52574604 |
| children | 9a5e50e7afaa |
| files | gnv/ChangeLog gnv/src/main/webapp/WEB-INF/config/struts-config.xml gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl |
| diffstat | 3 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv/ChangeLog Fri Feb 12 09:58:24 2010 +0000 +++ b/gnv/ChangeLog Fri Feb 12 11:16:33 2010 +0000 @@ -1,3 +1,11 @@ +2010-02-12 Ingo Weinzierl <ingo.weinzierl@intevation.de> + + * src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl: Render an + icon to trigger a step-back in history for each state. + + * src/main/webapp/WEB-INF/config/struts-config.xml: Added missing forwards + used for stepping back to former states. + 2010-02-12 Tim Englich <tim.englich@intevation.de> * src/main/webapp/WEB-INF/jsp/includes/display_mapviewercall_inc.jsp:
--- a/gnv/src/main/webapp/WEB-INF/config/struts-config.xml Fri Feb 12 09:58:24 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/config/struts-config.xml Fri Feb 12 11:16:33 2010 +0000 @@ -59,6 +59,12 @@ <forward name="success" path="/WEB-INF/jsp/mainlayout.jsp"/> + <forward + name="back" + path="/gnv/back.do"/> + <forward + name="selectfis" + path="/gnv/selectFis.do"/> </action> <action path="/selectFis" type="de.intevation.gnv.action.SelectFisAction"
--- a/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl Fri Feb 12 09:58:24 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl Fri Feb 12 11:16:33 2010 +0000 @@ -28,13 +28,11 @@ <th class="parameter"><xsl:value-of select="xform:label" /></th> <td><xsl:apply-templates select="xform:choices" /></td> <td class="historyback"> - <!-- <xsl:if test="$state != ''"> <a href="{$back-url}?target={$state}"> <img title="{$edit}" alt="{$edit}" src="images/back_button.png"/> </a> </xsl:if> - --> </td> </tr> </xsl:template> @@ -48,13 +46,11 @@ <th class="parameter"><xsl:value-of select="xform:label" /></th> <td><xsl:apply-templates select="xform:choices" /></td> <td class="historyback"> - <!-- <xsl:if test="$state != ''"> <a href="{$back-url}?target={$state}"> <img title="{$edit}" alt="{$edit}" src="images/back_button.png"/> </a> </xsl:if> - --> <xsl:if test="$fis"> <a href="{$selectfis}"><img title="{$edit}" alt="{$edit}" src="images/back_button.png"/></a> </xsl:if> @@ -86,11 +82,9 @@ <table><xsl:apply-templates select="xform:input" /></table> </td> <td class="historyback"> - <!-- <xsl:if test="$state != ''"> <a href="{$back-url}?target={$state}"><img title="{$edit}" alt="{$edit}" src="images/back_button.png"/></a> </xsl:if> - --> </td> </tr> </xsl:template>