Mercurial > dive4elements > gnv-client

changeset 973:1bb54da8c8ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added more resources which are required to use the ol-client properly gnv/trunk@1141 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Tim Englich <tim.englich@intevation.de>
date Tue, 01 Jun 2010 14:15:10 +0000
parents d0b187202f84
children a8e044224b16
files gnv/ChangeLog gnv/src/main/webapp/WEB-INF/jsp/wmslayout.jsp gnv/src/main/webapp/images/ol/feature_info_off.png gnv/src/main/webapp/images/ol/feature_info_on.png gnv/src/main/webapp/images/ol/measure_line_off.png gnv/src/main/webapp/images/ol/measure_line_on.png gnv/src/main/webapp/images/ol/measure_polygon_off.png gnv/src/main/webapp/images/ol/measure_polygon_on.png gnv/src/main/webapp/images/ol/wvHeaderBG.gif gnv/src/main/webapp/images/ol/zoom_box_off.png gnv/src/main/webapp/images/ol/zoom_box_on.png gnv/src/main/webapp/scripts/viewport.jsp gnv/src/main/webapp/styles/ol_style.css
diffstat 13 files changed, 142 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/gnv/ChangeLog	Tue Jun 01 13:01:25 2010 +0000
+++ b/gnv/ChangeLog	Tue Jun 01 14:15:10 2010 +0000
@@ -1,3 +1,18 @@
+2010-06-01  Tim Englich  <tim.englich@intevation.de>
+
+	* src/main/webapp/scripts/viewport.jsp: 
+	  Removed som obsolet Code.
+
+	* src/main/webapp/WEB-INF/jsp/wmslayout.jsp: 
+	  Added reference to the new css-file.
+
+	* src/main/webapp/images/ol/*.png: 
+	  Added Icons for an customized Toolbar.
+
+	* src/main/webapp/styles/ol_style.css: 
+	  Added separat CSS-File for create own Style of the Buttons of the 
+	  OL-Buttonbar.
+	
 2010-06-01  Tim Englich  <tim.englich@intevation.de>
 
 	* src/main/webapp/scripts/openlayers,
--- a/gnv/src/main/webapp/WEB-INF/jsp/wmslayout.jsp	Tue Jun 01 13:01:25 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/wmslayout.jsp	Tue Jun 01 14:15:10 2010 +0000
@@ -26,7 +26,8 @@
         <link rel="stylesheet" type="text/css" href="scripts/ext/ext-2.3.0/resources/css/ext-all.css"></link>
         <link rel="stylesheet" type="text/css" href="scripts/geoext/geoext-0.6/resources/css/geoext-all.css"></link>
         <link rel="stylesheet" type="text/css" href="scripts/openlayers/OpenLayers-2.9/theme/default/style.css"></link>
-        <link href="styles/gnv.css" rel="stylesheet" type="text/css"/>
+        <link rel="stylesheet" type="text/css" href="styles/gnv.css"/>
+        <link rel="stylesheet" type="text/css" href="styles/ol_style.css"/>
         
         <script type="text/javascript" src="scripts/ext/ext-2.3.0/adapter/ext/ext-base.js"></script>
         <script type="text/javascript" src="scripts/ext/ext-2.3.0/ext-all.js"></script>
Binary file gnv/src/main/webapp/images/ol/feature_info_off.png has changed
Binary file gnv/src/main/webapp/images/ol/feature_info_on.png has changed
Binary file gnv/src/main/webapp/images/ol/measure_line_off.png has changed
Binary file gnv/src/main/webapp/images/ol/measure_line_on.png has changed
Binary file gnv/src/main/webapp/images/ol/measure_polygon_off.png has changed
Binary file gnv/src/main/webapp/images/ol/measure_polygon_on.png has changed
Binary file gnv/src/main/webapp/images/ol/wvHeaderBG.gif has changed
Binary file gnv/src/main/webapp/images/ol/zoom_box_off.png has changed
Binary file gnv/src/main/webapp/images/ol/zoom_box_on.png has changed
--- a/gnv/src/main/webapp/scripts/viewport.jsp	Tue Jun 01 13:01:25 2010 +0000
+++ b/gnv/src/main/webapp/scripts/viewport.jsp	Tue Jun 01 14:15:10 2010 +0000
@@ -90,47 +90,13 @@
 
 /* --------------------------------------------------------------------------- */
 
