From 767cbf870a0046cc2ed4c2124e36bfe1b95dcb3b Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Mon, 5 Nov 2018 14:36:33 -0500
Subject: [PATCH] arregalando conflicto

---
 index.php | 143 +++---------------------------------------------------
 1 file changed, 8 insertions(+), 135 deletions(-)

diff --git a/index.php b/index.php
index f44fcf9..0abc6af 100644
--- a/index.php
+++ b/index.php
@@ -34,17 +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'>
-<<<<<<< HEAD
-<script  type="text/javascript">
-window.addEventListener("load",function() {
- setTimeout(function(){
- window.scrollTo(0, 1);
- }, 0);
- });
-</script>
-=======
 
->>>>>>> c119b18641256b0d142514cd0030b24aa799685a
 
 
 
@@ -484,8 +474,8 @@ if ($variable !=''){
 
     </script>
 			";
-			
-			
+
+
 		//	$no_mostrar="display:none; ";
 
 
@@ -498,7 +488,7 @@ if ($variable !=''){
 	  		$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','') ;
@@ -668,133 +658,16 @@ if('serviceWorker' in navigator) {
 
 ";
 
-<<<<<<< HEAD
-//	  		$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);
->>>>>>> c119b18641256b0d142514cd0030b24aa799685a
 		}
 		elseif($v[0] =='g') {
 			/// g=FORMULARIO EMBEBIDO
 			$no_mostrar ="display:none; ";
 	  		$form =$v[1];
-	  		if($form =="" ){ header ("Location:./"); }
+	  		if($form =="" ){
+
+
+					er ("Location:./"); }
 	  		$empresa = 	remplacetas('form_id','id',$form,'id_empresa',"") ;
 	  		$razon_social_portal = remplacetas('empresa','id',"1",'razon_social','') ;
 			$id_empresa = $empresa[0];
@@ -1828,7 +1701,7 @@ $(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"> 
+<script  type="text/javascript">
 $('.navbar-collapse a').click(function(){
     $(".navbar-collapse").collapse('hide');
 });