Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

pull/2487/head
Yannick Warnier 9 years ago
commit 94614837a1
  1. 96
      main/inc/lib/extra_field.lib.php

@ -1660,27 +1660,34 @@ EOF;
$form->addHtml( $form->addHtml(
'<script> '<script>
$(document).ready(function() { $(document).ready(function() {
var address = "' . $dataValue . '"; if (typeof google === "object") {
initializeGeo'.$field_details['variable'].'(address, false);
var address = "' . $dataValue . '";
$("#geolocalization_extra_'.$field_details['variable'].'").on("click", function() {
var address = $("#extra_'.$field_details['variable'].'").val();
initializeGeo'.$field_details['variable'].'(address, false); initializeGeo'.$field_details['variable'].'(address, false);
return false;
}); $("#geolocalization_extra_'.$field_details['variable'].'").on("click", function() {
var address = $("#extra_'.$field_details['variable'].'").val();
$("#myLocation_extra_'.$field_details['variable'].'").on("click", function() { initializeGeo'.$field_details['variable'].'(address, false);
myLocation'.$field_details['variable'].'();
return false;
});
$("#extra_'.$field_details['variable'].'").keypress(function (event) {
if (event.which == 13) {
$("#geolocalization_extra_'.$field_details['variable'].'").click();
return false; return false;
} });
});
$("#myLocation_extra_'.$field_details['variable'].'").on("click", function() {
myLocation'.$field_details['variable'].'();
return false;
});
$("#extra_'.$field_details['variable'].'").keypress(function (event) {
if (event.which == 13) {
$("#geolocalization_extra_'.$field_details['variable'].'").click();
return false;
}
});
} else {
$("#map_extra_'.$field_details['variable'].'").html("<div class=\"alert alert-info\">' . get_lang('YouNeedToActivateTheGoogleMapsPluginInAdminPlatformToSeeTheMap') . '</div>");
}
}); });
function myLocation'.$field_details['variable'].'() { function myLocation'.$field_details['variable'].'() {
@ -1810,32 +1817,37 @@ EOF;
$form->addHtml( $form->addHtml(
'<script> '<script>
$(document).ready(function() { $(document).ready(function() {
if (typeof google === "object") {
var lat = "' . $lat . '";
var lng = "' . $lng . '"; var lat = "' . $lat . '";
var latLng = new google.maps.LatLng(lat, lng); var lng = "' . $lng . '";
initializeGeo'.$field_details['variable'].'(false, latLng);
$("#geolocalization_extra_'.$field_details['variable'].'").on("click", function() {
var latLng = $("#extra_'.$field_details['variable'].'").val().split(",");
var lat = latLng[0];
var lng = latLng[1];
var latLng = new google.maps.LatLng(lat, lng); var latLng = new google.maps.LatLng(lat, lng);
initializeGeo'.$field_details['variable'].'(false, latLng); initializeGeo'.$field_details['variable'].'(false, latLng);
return false;
}); $("#geolocalization_extra_'.$field_details['variable'].'").on("click", function() {
var latLng = $("#extra_'.$field_details['variable'].'").val().split(",");
$("#myLocation_extra_'.$field_details['variable'].'").on("click", function() { var lat = latLng[0];
myLocation'.$field_details['variable'].'(); var lng = latLng[1];
return false; var latLng = new google.maps.LatLng(lat, lng);
}); initializeGeo'.$field_details['variable'].'(false, latLng);
$("#extra_'.$field_details['variable'].'").keypress(function (event) {
if (event.which == 13) {
$("#geolocalization_extra_'.$field_details['variable'].'").click();
return false; return false;
} });
});
$("#myLocation_extra_'.$field_details['variable'].'").on("click", function() {
myLocation'.$field_details['variable'].'();
return false;
});
$("#extra_'.$field_details['variable'].'").keypress(function (event) {
if (event.which == 13) {
$("#geolocalization_extra_'.$field_details['variable'].'").click();
return false;
}
});
} else {
$("#map_extra_'.$field_details['variable'].'").html("<div class=\"alert alert-info\">' . get_lang('YouNeedToActivateTheGoogleMapsPluginInAdminPlatformToSeeTheMap') . '</div>");
}
}); });
function myLocation'.$field_details['variable'].'() { function myLocation'.$field_details['variable'].'() {

Loading…
Cancel
Save