[Webflysuesk-commits] r61 - in webflysuesk/branches/openlayers-integration: . webflys/src/main/webapp/images webflys/src/main/webapp/pages
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Jul 13 17:44:29 CEST 2009
Author: iweinzierl
Date: 2009-07-13 17:44:29 +0200 (Mon, 13 Jul 2009)
New Revision: 61
Added:
webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/images/logo-intevation.png
Modified:
webflysuesk/branches/openlayers-integration/ChangeLog.txt
webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/App.js
webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/InteractiveRangeSelection.js
webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/app.jsp
webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/karte.js
webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/main.jsp
webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/style.css
Log:
Style improvements and removing of some global variables.
Modified: webflysuesk/branches/openlayers-integration/ChangeLog.txt
===================================================================
--- webflysuesk/branches/openlayers-integration/ChangeLog.txt 2009-07-02 13:50:18 UTC (rev 60)
+++ webflysuesk/branches/openlayers-integration/ChangeLog.txt 2009-07-13 15:44:29 UTC (rev 61)
@@ -1,3 +1,15 @@
+2009-07-13 Ingo Weinzierl <ingo.weinzierl at intevation.de>
+
+ * src/main/webapp/pages/main.jsp,
+ src/main/webapp/pages/karte.js,
+ src/main/webapp/pages/style.css,
+ src/main/webapp/pages/InteractiveRangeSelection.js,
+ src/main/webapp/pages/App.js,
+ src/main/webapp/pages/app.jsp: Style-improvements and removing of some
+ global variables.
+
+ * src/main/webapp/images/logo-intevation.png: Intevation logo added.
+
2009-07-02 Ingo Weinzierl <ingo.weinzierl at intevation.de>
* webflys/src/main/webapp/pages/InteractiveRangeSelection.js: Changed
Added: webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/images/logo-intevation.png
===================================================================
(Binary files differ)
Property changes on: webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/images/logo-intevation.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/App.js
===================================================================
--- webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/App.js 2009-07-02 13:50:18 UTC (rev 60)
+++ webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/App.js 2009-07-13 15:44:29 UTC (rev 61)
@@ -1,8 +1,8 @@
function wsplgenLoaded() {
- if($j('#map').css('display') == 'none') {
+ if($j('#mapWrapper').css('display') == 'none') {
- $j('#map').show();
+ $j('#mapWrapper').show();
$j('#rightPanel').show();
createMapForRiver();
Modified: webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/InteractiveRangeSelection.js
===================================================================
--- webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/InteractiveRangeSelection.js 2009-07-02 13:50:18 UTC (rev 60)
+++ webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/InteractiveRangeSelection.js 2009-07-13 15:44:29 UTC (rev 61)
@@ -1,6 +1,3 @@
-/** Tool */
-var tool = null;
-
/** Layer to store markers */
var markerLayer = null;
@@ -28,7 +25,7 @@
displayClass: 'olControlDrawMarker'
};
- tool = new DrawMarker(
+ var tool = new DrawMarker(
markerLayer,
options
);
Modified: webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/app.jsp
===================================================================
--- webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/app.jsp 2009-07-02 13:50:18 UTC (rev 60)
+++ webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/app.jsp 2009-07-13 15:44:29 UTC (rev 61)
@@ -39,6 +39,7 @@
<%-- including needed js libs --%>
<script src="OpenLayers/OpenLayers.js"></script>
<script src="JQuery/jquery-1.3.2.js"></script>
+ <script src="App.js"></script>
<script src="Wrapper.js"></script>
<script src="DrawMarker.js"></script>
<script src="karte.js"></script>
@@ -54,19 +55,39 @@
</head>
<body>
+ <div id="olbanner" style="height: 85px; margin: 10px 0px;">
+ <a href="index.html" alt="Startseite" title="Startseite">
+ WebFLYS.next generation
+ </a>
+ <br>
+
+ <h3 style="font-weight: normal; font-size: 0.4em; margin: 0 5 0 5;">
+ Prototyp WebFLYS.next generation der Intevation GmbH
+ </h3>
+
+ <a href="http://intevation.de">
+ <img style="position: absolute; right: 30px; top: 15px; border:none;"
+ src="../images/logo-intevation.png"
+ alt="Intevation GmbH" title="Intevation GmbH"/>
+ </a>
+ </div>
+
+
<div id="leftPanel">
<iframe id="webflys" style="border: 0px; height:100%; width:100%;" src="entrance.jsp"></iframe>
</div>
- <div id="map" style="display: none;"></div>
+ <div id="mapWrapper" class="mapWrapper" style="display: none;">
+ <div id="map"></div>
+ </div>
- <div style="width: 25px; float: left;"> </div>
+ <div style="width: 15px; float: left;"> </div>
<%-- the panel to show the results --%>
<div id="rightPanel" style="display: none;">
<fieldset id="resultPanel">
- <input type="button" value="<bean:message key='wsplgen.refresh.button'/>" onClick="resultPanel();">
+ <input type="button" value="<bean:message key='wsplgen.refresh.button'/>" onClick="resultPanel();" class="button">
<legend><bean:message key="wsplgen.result.title"/></legend>
<div id="results"></div>
</fieldset>
Modified: webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/karte.js
===================================================================
--- webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/karte.js 2009-07-02 13:50:18 UTC (rev 60)
+++ webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/karte.js 2009-07-13 15:44:29 UTC (rev 61)
@@ -1,9 +1,6 @@
/** the map */
var map = null;
-/** OpenLayers.Format.WMC to read a wmc configuration file for the map */
-var format = new OpenLayers.Format.WMC({'layerOptions': {buffer: 0}});
-
/** OpenLayers.Layer.WMS layer to store the different barriers in */
var wfs = null;
@@ -99,7 +96,11 @@
// add a basic background layer initial to the map
map.addLayers([jpl_wms]);
+
+ // OpenLayers.Format.WMC to read a wmc configuration file for the map
+ var format = new OpenLayers.Format.WMC({'layerOptions': {buffer: 0}});
+
// fetch other layers from a WMC file to make the map configurable
$j.get(
'http://beige.rgb:8080/webflys/wmc',
@@ -440,7 +441,7 @@
var usedJobId = new Array();
// read all features of the response
- features = new OpenLayers.Format.GML().read(response.responseText);
+ var features = new OpenLayers.Format.GML().read(response.responseText);
for(var i = 0; i < features.length; ++i) {
var job = features[i].attributes.job_id;
var des = features[i].attributes.description;
@@ -451,9 +452,12 @@
if($j.inArray(job, usedJobId) == '-1') {
var content = '<input type="radio" name="job" value="'+job+'">';
content += job;
+ content += '- '+ des;
+ /*
content += '- '+ des + ' ';
content += '(' + sta + ')';
content += '(' + sto + ')';
+ */
content += '<br>';
$j('#results').append(content);
usedJobId.push(job);
@@ -462,11 +466,12 @@
if(features.length != 0) {
// add the button to load a selected job into the map
- var button = '<input type="button" value="Load job" onClick="loadSelectedJob();">';
+ var button = '<input type="button" value="Berechnung laden" onClick="loadSelectedJob();" class="button">';
+ $j('#results').append('<br>');
$j('#results').append(button);
}
else {
- var content = '<font color="red">No results for the current user.</font>';
+ var content = '<font color="red">Keine Berechnungsergebnisse für den aktuellen Benutzer vorhanden.</font>';
$j('#results').append(content);
}
}
Modified: webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/main.jsp
===================================================================
--- webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/main.jsp 2009-07-02 13:50:18 UTC (rev 60)
+++ webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/main.jsp 2009-07-13 15:44:29 UTC (rev 61)
@@ -180,7 +180,7 @@
</fieldset>
<br>
<input type="submit"
- value="<bean:message key='main.calculation.submit' />" id="button" >
+ value="<bean:message key='main.calculation.submit' />" id="button" class="button" >
</html:form>
</body>
</html:html>
Modified: webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/style.css
===================================================================
--- webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/style.css 2009-07-02 13:50:18 UTC (rev 60)
+++ webflysuesk/branches/openlayers-integration/webflys/src/main/webapp/pages/style.css 2009-07-13 15:44:29 UTC (rev 61)
@@ -2,28 +2,29 @@
font-size: 8pt;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
}
-#map {
- width: 500px;
- height: 600px;
+.mapWrapper {
+ width: 490px;
+ height: 591px;
border: 1px solid #669FD1;
float: left;
+ margin: 7px 0px 0px 0px;
}
#menu {
border: 1px solid #669FD1;
- width : 300px;
+ width : 270px;
font-size: 8pt;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
}
#resultPanel {
border: 1px solid #669FD1;
- width : 400px;
+ width : 150px;
font-size: 8pt;
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
}
#leftPanel {
float: left;
height: 100%;
- width: 350px;
+ width: 320px;
}
#table {
width: 100%;
@@ -46,7 +47,7 @@
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
text-align: center;
}
-#button {
+.button {
background-color: #ffffff;
border-top-width: 1px;
border-right-width: 1px;
@@ -69,6 +70,37 @@
margin-bottom: 10px;
}
+#olbanner {
+ background: #669FD1;
+ color: #FFFFFF;
+ font-size: 44px;
+ text-shadow: 2px 2px 3px gray;
+ height: 32px;
+ padding: 4px 16px 0px 16px;
+ vertical-align: top;
+ margin: 0px -15px 0px -15px;
+}
+#olbanner a:link, #olbanner a:visited {
+ color: white;
+ background: none;
+ border: none;
+ text-decoration: none;
+}
+.olbannerimg {
+ height: 44px;
+ margin:6px 5px 5px 5px;
+ vertical-align: top;
+ border:none;
+}
+
+.bannerimg {
+ width: 75px;
+ height:44px;
+ margin:6px 5px 5px 5px;
+ border: none;
+ vertical-align: top;
+}
+
.olControlPanel div {
background-color: white;
float: left;
More information about the Webflysuesk-commits
mailing list