From 9c8b1418081b0e3c29314fdf1c95dbb8c6223fa3 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 24 Oct 2018 10:37:25 -0500
Subject: [PATCH 01/12] actualizando ultimo repositorio

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index 3373ee1..bc518c8 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 3373ee1dd17019a91f63696fdfc00277dd6ad88a
+Subproject commit bc518c8de8b6b0e4514fbc7e13acafec1e011b42

From 84407e8bb8dc590b6c670d32c8caa71db4085e0c Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 24 Oct 2018 16:39:07 -0500
Subject: [PATCH 02/12] =?UTF-8?q?hice=20varias=20cosas,=20primero=20organi?=
 =?UTF-8?q?c=C3=A9=20el=20imput=20de=20cierre=20de=20sesion=20para=20que?=
 =?UTF-8?q?=20no=20chocara=20arriba=20en=20la=20navbar=20con=20el=20logo?=
 =?UTF-8?q?=20y=20que=20tales,=20luego=20busqu=C3=A9=20cerrar=20un=20div?=
 =?UTF-8?q?=20de=20la=20parte=20de=20lo=20ultimo=20y=20agregue=20unos=20id?=
 =?UTF-8?q?s=20para=20diferencias=20ese=20container,=20tambien=20le=20quit?=
 =?UTF-8?q?=C3=A9=20el=20margin=20y=20padding=20a=20los=20contenedores=20e?=
 =?UTF-8?q?n=20general,=20es=20mejor=20trabajar=20as=C3=AD=20para=20tener?=
 =?UTF-8?q?=20control=20de=20lo=20que=20pasa=20con=20las=20cajas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/index.php b/index.php
index 9235b51..d798e2e 100644
--- a/index.php
+++ b/index.php
@@ -1143,8 +1143,8 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
     <li>
 		<form name='form_session' class='navbar-form navbar-left'>
 					<div class='input-group'>
-						<input type='text' name='tiempo_session' size='30' class='form-control input-sm' readonly>
-						<span class='input-group-addon'><a href='#' onclick=\"location.reload();\" title='Renovar'>Reload</a></span>
+						<input type='text' name='tiempo_session' size='18' class='form-control input-sm' readonly>
+						<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>
 	</li> ";  } else{ $form_tiempo_session = "";}
@@ -1616,7 +1616,7 @@ echo $css_adicional;
 				</div>
 			<div class='col-md-9' id='texto_articulo'>"
 				;
