Mercurial > dive4elements > gnv-client
changeset 39:6c46f9b16166
gnv/trunk@179 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Tim Englich <tim.englich@intevation.de> |
|---|---|
| date | Fri, 02 Oct 2009 14:29:08 +0000 |
| parents | fccf90761825 |
| children | 23a4f196d7d6 |
| files | gnv/Changelog gnv/src/main/resources/applicationMessages.properties 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/includes/display_fis_inc.jsp |
| diffstat | 5 files changed, 28 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv/Changelog Fri Oct 02 09:10:36 2009 +0000 +++ b/gnv/Changelog Fri Oct 02 14:29:08 2009 +0000 @@ -1,3 +1,13 @@ +2009-10-02 Tim Englich <tim.englich@intevation.de> + + * src/main/webapp/WEB-INF/config/templates/describe-ui.xsl Edited, + * src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl Edited: + Switched Value for legend from ref-Attribute to Label-Element + * src/main/webapp/WEB-INF/jsp/includes/display_fis_inc.jsp Edited: + Added translation for FIS (ArtifactFactorynames) + * src/main/resources/applicationMessages.properties Edited: + Added Germannameds for FIS. + 2009-10-02 Tim Englich <tim.englich@intevation.de> * src/**/*.java Edited:
--- a/gnv/src/main/resources/applicationMessages.properties Fri Oct 02 09:10:36 2009 +0000 +++ b/gnv/src/main/resources/applicationMessages.properties Fri Oct 02 14:29:08 2009 +0000 @@ -7,6 +7,16 @@ gnviewer.project.load.invalidvalue = Wert mit ID '{0}' konnte nicht selektiert werden. gnviewer.project.load.failed = Projekt-Datei '{0}' konnte nicht geladen werden. +gnviewer.fis.fis_marnet = Marnet +gnviewer.fis.fis_imis = IMIS +gnviewer.fis.fis_staun = STAUN +gnviewer.fis.fis_modeldata = Modeldaten +gnviewer.fis.fis_delphin = Delphin +gnviewer.fis.fis_thermosalinograph = Thermosalinograph +gnviewer.fis.fis_chemusurvey = Chemusurvey + + + gnviewer.select.button = Ausw\u00e4hlen gnviewer.draw.button = Zeichnen
--- a/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl Fri Oct 02 09:10:36 2009 +0000 +++ b/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl Fri Oct 02 14:29:08 2009 +0000 @@ -11,7 +11,7 @@ <div id="timeseriesfilter"> <form id="{$selectName}Form" method="post"> <fieldset> - <legend><xsl:value-of select="@ref"/></legend> + <legend><xsl:value-of select="*[local-name() = 'label']"/></legend> <select name="{$selectName}" multiple="multiple" size="6" disabled="disabled"> <xsl:apply-templates/></select> </fieldset> </form> @@ -22,7 +22,7 @@ <div id="timeseriesfilter"> <form id="{$selectName}Form" method="post"> <fieldset> - <legend><xsl:value-of select="@ref"/></legend> + <legend><xsl:value-of select="*[local-name() = 'label']"/></legend> <select name="{$selectName}" disabled="disabled"> <xsl:apply-templates/></select> </fieldset> </form>
--- a/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui.xsl Fri Oct 02 09:10:36 2009 +0000 +++ b/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui.xsl Fri Oct 02 14:29:08 2009 +0000 @@ -8,12 +8,12 @@ <xsl:template match="*[local-name() = 'select']"> <xsl:variable name="selectName" select="@ref"/> - <legend><xsl:value-of select="@ref"/></legend> + <legend><xsl:value-of select="*[local-name() = 'label']"/></legend> <select name="{$selectName}" multiple="multiple" size="6"> <xsl:apply-templates/></select> </xsl:template> <xsl:template match="*[local-name() = 'select1']"> <xsl:variable name="selectName" select="@ref"/> - <legend><xsl:value-of select="@ref"/></legend> + <legend><xsl:value-of select="*[local-name() = 'label']"/></legend> <select name="{$selectName}"> <xsl:apply-templates/></select> </xsl:template> <xsl:template match="*[local-name() = 'item']"> @@ -31,7 +31,7 @@ <xsl:template match="*[local-name() = 'input']"> <xsl:variable name="inputValue" select="*[local-name() = 'value']"/> - <xsl:variable name="inputName" select="*[local-name() = 'label']"/> + <xsl:variable name="inputName" select="@ref"/> <xsl:value-of select="*[local-name() = 'label']"/>: <input type="text" id="{$inputName}" name="{$inputName}" value="{$inputValue}" /><br/> </xsl:template>
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_fis_inc.jsp Fri Oct 02 09:10:36 2009 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_fis_inc.jsp Fri Oct 02 14:29:08 2009 +0000 @@ -1,4 +1,5 @@ <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean-el" prefix="bean-el" %> <%@page import="de.intevation.gnv.action.sessionmodel.SessionModel"%> <%@page import="de.intevation.gnv.action.sessionmodel.SessionModelFactory"%> <%@page import="java.util.Collection"%> @@ -7,6 +8,7 @@ <% SessionModel sm = SessionModelFactory.getInstance().getSessionModel(request); Collection<ArtifactObject> artifactFactories = sm.getArtifactFactories(); + String prefix = "gnviewer.fis."; %> <div id="basefilter"> <form id="fisSelectionForm" action="<%=response.encodeURL("selectArtifactFactory.do")%>" method="post"> @@ -18,7 +20,7 @@ <%Iterator<ArtifactObject> it = artifactFactories.iterator(); while (it.hasNext()){ ArtifactObject ao = it.next();%> - <option value="<%=ao.getId()%>" <%=(ao.isSelected() ? "selected=\"selected\"" : "")%> ><%=ao.getName()%></option> + <option value="<%=ao.getId()%>" <%=(ao.isSelected() ? "selected=\"selected\"" : "")%> ><bean-el:message key="<%=(prefix+ao.getName())%>"/></option> <%}%> </select> <%}%>