changeset 162:3be414dc974a

The Submitbutton now is placed properly after single IinputFields issue81 gnv/trunk@322 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Wed, 11 Nov 2009 13:20:34 +0000
parents 9b35599f50bb
children 1fe52a0cbd1f
files gnv/ChangeLog gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl gnv/src/main/webapp/WEB-INF/config/templates/describe-ui.xsl gnv/src/main/webapp/WEB-INF/jsp/index.jsp
diffstat 4 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gnv/ChangeLog	Wed Nov 11 12:12:10 2009 +0000
+++ b/gnv/ChangeLog	Wed Nov 11 13:20:34 2009 +0000
@@ -1,6 +1,15 @@
 2009-11-11  Tim Englich  <tim.englich@intevation.de>
 
 	* src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl: 
+	  Remove <br/> Tag after Input-Elements
+	* src/main/webapp/WEB-INF/config/templates/describe-ui.xsl: 
+	  Add an <br/>-Tag after the generation of Select-Boxes to get
+	  a better look and feel in the ui. issue81
+	* src/main/webapp/WEB-INF/jsp/index.jsp: 
+	  Replace NonBreakingSpace-Strings from UI issue81
+	  
+2009-11-11  Tim Englich  <tim.englich@intevation.de>
+	* src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl: 
 	  BugFix: Text-Inputfields will now be diabaled in static-ui issue81
 
 2009-11-06  Ingo Weinzierl <ingo.weinzierl@intevation.de>
--- a/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl	Wed Nov 11 12:12:10 2009 +0000
+++ b/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl	Wed Nov 11 13:20:34 2009 +0000
@@ -61,7 +61,7 @@
                <xsl:value-of select="*[local-name() = 'label']"/>: 
            </xsl:when>
         </xsl:choose>
-        <input type="text" id="{$inputName}" name="{$inputName}" value="{$inputValue}" disabled="disabled"/><br/> 
+        <input type="text" id="{$inputName}" name="{$inputName}" value="{$inputValue}" disabled="disabled"/>
     </xsl:template>
     
     <xsl:template match="*[local-name() = 'label']">
--- a/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui.xsl	Wed Nov 11 12:12:10 2009 +0000
+++ b/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui.xsl	Wed Nov 11 13:20:34 2009 +0000
@@ -10,11 +10,13 @@
         <xsl:variable name="selectName" select="@ref"/>
 	                <legend><xsl:value-of select="*[local-name() = 'label']"/></legend>
 	                <select name="{$selectName}" multiple="multiple" size="6"> <xsl:apply-templates/></select>
+	                <br/>
     </xsl:template>
     <xsl:template match="*[local-name() = 'select1']">
         <xsl:variable name="selectName" select="@ref"/>
                     <legend><xsl:value-of select="*[local-name() = 'label']"/></legend>
                     <select name="{$selectName}"> <xsl:apply-templates/></select>
+                    <br/>
     </xsl:template>
     <xsl:template match="*[local-name() = 'item']">
         <xsl:variable name="optionValue" select="*[local-name() = 'value']"/>
--- a/gnv/src/main/webapp/WEB-INF/jsp/index.jsp	Wed Nov 11 12:12:10 2009 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/index.jsp	Wed Nov 11 13:20:34 2009 +0000
@@ -23,8 +23,8 @@
     <div id="timeseriesfilter">
         <form id="fisSelectionForm" onsubmit="displayOverlay()" action="<%=response.encodeURL("next.do")%>") method="post">
            <fieldset>
-            <%=ui != null ? ui.toString() : "" %>
-            <br/>
+            <%=ui != null ? ui.toString().replaceAll("&nbsp;", "") : "" %>
+           
             <%if(furthertargets){%>
             <input type="submit" value="<bean:message key="gnviewer.select.button"/>"/>
             <%}else{%>

http://dive4elements.wald.intevation.org