From 2c497c474113eae69c63725a9a79f4a1ae770956 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Thu, 1 Nov 2018 12:01:46 -0500
Subject: [PATCH] actualizando upstream

---
 index.php | 28 ++++++++++++++--------------
 milfs     |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/index.php b/index.php
index fa21953..6f28724 100644
--- a/index.php
+++ b/index.php
@@ -36,7 +36,7 @@ if(isset($_REQUEST['debug'])) {
 <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
     <!-- Chrome, Firefox OS y Opera -->
 
-<script  type="text/javascript"> 
+<script  type="text/javascript">
 window.addEventListener("load",function() {
  setTimeout(function(){
  window.scrollTo(0, 1);
@@ -109,7 +109,7 @@ $librerias_pie ="";
 //if (isset($_GET['v'])) {$variable = $_GET['v'];}else {$variable = "";}
 if (isset($_REQUEST['empresa'])) {
 
-		
+
 	$variable = "e".$_REQUEST['empresa'];
 
 }
@@ -562,11 +562,11 @@ if ($variable !=''){
 	  		$plantilla="landingpage";
 	  		$librerias_cabeza ="
 	  		<style>
-	  		
+
 	  		.control_planilla{
 	  		display:none
 	  		}
-	  		
+
 	  		</style>
 	  		 <script src='./librerias/ekko-lightbox/4.0.1/ekko-lightbox.min.js'></script>
 	  		 <script src='./librerias/charts/Chart.bundle.js'></script>
@@ -684,7 +684,7 @@ if('serviceWorker' in navigator) {
 							<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'> 
+<table class='table table-bordered table-striped exportable'>
 <thead></thead>
 <tbody style=' ' id='scroll-galeria' >
 </tbody>
@@ -706,12 +706,12 @@ if('serviceWorker' in navigator) {
 			$estadisticas = portal_listado_campos("$form");
 			$acciones= formulario_acciones("$form","aplicacion");
 			$no_mostrar="display:none; ";
-		
+
 			$footer="
 
 			<nav class='navbar navbar-inverse navbar-fixed-bottom'>
-			
-			 
+
+
 				<div id='navbar' class='' aria-expanded='false' style='height: 1px;'>
 					<ul class='nav navbar-nav center-block' style='
 					float:none;
@@ -721,7 +721,7 @@ if('serviceWorker' in navigator) {
 					  $acciones
 					</ul>
 			    </div>
-			 
+
 			</nav>";
 
 
@@ -758,7 +758,7 @@ if('serviceWorker' in navigator) {
 								<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'> 
+<table class='table table-bordered table-striped exportable'>
 <thead>$titulos</thead>
 <tbody style=' ' id='scroll-content' >
 </tbody>
@@ -1011,7 +1011,7 @@ $aplicacion_pie="
 							$banner
 
 							</div>
-							
+
 								<div class='barra navbar-collapse collapse ' id='barra_aplicaciones'>
 									 <div class='navbar-header'>
 										  <button type='button' class='navbar-toggle collapsed' data-toggle='collapse' data-target='#menu_colapsible' aria-expanded='false'>
@@ -1039,7 +1039,7 @@ $aplicacion_pie="
 								</div>
 								<div id='mapa' class='container'><a name ='mapa' ></a>$mapa</div>
 								$presentacion
-							
+
 
 
 	  		<script>
@@ -1208,7 +1208,7 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
  if(isset($_SESSION['id'])){
 	 $form_tiempo_session = "
     <li>
-		
+
 	</li> ";  } else{ $form_tiempo_session = "";}
  if($tema=="") {
 
@@ -1302,7 +1302,7 @@ else {
  <!-- iOS Safari -->
 <meta name='apple-mobile-web-app-capable' content='yes'/>
 <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
-  
+
 	";
 include("temas/$tema/cabecera");
 include("temas/$tema/pie");
diff --git a/milfs b/milfs
index 434df34..b77e346 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 434df34e0458f6372b526a34eb2146d99fbca21e
+Subproject commit b77e3464fc48ee07e958c7030456d434dfa9a4ca