Mercurial > dive4elements > gnv-client
changeset 411:8e39c74f9fb6
Put former parameter into a fieldset with label and removed background image from all fieldsets.
gnv/trunk@606 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 22 Jan 2010 16:08:42 +0000 |
parents | 9602f4bffc07 |
children | 49898531c0b6 |
files | gnv/ChangeLog gnv/src/main/resources/applicationMessages.properties gnv/src/main/resources/applicationMessages_en.properties gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl gnv/src/main/webapp/WEB-INF/jsp/index.jsp gnv/src/main/webapp/styles/default.css |
diffstat | 6 files changed, 32 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv/ChangeLog Fri Jan 22 13:58:30 2010 +0000 +++ b/gnv/ChangeLog Fri Jan 22 16:08:42 2010 +0000 @@ -1,3 +1,18 @@ +2010-01-22 Ingo Weinzierl <ingo.weinzierl@intevation.de> + + * src/main/resources/applicationMessages.properties, + src/main/resources/applicationMessages_en.properties: Added legend for + summary box. + + * src/main/webapp/styles/default.css: Adapted some css classes regarding the + position of boxes and removed background image in fieldsets. + + * src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl: Removed + useless div container (div container is now outside the xsl sheet). + + * src/main/webapp/WEB-INF/jsp/index.jsp: Moved former parameter into a + fieldset and added a label to this fieldset. + 2010-01-22 Ingo Weinzierl <ingo.weinzierl@intevation.de> * src/main/java/de/intevation/gnv/action/ShowStatisticAction.java: This
--- a/gnv/src/main/resources/applicationMessages.properties Fri Jan 22 13:58:30 2010 +0000 +++ b/gnv/src/main/resources/applicationMessages.properties Fri Jan 22 16:08:42 2010 +0000 @@ -9,6 +9,8 @@ gnviewer.project.load = Projekt laden gnviewer.project.load.button = Laden +gnviewer.history.title=\u00dcberblick + gnviewer.fis.fis_marnet = Marnet gnviewer.fis.fis_imis = IMIS gnviewer.fis.fis_staun = STAUN
--- a/gnv/src/main/resources/applicationMessages_en.properties Fri Jan 22 13:58:30 2010 +0000 +++ b/gnv/src/main/resources/applicationMessages_en.properties Fri Jan 22 16:08:42 2010 +0000 @@ -5,6 +5,8 @@ gnviewer.app.title = BSH-GDI genericViewer +gnviewer.history.title=Summary + gnviewer.project.save = Save Project gnviewer.project.load = Load Project gnviewer.project.load.button = Load
--- a/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl Fri Jan 22 13:58:30 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui-static.xsl Fri Jan 22 16:08:42 2010 +0000 @@ -15,11 +15,9 @@ <!-- start parsing document --> <xsl:template match="*"> - <div id="down"> - <table class="static"> - <xsl:apply-templates /> - </table> - </div> + <table class="static"> + <xsl:apply-templates /> + </table> </xsl:template>
--- a/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Fri Jan 22 13:58:30 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Fri Jan 22 16:08:42 2010 +0000 @@ -18,7 +18,12 @@ <%if (staticui == null){ %> <jsp:include page="includes/display_fis_inc.jsp"></jsp:include> <%} else {%> - <%=staticui.toString()%> + <div class="down"> + <fieldset> + <legend><bean:message key="gnviewer.history.title"/></legend> + <%=staticui.toString()%> + </fieldset> + </div> <%}%> <%-- render the dynamic part to feed the state and advance to the next state --%>
--- a/gnv/src/main/webapp/styles/default.css Fri Jan 22 13:58:30 2010 +0000 +++ b/gnv/src/main/webapp/styles/default.css Fri Jan 22 16:08:42 2010 +0000 @@ -55,16 +55,11 @@ padding-left: 10px; padding-right: 10px; border: 1px solid #CCD5DE; - background-image: url( ../images/bg_fieldset_ie6.gif ); background-repeat: repeat-x; background-position: top left; display: block; } -html > body fieldset { - background-image: url( ../images/bg_fieldset.gif ); -} - div { margin: 0; padding: 0; @@ -93,11 +88,8 @@ } table.static { - border: 1px solid #CCD5DE; - margin: 5px 0 0 10px; - padding-left: 7px; - padding-right: 10px; - width: 315px; + margin: 0 0 0 0; + width: 293px; } table, th, td { @@ -110,8 +102,9 @@ border: 0px; } -#down { +.down { padding-top: 20px; + width: 315px; } .historyback {