-    // Scale Chooser
-    var scaleStore = new GeoExt.data.ScaleStore({map: map});
-    var zoomSelector = new Ext.form.ComboBox({
-        store: scaleStore,
-        emptyText: "Zoom Level",
-        tpl: '<tpl for="."><div class="x-combo-list-item">1 : {[parseInt(values.scale)]}</div></tpl>',
-        editable: false,
-        triggerAction: 'all', // needed so that the combo box doesn't filter by its current content
-        mode: 'local' // keep the combo box from forcing a lot of unneeded data refreshes
-    });
-
-    zoomSelector.on('select', 
-        function(combo, record, index) {
-            map.zoomTo(record.data.level);
-        },
-        this
-    );     
-
-    map.events.register('zoomend', this, function() {
-        var scale = scaleStore.queryBy(function(record){
-            return this.map.getZoom() == record.data.level;
-        });
-
-        if (scale.length > 0) {
-            scale = scale.items[0];
-            zoomSelector.setValue("1 : " + parseInt(scale.data.scale));
-        } else {
-            if (!zoomSelector.rendered) return;
-            zoomSelector.clearValue();
-        }
-    });
-
-
     // create MapPanel
     mapPanel = new GeoExt.MapPanel({
         border: true,
-        title: "Karte mit GeoNames Suche",
         region: "center",
         map: map,
-        layers: layers,
-        bbar: [zoomSelector]
+        layers: layers
+        
     });
 
    // map.setCenter(INITIAL_CENTER);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnv/src/main/webapp/styles/ol_style.css	Tue Jun 01 14:15:10 2010 +0000
@@ -0,0 +1,123 @@
+.title {
+  background-image: url("./img/wvHeaderBG.gif");
+  height: 50px;
+  color: #1E4176;
+  font-weight: bold;
+  font-family: 'Verdana, Arial, Helvetica, sans-serif'; 
+}
+
+.wmcbox {
+  width: 100%;
+  height: 480px;
+}
+
+.olControlPanel div { 
+  background-color: white;
+  float: left;
+  display: block;
+  position: relative;
+  left: 80px;
+  margin: 5px;
+  width:  24px;
+  height: 24px;
+}
+
+.olControlPanel .olControlFeatureInfoItemActive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../images/ol/feature_info_on.png");
+}
+.olControlPanel .olControlFeatureInfoItemInactive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../images/ol/feature_info_off.png");
+}
+
+
+.olControlPanel .olControlHistoryBackItemActive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../scripts/openlayers/OpenLayers-2.9/theme/default/img/view_previous_on.png");
+}
+.olControlPanel .olControlHistoryBackItemInactive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../scripts/openlayers/OpenLayers-2.9/theme/default/img/view_previous_off.png");
+}
+
+.olControlPanel .olControlPanItemActive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../scripts/openlayers/OpenLayers-2.9/theme/default/img/pan_on.png");
+}
+.olControlPanel .olControlPanItemInactive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../scripts/openlayers/OpenLayers-2.9/theme/default/img/pan_off.png");
+}
+
+.olControlPanel .olControlZoomBoxItemActive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../images/ol/zoom_box_on.png");
+}
+.olControlPanel .olControlZoomBoxItemInactive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../images/ol/zoom_box_off.png");
+}
+
+.olControlPanel .olControlDrawPointItemActive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../scripts/openlayers/OpenLayers-2.9/theme/default/img/draw_point_on.png");
+}
+.olControlPanel .olControlDrawPointItemInactive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../scripts/openlayers/OpenLayers-2.9/theme/default/img/draw_point_off.png");
+}
+
+.olControlPanel .olControlDrawLineItemActive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../scripts/openlayers/OpenLayers-2.9/theme/default/img/draw_line_on.png");
+}
+.olControlPanel .olControlDrawLineItemInactive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../scripts/openlayers/OpenLayers-2.9/theme/default/img/draw_line_off.png");
+}
+
+.olControlPanel .olControlDrawPolygonItemActive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../scripts/openlayers/OpenLayers-2.9/theme/default/img/draw_polygon_on.png");
+}
+.olControlPanel .olControlDrawPolygonItemInactive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../scripts/openlayers/OpenLayers-2.9/theme/default/img/draw_polygon_off.png");
+}
+
+.olControlPanel .olControlMeasureLineItemActive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../images/ol/measure_line_on.png");
+}
+.olControlPanel .olControlMeasureLineItemInactive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../images/ol/measure_line_off.png");
+}
+
+.olControlPanel .olControlMeasurePolygonItemActive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../images/ol/measure_polygon_on.png");
+}
+.olControlPanel .olControlMeasurePolygonItemInactive { 
+  width:  22px;  
+  height: 22px;
+  background-image: url("../images/ol/measure_polygon_off.png");
+}
http://dive4elements.wald.intevation.org