humano/milfs
1
0
Fork 0
forked from qwerty/milfs
Code Issues Pull Requests Releases Wiki Activity

MAPA Mejoras en la visualizacion especialmente apra dispositivos móviles

Browse Source
This commit is contained in:
humano 2015-11-03 08:15:30 -05:00
parent 37c1b68f60
commit 619bb3aed8
2 changed files with 81 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
milfs/funciones/funciones.php
View File

@ -111,19 +111,28 @@ function mapa_ficha($id) {
//$prueba = json_decode($prueba); //$prueba = json_decode($prueba);
$resultado =" $resultado ="
<div style='border-radius:10px ;
background-color:white ;
right:5px ;
/*z-index:10000 ;*/
position:absolute ;
top:5px;
padding:5px ;'
class='panel-map' id='panel_map_$id' >
<div role='row' class='row center-block' > <div role='row' class='row center-block' >
<div class='row'> <div class='col-xs-4 col-md-12'>
<div class='col-xs-12'>$imagen</div> $imagen
</div> </div>
<div class='row'> <div class='col-xs-8 col-md-12'>
<div class='col-xs-12'> <h4 class='text-center'> $nombre[0]<small>
<h4 class='text-center'> $nombre[0]</h4> $descripcion[0]</h4>
<h5>$descripcion[0]</h5>
<A target='milfs' HREF='https://github.com/humano/milfs'><small class='pull-right'>MILFS</small></A></div> </div>
$prueba <div class='col-xs-8 col-md-12'>
<p>$razon_social[0]</p>
<A target='milfs' HREF='https://github.com/humano/milfs'><small class='pull-right'>MILFS</small></A>
</div> </div>
<a class='btn btn-default btn-block' href='#' onclick=\"xajax_formulario_modal('$id') \">Agregar </a>
<strong>$razon_social[0]</strong>
</div> </div>
"; ";
return $resultado; return $resultado;
@ -225,7 +234,8 @@ while( $row = mysql_fetch_array( $sql ) ) {
$icon = $icono[0]; $icon = $icono[0];
} }
$icono = "$icon"; $icono = "$icon";
$resultado .= "<li class ='' style=''><img class='img img-rounded' src='$icono' style='max-height:70px;'><br><div class='badge'>$row[contenido]</div></li>"; $contenido= substr($row[contenido],0, $length = 100);
$resultado .= "<li class ='' style='' title='$row[contenido]'><div style='max-width:60px;'><img class='img img-rounded img-responsive' src='$icono' style='max-height:50px;'><small>$contenido</small></div></li>";
} }
$resultado .= " </ul >"; $resultado .= " </ul >";
} }
@ -2856,7 +2866,7 @@ while( $row = mysql_fetch_array( $sql ) ) {
$propiedades[description] ="<div class='container-fluid' id='contenedor_datos' >$formulario</div>"; $propiedades[description] ="<div class='container-fluid' id='contenedor_datos' >$formulario</div>";
$propiedades[sounds] =""; $propiedades[sounds] ="";
$propiedades[url] =''; $propiedades[url] ='';
$propiedades[icon][iconSize] =[100,100]; $propiedades[icon][iconSize] =[60,60];
//$propiedades[icon][shadowSize] =[70,70]; //$propiedades[icon][shadowSize] =[70,70];
//$propiedades[icon][shadowUrl] = "https://raw.githubusercontent.com/humano/milfs/master/milfs/images/iconos/negro.png"; //$propiedades[icon][shadowUrl] = "https://raw.githubusercontent.com/humano/milfs/master/milfs/images/iconos/negro.png";

75
milfs/map.php
View File

@ -27,23 +27,40 @@ $plantilla ="mapa";
<?php $xajax->printJavascript("xajax/"); ?> <?php $xajax->printJavascript("xajax/"); ?>
<link rel="shortcut icon" href="favicon-152.png"> <link rel="shortcut icon" href="favicon-152.png">
<link rel="apple-touch-icon-precomposed" href="favicon-152.png"> <link rel="apple-touch-icon-precomposed" href="favicon-152.png">
<link href="css/font-awesome/css/font-awesome.css" rel="stylesheet">
<script src='https://api.tiles.mapbox.com/mapbox.js/v2.1.2/mapbox.js'></script> <script src='https://api.mapbox.com/mapbox.js/v2.2.2/mapbox.js'></script>
<link href='https://api.tiles.mapbox.com/mapbox.js/v2.1.2/mapbox.css' rel='stylesheet' /> <link href='https://api.mapbox.com/mapbox.js/v2.2.2/mapbox.css' rel='stylesheet' />
<link href='https://api.mapbox.com/mapbox.js/plugins/leaflet-markercluster/v0.4.0/MarkerCluster.Default.css' rel='stylesheet' />
<link href='https://mapbox.com/base/latest/base.css' rel='stylesheet' /> <link href='https://mapbox.com/base/latest/base.css' rel='stylesheet' />
<!-- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" /> --> <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha256-k2/8zcNbxVIh5mnQ52A0r3a6jAgMGxFJFE2707UxGCk= sha512-ZV9KawG2Legkwp3nAlxLIVFudTauWuBpC10uEafMHYL0Sarrz5A7G79kXh5+5+woxQ5HM559XX2UZjMJ36Wplg==" crossorigin="anonymous">
<link href="css/bootstrap.min.css" rel="stylesheet"> <link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap.css">
<link href="css/estilos.php?hghgSs" rel="stylesheet"> <link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.css">
<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.min.css">
<!-- <link href="css/estilos.php?hghgSs" rel="stylesheet"> -->
<style type="text/css"> <style type="text/css">
body { padding: 0; margin: 0; } .navbar-default {
/* .leaflet-container h1{font-size:initial !important;} background:rgba(255,255,255,1) ;
.leaflet-container h2{font-size:30px; !important;}
*/ }
@media (min-width: 800px) {
.panel-map{
max-width: 970px;
}
.listado_categorias{
max-height: 70px;
}
}
@media (min-width: 1200px) {
.panel-map{
max-width: 200px;
}
}
.leaflet-popup-content { width:600px !important; } .leaflet-popup-content { width:600px !important; }
body { margin:0; padding:0; }
#map { position:absolute; top:0; bottom:0; width:100%; } #map { position:absolute; top:0; bottom:0; width:100%; }
/* Sticky footer styles /* Sticky footer styles
-------------------------------------------------- */ -------------------------------------------------- */
@ -54,14 +71,15 @@ html {
body { body {
/* Margin bottom by footer height */ /* Margin bottom by footer height */
margin-bottom: 60px; margin-bottom: 60px;
padding: 0; margin: 0;
} }
.footer { .footer {
position: absolute; position: absolute;
bottom: 0; bottom: 2px;
width: auto; width: auto;
/* Set the fixed height of the footer here */ /* Set the fixed height of the footer here */
height: auto; height: auto;
z-index:200000 z-index:5000
} }
@ -77,22 +95,33 @@ body > .container {
} }
.footer > .container { .footer > .container {
padding-right: 15px; padding: 2px;
padding-left: 15px; background-color: white;
border-radius: 3px;
width: auto;
} }
code { code {
font-size: 80%; font-size: 80%;
}
.modal-dialog {
width: 98%;
height: auto;
padding: 0;
}
.modal-content {
height: auto;
} }
</style> </style>
<script src="http://code.jquery.com/jquery-2.1.0.min.js"></script>
<!-- <link rel="points" type="application/json" href="json.php?id=<?php echo $_REQUEST["id"] ?>"> --> <!-- <link rel="points" type="application/json" href="json.php?id=<?php echo $_REQUEST["id"] ?>"> -->
</head> </head>
<body> <body>
<div id='map'> <div id='map'>
<div class='footer' ><?php echo $categorias = lista_categorias($_REQUEST[id],'','') ; ?></div> <div class='footer' ><div style=" " class='container'><?php echo $categorias = lista_categorias($_REQUEST[id],'','') ; ?></div></div>
</div> </div>
<script> <script>
@ -126,10 +155,9 @@ map.fitBounds(myLayer.getBounds());
myLayer.setGeoJSON(geoJson); myLayer.setGeoJSON(geoJson);
</script> </script>
<div class="panel-map" id="panel_map_<?php echo $_REQUEST[id] ?>" >
<?php echo mapa_ficha("$_REQUEST[id]");?> <?php echo mapa_ficha("$_REQUEST[id]");?>
</div>
<!-- Modal --> <!-- Modal -->
<div class='modal fade ' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'> <div class='modal fade ' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
@ -142,6 +170,7 @@ myLayer.setGeoJSON(geoJson);
<div class='modal-body'> <div class='modal-body'>
<div id='muestra_form'></div> <div id='muestra_form'></div>
</div> </div>
<div class='modal-footer' id='pie_modal'> <div class='modal-footer' id='pie_modal'>
@ -153,8 +182,12 @@ myLayer.setGeoJSON(geoJson);
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="js/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="js/bootstrap.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script src="js/markdown.js"></script>
<script src="js/to-markdown.js"></script>
<script src="js/bootstrap-markdown.js"></script>
<script src="js/scripts.js"></script> <script src="js/scripts.js"></script>
</body> </body>
</html> </html>