-			}else{ echo "<div class='col-md-12' id='texto_articulo'>" ;} ?>
+			}else{ echo "<div class='col-md-12' id='lo_ultimo'>" ;} ?>
 		<?php echo $eventos;
                         if($id_empresa=="") {
 
@@ -1630,7 +1630,7 @@ echo $css_adicional;
                        // echo mas_visto("identificador","4","");
                         //echo "<div class='clearfix visible-lg-block visible-md-block visible-sm-block visible-xs-block'></div>";
                         //echo mas_visto("formulario","4","");
-                        echo "";
+                        echo "</div>";
                      }
 
 	if($acceso ==1) {

From 579bdbf1b6d0051e1a1b09c19e82ec1375cc8f87 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 24 Oct 2018 16:41:08 -0500
Subject: [PATCH 03/12] actualizacion submodulo

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index bc518c8..b437cdb 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit bc518c8de8b6b0e4514fbc7e13acafec1e011b42
+Subproject commit b437cdbf14a1f0701368f3b1c50cf8e044d3d253

From af4b25e85aac9ff57cad7791489c8abd33ec2fc0 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 24 Oct 2018 17:37:05 -0500
Subject: [PATCH 04/12] =?UTF-8?q?indentando=20c=C3=B3digo=20confirmando=20?=
 =?UTF-8?q?divs=20abiertos=20y=20cerrados?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.php | 115 ++++++++++++++++++++++++------------------------------
 1 file changed, 52 insertions(+), 63 deletions(-)

diff --git a/index.php b/index.php
index d798e2e..afe6146 100644
--- a/index.php
+++ b/index.php
@@ -1542,81 +1542,70 @@ echo $css_adicional;
 
 
 <div class="col-sm-<?php echo $cols_interior; ?> col-lg-<?php echo $cols_interior; ?>" id='principal_general'>
-<?php echo $menu_lateral ; ?>
+	<?php echo $menu_lateral ; ?>
 		<!-- END #fh5co-offcanvas -->
 	<header id="fh5co-header">
-
-					  <div class="container-fluid" id='principal_superior'>
-                    <div id='formulario_login' class='' ></div>
-										<div id='div_panel_aplicaciones' class=''>
-
- 									 </div>
-
-                    <div class='container top' id='contenedor_cabecera'>
-
-							<h1 class="text-center" id="titulo_cabecera" data-toc-skip ><a href="<?php if($id_form !=""){echo "s".$id_form;} ?>"><?php echo $titulo[0]; ?></a></h1>
-							<div class="text-center"id='slogan_cabecera'><p><?php echo "$slogan[0] "; ?> </p></div>
-
-	                 </div>
+	  <!-- En el contenedor principal superior está: el nombre de empresa, el eslogan, el asistento -->
+		<div class="container-fluid" id='principal_superior'>
+	    <div id='formulario_login' class='' ></div>
+			<div id='div_panel_aplicaciones' class=''></div>
+	    <div class='container top' id='contenedor_cabecera'>
+				<h1 class="text-center" id="titulo_cabecera" data-toc-skip ><a href="<?php if($id_form !=""){echo "s".$id_form;} ?>"><?php echo $titulo[0]; ?></a></h1>
+				<div class="text-center"id='slogan_cabecera'><p><?php echo "$slogan[0] "; ?> </p></div>
+		  </div>
 
 
-	                 <div id="asistento" class="col-md-12 text-center">
-	                 <?php
-	                 if(isset($_REQUEST['asistento'])) {
-                        echo asistente_aplicaciones("",'','','');
-		                     }else {
-		                  echo "<a href='?asistento' class='btn btn-success'>Quiero crear una aplicación. </a>";
-
-		                     }
-	                 ?>
-
-	                 </div>
-
-	                  <div class="col-md-11" id='resaltado'>
-	                 	       <div class='center-block'>
-
-	                          <?php
-
-
-										if($id_empresa=="") {
-											echo identificador_resaltado("1","");
-
-											//echo milfs_session("$login_formulario","$login_campo_usuario","$login_campo_password","","");
-											echo social_login("","","") ;
-
-
-											}else {echo identificador_resaltado($id_empresa,"landingpage");} ?>
-									</div>
-							</div>
-	              </div>
+		  <div id="asistento" class="col-md-12 text-center">
+		    <?php
+		      if(isset($_REQUEST['asistento'])) {
+	          echo asistente_aplicaciones("",'','','');
+			    }else {
+			      echo "<a href='?asistento' class='btn btn-success'>Quiero crear una aplicación. </a>";
+			      }
+		    ?>
+		  </div>
 
+		  <div class="col-md-push-1 col-md-10" id='resaltado'>
+		    <div class='center-block'>
+		      <?php
 
+						if($id_empresa=="") {
+							echo identificador_resaltado("1","");
+									//echo milfs_session("$login_formulario","$login_campo_usuario","$login_campo_password","","");
+							echo social_login("","","") ;
+						}else {echo identificador_resaltado($id_empresa,"landingpage");}
+					?>
+				</div>
+			</div>
+		</div>
+		<!-- FIN DEL CONTENEDOR Principal Superior -->
 	</header>
-		<div class="container-fluid" id='caja'>
-
-			<?php
+	<!-- FIN DE este <header> asociado a id="fh5co-header que tiene protagonismo en el código -->
+	<div class="container-fluid" id='caja'>
+		<?php
 			$id_campo = campo_titulo($set) ;
 			$corpus = formulario_corpus("$set","$id_campo","contenido","barras","texto_articulo");
 			$ultimos = mas_visto("ultimos","5","1","$set","$id_empresa");
 			if ($v[0]=='s'){
 				$buscar_datos  = buscar_datos("*formato*","$set","$plantilla","texto_articulo");
 				echo "
-			<div class='col-md-3 hidden-xs  '>
-			<aside id='aside_index'>
-				 $buscar_datos
-				<div id='grid_resultado_landing'></div>
-				<br>
-				<hr>
-				".aplicaciones_listado("$id_empresa",'','nav','')."
-				<hr>
-				$corpus
-				<hr>
-				$ultimos
-			</aside>
+				<div class='col-md-3 hidden-xs  '>
+					<aside id='aside_index'>
+				 		$buscar_datos
+						<div id='grid_resultado_landing'></div>
+						<br>
+						<hr>
+						".aplicaciones_listado("$id_empresa",'','nav','')."
+						<hr>
+						$corpus
+						<hr>
+						$ultimos
+					</aside>
 				</div>
-			<div class='col-md-9' id='texto_articulo'>"
+					<div class='col-md-9' id='texto_articulo'>"
 				;
-			}else{ echo "<div class='col-md-12' id='lo_ultimo'>" ;} ?>
+			}else{ echo "<div class='col-md-12' id='lo_ultimo'>" ;}
+		?>
 		<?php echo $eventos;
                         if($id_empresa=="") {
 
@@ -1659,7 +1648,7 @@ echo $css_adicional;
  ?>
 
     </div>
-    </div>
+  </div>
 
 
 	<footer id="fh5co-footer">
@@ -1669,8 +1658,8 @@ echo $css_adicional;
 		</small>
 	</footer>
 </div>
-   <?php echo $menu; ?>
-</div>
+  <?php echo $menu; ?>
+
 
 <div class='modal fade ' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
   <div <div id="modal_landing"  class='modal-dialog modal-lg' >

From 6d29c633b8536726ad461ac3640483b843afda17 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 24 Oct 2018 17:38:09 -0500
Subject: [PATCH 05/12] =?UTF-8?q?indentando=20c=C3=B3digo=20confirmando=20?=
 =?UTF-8?q?divs=20abiertos=20y=20cerrados?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index b437cdb..e444a6b 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit b437cdbf14a1f0701368f3b1c50cf8e044d3d253
+Subproject commit e444a6b0bb4a17e10b3319bb3cfdd006a530bb3f

From 09237d153d394f5c8cfd53ec85b642f805e32541 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 24 Oct 2018 19:08:37 -0500
Subject: [PATCH 06/12] organizando consistencia de layout commit antes de
 tocar milfs.css

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index afe6146..fc019eb 100644
--- a/index.php
+++ b/index.php
@@ -1604,7 +1604,7 @@ echo $css_adicional;
 				</div>
 					<div class='col-md-9' id='texto_articulo'>"
 				;
-			}else{ echo "<div class='col-md-12' id='lo_ultimo'>" ;}
+			}else{ echo "<div class='col-md-12 col-lg-push-2 col-lg-8' id='lo_ultimo'>" ;}
 		?>
 		<?php echo $eventos;
                         if($id_empresa=="") {

From f98c08940b2051204c2c78188defc35e34351c8c Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 24 Oct 2018 19:10:42 -0500
Subject: [PATCH 07/12] =?UTF-8?q?actualizaci=C3=B3n=20del=20submodulo=20en?=
 =?UTF-8?q?=20este=20comir?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index e444a6b..3706a62 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit e444a6b0bb4a17e10b3319bb3cfdd006a530bb3f
+Subproject commit 3706a62db6a7e70c5e0e4eb8e7a3d922ebe50be1

From 549665c8124807c3ced6ab80c926ae0739b2ef37 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 24 Oct 2018 19:37:38 -0500
Subject: [PATCH 08/12] submodulo en este commit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index 3706a62..b45da7a 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 3706a62db6a7e70c5e0e4eb8e7a3d922ebe50be1
+Subproject commit b45da7a15dc557bdca2c01f7bc3210d1bbc25e49

From 0a8d46d624e3e1cffd0cda0bcfb88f1aafde6c4b Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 24 Oct 2018 19:39:59 -0500
Subject: [PATCH 09/12] =?UTF-8?q?actualizaci=C3=B3n=20submodulo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index b45da7a..9652b3b 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit b45da7a15dc557bdca2c01f7bc3210d1bbc25e49
+Subproject commit 9652b3b8b1b398487d40e48ee466a6a5dee3c79a

From 29af806d0f7dac80f76c7a41b28229be5b54979d Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 24 Oct 2018 22:42:54 -0500
Subject: [PATCH 10/12] actualizando submodulo

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index 9652b3b..b3fde74 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 9652b3b8b1b398487d40e48ee466a6a5dee3c79a
+Subproject commit b3fde74a2f8832f6402658f4c51d95ded6712b40

From 62e94427ade3d8392370a8eca32961801f8af975 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 24 Oct 2018 23:37:25 -0500
Subject: [PATCH 11/12] =?UTF-8?q?organizaci=C3=B3n=20de=20las=20cajas=20in?=
 =?UTF-8?q?ternas=20de=20las=20empresas=20para=20poder=20quitar=20los=20cs?=
 =?UTF-8?q?s=20adicionales=20puestos=20a=20cada=20empresa=20para=20estiliz?=
 =?UTF-8?q?ar=20los=20layout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.php b/index.php
index fc019eb..3aa7513 100644
--- a/index.php
+++ b/index.php
@@ -1541,7 +1541,7 @@ echo $css_adicional;
 
 
 
-<div class="col-sm-<?php echo $cols_interior; ?> col-lg-<?php echo $cols_interior; ?>" id='principal_general'>
+<div class="col-sm-<?php echo $cols_interior; ?> col-lg-push-1 col-lg-<?php echo $cols_interior; ?>" id='principal_general'>
 	<?php echo $menu_lateral ; ?>
 		<!-- END #fh5co-offcanvas -->
 	<header id="fh5co-header">
@@ -1604,7 +1604,7 @@ echo $css_adicional;
 				</div>
 					<div class='col-md-9' id='texto_articulo'>"
 				;
-			}else{ echo "<div class='col-md-12 col-lg-push-2 col-lg-8' id='lo_ultimo'>" ;}
+			}else{ echo "<div class='col-md-12 col-lg-12' id='lo_ultimo'>" ;}
 		?>
 		<?php echo $eventos;
                         if($id_empresa=="") {

From bd1a9fce9fbf084b5d37b8aeee9b69eb018ed02f Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 24 Oct 2018 23:37:48 -0500
Subject: [PATCH 12/12] =?UTF-8?q?organizaci=C3=B3n=20de=20las=20cajas=20in?=
 =?UTF-8?q?ternas=20de=20las=20empresas=20para=20poder=20quitar=20los=20cs?=
 =?UTF-8?q?s=20adicionales=20puestos=20a=20cada=20empresa=20para=20estiliz?=
 =?UTF-8?q?ar=20los=20layout=20submodulo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index b3fde74..098f9d5 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit b3fde74a2f8832f6402658f4c51d95ded6712b40
+Subproject commit 098f9d554654bf50ceba239c013897299918a59e