mejoras en el portal

milfs/funciones/funciones.php

@@ -426,9 +426,11 @@ $sql=mysql_query($consulta,$link);
 if (mysql_num_rows($sql)!='0'){
 	mysql_data_seek($sql, 0);
 	$resultado_li .= "<ul class='list-group'>";
+	$resultado_grid .= "<div id='row_aplicacion' class='row centered' style=''>";
  	//$resultado_nav .= "<ul class='nav navbar-nav ' >";
 $fila=0;
 while( $row = mysql_fetch_array( $sql ) ) {
+	$descripcion_corta = substr($row[descripcion],0, $length = 100);
 		$geo = buscar_campo_tipo($row[id],"14");
 		if($geo[0] !='') { $mapa= "<tr><td><a href='geo.php?id=$row[id]' target='mapa'><i class='fa fa-globe'></i></a></td></tr>";}else {$mapa='';}
 
@@ -461,18 +463,86 @@ $resultado .= "<li  class='list-group-item'><span class='badge alert-success'>$r
 $campos = formulario_campos_select("$row[id]","");
 if($row[nombre] !="Portada") {
 $resultado .= "<ul  class='list-group'>$campos</ul></li>";
-}
 }
 
+$campo_imagen = buscar_campo_tipo($row[id],"15");
+/*if($tipo =='grid' AND $id_form !='') {
+$resultado_grid .= contenido_aplicacion($row[id]);
+}else {
+	*/
+$imagen = ultimo_campo($row[id],"$campo_imagen[0]");
+if($imagen[0] !='' ) { $bg ="background-image : url(\"milfs/images/secure/?file=300/$imagen[0]\"); 
+										background-repeat: no-repeat; 
+										background-size :cover;
+										background-position: center; ";}
+else { $color_aleatorio = sprintf("%02X", mt_rand(0, 0xFFFFFF)); $bg = "background-color: #$color_aleatorio ;"; }
+	$resultado_grid .= "<div class='col-sm-4 div_aplicacion' style ='height:300px; $bg '>  <h2 style='text-shadow:  1px 1px 1px rgba(255,255,255,0.8) ;';>$row[nombre] </h2>
+	<div class='round' style=' padding:5px; background-image : url(\"milfs/images/transparente40.png\");'><h3>$descripcion_corta</h3></div>
+	 $contenido <br><a class='badge pull-right' href='?id=$row[id]'>Leer</a>
+							</div>";
+															}
+		$resultado_grid .= "</div>";
+											//	}			
 	$resultado .="</ul>";
 										}else {$resultado_li = "";}
 
 if($tipo =='li') { return $resultado_li.$resultado;}
 elseif($tipo =='nav') { return $resultado_nav;}
+elseif($tipo =='grid') { return $resultado_grid;}
 else {return $resultado;}
 }
 $xajax->registerFunction("aplicaciones_listado");
 
+
+function contenido_aplicacion($id){
+$div = "contenedor";
+	$respuesta = new xajaxResponse('utf-8');
+	
+	$campo_titulo = remplacetas('parametrizacion','campo',$id,'descripcion'," tabla='form_id' and  opcion = 'titulo'") ;
+if($campo_titulo[0] !='') {$w_campo = "AND id_campo = '$campo_titulo[0]'";}
+$campo_titulo = $campo_titulo[0];
+$consulta ="SELECT *,GROUP_CONCAT(id  ORDER by timestamp desc ) as identificador FROM  form_datos WHERE form_id = '$id' $w_campo GROUP BY control order by contenido";
+$link=Conectarse(); 
+$sql=mysql_query($consulta,$link);
+if (mysql_num_rows($sql)!='0'){
+	$control = mysql_result($sql,0,control);
+	//$contenido = "<ul class='dropdown-menu' role='menu'>";
+		mysql_data_seek($sql, 0);
+				$contenido = " 
+
+";
+				$orden = 0;
+while( $row = mysql_fetch_array( $sql ) ) {
+	//$orden = $orden+500;
+	$identificador = explode(',',$row[identificador]);
+	$identificador = $identificador[0];
+	$contenido_desplegado = contenido_mostrar("$row[form_id]","$row[control]",'');
+
+	$titulo = remplacetas('form_datos','id',$identificador,'contenido',"") ;
+
+	$contenido  .= "
+  
+							$contenido_desplegado 
+
+						 "; 
+
+														}
+ 	$contenido = "
+ 	
+ 	
+ 	 $links
+
+        <section id=''>$contenido</section>";
+										}
+
+//return " $contenido";
+//		$respuesta->addAssign("$div","innerHTML","$contenido");
+		return $contenido;
+
+}
+
+
+
 function contenido_parallax($id){
 $div = "contenedor";
 	$respuesta = new xajaxResponse('utf-8');
@@ -635,6 +705,21 @@ return " $contenido";
 }
 $xajax->registerFunction("contenido_listado");
 
