[Mapbender-commits] r7974 - branches/2.7/http/javascripts
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Tue Jul 19 09:05:26 EDT 2011
Author: astrid_emde
Date: 2011-07-19 06:05:26 -0700 (Tue, 19 Jul 2011)
New Revision: 7974
Modified:
branches/2.7/http/javascripts/map_obj.js
branches/2.7/http/javascripts/mod_addWMSfromTree.js
branches/2.7/http/javascripts/mod_coordsLookup.php
branches/2.7/http/javascripts/mod_digitize_tab.php
branches/2.7/http/javascripts/mod_featureInfo.php
branches/2.7/http/javascripts/mod_featureInfoTunnel.php
branches/2.7/http/javascripts/mod_overviewToggle.js
Log:
merged with trunk
Modified: branches/2.7/http/javascripts/map_obj.js
===================================================================
--- branches/2.7/http/javascripts/map_obj.js 2011-07-19 13:04:46 UTC (rev 7973)
+++ branches/2.7/http/javascripts/map_obj.js 2011-07-19 13:05:26 UTC (rev 7974)
@@ -198,7 +198,7 @@
});
};
- // using the normalized jQuery event
+ // using the normalized jQuery event
this.getPos = function (e) {
var $dom = $(this.getDomElement());
/* if ( $.browser.msie ) {
@@ -213,7 +213,7 @@
e.pageX - $dom.offset().left,
e.pageY - $dom.offset().top
);
- //}
+// }
};
this.getMousePosition = function (event) {
Modified: branches/2.7/http/javascripts/mod_addWMSfromTree.js
===================================================================
--- branches/2.7/http/javascripts/mod_addWMSfromTree.js 2011-07-19 13:04:46 UTC (rev 7973)
+++ branches/2.7/http/javascripts/mod_addWMSfromTree.js 2011-07-19 13:05:26 UTC (rev 7974)
@@ -88,7 +88,6 @@
var $msg= $("<div>" + msg + "</div>");
$msg.dialog({
- bgiframe: true,
autoOpen: true,
modal: false,
width: 300,
@@ -184,6 +183,7 @@
$metadataPopup.dialog({
title : "Metadata",
width : 450,
+ bgiframe: true,
height :600,
left : 250,
top : 100
Modified: branches/2.7/http/javascripts/mod_coordsLookup.php
===================================================================
--- branches/2.7/http/javascripts/mod_coordsLookup.php 2011-07-19 13:04:46 UTC (rev 7973)
+++ branches/2.7/http/javascripts/mod_coordsLookup.php 2011-07-19 13:05:26 UTC (rev 7974)
@@ -153,7 +153,8 @@
alert('<?php echo _mb("Invalid X coordinate! Must be a float or a DMS value!");?>');
return;
} else {
- this.coords.x = parseFloat(RegExp.$1) + parseFloat(RegExp.$2) / 60.0 + parseFloat(RegExp.$2) / 3600.0;
+ this.coords.x = parseFloat(RegExp.$1) + parseFloat(RegExp.$2) / 60.0 + parseFloat(RegExp.$3) / 3600.0;
+ //alert('this.coords.x');
}
}
if(this.coords.y.length === 0 || isNaN(this.coords.y)) {
@@ -164,7 +165,8 @@
alert('<?php echo _mb("Invalid Y coordinate! Must be a float or a DMS value!");?>');
return;
} else {
- this.coords.y = parseFloat(RegExp.$1) + parseFloat(RegExp.$2 / 60.0) + parseFloat(RegExp.$2 / 3600.0);
+ this.coords.y = parseFloat(RegExp.$1) + parseFloat(RegExp.$2 / 60.0) + parseFloat(RegExp.$3 / 3600.0);
+ //alert('this.coords.y');
}
}
Modified: branches/2.7/http/javascripts/mod_digitize_tab.php
===================================================================
--- branches/2.7/http/javascripts/mod_digitize_tab.php 2011-07-19 13:04:46 UTC (rev 7973)
+++ branches/2.7/http/javascripts/mod_digitize_tab.php 2011-07-19 13:05:26 UTC (rev 7974)
@@ -2597,6 +2597,7 @@
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>';
}
+ str +='</td></tr></table>';
}
for (var currentCategory = 0; currentCategory < elementCategories.length || !hasCategories; currentCategory++) {
Modified: branches/2.7/http/javascripts/mod_featureInfo.php
===================================================================
--- branches/2.7/http/javascripts/mod_featureInfo.php 2011-07-19 13:04:46 UTC (rev 7973)
+++ branches/2.7/http/javascripts/mod_featureInfo.php 2011-07-19 13:05:26 UTC (rev 7974)
@@ -118,7 +118,6 @@
}
}
}).parent().css({position:"fixed"});
-
}
else
window.open(urls[i], "" , "width="+featureInfoPopupWidth+",height="+featureInfoPopupHeight+",scrollbars=yes,resizable=yes");
Modified: branches/2.7/http/javascripts/mod_featureInfoTunnel.php
===================================================================
--- branches/2.7/http/javascripts/mod_featureInfoTunnel.php 2011-07-19 13:04:46 UTC (rev 7973)
+++ branches/2.7/http/javascripts/mod_featureInfoTunnel.php 2011-07-19 13:05:26 UTC (rev 7974)
@@ -152,7 +152,6 @@
$(this).remove();
}
}).parent().css({position:"fixed"});
-
$(".noResultFound").dialog("close");
}
@@ -173,7 +172,6 @@
height:200,
position:[600,200]
}).parent().css({position:"fixed"});
-
}
}
removeProgressWheel();
Modified: branches/2.7/http/javascripts/mod_overviewToggle.js
===================================================================
--- branches/2.7/http/javascripts/mod_overviewToggle.js 2011-07-19 13:04:46 UTC (rev 7973)
+++ branches/2.7/http/javascripts/mod_overviewToggle.js 2011-07-19 13:05:26 UTC (rev 7974)
@@ -23,6 +23,11 @@
* > 'overviewToggle_css', '../css/dialog/jquery-ui-1.7.2.custom.css',
* > '' ,'file/css');
*
+ * > INSERT INTO gui_element_vars (fkey_gui_id, fkey_e_id, var_name,
+ * > var_value, context, var_type) VALUES ('<app_id>', 'overviewToggle',
+ * > 'initialOpen', 'false',
+ * > '' ,'var');
+ * >
* Help:
* http://www.mapbender.org/OverviewToggle
*
@@ -35,11 +40,12 @@
* and Simplified BSD license.
* http://svn.osgeo.org/mapbender/trunk/mapbender/license/license.txt
*/
+options.initialOpen = options.initialOpen ? true : false;
var ovSwitchTarget = options.target[0];
var ovSwitchId = options.id;
-var overview_visible = false;
+var overview_visible = options.initialOpen;
//▶
//◀
@@ -68,6 +74,10 @@
display:"none",
left: overviewLeft + "px"
});
+ } else {
+ $('.ui-widget-header').css('width',overviewInitialWidth+'px');
+ $this.addClass("ui-corner-top").removeClass("ui-corner-all");
+ $ovToggleButton.removeClass("ui-icon-triangle-1-e").addClass("ui-icon-triangle-1-w");
}
$this.css({
@@ -103,6 +113,7 @@
$ovToggleButton.addClass("ui-icon-triangle-1-e").removeClass("ui-icon-triangle-1-w");
});
overview_visible = false;
+ options.initialOpen = false;
});
}
else{
@@ -127,6 +138,7 @@
$ovToggleButton.removeClass("ui-icon-triangle-1-e").addClass("ui-icon-triangle-1-w");
});
overview_visible = true;
+ options.initialOpen = true;
});
}
});
More information about the Mapbender_commits
mailing list