From c98234425af90f841022176cd712e8594d8a2105 Mon Sep 17 00:00:00 2001
From: root <root@alien.cubil>
Date: Mon, 8 Oct 2018 12:38:35 -0500
Subject: [PATCH] mejoras en login

---
 funciones/funciones.php | 17 ++++++++++++-----
 index.php               | 22 ++++++++++------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/funciones/funciones.php b/funciones/funciones.php
index b9a8a50..1de9848 100644
--- a/funciones/funciones.php
+++ b/funciones/funciones.php
@@ -8937,7 +8937,14 @@ if($tipo =="") {
 				return $formulario;
 			}else {
 
-/*				if($_SERVER['HTTP_HOST'] !="tupale.co" ) {
+/*			
+ * 
+ * //// social login
+ * <!--					<a class=' list-group-item btn btn-default ' href='./sociallogin.php?provider=twitter'><i class='fa fa-twitter'></i> Twitter</a>
+ 						<a class=' list-group-item btn btn-default ' href='./sociallogin.php?provider=facebook'><i class='fa fa-facebook'></i> Facebook</a> -->
+ * 
+ * ////////
+ * 	if($_SERVER['HTTP_HOST'] !="tupale.co" ) {
 			$social_login="";
 			$cols="12";
 				}
@@ -8948,10 +8955,9 @@ if($tipo =="") {
 				<div class='col-md-12'>
 
 					<div class='list-group'>
-						<a class=' list-group-item btn btn-default ' href='./milfs'>MILFS</a>
-						<a class=' list-group-item btn btn-default ' href='#'  onclick=\"javascript: document.getElementById('div_formulario_session').className= 'visible col-md-12'; \">TUPALE.CO</a>
-						<a class=' list-group-item btn btn-default ' href='./sociallogin.php?provider=twitter'><i class='fa fa-twitter'></i> Twitter</a>
-<!-- 						<a class=' list-group-item btn btn-default ' href='./sociallogin.php?provider=facebook'><i class='fa fa-facebook'></i> Facebook</a> -->
+						<a class=' list-group-item btn btn-default ' href='./milfs'>Administrador</a>
+						<a class=' list-group-item btn btn-default ' href='#'  onclick=\"javascript: document.getElementById('div_formulario_session').className= 'visible col-md-12'; \">Usuario</a>
+	
 					</div>
 				</div>
 
@@ -9344,6 +9350,7 @@ elseif ($tipo=='boton'){
 				";
 
 			}else{
+				$div ="formulario_login";
 	      $formulario ="
 	      <div id='formulario_login' class='' >
 	      <div class=' btn btn-success btn-block' onclick=\"xajax_milfs_session('$login_formulario','$login_campo_usuario','$login_campo_password','','','$div');\">Ingresa</div>
diff --git a/index.php b/index.php
index 79d75e7..0faec6e 100644
--- a/index.php
+++ b/index.php
@@ -221,7 +221,10 @@ else{}
 <div id='debug'></div>
 	<div class='container' id='contenedor_principal'>
 		<div id='contenido'>
-		
+			<div class='row'>
+				 <div id='' class='col-sm-6'>
+			
+			
 
 		
 		<?php 
@@ -232,24 +235,19 @@ else{}
 	$pie = empresa_datos("$id_empresa_portada",'pie');
 	echo "$encabezado";		
 	//if(isset($_SESSION['id_empresa'])) {$id_empresa_portada='1'; echo panel_aplicaciones('1',"");} 
-	
-		?>
-		
-<?php if(isset($_REQUEST['change'])){
+echo " </div>
+	<div id='div_login' class='col-sm-6'>";
+ if(isset($_REQUEST['change'])){
 echo cambiar_password_formato("$_REQUEST[change]");
 }
 revisar_ingreso('');
-
-?>		
-
-<?php echo $pie; ?>
+echo "</div>";
+ echo $pie; ?>
 <img class='img-responsive center-block' src="images/logo.png" alt="MILFS">
 		</div>
-
-<?php
+		</div>
 
 
-?>
 
 
 <!-- Modal -->