1
0
Fork 0

Implementacion de ventana modal en el mapa

This commit is contained in:
humano 2014-10-07 07:02:29 -05:00
parent 7c570f8dd3
commit 164dc9b124
3 changed files with 45 additions and 11 deletions

View File

@ -76,11 +76,15 @@ function empresa_datos($id_empresa,$tipo) {
if($tipo=='encabezado') {
$resultado ="
<div class=''>
<img class='img-responsive' src='images/secure/?file=600/$imagen[0]'>
<div class='caption'>
<h3>$razon_social[0]</h3>
<p class='lead'>$slogan[0]</p>
<div class='datos_empresa row' role='row'>
<div class='col-sm-2'>
<img id='logo_empresa' class='img-responsive' src='images/secure/?file=600/$imagen[0]'>
</div>
<div class='col-sm-10'>
<div class='caption'>
<h3>$razon_social[0]</h3>
<p class='lead'>$slogan[0]</p>
</div>
</div>
</div>
";
@ -415,7 +419,8 @@ $html = html_entity_decode($html);
//$resultado .=" </div> <!-- <div class='badge pull-right'>Datos registrados el $fecha </div> --> ";
}else {$resultado ="No hay datos ";}
$resultado =" $resultado
<a target='_blank' href='index.php?id=$id&c=$control' class='pull-right'>Ampliar</a>";
<a class='btn btn-default pull-right' onclick=\"xajax_formulario_modal('$id','','$control'); \"> Ampliar</a>
<a target='_blank' href='index.php?id=$id&c=$control' class='btn btn-default pull-right'><i class='fa fa-share-square-o'></i> Compartir</a>";
return $resultado;
}

View File

@ -8,7 +8,6 @@ require ('funciones/convert.php');
require ('funciones/login.php');
$xajax->processRequests();
?>
<!DOCTYPE html>
<html lang="en">
@ -19,7 +18,7 @@ $xajax->processRequests();
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="fredyrivera" >
<?php $xajax->printJavascript("xajax/"); ?>
<link rel="shortcut icon" 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">
@ -34,7 +33,7 @@ $xajax->processRequests();
body { padding: 0; margin: 0; }
html, body, #cupcake-map { z-index: 10; position:absolute; top:0; bottom:0px; width:100%; }
.leaflet-popup-content {
width:600px !important;
width:600px !important;
}
</style>
@ -62,5 +61,31 @@ $xajax->processRequests();
<div class="center-block" style=" z-index:10000; position:absolute; bottom:10px;">
<div role='row' class='row center-block' style="width:95% ; "><?php echo aplicacion_datos("$_REQUEST[id]");?></div>
</div>
<!-- Modal -->
<div class='modal fade ' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
<div class='modal-dialog' >
<div class='modal-content'>
<div class='modal-header' >
<button type='button' class='close' data-dismiss='modal' aria-hidden='true'>&times;</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>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="js/jquery.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="js/scripts.js"></script>
</body>
</html>

View File

@ -21,7 +21,7 @@ $link=Conectarse();
AND form_id = '$id'
";
*/
$consulta = "SELECT contenido as data , form_id as id, control, GROUP_CONCAT(id ORDER by timestamp desc ) as identificador
$consulta = "SELECT form_id as id, control, GROUP_CONCAT(contenido ORDER by timestamp desc ) as data
FROM `form_datos`
WHERE form_id = '$id'
AND id_campo ='$id_campo' $valor
@ -45,13 +45,17 @@ while( $row = mysql_fetch_array( $sql ) ) {
//$marcador["id"] = $id;
//$titulo = remplacetas("form_datos","control","$row[control]","contenido","id_campo ='28' AND timestamp ='$row[timestamp]'");
//$marcador["id"] = $id;
$campos = explode(" ",$row[data]);
//$identificador=mysql_result($sql,0,"identificador");
$identificador = explode(',',$row[data]);
$identificador = $identificador[0];
$campos = explode(" ",$identificador);
$lat = $campos[0];
$lon = $campos[1];
$zoom = $campos[2];
$marcador["type"] = "Point";
$marcador["coordinates"] = array($lat,$lon);
//$marcador["loc"] = array('lat'=>$lat,'lon'=>$lon);
$formulario = formulario_imprimir($perfil,$row[control],'obligatorio');
$propiedades["name"] ="<div class='container-fluid' id='contenedor_datos' >$formulario</div>";