+function ultimo_campo($id,$id_campo) {
+$link=Conectarse(); 
+$sql=mysql_query($consulta,$link);
+$consulta ="SELECT * FROM  form_datos WHERE form_id = '$id' AND id_campo ='$id_campo' ORDER BY id DESC limit 1 ";
+$sql=mysql_query($consulta,$link);
+if (mysql_num_rows($sql)!='0'){
+	$control = mysql_result($sql,0,"control");
+	$contenido = mysql_result($sql,0,"contenido");
+$resultado[0]=$contenido;
+$resultado[1]=$control;
+$resultado[2]=$consulta;
+}
+return $resultado;
+
+}
 
 function contenido_aleatorio($id) {
 $link=Conectarse(); 
@@ -784,6 +869,8 @@ return $link;
 		$empresa_telefono = editar_campo("empresa","$_SESSION[id_empresa]","telefono_1","");
 		$empresa_web = editar_campo("empresa","$_SESSION[id_empresa]","web","");
 		$empresa_email = editar_campo("empresa","$_SESSION[id_empresa]","email","");
+		$empresa_twitter = editar_campo("empresa","$_SESSION[id_empresa]","twitter","");
+		$empresa_facebook = editar_campo("empresa","$_SESSION[id_empresa]","facebook","");
 			$background =  remplacetas("empresa","id",$_SESSION[id_empresa],"imagen","");
 			$background_imagen = "images/secure/?file=600/$background[0]"; 
 		$nombre = editar_campo("usuarios","$_SESSION[id]","p_nombre","");
@@ -825,6 +912,8 @@ return $link;
 							<li>$empresa_telefono</li>
 							<li>$empresa_web</li>
 							<li>$empresa_email</li>
+							<li>$empresa_twitter</li>
+							<li>$empresa_facebook</li>
 							
 						
 					</div>
@@ -1045,7 +1134,7 @@ if (mysql_num_rows($sql)!='0'){
 		$resultado .= "
 			<div class='row' id='contenedor_imagen'>
 				<div class='col-lg-12 '>
-					<img class='img-thumbnail responsive' src='images/secure/?file=300/$imagen'>
+					<img class='img-thumbnail responsive' src='http://$_SERVER[HTTP_HOST]/milfs/images/secure/?file=300/$imagen'>
 				</div>
 			</div>";
 			$imagen_ancho = '100%';
@@ -1063,7 +1152,7 @@ if (mysql_num_rows($sql)!='0'){
 		$contenido = $contenido[3];
 		//$contenido = Markdown($contenido);
 		
-		if($campo_tipo=='15'){if($contenido !=""){$contenido = "<img class='img-thumbnail responsive' src='images/secure/?file=150/$contenido'>"; }else{$contenido="";}}
+		if($campo_tipo=='15'){if($contenido !=""){$contenido = "<img class='img-thumbnail responsive' src='http://$_SERVER[HTTP_HOST]/milfs/images/secure/?file=300/$contenido'>"; }else{$contenido="";}}
 				
 		elseif($campo_tipo=='14'){
 			if($contenido !='') {
@@ -1119,10 +1208,10 @@ if (mysql_num_rows($sql)!='0'){
 
 	$resultado .= "
 	<div class='row' id='contenedor_$row[id_campo]'>
-		<div class='col-lg-3 '>
+		<div class='col-lg-1 ' >
-			<span class='campo_nombre' id='nombre_$row[id_campo]'>$campo_nombre[0]</span>
+			<span class='campo_titulo campo_nombre' id='nombre_$row[id_campo]'>$campo_nombre[0]</span>
 		</div>
-		<div class='col-lg-9'>
+		<div class='col-lg-11'>
 			<span class='campo_contenido' id='contenido_$row[id_campo]'>$contenido</span>
 		</div>
 	</div>";

milfs/map.php

@@ -4,6 +4,7 @@ require ('xajax/xajax.inc.php');
 $xajax = new xajax();
 //require ('json.lab.php');
 require ('funciones/funciones.php');
+//require_once ('milfs/includes/markdown.php');
 //require ('funciones/convert.php');
 $xajax->processRequests(); 
 if($_REQUEST[id2] =='') {$agregar= $_REQUEST[id];}else {$agregar = $_REQUEST[id2];}
@@ -61,7 +62,7 @@ $agregar_nombre = remplacetas('form_id','id',$agregar,'nombre') ;
 <div id='map'></div>
 <script>
 L.mapbox.accessToken = 'pk.eyJ1IjoiaHVtYW5vIiwiYSI6IlgyRTFNdFEifQ.OmQBXmcVg_zq-vMpr8P5vQ';
-var map = L.mapbox.map('map', 'humano.jki5hno0')
+var map = L.mapbox.map('map', 'examples.map-i86nkdio')
     .setView([40, -74.50], 8);
 
 var geoJson = [ <?php echo imprime_geojson("$_REQUEST[id]","$_REQUEST[id2]");?> ];

milfs/portal.php

@@ -1,18 +1,22 @@
 <?php
-///este archivo debe estar un nivel superior al directorio milfs 
+/// ESTE ARCHIVO DEBE ESTAR UN NIVEL POR ENCIMA DEL DIRECTORIO milfs 
 session_start();
 //ini_set('display_errors', 'On');
 require ('milfs/xajax/xajax.inc.php');
 $xajax = new xajax();
 require ('milfs/funciones/funciones.php');
-//require ('milfs/funciones/convert.php');
+require ('milfs/funciones/convert.php');
 require ('milfs/funciones/login.php');
-require_once ('milfs/includes/markdown.php');
 $xajax->processRequests(); 
 $logo = remplacetas('empresa','id','1','imagen') ;
 $direccion = remplacetas('empresa','id','1','direccion') ;
 $telefono = remplacetas('empresa','id','1','telefono_1') ;
 $email = remplacetas('empresa','id','1','email') ;
+$razon_social = remplacetas('empresa','id','1','razon_social') ;
+$sigla = remplacetas('empresa','id','1','sigla') ;
+$facebook = remplacetas('empresa','id','1','facebook') ;
+$twitter = remplacetas('empresa','id','1','twitter') ;
+$slogan = remplacetas('empresa','id','1','slogan') ;
 ?>
 <!DOCTYPE html>
 <html lang="en">
@@ -27,7 +31,6 @@ $email = remplacetas('empresa','id','1','email') ;
     <link rel="shortcut icon" href="favicon-152.png">
 	<link rel="apple-touch-icon-precomposed" href="favicon-152.png">
 	<link href="milfs/css/font-awesome/css/font-awesome.css" rel="stylesheet">
-		<link rel="stylesheet" href="milfs/css/style.css" media="screen" />
 <!--  <link href="http://getbootstrap.com/examples/sticky-footer-navbar/sticky-footer-navbar.css" rel="stylesheet"> -->
 
 <!-- <script src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script> -->
@@ -35,30 +38,95 @@ $email = remplacetas('empresa','id','1','email') ;
 <!-- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" /> -->
 <link href="milfs/css/bootstrap.min.css" rel="stylesheet">
 <link href="milfs/css/estilos.php" rel="stylesheet">
-	<script src="milfs/js/jquery.min.js"></script>
-<script src="milfs/js/jquery.timelinr-0.9.54.js"></script>
-      	<script>
 
-	</script>
+<!--   <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"] ?>"> -->
+<style type="text/css">
+
+.jumbotron {
+background-image: url("milfs/images/secure/?file=600/<?php echo $logo[0];?>");
+background-size: cover;
+background-position: center;}
+
+.div_aplicacion:hover {
+   -webkit-animation: animatedBackground 1s ease-out 1;
+        -moz-animation: animatedBackground 1s ease-out 1;
+        animation: animatedBackground 1s ease-out 1;
+        -webkit-animation-fill-mode: forwards;
+        animation-fill-mode: forwards;
+        z-index: 10000;
+}
+
+    @-webkit-keyframes animatedBackground {
+        0% {
+            -webkit-transform: scale(1, 1);
+            -moz-transform: scale(1, 1);
+            -ms-transform: scale(1, 1);
+            -o-transform: scale(1, 1);
+            transform: scale(1, 1)
+        }
+        100% {
+        -webkit-transform: scale(1.1, 1.1);
+        -moz-transform: scale(1.1, 1.1);
+        -ms-transform: scale(1.1, 1.1);
+        -o-transform: scale(1.1, 1.1);
+        transform: scale(1.1, 1.1)
+        }
+
+    }
+    
+    
+    @-moz-keyframes animatedBackground {
+        0% {
+            -webkit-transform: scale(1, 1);
+            -moz-transform: scale(1, 1);
+            -ms-transform: scale(1, 1);
+            -o-transform: scale(1, 1);
+            transform: scale(1, 1)
+        }
+        100% {
+            -webkit-transform: scale(1.1, 1.1);
+            -moz-transform: scale(1.1, 1.1);
+            -ms-transform: scale(1.1, 1.1);
+            -o-transform: scale(1.1, 1.1);
+            transform: scale(1.1, 1.1)
+        }
+
+    }
+    @keyframes animatedBackground {
+        0% {
+            -webkit-transform: scale(1, 1);
+            -moz-transform: scale(1, 1);
+            -ms-transform: scale(1, 1);
+            -o-transform: scale(1, 1);
+            transform: scale(1, 1)
+        }
+        100% {
+            -webkit-transform: scale(1.1, 1.1);
+            -moz-transform: scale(1.1, 1.1);
+            -ms-transform: scale(1.1, 1.1);
+            -o-transform: scale(1.1, 1.1);
+            transform: scale(1.1, 1.1)
+        }
+
+    }
+</style>
 </head>
 <body>
-      <!-- Static navbar -->
+  <body>
 
-      <div class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class='col-sx-12 ' id='logo_cabecera' style='width:100%;left:40px; background-color: white; '>
-      <br>
+      
-      <img  style="max-height:38px;" src="milfs/images/100x100.png"  width='40px'>
-      <img  style="max-height:38px;" src="milfs/images/secure/?file=150/<?php echo $logo[0] ?>" >
-      <img  style="max-height:38px;" src="milfs/images/100x100.png"  width='40px'>
       <div class='pull-right' >
-      	<div style="">Follow us<br>
+      	<div style="">
-      	<a target="_facebook" href="https://www.facebook.com/casa3patios"><span style='font-size:30px; color:black'><i class='fa fa-facebook-square'></i></span></a>
+      	<a target="_redes" href="mailto:<?php echo $email[0];?>"><span style='font-size:30px; color:black'><i class='fa fa-envelope'></i></span></a>
-      	<a target="_facebook" href="https://twitter.com/CasaTresPatios"><span style='font-size:30px; color:black'<i class='fa fa-twitter'></i></span></a>
+      	<a target="_redes" href="<?php echo $facebook[0];?>"><span style='font-size:30px; color:black'><i class='fa fa-facebook-square'></i></span></a>
-      	<img  style="max-height:38px;" src="milfs/images/100x100.png"  width='40px'></div>
+      	<a target="_redes" href="https://twitter.com/<?php echo $twitter[0];?>"><span style='font-size:30px; color:black'<i class='fa fa-twitter'></i></span></a>
+      	<img  style="max-height:38px;" src="milfs/images/100x100.png"  width='40px'>
+      	</div>
       	
       </div>
       </div>
-       <!--  <div class="container-fluid"> -->
           <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
               <span class="sr-only">Toggle navigation</span>
@@ -70,19 +138,27 @@ $email = remplacetas('empresa','id','1','email') ;
           </div>
           <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
-					<?php echo aplicaciones_listado("$_REQUEST[id]","nav"); ?>
+            
+					<li><a target="" href="?"><span style='font-size:30px; color:black'><i class='fa fa-home'></i></span></a></li>
               
             </ul>
 
           </div><!--/.nav-collapse -->
-      <!--   </div> --><!--/.container-fluid -->
-      </div>
-<!-- /container -->
-	<div id ='contenedor' style=' top: 110px; position:absolute; width:100%;  ' class="">
-	<?php echo contenido_aleatorio("9"); ?>
-	</div>
 
+      </div>
+<div class="jumbotron">
+    <h1><?php echo $razon_social[0]; ?></h1>
+    <p><?php echo $slogan[0]; ?></p>
+  </div>
+    <div class="container">
+	<?php  
+	if(isset($_REQUEST[id])){ echo contenido_aplicacion("$_REQUEST[id]"); }
+	else{	echo aplicaciones_listado("","grid");} ?>
 
+	</div>
+  <div  class="center-block" style="  z-index:10000; 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'>
@@ -103,7 +179,6 @@ $email = remplacetas('empresa','id','1','email') ;
     </div>
   </div>
 </div>
-
 	       <div class='pie' style=" position: fixed;
   bottom: 0;
   width: 100%;
@@ -113,12 +188,10 @@ $email = remplacetas('empresa','id','1','email') ;
 	      <p class='text-center'> <?php echo "$direccion[0] $telefono[0] $email[0]"; ?></p>
         <a class='pull-right' href='http://QWERTY.co/milfs'>Powered by: &copy; MILFS </a> 
         	</div> 
-
-
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-<!--      <script src="milfs/js/jquery.min.js"></script>  -->
+     <script src="milfs/js/jquery.min.js"></script> 
     <script src="milfs/js/bootstrap.min.js"></script>
     <script src="milfs/js/scripts.js"></script>
 </body>

milfs/top.php~

@@ -1,122 +0,0 @@
-<?php 
-//ini_set('display_errors', 'On');
-require ('xajax/xajax.inc.php');
-$xajax = new xajax();
-//require ('json.lab.php');
-require ('funciones/funciones.php');
-//require ('funciones/convert.php');
-$xajax->processRequests(); 
-if($_REQUEST[id2] =='') {$agregar= $_REQUEST[id];}else {$agregar = $_REQUEST[id2];}
-$formulario_nombre = remplacetas('form_id','id',$_REQUEST[id],'nombre') ;
-$agregar_nombre = remplacetas('form_id','id',$agregar,'nombre') ;
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset=utf-8 />
-<title><?php echo $formulario_nombre[0] ?> MILFS</title>
-<meta name='viewport' content='initial-scale=1,maximum-scale=1,user-scalable=no' />
-<script src='https://api.tiles.mapbox.com/mapbox.js/v2.1.2/mapbox.js'></script>
-<link href='https://api.tiles.mapbox.com/mapbox.js/v2.1.2/mapbox.css' rel='stylesheet' />
-<style>
-  body { margin:0; padding:0; }
-  #map { position:absolute; top:0; bottom:0; width:100%; }
-</style>
-</head>
-<!DOCTYPE html>
-<html lang="en">
-   <head >
-   <title><?php echo $formulario_nombre[0] ?> MILFS</title>
-    <meta charset="utf-8">
-    <meta name="viewport" content="user-scalable=no, width=device-width,  maximum-scale=1,  initial-scale=1">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <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">
- <link href="http://getbootstrap.com/examples/sticky-footer-navbar/sticky-footer-navbar.css" rel="stylesheet">
-
-<script src='https://api.tiles.mapbox.com/mapbox.js/v2.1.2/mapbox.js'></script>
-<link href='https://api.tiles.mapbox.com/mapbox.js/v2.1.2/mapbox.css' rel='stylesheet' />
-
-<!-- <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" /> -->
-<link href="css/bootstrap.min.css" rel="stylesheet">
-<link href="css/estilos.php?hghgS" rel="stylesheet">
-  <style type="text/css">
-  body {  padding: 0; margin: 0;  }
-
-  .leaflet-popup-content {     width:600px !important; }
-
-    body { margin:0; padding:0; }
-  #map { position:absolute; top:0; bottom:0; width:100%; }
-  </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"] ?>"> -->
-</head>
-<body>
-<div id='map'></div>
-<script>
-L.mapbox.accessToken = 'pk.eyJ1IjoiaHVtYW5vIiwiYSI6IlgyRTFNdFEifQ.OmQBXmcVg_zq-vMpr8P5vQ';
-var map = L.mapbox.map('map', 'humano.jki5hno0')
-    .setView([40, -74.50], 8);
-
-var geoJson = [ <?php echo imprime_geojson("$_REQUEST[id]","$_REQUEST[id2]");?> ];
-var myLayer = L.mapbox.featureLayer()
-  .setGeoJSON(geoJson)
-  .addTo(map);
-  
-myLayer.on('layeradd', function(e) {
-	    var marker = e.layer,
-        feature = marker.feature;
-           // Create custom popup content
-    var popupContent =  '' + feature.properties.description + '';
-
-    // http://leafletjs.com/reference.html#popup
-    marker.bindPopup(popupContent,{
-        closeButton: false,
-        minWidth: 320
-    });
-
-         marker.setIcon(L.icon(feature.properties.icon));
-
-});
- 
-map.fitBounds(myLayer.getBounds());
-myLayer.setGeoJSON(geoJson);
-</script>
-<div  class="panel-map" id='panel_map_<?php echo $id ?>' style="">
-  <div role='row' class='row center-block' style="; "><?php echo mapa_ficha("$_REQUEST[id]");?></div>
-    <a class="btn btn-primary btn-block" href="#" onclick="xajax_formulario_modal('<?php echo $agregar ?>'); ">Agregar<br> <?php echo $agregar_nombre[0]; ?></a>
-  </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>