From 147355009e7c2ad140d1f9cf21d1d03a1f6a7bc7 Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Sat, 3 Nov 2018 17:20:38 -0500
Subject: [PATCH] mejoras en vista aplicacion

---
 index.php | 176 ++++++++++++------------------------------------------
 milfs     |   2 +-
 2 files changed, 40 insertions(+), 138 deletions(-)

diff --git a/index.php b/index.php
index 2551860..cec4d18 100644
--- a/index.php
+++ b/index.php
@@ -34,13 +34,7 @@
 <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
     <!-- Chrome, Firefox OS y Opera -->
 <link rel='stylesheet' href='./librerias/animate/animate.min.css'>
-<script  type="text/javascript"> 
-window.addEventListener("load",function() {
- setTimeout(function(){
- window.scrollTo(0, 1);
- }, 0);
- });
-</script>
+
 
 
 
@@ -182,6 +176,7 @@ $presentacion_pie="
 				progress: true,
 				history: true,
 				center: true,
+				mouseWheel: true,
 
 				transition: 'slide', // none/fade/slide/convex/concave/zoom
 
@@ -479,6 +474,11 @@ if ($variable !=''){
 
     </script>
 			";
+			
+			
+		//	$no_mostrar="display:none; ";
+
+
 	  		$onload =" <script type=\"text/javascript\">xajax_formulario_embebido_ajax('','$form','','nuevo')</script>";
 		}
 		elseif($v[0] =='c') {
@@ -487,6 +487,8 @@ if ($variable !=''){
 	  		//$presentacion = contenido_presentacion("$form");
 	  		$presentacion = contenido_presentacion("$form");
 	  		$embebido = "1";
+	  		//$no_mostrar ="display:none; ";
+	  		
 	  		$empresa = 	remplacetas('form_id','id',"$form",'id_empresa',"") ;
 	  		$id_empresa= $empresa[0];
 	  		$logo = remplacetas('empresa','id',$id_empresa,'imagen','') ;
@@ -505,17 +507,9 @@ if ($variable !=''){
 		}
 		elseif($v[0] =='a') {
 			$form =$v[1];
-			$plantilla="carousel";
-			/// a=Aplicacion
-			$geo = buscar_campo_tipo($form,"14");
 			$embebido = "1";
-	  		$empresa = 	remplacetas('form_id','id',$form,'id_empresa',"") ;
-	  		$razon_social_portal = remplacetas('empresa','id',"1",'razon_social','') ;
-			$id_empresa = $empresa[0];
-			$titulo = 	remplacetas('form_id','id',$form,'nombre',"") ;
-			$descripcion = 	remplacetas('form_id','id',$form,'descripcion',"") ;
-				  		$no_mostrar ="display:none; ";
-	$aplicacion_pie="
+			$no_mostrar ="display:none; ";
+			$aplicacion_pie="
 
 
 			<script src='librerias/reveal/lib/js/head.min.js'></script>
@@ -664,123 +658,7 @@ if('serviceWorker' in navigator) {
 
 ";
 
-//	  		$registros = aplicacion_carrusel("$form",'10','','embebido','',"carousel");
-	  		//$registros="<div id='mostrar_carrusel'>$registros</div>";
-	 // 		$formulario = formulario_embebido($form,$opciones);
-	  		$titulo = 	remplacetas('form_id','id',$form,'nombre',"") ;
-	  		$razon_social = remplacetas('empresa','id',"$id_empresa",'razon_social','') ;
-			$slogan = remplacetas('empresa','id',"$id_empresa",'slogan','') ;
-	  		$web =  remplacetas('empresa','id',"$id_empresa",'web','');
-	  		$logo = remplacetas('empresa','id',"$id_empresa",'imagen','') ;
-	  		$campo_imagen = buscar_campo_tipo($form,"15");
-	  		  $titulos = formulario_imprimir_linea("$form","","titulos")."";
-	$id_campo = $campo_imagen[0];
-	if($id_campo[0] =="") {
-		$galeria="";
-
-	}else{
-	$galeria= "
-					<section id='galeria' class='' >
-							<div class='container-fluid'>
-								<div  style='overflow-y: scroll; overflow-x: hidden;  max-height: calc(100vh - 50px); min-height: calc(100vh - 50px); '>
-								<br>
-<table class='table table-bordered table-striped exportable'> 
-<thead></thead>
-<tbody style=' ' id='scroll-galeria' >
-</tbody>
-</table>
-								</div>
-							</div>
-					</section>
-
-	";
-	}
-
-			if($geo[0] != "") {
-			$mapa = "
-			<a name='mapa'></a>
-
-	  			<embed class='' src='mapero.php?id=$form' width='100%' style='height: calc(100vh - 150px);'  webkitAllowFullScreen mozallowfullscreen allowFullScreen ></embed>
-	  		";
-			}else {$mapa = "";}
-			$estadisticas = portal_listado_campos("$form");
-			$acciones= formulario_acciones("$form","aplicacion");
-			$no_mostrar="display:none; ";
-		
-			$footer="
-
-			<nav class='navbar navbar-default navbar-fixed-bottom'>
-<div class='container-fluid'>
-
-<!-- Brand/logo -->
-<div class='navbar-header'>
-<button type='button' class='navbar-toggle collapsed' data-toggle='collapse' data-target='#example-1' aria-expanded='false'>
-<span class='sr-only'>Toggle navigation</span>
-<span class='icon-bar'></span>
-<span class='icon-bar'></span>
-<span class='icon-bar'></span>
-</button>
-<a class='navbar-brand' href='#'></a>
-</div>
-
-<!-- Collapsible Navbar -->
-<div class='collapse navbar-collapse' id='example-1'>
-<ul class='nav navbar-nav'>
-
-$acciones
-</ul>
-</div>
-
-</div>
-</nav>";
-
-
-
-	  			  		$onload="
-
-	  			<div class='reveal' style='bottom: 80px !important; '>
-					<div class='slides' >
-						<section id='inicio' class='text-center scrollable' >
-							<img style='width: 20%;
-								  display: block;
-								  margin-left: auto;
-								  margin-right: auto;' src='milfs/images/secure/?file=600/$logo[0]' alt='' class='img img-responsive  center-block'>
-							<h1>$titulo[0]</h1>
-							<h2>$descripcion[0]</h2>
-							<hr>
-							<h2>$razon_social[0]</h2>
-							<h3>$slogan[0]</h3>
-							<hr>
-							<a href='https://tupale.co'>Tupale.co</a>
-						</section>
-
-						$galeria
-						<section id='estadisticas' class='scrollable' >
-
-						$estadisticas
-
-						</section>
-						<section id='mapa'>
-						$mapa
-						</section>
-						<section id='listado' class='' >
-							<div class='container-fluid'>
-								<div style='overflow-y: scroll; overflow-x: hidden;  max-height: calc(100vh - 100px); min-height: calc(100vh - 150px); '  >
-<br>
-<div class=''>
-<table class='table table-bordered table-striped exportable'> 
-<thead>$titulos</thead>
-<tbody style=' ' id='scroll-content' >
-</tbody>
-</table>
-</div>
-								</div>
-							</div>
-						</section>
-					</div>
-				</div>$footer";
-	  		//$onload = "$footer $aplicacion ";
-
+			$onload = vista_aplicacion($form);
 		}
 		elseif($v[0] =='g') {
 			/// g=FORMULARIO EMBEBIDO
@@ -826,8 +704,7 @@ $acciones
 			});
 
     </script>
-			";
-		}
+			";}
 		elseif($v[0] =='h') {
 			/// h=ADDON
 	  		$addon =$v[1];
@@ -1421,7 +1298,7 @@ document.oncopy = addLink;
 <?php } ?>
 </head>
 
-<body data-spy="scroll" data-target="#toc" onload="revisarSession()"; >
+<body data-spy="scroll" data-target="#toc" onload="revisarSession();  ";  >
 		<?php
 		if(isset($_REQUEST['debug'])) {
 	print_r( $_SESSION );
@@ -1821,7 +1698,32 @@ $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) {
 						<span class='input-group-addon'><a href='#' onclick="location.reload();" title='Renovar'> <i class='fa fa-refresh' aria-hidden='true'></i></a></span>
 					</div>
 		</form>
+<script  type="text/javascript"> 
+	
 
+var page_size_check = null, q_body;
+(q_body = $('#body')).bind('DOMSubtreeModified', function() {
+  if (page_size_check === null) {
+    return;
+  }
+  page_size_check = setTimeout(function() {
+    q_body.css('height', '');
+    if (q_body.height() < window.innerHeight) {
+      q_body.css('height', window.innerHeight + 'px');
+    }
+    if (!(window.pageYOffset > 1)) {
+      window.scrollTo(0, 1);
+    }
+    page_size_check = null;
+  }, 400);
+});
+	/*
+window.addEventListener("load",function() {
+ setTimeout(function(){
+ window.scrollTo(0, 1);
+ }, 0);
+ });*/
+</script>
 </body>
 
 </html>
diff --git a/milfs b/milfs
index 7da8027..8960da1 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 7da802721f833958604f274dfd1ceb242fd4c8cb
+Subproject commit 8960da1e2775bb6949fbf38f0244c18dffd56676