Mercurial > dive4elements > gnv-client
changeset 694:271ec4d11a9f
Changed the whole design of the application regarding the bsh styleguide.
gnv/trunk@925 c6561f87-3c4e-4783-a992-168aeb5c3f6f
line wrap: on
line diff
--- a/gnv/ChangeLog Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/ChangeLog Tue Apr 13 16:44:30 2010 +0000 @@ -1,3 +1,30 @@ +2010-04-13 Ingo Weinzierl <ingo.weinzierl@intevation.de> + + * src/main/webapp/WEB-INF/config/templates/describe-ui.xsl: Fixed a display + bug in the measurement panel for one parameter. + + * src/main/resources/applicationMessages.properties, + src/main/resources/applicationMessages_en.properties: New strings for + header and footer links. + + * src/main/webapp/styles/default.css: Added and adapted style classes. + + * src/main/webapp/WEB-INF/jsp/header.jsp: Added links for restarting the app, + retrieving information about it and switching the current language. + + * src/main/webapp/WEB-INF/jsp/footer.jsp: Added navigation links to 'home', + a contact page and an about page. + + * src/main/webapp/WEB-INF/jsp/wmslayout.jsp, + src/main/webapp/WEB-INF/jsp/mainlayout.jsp, + src/main/webapp/WEB-INF/jsp/index.jsp, + src/main/webapp/WEB-INF/jsp/includes/display_histogram_options_inc.jsp, + src/main/webapp/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp, + src/main/webapp/WEB-INF/jsp/includes/display_histogram_inc.jsp, + src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp, + src/main/webapp/WEB-INF/jsp/includes/display_wms_options_inc.jsp: Changed + the design of the whole application regarding the bsh styleguide. + 2010-04-13 Tim Englich <tim.englich@intevation.de> * src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactFactory.java,
--- a/gnv/src/main/resources/applicationMessages.properties Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/resources/applicationMessages.properties Tue Apr 13 16:44:30 2010 +0000 @@ -4,6 +4,15 @@ application.releasedate=${timestamp} application.reload=Klicken Sie hier um es erneut zu versuchen +gnviewer.footer.home = Home +gnviewer.footer.contact = Kontakt +gnviewer.footer.about = Impressum + +gnviewer.header.restart = Neustart +gnviewer.header.german = Deutsch +gnviewer.header.english = Englisch +gnviewer.header.info = Info + gnviewer.app.title = BSH-GDI genericViewer gnviewer.project.save = Projekt speichern @@ -98,6 +107,7 @@ # Fehlermeldungen: java.io.ioexception..connection.refused=Die Verbindung zur Artifaktdatenbank ist unterbrochen. Bitte probieren Sie es zu einem sp\u00e4teren Zeitpunkt erneut. +java.io.ioexception..connection.reset=Die Verbindung zur Artifaktdatenbank ist unterbrochen. Bitte probieren Sie es zu einem sp\u00e4teren Zeitpunkt erneut. java.io.ioexception..unable.to.parse.the.response.http.version..end.of.stream.reached.too.early=Die Verbindung zur Artifaktdatenbank wurde unerwartet unterbrochen. no.inputdata.given..please.select.at.least.one.entry=Es wurde kein Eintrag ausgew\u00e4hlt. Bitte w\u00e4hlen sie mindestens einen Eintrag aus. de.intevation.gnv.geobackend.base.query.exception.queryexception..java.sql.sqlexception =Es ist ein interner Serverfehler aufgetreten. Bitte benachrichtigen Sie den Support.
--- a/gnv/src/main/resources/applicationMessages_en.properties Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/resources/applicationMessages_en.properties Tue Apr 13 16:44:30 2010 +0000 @@ -4,6 +4,15 @@ application.releasedate=${timestamp} application.reload=Click here to try again +gnviewer.footer.home = Home +gnviewer.footer.contact = Contact +gnviewer.footer.about = About + +gnviewer.header.restart = Restart +gnviewer.header.german = German +gnviewer.header.english = English +gnviewer.header.info = Info + gnviewer.app.title = BSH-GDI genericViewer gnviewer.history.title=Summary @@ -96,6 +105,7 @@ title=Title java.io.ioexception..connection.refused = The Connection to the ArtifactDatabase is interrupted. Please try again later. +java.io.ioexception..connection.reset = The Connection to the ArtifactDatabase is interrupted. Please try again later. java.io.ioexception..unable.to.parse.the.response.http.version..end.of.stream.reached.too.early= The Connection to the ArtifactDatabase was interrupted unexpected. no.inputdata.given..please.select.at.least.one.entry = No Entry was chosen. Please select at least one entry. de.intevation.gnv.geobackend.base.query.exception.queryexception..java.sql.sqlexception: A internal Server error has occurred. Please contact the Support.
--- a/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui.xsl Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui.xsl Tue Apr 13 16:44:30 2010 +0000 @@ -24,7 +24,6 @@ <xsl:variable name="selectName" select="@ref"/> <xsl:variable name="items" select="count(//xform:item)"/> - <legend><xsl:value-of select="xform:label"/></legend> <xsl:choose> <xsl:when test="$items = 1"> <select name="{$selectName}" multiple="multiple" size="{$items}"> @@ -165,7 +164,7 @@ <tr> <xsl:choose> <xsl:when test="$label != ''"> - <td><xsl:value-of select="$label"/>:</td> + <td class="parameter"><xsl:value-of select="$label"/>:</td> </xsl:when> </xsl:choose>
--- a/gnv/src/main/webapp/WEB-INF/jsp/footer.jsp Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/footer.jsp Tue Apr 13 16:44:30 2010 +0000 @@ -2,5 +2,28 @@ <%@ taglib uri="http://jakarta.apache.org/struts/tags-html" prefix="html" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> -<html:xhtml/> -<%--div style="clear: left; margin-top: 40px;"/--%> \ No newline at end of file +<html> + <table class="footerTable"> + <tr> + <td class="footerLine">© 2010 Bundesamt für Seeschifffahrt und Hydrographie</td> + <td></td> + </tr> + <tr> + <td colspan="2"> + <table class="footerTableLinks"> + <tr> + <td align="left"></td> + <td align="right"> + <a class="footerLineLinks" href=""><bean:message key="gnviewer.footer.home"/></a> + <font size="1.5em" color="white">·</font> + <a class="footerLineLinks" href=""><bean:message key="gnviewer.footer.contact"/></a> + <font size="1.5em" color="white">·</font> + <a class="footerLineLinks" href=""><bean:message key="gnviewer.footer.about"/></a> + </td> + </tr> + </table> + </td> + </tr> + </table> +</html> +<%--div style="clear: left; margin-top: 40px;"/--%>
--- a/gnv/src/main/webapp/WEB-INF/jsp/header.jsp Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/header.jsp Tue Apr 13 16:44:30 2010 +0000 @@ -4,69 +4,24 @@ <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean-el" prefix="bean-el" %> <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> <%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles"%> -<% Object exceptionMessage = request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_MESSAGE_ID); - exceptionMessage = (exceptionMessage != null ? exceptionMessage.toString().replaceAll(" ", ".").replaceAll(":",".").toLowerCase() : null); - exceptionMessage = (exceptionMessage != null && exceptionMessage.toString().endsWith(".") ? exceptionMessage.toString().substring(0,exceptionMessage.toString().length()-1) : exceptionMessage); - - boolean showmapviewercallBody = request.getAttribute("MAPVIEWERCALL") != null; - String exceptionProject = (String) request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_PROJECT); - exceptionProject = exceptionProject != null ? exceptionProject.toLowerCase() : null; - exceptionProject = exceptionProject != null ? exceptionProject.replaceAll(" ", ".") : null; -%> -<%@page import="de.intevation.gnv.action.CommunicationKeys"%><html:xhtml /> -<!-- Kopfleiste--> -<div id="head" title="GDI BSH genericViewer"> - <div id="logo"> - - - </div> - <h1> - <a href="<html:rewrite action="/start"/>"> - <bean:message key="gnviewer.app.title" /> - </a> - </h1> - - <div id="project"> - <table> - <tr> - <td> - <form id="storeProject" action="<%=response.encodeURL("store.do")%>" method="post"> - <input type="submit" name="storeProject" value="<bean:message key="gnviewer.project.save"/>"/> - </form> - </td> - <td> - <form id="loadProject" action="<%=response.encodeURL("load.do")%>" method="post" enctype="multipart/form-data"> - <input type="submit" name="loadProject" value="<bean:message key="gnviewer.project.load"/>"/> - <input type="file" name="document" accept="application/xml"/> - </form> - </td> - </tr> - </table> - <%if (exceptionProject != null) {%> - <div class="projectException"> - <bean:message key="<%=exceptionProject%>"/> - <br/> - <a href="<%=response.encodeURL("describe.do?uid="+System.currentTimeMillis())%>" title="<bean:message key="application.reload"/>"> - <bean:message key="application.reload"/> - </a> - </div> - <%}%> - - <br/> - <%if (showmapviewercallBody){ %> - <jsp:include page="includes/display_mapviewercall_inc.jsp" /> - <%}%> - </div> - <div class="errormsg" id="load_error"> - <%if (exceptionMessage != null){ %> - <bean-el:message key="<%=exceptionMessage.toString()%>"/> - <p class="reload"> - <a href="<%=response.encodeURL("describe.do?uid="+System.currentTimeMillis())%>" title="<bean:message key="application.reload"/>"> - <bean:message key="application.reload"/> - </a> - </p> - <%}%> - </div> +<div id="headline"> + <h1 class="headline">BSH Generischer Viewer</h1> </div> +<br> + +<table class="headerTableLinks"> + <tr> + <td align="left"></td> + <td align="right"> + <a class="headerLineLinks" href="/gnv"><bean:message key="gnviewer.header.restart"/></a> + <font size="1.5em" color="white">·</font> + <a class="headerLineLinks" href=""><bean:message key="gnviewer.header.german"/></a> + <font size="1.5em" color="white">·</font> + <a class="headerLineLinks" href=""><bean:message key="gnviewer.header.english"/></a> + <font size="1.5em" color="white">·</font> + <a class="headerLineLinks" href=""><bean:message key="gnviewer.header.info"/></a> + </td> + </tr> +</table>
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp Tue Apr 13 16:44:30 2010 +0000 @@ -32,7 +32,6 @@ %> <%-- diagramm is not null if the user clicked the 'draw' button --%> -<jsp:include page="/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp"></jsp:include> <div id="diagram"> <img src='<%=response.encodeURL("out.do?mimetype="+mimeType+"&target="+target+"&mode=img"+parameterString+"&uid="+System.currentTimeMillis())%>' alt='<bean:message key="gnviewer.output.options.diagramm.alt"/>'/> <br/>
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp Tue Apr 13 16:44:30 2010 +0000 @@ -72,7 +72,7 @@ while (it.hasNext()){ OutputParameter om = it.next(); %> <tr> - <td> + <td class="parameter"> <bean-el:message key="<%=om.getName()%>"/> </td> <td>
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_histogram_inc.jsp Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_histogram_inc.jsp Tue Apr 13 16:44:30 2010 +0000 @@ -27,7 +27,6 @@ } %> -<jsp:include page="/WEB-INF/jsp/includes/display_histogram_options_inc.jsp"></jsp:include> <div class="histogram"> <img src='<%=response.encodeURL("out.do?mimetype="+mimeType+"&target="+target+"&mode=img"+parameterString+"&uid="+System.currentTimeMillis())%>' alt='<bean:message key="gnviewer.output.options.histogram.alt"/>'/> </div>
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_histogram_options_inc.jsp Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_histogram_options_inc.jsp Tue Apr 13 16:44:30 2010 +0000 @@ -97,7 +97,7 @@ <input type="checkbox" <%= check %> name="bintype" value="binwidth" id="checkWidth" onClick="toggleBinType('checkCount')"> </input> <%}%> </td> - <td> + <td class="parameter"> <bean-el:message key="<%=om.getName()%>"/> </td> <td>
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_wms_options_inc.jsp Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_wms_options_inc.jsp Tue Apr 13 16:44:30 2010 +0000 @@ -41,7 +41,7 @@ OutputParameter param = iter.next(); %> <tr> - <td><bean-el:message key="<%=param.getName()%>"/></td> + <td class="parameter"><bean-el:message key="<%=param.getName()%>"/></td> <td> <%if (param.getType().equalsIgnoreCase("boolean")) { boolean checked = (opts != null) ? "true".equalsIgnoreCase(opts.getValue(param.getName())) : param.getValue().equalsIgnoreCase("true");
--- a/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Tue Apr 13 16:44:30 2010 +0000 @@ -28,8 +28,63 @@ if (furthertargetsObject != null){ furthertargets = ((Boolean)furthertargetsObject).booleanValue(); } + + Object exceptionMessage = request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_MESSAGE_ID); + exceptionMessage = (exceptionMessage != null ? exceptionMessage.toString().replaceAll(" ", ".").replaceAll(":",".").toLowerCase() : null); + exceptionMessage = (exceptionMessage != null && exceptionMessage.toString().endsWith(".") ? exceptionMessage.toString().substring(0,exceptionMessage.toString().length()-1) : exceptionMessage); + + boolean showmapviewercallBody = request.getAttribute("MAPVIEWERCALL") != null; + + String exceptionProject = (String) request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_PROJECT); + exceptionProject = exceptionProject != null ? exceptionProject.toLowerCase() : null; + exceptionProject = exceptionProject != null ? exceptionProject.replaceAll(" ", ".") : null; %> - <div> + + <%-- div container for project loading/saving and error messages related to this --%> + <div id="project"> + <table> + <tr> + <td> + <form id="storeProject" action="<%=response.encodeURL("store.do")%>" method="post"> + <input type="submit" name="storeProject" value="<bean:message key="gnviewer.project.save"/>"/> + </form> + </td> + <td> + <form id="loadProject" action="<%=response.encodeURL("load.do")%>" method="post" enctype="multipart/form-data"> + <input type="submit" name="loadProject" value="<bean:message key="gnviewer.project.load"/>"/> + <input type="file" name="document" accept="application/xml"/> + </form> + </td> + </tr> + </table> + <%if (exceptionProject != null) {%> + <div class="projectException"> + <bean:message key="<%=exceptionProject%>"/> + <br/> + <a href="<%=response.encodeURL("describe.do?uid="+System.currentTimeMillis())%>" title="<bean:message key="application.reload"/>"> + <bean:message key="application.reload"/> + </a> + </div> + <%}%> + + <br/> + <%if (showmapviewercallBody){ %> + <jsp:include page="includes/display_mapviewercall_inc.jsp" /> + <%}%> + </div> + <div class="errormsg" id="load_error"> + <%if (exceptionMessage != null){ %> + <bean-el:message key="<%=exceptionMessage.toString()%>"/> + <p class="reload"> + <a href="<%=response.encodeURL("describe.do?uid="+System.currentTimeMillis())%>" title="<bean:message key="application.reload"/>"> + <bean:message key="application.reload"/> + </a> + </p> + <%}%> + </div> + + <%-- the parameter panel is following --%> + <div id="parameterPanel"> <%if (staticui == null){ %> <jsp:include page="includes/display_fis_inc.jsp"></jsp:include> <%} else {%> @@ -60,10 +115,24 @@ </form> </div> <%}%> - </div> - <%-- render export options if existing for this state --%> - <jsp:include page="includes/display_export_inc.jsp"></jsp:include> + <%-- render export options if existing for this state --%> + <jsp:include page="includes/display_export_inc.jsp"></jsp:include> + + <%if (chart != null) {%> + <jsp:include page="/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp"></jsp:include> + <%}%> + + + <%if (histogram != null) {%> + <jsp:include page="/WEB-INF/jsp/includes/display_histogram_options_inc.jsp"></jsp:include> + <%}%> + + <%-- render wms options --%> + <%if (wms != null) {%> + <jsp:include page="/WEB-INF/jsp/includes/display_wms_options_inc.jsp"></jsp:include> + <%}%> + </div> <%if (chart != null) {%> <%-- render chart options if existing for this state --%> @@ -79,8 +148,3 @@ <%if (histogram != null) {%> <jsp:include page="includes/display_histogram_inc.jsp"></jsp:include> <%}%> - - <%-- render wms options --%> - <%if (wms != null) {%> - <jsp:include page="/WEB-INF/jsp/includes/display_wms_options_inc.jsp"></jsp:include> - <%}%>
--- a/gnv/src/main/webapp/WEB-INF/jsp/mainlayout.jsp Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/mainlayout.jsp Tue Apr 13 16:44:30 2010 +0000 @@ -68,9 +68,16 @@ </div> </div> <div id="page"> - <jsp:include page="header.jsp" /> - <jsp:include page="index.jsp" /> - <jsp:include page="footer.jsp" /> + <div id="headerElement"> + <jsp:include page="header.jsp" /> + </div> + <div id="contentElement" class="contentElement bgblue2"> + <jsp:include page="index.jsp" /> + </div> + <br> + <div id="footerElement"> + <jsp:include page="footer.jsp" /> + </div> </div> </body> </html>
--- a/gnv/src/main/webapp/WEB-INF/jsp/wmslayout.jsp Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/wmslayout.jsp Tue Apr 13 16:44:30 2010 +0000 @@ -62,30 +62,37 @@ </div> </div> <div id="page"> - <jsp:include page="header.jsp" /> - <jsp:include page="index.jsp" /> - <jsp:include page="footer.jsp" /> - <%if(request.getAttribute("wms_published") != null){ %> - <div class="outerMap"> - <div id="wms"> - <table> - <tr> - <td class="parameter"><bean:message key="gnviewer.wms.server.path"/>:</td> - <td class="wmsvalue"><%=serverPath%>?MAP=<%=mapfilePath%></td> - </tr> - <tr> - <td class="parameter"><bean:message key="gnviewer.wms.server.layer"/>:</td> - <td class="wmsvalue"><%=layerName%></td> - </tr> - <tr> - <td class="parameter"><bean:message key="gnviewer.wms.layer.ttl"/>:</td> - <td class="wmsvalue"><%=timeToLive%></td> - </tr> - </table> + <div id="headerElement"> + <jsp:include page="header.jsp" /> + </div> + <div id="contentElement" class="contentElement bgblue2"> + <jsp:include page="index.jsp" /> + <%if(request.getAttribute("wms_published") != null){ %> + <div class="outerMap"> + <div id="wms"> + <table> + <tr> + <td class="parameter"><bean:message key="gnviewer.wms.server.path"/>:</td> + <td class="wmsvalue"><%=serverPath%>?MAP=<%=mapfilePath%></td> + </tr> + <tr> + <td class="parameter"><bean:message key="gnviewer.wms.server.layer"/>:</td> + <td class="wmsvalue"><%=layerName%></td> + </tr> + <tr> + <td class="parameter"><bean:message key="gnviewer.wms.layer.ttl"/>:</td> + <td class="wmsvalue"><%=timeToLive%></td> + </tr> + </table> + </div> + <div id="map"></div> </div> - <div id="map"></div> + <%}%> + </div> + <br> + <div id="footerElement"> + <jsp:include page="footer.jsp" /> </div> - <%}%> </div> </body> </html>
--- a/gnv/src/main/webapp/styles/default.css Tue Apr 13 12:10:15 2010 +0000 +++ b/gnv/src/main/webapp/styles/default.css Tue Apr 13 16:44:30 2010 +0000 @@ -41,12 +41,12 @@ } legend { - border: 1px solid #CCD5DE; + border: 1px solid #003A66; padding: 4px 5px; margin: 0 0 0 0; background-color: white; font-weight: bolder; - color: #00416B; + color: #003A66; clear: both; } @@ -54,7 +54,8 @@ margin: 5px 0 0 10px; padding-left: 10px; padding-right: 10px; - border: 1px solid #CCD5DE; + border: 1px solid #003A66; + background-color: #F2F1F5; background-repeat: repeat-x; background-position: top left; display: block; @@ -115,6 +116,57 @@ border: 0px; } +/* styles used in footer.jsp */ +.footerTable { + width: 100%; + background-color: white; +} + +.footerLine { + color: #003A66; + font-family: Arial,Helvetica,sans-serif; + font-size: 0.95em; + line-height: 1.1em; + padding-left: 1px; +} + +.footerTableLinks { + width: 100%; + background-color: #003a66; +} + +.footerLineLinks { + color: #FFFFFF; + font-family: Arial,Helvetica,sans-serif; + font-size: 1.5em; + text-decoration:none; +} + +.headerTableLinks { + width: 100%; + background-color: #003a66; +} + +.headerLineLinks { + color: #FFFFFF; + font-family: Arial,Helvetica,sans-serif; + font-size: 1em; + text-decoration:none; +} + +/* styles used content */ +#contentElement { + margin: 0px 0px 10px 0px; +} + +.bgblue2 { + background-color: #F7F7F9; +} + +#footerElement { + margin-top: 10px; +} + .down { padding-top: 20px; width: 315px; @@ -126,8 +178,13 @@ text-align: right; } +#parameterPanel { + float: left; + width: 400px; +} + .parameter { - color: #00416B; + color: #003A66; font-size: 0.8em; font-weight: bold; padding-left: 5px; @@ -171,11 +228,12 @@ color: #CD3426; font-size: 10px; font-weight: bold; - margin: 2px 2px; + margin-bottom: 2px; + border: 2px solid red; + padding: 2px; } .errormsg { - color: red; font-weight: bold; } @@ -184,25 +242,46 @@ color: red; font-size: 10px; font-weight: bold; - margin: 2px 2px; + margin-bottom: 2px; + border: 2px solid red; + padding: 2px; } .inputException { - color: red; - font-size: 10px; - font-weight: bold; - margin: 2px 2px; + color: red; + font-size: 10px; + font-weight: bold; + margin-bottom: 2px; + border: 2px solid red; + padding: 2px; } /* ====================== Header ============================= */ -#head { - +#head { height: 25px; margin: 0; padding: 0; background-color: #103D64; } +#headline { + color: #4C7594; + font-family: "Arial Black",Arial,Helvetica,sans-serif; + font-weight: bold; + line-height: 1.1em; + padding-left: 5px; + width: 533px; +} + +.headline { + border-top: 2px solid #CCe0f4; + border-bottom: 2px solid #CCe0f4; + color: #4C7594; + /*font-weight: bold;*/ + font-size: 1.2em; + padding: 10px; +} + #logo { float:right; background-image: url( ../images/bsh_logo.gif ); @@ -222,25 +301,31 @@ } #project { - position:absolute; - top:27px; - left:10px; - width: 500px; + padding-left: 5px; + padding-top: 5px; + padding-bottom: 5px; text-align: left; font-size: 1.2em; - + background-color: #e9e8f0; +} + +.devide { + width: 100%; + height: 2px; } .projectException { color: red; font-size: 10px; font-weight: bold; - margin: 2px 2px; + margin-bottom: 2px; + border: 2px solid red; + padding: 2px; } #load_error { position:absolute; - top:75px; + top:175px; left:375px; width: 400px; text-align: left; @@ -304,14 +389,15 @@ } div#diagram { + float: left; position: absolute; - top: 33px; - left: 350px; + top: 165px; + left: 330px; } div.outerMap { position: absolute; - top: 62px; + top: 175px; left: 350px; width: 555px; height: 436px; @@ -337,9 +423,10 @@ } div.histogram { + float: left; position: absolute; - top: 33px; - left: 350px; + top: 165px; + left: 330px; } div#export {