Conoce los proyectos que usan Tupale.co para la implementación de sus herramientas, selecciona para conocer más
-
+
$encontrados
@@ -5060,7 +5061,9 @@ $consulta = "
$sql=mysqli_query($link,$consulta);
if (mysqli_num_rows($sql)!='0'){
-$resultado = "<?php echo $formulario_nombre[0] ?> MILFS
-
+
-
+
printJavascript("milfs/xajax/"); ?>
@@ -32,8 +35,8 @@ $plantilla ="mapa";
-
-
+
+
@@ -48,12 +51,9 @@ $plantilla ="mapa";
-
-
+
+
+
+
+
+
-
@@ -171,14 +210,66 @@ $leyenda ="
";
+$resultado = "
";
+$resultado .= " ";
}
else{$resultado = '';}
}
diff --git a/nomapa.php b/nomapa.php
index cf2a8a0..a361771 100644
--- a/nomapa.php
+++ b/nomapa.php
@@ -10,8 +10,11 @@ require ("milfs/funciones/conex.php");
$xajax->processRequests();
//if($_REQUEST[id2] =='') {$agregar= $_REQUEST[id];}else {$agregar = $_REQUEST[id2];}
$formulario_nombre = remplacetas('form_id','id',$_REQUEST[id],'nombre') ;
+$formulario_descripcion = remplacetas('form_id','id',$_REQUEST[id],'descripcion') ;
$agregar_nombre = remplacetas('form_id','id',$agregar,'nombre') ;
$id_empresa = remplacetas('form_id','id',$_REQUEST[id],'id_empresa') ;
+$logo = remplacetas('empresa','id',"$id_empresa[0]",'imagen','') ;
+$razon_social = remplacetas('empresa','id',"$id_empresa[0]",'razon_social','') ;
$plantilla ="mapa";
?>
@@ -19,9 +22,9 @@ $plantilla ="mapa";
-
+
+";
while( $row = mysqli_fetch_array( $sql ) ) {
$icono = remplacetas('form_parametrizacion','campo',$perfil,'descripcion'," tabla='form_id' and opcion = 'categoria:icon:$row[md5_contenido]'") ;
@@ -5071,10 +5074,18 @@ while( $row = mysqli_fetch_array( $sql ) ) {
$icon = $icono[0];
}
$icono = "$icon";
- $contenido= substr($row[contenido],0, $length = 15);
-$resultado .= "
$contenido
";
}
-$resultado .= "
+
+
+
+ $contenido
+
";
+$resultado .="
-
+
+ function htmlbodyHeightUpdate(){
+ var height3 = $( window ).height()
+ var height1 = $('.nav').height()+50
+ height2 = $('.main').height()
+ if(height2 > height3){
+ $('html').height(Math.max(height1,height3,height2)+10);
+ $('body').height(Math.max(height1,height3,height2)+10);
+ }
+ else
+ {
+ $('html').height(Math.max(height1,height3,height2));
+ $('body').height(Math.max(height1,height3,height2));
+ }
+
+ }
+ $(document).ready(function () {
+ htmlbodyHeightUpdate()
+ $( window ).resize(function() {
+ htmlbodyHeightUpdate()
+ });
+ $( window ).scroll(function() {
+ height2 = $('.main').height()
+ htmlbodyHeightUpdate()
+ });
+ });
+ function htmlbodyHeightUpdate(){
+ var height3 = $( window ).height()
+ var height1 = $('.nav').height()+50
+ height2 = $('.main').height()
+ if(height2 > height3){
+ $('html').height(Math.max(height1,height3,height2)+10);
+ $('body').height(Math.max(height1,height3,height2)+10);
+ }
+ else
+ {
+ $('html').height(Math.max(height1,height3,height2));
+ $('body').height(Math.max(height1,height3,height2));
+ }
+
+ }
+ $(document).ready(function () {
+ htmlbodyHeightUpdate()
+ $( window ).resize(function() {
+ htmlbodyHeightUpdate()
+ });
+ $( window ).scroll(function() {
+ height2 = $('.main').height()
+ htmlbodyHeightUpdate()
+ });
+ });
+
+
var tiles = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
maxZoom: 18,
attribution: '© OpenStreetMap contributors'
}),
latlng = L.latLng(4, -74.9005222);
- var map = L.map('map', {center: latlng, zoom: 5, layers: [tiles]});
+ var map = L.map('map', {center: latlng, zoom: 5, layers: [tiles],zoomControl: false});
var geojson = L.geoJson(geojsonSample, {
@@ -207,14 +298,21 @@ onEachFeature: function(feature, layer) {
var markers = L.markerClusterGroup();
markers.addLayer(geojson);
+ map.fitBounds(geojson.getBounds());
var legend = L.control({position: 'bottomright'});
+//disable zoomControl when initializing map (which is topleft by default)
+//add zoom control with your options
+L.control.zoom({
+ position:'topright'
+}).addTo(map);
+
legend.onAdd = function (map) {
var div = L.DomUtil.create('div', 'info legend');
- div.innerHTML = " Leyenda";
+ div.innerHTML = "";
div.id = "info legend"
diff --git a/temas/landingpage/css/landingpage.css b/temas/landingpage/css/landingpage.css
index 601b546..6b24def 100644
--- a/temas/landingpage/css/landingpage.css
+++ b/temas/landingpage/css/landingpage.css
@@ -164,12 +164,21 @@ transition: all 0.3s ease;
.img-gris{
+<<<<<<< HEAD
+ -webkit-filter: grayscale(100%) blur(3px) ;
+ max-height: 200px;
+ max-width: 200px;
+ z-index:10;
+ transition:filter 0.2s;
+ -webkit-transition:-webkit-filter 1s;
+=======
-webkit-filter: grayscale(100%) blur(3px) ;
height: 200px;
width: 200px;
z-index:10;
transition:filter 0.2s;
-webkit-transition:-webkit-filter 1s;
+>>>>>>> 4e304354f68bfb9c6ff10bfa59215a36ea9a90ff
}
.img-gris:hover{
filter: grayscale(0);