diff --git a/milfs/funciones/funciones.php b/milfs/funciones/funciones.php index 1907806..daf7aba 100644 --- a/milfs/funciones/funciones.php +++ b/milfs/funciones/funciones.php @@ -76,11 +76,15 @@ function empresa_datos($id_empresa,$tipo) { if($tipo=='encabezado') { $resultado =" -
- -
-

$razon_social[0]

-

$slogan[0]

+
+
+ +
+
+
+

$razon_social[0]

+

$slogan[0]

+
"; @@ -415,7 +419,8 @@ $html = html_entity_decode($html); //$resultado .="
"; }else {$resultado ="No hay datos ";} $resultado =" $resultado - Ampliar"; + Ampliar + Compartir"; return $resultado; } diff --git a/milfs/geo.php b/milfs/geo.php index 5a8ff9c..712adea 100644 --- a/milfs/geo.php +++ b/milfs/geo.php @@ -8,7 +8,6 @@ require ('funciones/convert.php'); require ('funciones/login.php'); $xajax->processRequests(); - ?> @@ -19,7 +18,7 @@ $xajax->processRequests(); - + printJavascript("xajax/"); ?> @@ -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; } @@ -62,5 +61,31 @@ $xajax->processRequests();
+ + + + + + + + \ No newline at end of file diff --git a/milfs/json.php b/milfs/json.php index b930eab..e4f669b 100644 --- a/milfs/json.php +++ b/milfs/json.php @@ -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"] ="
$formulario
";