From a967e87db318ad46ad9ca959d83c70428626b857 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Sun, 14 Oct 2018 10:46:17 -0500
Subject: [PATCH 1/3] actualizacion submodulo

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

diff --git a/milfs b/milfs
index 60f3c18..46b9ba4 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 60f3c18a77515b1dbb28741afd7181afafa03f59
+Subproject commit 46b9ba4193762a9ed0652e6b8a63f410ec800d17

From 4a9effdc2594900dd125f22542351a014ef720f2 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Sun, 14 Oct 2018 21:24:44 -0500
Subject: [PATCH 2/3] ultimos ajustes de menus

---
 index.php                              | 14 ++++++--------
 librerias/landingjs/scripts_landing.js |  4 ++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/index.php b/index.php
index 8ee1bd0..7453210 100644
--- a/index.php
+++ b/index.php
@@ -955,7 +955,7 @@ $aplicacion_pie="
 									<a href='#' class='dropdown-toggle ' data-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'>
 									Secciones<span class='caret'></span>
 									</a>
-									<ul class='dropdown-menu'>
+									<ul  class='dropdown-menu'>
 									$aplicaciones_listado
 									</ul>
 								</li>
@@ -1115,14 +1115,12 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
 	 if(isset($_SESSION['id'])){ $boton_ingresar="
 
 
-		 <li class='dropdown'>
-				 <a href='milfs/' class='dropdown-toggle' data-toggle='dropdown'>$_SESSION[username]<b class='caret'></b></a>
-				 <ul class='dropdown-menu'>
-				     <li>
-						 $panel_aplicaciones
-						 </li>
+		 <li id='user_dropdow' class='dropdown'>
+				 <a href='milfs/' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'>$_SESSION[username]<b class='caret'></b></a>
+				 <ul id='menu_administrador' class='dropdown-menu'>
+						  $panel_aplicaciones
 						 <li class='divider'></li>
-						 <li><a onclick=\"xajax_milfs_session('','','','salir') \">SALIR <i class='fa fa-sign-out'></i></a></li>
+						 <li class='btn btn_hover'><a onclick=\"xajax_milfs_session('','','','salir') \"><i class='fa fa-sign-out'></i> SALIR</a></li>
 				 </ul>
 		 </li>
 
diff --git a/librerias/landingjs/scripts_landing.js b/librerias/landingjs/scripts_landing.js
index 055fa74..d5aa47f 100644
--- a/librerias/landingjs/scripts_landing.js
+++ b/librerias/landingjs/scripts_landing.js
@@ -9,3 +9,7 @@ $(window).scroll(function() {
 $(window).scroll(function(){
     $(".top").css("opacity", 1 - $(window).scrollTop() / 100);
   });
+
+$('.dropdown-menu').click(function(e) {
+                e.stopPropagation(); //This will prevent the event from bubbling up and close the dropdown when you type/click on text boxes.
+            });

From 265311560f11f236e23046f81b4f51ac84a9a07b Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Sun, 14 Oct 2018 21:31:57 -0500
Subject: [PATCH 3/3] cambios que generaron conflicto submodulo

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

diff --git a/milfs b/milfs
index 46b9ba4..291d171 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 46b9ba4193762a9ed0652e6b8a63f410ec800d17
+Subproject commit 291d171d9d7dcdbd00c5c586124482fb1dcccc90