# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1263918868 0
# Node ID 3a286c9e186c251faa483f7df041498ec7f20fa4
# Parent  24a6c0cb0a628ffd079cacc0e4ee24ab5bc9d91d
Disabled step-back functionality.

gnv/trunk@575 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 24a6c0cb0a62 -r 3a286c9e186c gnv/ChangeLog
--- a/gnv/ChangeLog	Tue Jan 19 14:50:39 2010 +0000
+++ b/gnv/ChangeLog	Tue Jan 19 16:34:28 2010 +0000
@@ -1,3 +1,10 @@
+2010-01-19  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	* src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl,
+	  src/main/webapp/WEB-INF/jsp/index.jsp: Commented links to step back in
+	  history out and always render a fis select box (reason for this is the
+	  next release and a too buggy 'step-back-history').
+
 2010-01-19  Tim Englich  <tim.englich@intevation.de>
 
 	* src/test/ressources/externalinterfacecall.xml:
diff -r 24a6c0cb0a62 -r 3a286c9e186c gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl
--- a/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl	Tue Jan 19 14:50:39 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl	Tue Jan 19 16:34:28 2010 +0000
@@ -22,11 +22,13 @@
     <xsl:template match="xform:select">
         <xsl:variable name="state" select="@art:state" />
         <tr>
+            <!-- TODO Remove this link to render links to jump back in history
             <td class="historyback">
                 <xsl:if test="$state != ''">
                     <a href="{$back-url}?target={$state}">[X]</a>
                 </xsl:if>
             </td>
+            -->
             <th class="parameter"><xsl:value-of select="xform:label" /></th>
             <td><xsl:apply-templates select="xform:choices" /></td>
         </tr>
@@ -38,6 +40,7 @@
         <xsl:variable name="state" select="@art:state" />
         <xsl:variable name="fis" select="@art:fis" />
         <tr>
+            <!-- TODO Remove this link to render links to jump back in history
             <td class="historyback">
                 <xsl:if test="$state != ''">
                     <a href="{$back-url}?target={$state}">[X]</a>
@@ -46,8 +49,19 @@
                     <a href="{$selectfis}">[X]</a>
                 </xsl:if>
             </td>
-            <th class="parameter"><xsl:value-of select="xform:label" /></th>
-            <td><xsl:apply-templates select="xform:choices" /></td>
+            -->
+            <!-- TODO Remove when-clause which disables the fis select box .
+                 TODO Just render the 'otherwise' part -->
+            <xsl:choose>
+                <xsl:when test="$fis">
+                    <th></th>
+                    <td></td>
+                </xsl:when>
+                <xsl:otherwise>
+                    <th class="parameter"><xsl:value-of select="xform:label" /></th>
+                    <td><xsl:apply-templates select="xform:choices" /></td>
+                </xsl:otherwise>
+            </xsl:choose>
         </tr>
     </xsl:template>
 
@@ -70,11 +84,13 @@
     <xsl:template match="xform:group">
         <xsl:variable name="state" select="@art:state" />
         <tr>
+            <!-- TODO Remove this link to render links to jump back in history
             <td class="historyback">
                 <xsl:if test="$state != ''">
                     <a href="{$back-url}?target={$state}">[X]</a>
                 </xsl:if>
             </td>
+            -->
             <th class="parameter"><xsl:value-of select="xform:label" /></th>
             <td>
                 <table><xsl:apply-templates select="xform:input" /></table>
diff -r 24a6c0cb0a62 -r 3a286c9e186c gnv/src/main/webapp/WEB-INF/jsp/index.jsp
--- a/gnv/src/main/webapp/WEB-INF/jsp/index.jsp	Tue Jan 19 14:50:39 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/index.jsp	Tue Jan 19 16:34:28 2010 +0000
@@ -17,6 +17,7 @@
     <%if (staticui == null){ %>
         <jsp:include page="includes/display_fis_inc.jsp"></jsp:include>
     <%} else {%>
+        <jsp:include page="includes/display_fis_inc.jsp"></jsp:include>
         <%=staticui.toString()%>
     <%}%>