qwerty/tupali
4
1
Fork 1
Code Issues 25 Pull Requests Releases Wiki Activity

conflicto tamaños push mapero

Browse Source
This commit is contained in:
Hacky Purple 2017-10-07 14:36:02 -05:00
commit 875e73774a
1 changed files with 25 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
mapero.php
View File

@ -38,8 +38,6 @@ $plantilla ="mapa";
<link rel="stylesheet" href="librerias/leaflet/leaflet-search.css"/> <link rel="stylesheet" href="librerias/leaflet/leaflet-search.css"/>
<script src="librerias/leaflet/leaflet.js"></script> <script src="librerias/leaflet/leaflet.js"></script>
<script src="librerias/jquery/jquery-2.1.4.min.js"></script> <script src="librerias/jquery/jquery-2.1.4.min.js"></script>
<script src="milfs/js/scripts.js"></script>
<script src="./librerias/bootstrap/js/bootstrap.min.js" ></script>
<script src="librerias/leaflet/leaflet-providers.js"></script> <script src="librerias/leaflet/leaflet-providers.js"></script>
<script src="librerias/leaflet/leaflet-search.js"></script> <script src="librerias/leaflet/leaflet-search.js"></script>
<link rel="stylesheet" type="text/css" media="screen" href="milfs/css/bootstrap.css"> <link rel="stylesheet" type="text/css" media="screen" href="milfs/css/bootstrap.css">
@ -158,25 +156,15 @@ $ids = json_decode($otro_json[0]);
} }
<!-- ESTILOS PRIORITARIOS -->
.modal-dialog {
width: 95% !important;
height: auto;
padding: 0;
}
.modal-lg { .modal-dialog {
width: 95% !important; width: 70%;
height: auto; height: 50%;
padding: 0; padding: 0;
} }
.modal-content { .modal-content {
height: auto; height: 50%;
}
.modal-body {
max-height: calc(100vh - 100px);
overflow-y: auto;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
@ -209,28 +197,6 @@ $ids = json_decode($otro_json[0]);
echo $css_adicional; ?> echo $css_adicional; ?>
</head> </head>
<body> <body>
<!-- Modal -->
<div class='modal fade ' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
<div class='modal-dialog modal-lg' >
<div class='modal-content'>
<div class='modal-header' >
<button type='button' class='close' data-dismiss='modal' aria-hidden='true'><i class='fa fa-times-circle'></i></button>
<h4 class='modal-title' id='myModalLabel_info'><div id='titulo_modal'></div></h4>
</div>
<div class='modal-body'>
<div id='muestra_form'>
</div>
</div>
<div class='modal-footer' id='pie_modal'>
</div>
</div>
</div>
</div>
<!-- Modal -->
<!--nav sidebar --> <!--nav sidebar -->
<aside> <aside>
<nav class="navbar navbar-inverse sidebar navbar-fixed-top" role="navigation"> <nav class="navbar navbar-inverse sidebar navbar-fixed-top" role="navigation">
@ -390,33 +356,29 @@ onEachFeature: function(feature, layer) {
layer.bindPopup(popupText); } layer.bindPopup(popupText); }
}); });
var popup = L.popup();
function onMapClick(e) { /*
// gib_uni(); var geojsonAux = L.geoJson(geojsonAuxiliar, {
<?php
//establecer_session('geo');
$campo_mapa = buscar_campo_tipo($id,"14");
$campo_mapa = $campo_mapa[0];
?>
var z = map.getZoom();
var coordenadas = "mapa.php?lat="+e.latlng.lat+"&lon="+e.latlng.lng+"&zoom="+z+"&id=<?php echo $campo_mapa; ?>[0]&exif";
xajax_formulario_embebido_ajax("<?php echo $_REQUEST['id'] ?>",'','nuevo');
//var mapa = window.document.getElementById('<?php echo $campo_mapa."[0]"; ?>');
// document.getElementById('mapita').contentWindow.document.location.href=coordenadas;
/// window.parent.document.getElementById('<?php echo $_REQUEST[id]?>')
//mapa.value= e.latlng.lng+' '+e.latlng.lat+' '+z;
popup .setLatLng(e.latlng) .setContent('You clicked the map at '+coordenadas+' ' + e.latlng.toString()) .openOn(map);
window.document.getElementById("titulo_modal").innerHTML = "Paragraph changed!"+coordenadas;
document.getElementById('mapita').src=coordenadas;
document.getElementById("probador").value = coordenadas;
}
// map.on('click', onMapClick);
pointToLayer: function(feature, latlng) {
var smallIcon = new L.Icon({
iconSize: [60, 60],
iconAnchor: [13, 27],
popupAnchor: [1, -24],
iconUrl: "http://localhost/default/tupali/milfs/images/secure/?file=150/da6d16547658ebc06c5378b30d1ee4bf.png"
});
return L.marker(latlng, {icon: smallIcon});
},
onEachFeature: function(feature, layer) {
var popupText = feature.properties.description
layer.bindPopup(popupText); }
});
*/
<?php echo $layer; ?> <?php echo $layer; ?>
var markers = L.markerClusterGroup(); var markers = L.markerClusterGroup();
markers.addLayer(geojson); markers.addLayer(geojson);
@ -447,10 +409,8 @@ L.control.zoom({
legend.addTo(map); legend.addTo(map);
map.addLayer(markers); map.addLayer(markers);
</script> </script>
</body> </body>
</html> </html>