[Mapbender-commits] r6695 - trunk/mapbender/http/php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Thu Aug 5 06:26:11 EDT 2010
Author: christoph
Date: 2010-08-05 10:26:11 +0000 (Thu, 05 Aug 2010)
New Revision: 6695
Modified:
trunk/mapbender/http/php/mod_meetingPoint.php
Log:
removed jQuery, now used from parent
new order of elements (textarea first, then button)
more sophisticated ux
Modified: trunk/mapbender/http/php/mod_meetingPoint.php
===================================================================
--- trunk/mapbender/http/php/mod_meetingPoint.php 2010-08-05 10:24:54 UTC (rev 6694)
+++ trunk/mapbender/http/php/mod_meetingPoint.php 2010-08-05 10:26:11 UTC (rev 6695)
@@ -24,17 +24,20 @@
<html>
<head>
<title>meetingPoint</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET;?>">
<?php
include '../include/dyn_css.php';
?>
-<script type="text/javascript" src="../extensions/jquery-1.3.2.min.js"></script>
-<script language='JavaScript'>
+<script type="text/javascript">
<!--
<?php
include('../include/dyn_js.php');
echo "var mod_meetingPoint_target = '" . $_REQUEST["e_target"] . "';";
echo "var meetingPoint_write_to = 'meetingPoint';";
?>
+
+window.alert = parent.alert;
+
try{
if (meetingPoint_export_subject){}
}
@@ -134,23 +137,31 @@
parent.mb_button[ind].stop = new Function ("mod_meetingPoint_disable()");
}
+var mod_meetingPoint_getMousePosition = function (e) {
+ var mapObject = parent.getMapObjByName(mod_meetingPoint_target);
+ var clickPos = mapObject.getMousePosition(e);
+ mod_meetingPointRealPoint = mapObject.convertPixelToReal(clickPos);
+ mod_meetingPoint_write(mod_meetingPointRealPoint.x, mod_meetingPointRealPoint.y);
+ mod_meetingPoint_draw();
+ parent.mb_disableThisButton(mod_meetingPoint_button);
+};
+
function mod_meetingPoint_run(){
+ if (document.forms[0].mytext.value === "") {
+ alert("<?php echo _mb("Please define a text!") ?>");
+ parent.mb_disableThisButton(mod_meetingPoint_button);
+ return;
+ }
var mapObject = parent.getMapObjByName(mod_meetingPoint_target);
if (mapObject) {
- mapObject.getDomElement().ownerDocument.onclick = function (e) {
- var clickPos = mapObject.getMousePosition(e);
- mod_meetingPointRealPoint = mapObject.convertPixelToReal(clickPos);
- mod_meetingPoint_write(mod_meetingPointRealPoint.x, mod_meetingPointRealPoint.y);
- mod_meetingPoint_draw();
- parent.mb_disableThisButton(mod_meetingPoint_button);
- };
+ parent.$(mapObject.getDomElement()).bind("click", mod_meetingPoint_getMousePosition);
}
}
function mod_meetingPoint_disable(){
var mapObject = parent.getMapObjByName(mod_meetingPoint_target);
if (mapObject) {
- mapObject.getDomElement().ownerDocument.onclick = null;
+ parent.$(mapObject.getDomElement()).unbind("click", mod_meetingPoint_getMousePosition);
}
}
@@ -162,7 +173,7 @@
function mod_meetingPoint_hide(){
var mapObject = parent.getMapObjByName(mod_meetingPoint_target);
var map_el = mapObject.getDomElement();
- $(parent.document.getElementById(mapObject.elementName + "_meetingPoint_permanent")).empty();
+ parent.$(parent.document.getElementById(mapObject.elementName + "_meetingPoint_permanent")).empty();
}
@@ -177,9 +188,11 @@
var meetingPointClickPos = mapObject.convertRealToPixel(mod_meetingPointRealPoint);
var tagSource = "";
- tagSource += "<div style='visibility:visible;z-index:13;position:absolute;left:"+(meetingPointClickPos.x- Math.round(0.5*meetingPoint_width))+"px;top:"+(meetingPointClickPos.y-Math.round(0.5*meetingPoint_height))+"px'>";
+ tagSource += "<div style='visibility:visible;z-index:105;position:absolute;left:"+
+ (meetingPointClickPos.x- Math.round(0.5*meetingPoint_width))+"px;top:"+
+ (meetingPointClickPos.y-Math.round(0.5*meetingPoint_height))+"px'>";
tagSource += "<img src='"+meetingPoint_icon+"' />";
- tagSource += "<span style='"+meetingPoint_style+"'>"+document.forms[0].mytext.value+"</span>";
+ tagSource += "<div class='ui-widget-content ui-corner-all' style='padding:3px'><span style='white-space:nowrap;'>"+document.forms[0].mytext.value.replace("\n", "<br>")+"</span></div>";
tagSource += "</div>";
var map_el = mapObject.getDomElement();
@@ -190,12 +203,13 @@
$div.css({
position: "absolute",
top: "0px",
- left: "0px",
- zIndex: 20
+ left: "0px"
});
- $(map_el).append($div);
+ parent.$(map_el).append($div);
+ parent.mb_registerPanSubElement(mapObject.elementName + "_meetingPoint_permanent")
+ console.log(mapObject.elementName + "_meetingPoint_permanent");
}
- $(parent.document.getElementById(mapObject.elementName + "_meetingPoint_permanent")).html(tagSource);
+ parent.$(parent.document.getElementById(mapObject.elementName + "_meetingPoint_permanent")).html(tagSource);
}
}
}
@@ -206,7 +220,7 @@
var stringLength = document.forms[0].mytext.value.length;
if (stringLength > meetingPoint_max_characters) {
document.forms[0].mytext.value = document.forms[0].mytext.value.slice(0, meetingPoint_max_characters) ;
- alert("meetingPoint_max_characters is set to " + meetingPoint_max_characters);
+ alert("<?php echo _mb("Input too long. Maximum of allowed characters is"); ?> " + meetingPoint_max_characters);
}
}
@@ -228,15 +242,16 @@
function validate(){
var mycheck = true;
- var checkObj= document.forms[0].mytext.value;
- if(checkObj == '') {
+ var checkObj= document.forms[0].mytext;
+ if(checkObj.value == '') {
alert ("<?php echo _mb("Please define a text!") ?>");
checkObj.focus();
mycheck=false;
+ return false;
}
- var checkObj= document.forms[0].x.value;
- if(checkObj == '') {
+ var checkObj= document.forms[0].x;
+ if(checkObj.value == '') {
alert (meetingPoint_please_click);
mycheck = false;
}
@@ -274,7 +289,15 @@
createEmail(my_meetingPoint,meetingPoint_export_subject);
}
else {
- prompt(meetingPoint_export_subject,my_meetingPoint);
+ var div = parent.$("<div/>").attr("title", "Treffpunkt").text(meetingPoint_export_subject);
+ var textarea = parent.$("<textarea />").attr({
+ "rows": 5,
+ "cols": 30
+ }).text(my_meetingPoint);
+ div.append("<br /><br />");
+ div.append(textarea);
+ div.dialog();
+ // prompt(meetingPoint_export_subject,my_meetingPoint);
}
}
}
@@ -314,8 +337,6 @@
<form action="" >
-<img id='my_getCoords' name='my_getCoords' onclick="mod_meetingPoint_run()" onmouseover ="parent.mb_regButton_frame('init_mod_meetingPoint','meetingPoint',null)" title="Treffpunkt setzen" src = '../img/button_digitize/point_off.png'>
-<br>
<input class='strinput' type="hidden" name='myurl' value='<?php echo LOGIN; ?>'>
<input class='strinput' type="hidden" name='mygui' value='<?php echo Mapbender::session()->get("mb_user_gui"); ?>'>
@@ -323,10 +344,11 @@
<input class='strinput' type="hidden" name='myuser' value='<?php echo Mapbender::session()->get("mb_user_name"); ?>'>
<input class='strinput' type="hidden" name='mypw' value='<?php echo Mapbender::session()->get("mb_user_password"); ?>'>
-<br>
<!--<input class='strinput' type="textarea" size=2 name='mytext' value='' "maxlength=70" title="max. 70 Zeichen">-->
<textarea class='strinput' rows="3" name='mytext' id='mytext' onmouseover='checkMaxCharacters()' title='' onkeyup='checkMaxCharacters()'></textarea>
-<br>
+<br><br>
+<img id='my_getCoords' name='my_getCoords' onclick="mod_meetingPoint_run()" onmouseover ="parent.mb_regButton_frame('init_mod_meetingPoint','meetingPoint',null)" title="Treffpunkt setzen" src = '../img/button_digitize/point_off.png'>
+<br><br>
<input class="okbutton" name="Send" type="button" value="ok" onclick="validate();">
<input class="ibutton" type="button" value="<?php echo _mb("cancel") ?>" onClick="emptyfields();">
<br>
More information about the Mapbender_commits
mailing list