[Mapbender-commits] r7815 - branches/2.7/http/javascripts

Fri May 13 03:41:31 EDT 2011

Author: verenadiewald
Date: 2011-05-13 00:41:31 -0700 (Fri, 13 May 2011)
New Revision: 7815

Modified:
   branches/2.7/http/javascripts/mod_digitize_tab.php
Log:
http://trac.osgeo.org/mapbender/ticket/818

Modified: branches/2.7/http/javascripts/mod_digitize_tab.php
===================================================================

--- branches/2.7/http/javascripts/mod_digitize_tab.php	2011-05-12 08:21:34 UTC (rev 7814)
+++ branches/2.7/http/javascripts/mod_digitize_tab.php	2011-05-13 07:41:31 UTC (rev 7815)
@@ -417,8 +417,16 @@
 }
 function getMousePosition(e) {
 	var map = parent.getMapObjByName(mod_digitize_target);
+	var pos =  map.getMousePosition(e);
 
-	return map.getMousePosition(e);
+	// http://bugs.jquery.com/ticket/7319
+	if( $.browser.msie ) {
+		var doc = parent.$(e.target.ownerDocument);
+		pos.x = pos.x + doc.scrollLeft();
+		pos.y = pos.y + doc.scrollTop();
+	}
+
+	return pos;
 }
 
 
@@ -2360,9 +2368,9 @@
 		var headStr = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=<?php echo CHARSET;?>'><style type='text/css'>" + wfsConf[defaultIndex]['g_style'] + "</style>";
 		headStr += '<link rel="stylesheet" type="text/css" href="../extensions/jquery-ui-1.7.2.custom/development-bundle/themes/base/ui.all.css" />';
 		headStr += '<style type="text/css">'
-		headStr += 'a.tabheader { margin: 0 3px 0 0;padding: 1px 5px;text-decoration: none;color: #999;background-color: #F5F5F5;border: 1px solid #999;border-bottom: 0; }';
-		headStr += 'a.tabheader.active { color: #666;background-color: transparent;border-color: #666;border-bottom: 1px solid #FFF;cursor: default; }';
-		headStr += 'div.tabcontent { visibility: hidden;display: none;margin: 1px 0 5px 0;padding: 5px;border: 1px solid #666; }';
+		headStr += 'a.tabheader {float:left; margin: 0 3px 0 0;padding: 1px 5px;text-decoration: none;color: #999;background-color: #F5F5F5;border: 1px solid #999;border-bottom: 0; }';
+		headStr += 'a.tabheader.active {float:left; color: #666;background-color: transparent;border-color: #666;border-bottom: 0px solid #FFF;cursor: default; }';
+		headStr += 'div.tabcontent {clear:left; visibility: hidden;display: none;margin: 1px 0 5px 0;padding: 5px;border: 1px solid #666; }';
 		headStr += 'div.helptext { visibility: hidden;display: none;position: absolute;top: 5%;left: 5%;width: 85%;padding: 5px;color: #000;background-color: #EEEEEE;border: 1px solid #000;-moz-border-radius: 10px;-webkit-border-radius: 10px;}';
 		headStr += 'div.helptext p { margin: 0 ; }';
 		headStr += 'div.helptext p a.close { display: block;margin: 5px auto;text-align: center; }';
@@ -2585,6 +2593,7 @@
 			elementCategories.sort();
 			
 			initialTab = elementCategories[0];
+			str +='<table><tr><td>';
 			for (var currentCategory = 0; currentCategory < elementCategories.length; currentCategory++) {
 				str += '<a href="#" id="tabheader_' + elementCategories[currentCategory] + '" class="tabheader" onclick="return window.opener.toggleTabs(\'' + elementCategories[currentCategory] + '\')">' + elementCategories[currentCategory] + '</a>';
 			}
@@ -2903,7 +2912,7 @@
                         
                         var validElement = false;
 			for(var j in newWfsConf.element) {
-				if(e.name[i] == newWfsConf.element[j]['element_name']) {
+				if(e.name[i] == newWfsConf.element[j]['element_name'] && newWfsConf.element[j]['f_edit'] === "1") {
 					validElement = true;
 					break;
 				}

