[Mapbender-commits] r6987 - in trunk/mapbender: http/classes lib

[svn_mapbender at osgeo.org]

Author: kmq
Date: 2010-09-30 13:36:34 +0000 (Thu, 30 Sep 2010)
New Revision: 6987

Modified:
   trunk/mapbender/http/classes/class_gml.php
   trunk/mapbender/http/classes/class_gml_feature_collection.php
   trunk/mapbender/lib/class_Filter.php
   trunk/mapbender/lib/mb.ui.wfsGazetteer.js
   trunk/mapbender/lib/wizard.js
Log:
undoing wrong commits

Modified: trunk/mapbender/http/classes/class_gml.php
===================================================================
--- trunk/mapbender/http/classes/class_gml.php	2010-09-30 13:31:20 UTC (rev 6986)
+++ trunk/mapbender/http/classes/class_gml.php	2010-09-30 13:36:34 UTC (rev 6987)
@@ -20,9 +20,7 @@
 require_once(dirname(__FILE__)."/../../core/globalSettings.php");
 require_once(dirname(__FILE__)."/../classes/class_connector.php");
 require_once(dirname(__FILE__)."/../classes/class_json.php");
-		$e = new mb_exception("BB");
 require_once(dirname(__FILE__)."/../classes/class_gml_feature_collection.php");
-		$e = new mb_exception("DD");
 
 abstract class Gml {
 	var $featureCollection = null;
@@ -111,4 +109,4 @@
 	}
 }
 
-?>
+?>
\ No newline at end of file

Modified: trunk/mapbender/http/classes/class_gml_feature_collection.php
===================================================================
--- trunk/mapbender/http/classes/class_gml_feature_collection.php	2010-09-30 13:31:20 UTC (rev 6986)
+++ trunk/mapbender/http/classes/class_gml_feature_collection.php	2010-09-30 13:36:34 UTC (rev 6987)
@@ -1,5 +1,4 @@
 <?php
-		$e = new mb_exception("CC");
 # $Id: class_gml2.php 3099 2008-10-02 15:29:23Z nimix $
 # http://www.mapbender.org/index.php/class_gml2.php
 # Copyright (C) 2002 CCGIS 
@@ -26,11 +25,10 @@
 
 class FeatureCollection {
 	var $type = "FeatureCollection";
-	var $title = "";
 	var $featureArray = array();
 	
-	public function __construct($title="") {
-		$this->title = $title;
+	public function __construct() {
+		
 	}
 	
 	public function addFeature ($aFeature) {
@@ -51,9 +49,7 @@
 			}
 		}
 
-		$str .= "]";
-		$str .= $this->title ? ',"properties": { "title": "' . $this->title . '"} ': "";
-		$str .= "}";
+		$str .= "]}";
 		return $str;
 	}
 	
@@ -82,4 +78,4 @@
 		return count($this->featureArray);
 	}
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/mapbender/lib/class_Filter.php
===================================================================
--- trunk/mapbender/lib/class_Filter.php	2010-09-30 13:31:20 UTC (rev 6986)
+++ trunk/mapbender/lib/class_Filter.php	2010-09-30 13:36:34 UTC (rev 6987)
@@ -138,4 +138,4 @@
 	}
 	
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/mapbender/lib/mb.ui.wfsGazetteer.js
===================================================================
--- trunk/mapbender/lib/mb.ui.wfsGazetteer.js	2010-09-30 13:31:20 UTC (rev 6986)
+++ trunk/mapbender/lib/mb.ui.wfsGazetteer.js	2010-09-30 13:36:34 UTC (rev 6987)
@@ -2,8 +2,7 @@
 
 $.widget("mb.wfsGazetteer", {
 	options: {
-		geometry : null,
-		wfsConf: null
+		geometry : null
 	},
 
 	_create: function () {
@@ -79,6 +78,7 @@
  	*
  	*/
 	search : function(filter) {
+		$('.error',this.element).css('border','');
 		$('.error',this.element).removeClass('error');
 		this._status('Searching');
 		
@@ -107,6 +107,7 @@
 			// check if field is mandatory
 			if(el.f_min_input > value.length){
 				$('#'+id).addClass('error');
+				$(".error",this.element).css('border','2px inset red');
 				this._status('Errors in search');
 				return;
 			}

Modified: trunk/mapbender/lib/wizard.js
===================================================================
--- trunk/mapbender/lib/wizard.js	2010-09-30 13:31:20 UTC (rev 6986)
+++ trunk/mapbender/lib/wizard.js	2010-09-30 13:36:34 UTC (rev 6987)
@@ -20,6 +20,7 @@
 					that._trigger("to" + $t.attr("id").toLowerCase(), null, {});
 					that._trigger("to", null, {});
 					that.options.onClickLink(path);			
+
 				});
 			});
 		}