From 17fd890e30cb9b95901ae49c28a38db0caa3c1f2 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Fri, 29 Jun 2018 16:51:42 -0500
Subject: [PATCH] commit de seguimiento layout U/I U/X landing page y milf

---
 index.php                                     |  4 +-
 landingpage.php                               |  2 +-
 librerias/bootstrap-toc/bootstrap-toc.min.css | 59 ++++++++++++++++++-
 milfs/css/milfs.css                           | 11 ++++
 milfs/css/style.css                           | 55 +++++++++--------
 milfs/funciones/funciones.php                 | 31 +++++-----
 milfs/index.php                               |  6 +-
 7 files changed, 120 insertions(+), 48 deletions(-)
 create mode 100644 milfs/css/milfs.css

diff --git a/index.php b/index.php
index eef95a3..6af6657 100644
--- a/index.php
+++ b/index.php
@@ -191,7 +191,7 @@ if ($variable !=''){
 				}	
 			$acceso = 1;
 						$menu ="
-				<div class='col-sm-2 hidden-xs hidden-sm' id='caja_lateral_derecha'>
+				<div class='col-sm-3 col-lg-2 hidden-xs hidden-sm' id='caja_lateral_derecha'>
 			<div class='container'>
 			<nav style=' max-height:95% !important ; overflow:auto !important;  ' id='toc' data-spy='affix' data-toggle='toc'></nav>
 			</div>
@@ -1464,7 +1464,7 @@ echo $css_adicional;
 
 
 
-<div class="col-sm-<?php echo $cols_interior; ?>">
+<div class="col-sm-<?php echo $cols_interior; ?> col-lg-<?php echo $cols_interior; ?>">
 <?php echo $menu_lateral ; ?>
 		<!-- END #fh5co-offcanvas -->
 	<header id="fh5co-header">
diff --git a/landingpage.php b/landingpage.php
index 59272d8..e262f39 100644
--- a/landingpage.php
+++ b/landingpage.php
@@ -516,7 +516,7 @@ else{}
 <?php echo @$onload; ?>
 <?php 
  if ( isset ( $_SESSION['id'] ) ) {	?>
-<div class="navbar navbar-inverse nav-bar-fixed-top " role="navigation">
+<div class="navbar navbar-inverse navbar-fixed-top " role="navigation">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
diff --git a/librerias/bootstrap-toc/bootstrap-toc.min.css b/librerias/bootstrap-toc/bootstrap-toc.min.css
index 2d36ad1..0a7232b 100644
--- a/librerias/bootstrap-toc/bootstrap-toc.min.css
+++ b/librerias/bootstrap-toc/bootstrap-toc.min.css
@@ -1,4 +1,61 @@
 /*!
  * Bootstrap Table of Contents v0.4.1 (http://afeld.github.io/bootstrap-toc/)
  * Copyright 2015 Aidan Feldman
- * Licensed under MIT (https://github.com/afeld/bootstrap-toc/blob/gh-pages/LICENSE.md) */nav[data-toggle=toc] .nav>li>a{display:block;padding:4px 20px;font-size:13px;font-weight:500;color:#767676}nav[data-toggle=toc] .nav>li>a:focus,nav[data-toggle=toc] .nav>li>a:hover{padding-left:19px;color:#563d7c;text-decoration:none;background-color:transparent;border-left:1px solid #563d7c}nav[data-toggle=toc] .nav>.active:focus>a,nav[data-toggle=toc] .nav>.active:hover>a,nav[data-toggle=toc] .nav>.active>a{padding-left:18px;font-weight:700;color:#563d7c;background-color:transparent;border-left:2px solid #563d7c}nav[data-toggle=toc] .nav .nav{display:none;padding-bottom:10px}nav[data-toggle=toc] .nav .nav>li>a{padding-top:1px;padding-bottom:1px;padding-left:30px;font-size:12px;font-weight:400}nav[data-toggle=toc] .nav .nav>li>a:focus,nav[data-toggle=toc] .nav .nav>li>a:hover{padding-left:29px}nav[data-toggle=toc] .nav .nav>.active:focus>a,nav[data-toggle=toc] .nav .nav>.active:hover>a,nav[data-toggle=toc] .nav .nav>.active>a{padding-left:28px;font-weight:500}nav[data-toggle=toc] .nav>.active>ul{display:block}
\ No newline at end of file
+ * Licensed under MIT (https://github.com/afeld/bootstrap-toc/blob/gh-pages/LICENSE.md) */
+
+nav[data-toggle=toc] .nav>li>a {
+    display: block;
+    padding: 4px 20px;
+    font-size: 13px;
+    font-weight: 500;
+    color: #767676
+}
+
+nav[data-toggle=toc] .nav>li>a:focus,
+nav[data-toggle=toc] .nav>li>a:hover {
+    padding-left: 19px;
+    color: #563d7c;
+    text-decoration: none;
+    background-color: transparent;
+    border-left: 1px solid #563d7c
+}
+
+nav[data-toggle=toc] .nav>.active:focus>a,
+nav[data-toggle=toc] .nav>.active:hover>a,
+nav[data-toggle=toc] .nav>.active>a {
+    padding-left: 18px;
+    font-weight: 700;
+    color: #563d7c;
+    background-color: transparent;
+    border-left: 2px solid #563d7c
+}
+
+nav[data-toggle=toc] .nav .nav {
+    display: none;
+    padding-bottom: 10px
+}
+
+nav[data-toggle=toc] .nav .nav>li>a {
+    padding-top: 1px;
+    padding-bottom: 1px;
+    padding-left: 30px;
+    font-size: 12px;
+    font-weight: 400
+}
+
+nav[data-toggle=toc] .nav .nav>li>a:focus,
+nav[data-toggle=toc] .nav .nav>li>a:hover {
+	padding-top: 100px;
+    padding-left: 29px
+}
+
+nav[data-toggle=toc] .nav .nav>.active:focus>a,
+nav[data-toggle=toc] .nav .nav>.active:hover>a,
+nav[data-toggle=toc] .nav .nav>.active>a {
+    padding-left: 28px;
+    font-weight: 500
+}
+
+nav[data-toggle=toc] .nav>.active>ul {
+    display: block
+}
\ No newline at end of file
diff --git a/milfs/css/milfs.css b/milfs/css/milfs.css
new file mode 100644
index 0000000..76ceebd
--- /dev/null
+++ b/milfs/css/milfs.css
@@ -0,0 +1,11 @@
+/*Este archivo tiene los estilos de milfs, 
+el otro archivo css style.css que está en la carpeta milfs
+ no está referenciado en index.php de milfs*/
+
+#contenedor_principal{
+	padding-top: 100px;
+}
+
+#menu_milfs{
+	padding-left: 100px;
+}
\ No newline at end of file
diff --git a/milfs/css/style.css b/milfs/css/style.css
index 1cb800b..b031732 100644
--- a/milfs/css/style.css
+++ b/milfs/css/style.css
@@ -1,4 +1,7 @@
-body {overflow-x:hidden!important;} 
+body {
+    overflow-x: hidden!important;
+    
+}
 
 #cabecera-botonera-admin {
     background-color: #777677;
@@ -55,12 +58,13 @@ body {overflow-x:hidden!important;}
     height: 100% !important;
     overflow-y: auto;
     overflow-x: hidden;
-    padding: 0px 0px 70px 0px;;
-    border:none;
+    padding: 0px 0px 70px 0px;
+    ;
+    border: none;
 }
 
 .box-secciones {
-/*    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+    /*    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
     transition: all 0.3s cubic-bezier(.25, .8, .25, 1);*/
     border-radius: 0px !important;
     padding: 50px;
@@ -83,13 +87,14 @@ body {overflow-x:hidden!important;}
     display: inline-flex !important;
 }
 
-#fh5co-footer{
-display: inline-block;
+#fh5co-footer {
+    display: inline-block;
 }
 
 
 
 
+
 /* nube de etiquetas */
 
 div.etiquetas {
@@ -151,6 +156,7 @@ span.etiquetatam10 {
 
 
 
+
 /* nube de etiquetas */
 
 .drop-up {
@@ -177,8 +183,7 @@ span.etiquetatam10 {
     margin-top: -13px;
 }
 
-.navbar-principal>li>a,
-{
+.navbar-principal>li>a{
     padding-top: 0px !important;
     padding-bottom: 0 !important;
     height: 30px;
@@ -196,7 +201,6 @@ span.etiquetatam10 {
     width: 100px !important;
     display: inline;
     height: 30px;
-    padding-top: -10px !important;
     padding-bottom: 0 !important;
     height: 30px;
     background: none;
@@ -213,6 +217,7 @@ span.etiquetatam10 {
 
 
 
+
 /*width:80px; background: none; border:0px; -webkit-box-shadow: none;
 -moz-box-shadow: none;
 box-shadow: none;
@@ -234,7 +239,9 @@ box-shadow: none;
     }
 }
 
-<!-- ESTILOS PRIORITARIOS -->.modal-dialog {
+/*ESTILOS PRIORITARIOS*/
+
+.modal-dialog {
     width: 95% !important;
     height: auto;
     padding: 0;
@@ -243,14 +250,12 @@ box-shadow: none;
 .modal-lg {
     width: 98% !important;
     height: auto;
-
     padding: 0;
 }
 
 .modal-xs {
     width: 40% !important;
     height: auto;
-
     padding: 0;
 }
 
@@ -283,8 +288,7 @@ legend.legend-area {
 }
 
 .fh5co-post-entry article h2 {
-    font-size: 28px;
-    !important;
+    font-size: 28px !important;
 }
 
 #fh5co-offcanvas .fh5co-bio img {
@@ -314,12 +318,10 @@ legend.legend-area {
 
 
 
+
 /*RESPONSIVE*/
 
-@media only screen and (min-width: 1200px) {
-
-
-}
+@media only screen and (min-width: 1200px) {}
 
 @media (max-width: 991px) {
     #encabezado_proyecto {
@@ -333,7 +335,8 @@ legend.legend-area {
         padding-top: 0px !important;
     }
     #buscador_blog {
-    padding: 0px;;
+        padding: 0px;
+        ;
     }
 }
 
@@ -343,13 +346,13 @@ legend.legend-area {
         min-height: calc(100vh - 100px) !important;
     }
 
-#texto_articulo{
-padding: 0px !important;
-}
+    #texto_articulo {
+        padding: 0px !important;
+    }
 
     .box-secciones {
-    padding: 5px !important;
-}
+        padding: 5px !important;
+    }
 
     #menu_tupale {
         background-color: #dfdfdf;
@@ -376,10 +379,9 @@ padding: 0px !important;
         margin-bottom: 3px;
     }
 
-    #btn_filtro{
+    #btn_filtro {
         margin-bottom: 3px;
     }
-
 }
 
 
@@ -401,4 +403,5 @@ padding: 0px !important;
 
 
 
+
 /*FIN responsive*/
\ No newline at end of file
diff --git a/milfs/funciones/funciones.php b/milfs/funciones/funciones.php
index 1015a3a..e9ebd75 100644
--- a/milfs/funciones/funciones.php
+++ b/milfs/funciones/funciones.php
@@ -5986,7 +5986,7 @@ if($ver_data[0] !="0") {$boton_ver_data ="	<a target='datos'class='boton_land bt
 if($publico[0] =='1') {
 	$linea .= "
 
-<div style='  ' class='  articulo_cuadro col-xs-12 col-sm-10 col-lg-10' id='b_articulo_formulario_$row[id]'>
+<div style='  ' class='  articulo_cuadro col-xs-12 col-sm-push-1 col-sm-9 col-lg-push-1 col-lg-10' id='b_articulo_formulario_$row[id]'>
     <div class=' thumbnail box-secciones' id='b_articulo_formulario_$row[id]'>
         <a name='formulario_$row[id]'></a>
         <div class='row rp-b '>
@@ -6007,7 +6007,7 @@ if($publico[0] =='1') {
 			}else{
 					if($llenar[0] !="0"){
 			 $linea .="
-<div style='  ' class='  articulo_cuadro col-xs-12 col-sm-10 col-lg-10' id='b_articulo_formulario_$row[id]'>
+<div style='  ' class='  articulo_cuadro col-xs-12 col-sm-push-1 col-sm-9 col-lg-push-1 col-lg-10' id='b_articulo_formulario_$row[id]'>
     <div class=' thumbnail box-secciones ' id='b_articulo_formulario_$row[id]'>
         <a name='formulario_$row[id]'></a>
         <div class='row rp-b '>
@@ -6460,7 +6460,7 @@ $resultado .= "
 </table>
 <legend>Agregar empresa</legend>
 <div class='row'>
-<form role='form' id='agregar' name='agregar'>
+<form role='form' id='agregar' class='agregar_area'name='agregar'>
 <input type='hidden' name='estado' id='estado' value='1'>
 
 <div class='col-xs-4'>
@@ -9681,7 +9681,7 @@ function tabla_areas($tabla,$value,$descripcion,$onchange,$where,$nombre,$div){
 	if($div =="") {
 		$div="div_campos";
 		$resultado = "
-		<div class='btn btn-default btn-block' onclick= \"xajax_tabla_areas('$tabla','$value','$descripcion','$onchange','$where','$nombre','$div') \">Modificar areas</a></div>
+		<div class='btn btn-default btn-block btn-warning' onclick= \"xajax_tabla_areas('$tabla','$value','$descripcion','$onchange','$where','$nombre','$div') \">Crear / Modificar Áreas</a></div>
 		<!-- <div id='$div'></div> -->";
 		return $resultado;
 		}
@@ -9701,7 +9701,7 @@ $consulta = "SELECT * FROM $tabla WHERE 1 $w  AND id_empresa='$_SESSION[id_empre
 $sql=mysqli_query($link,$consulta);
 if($nombre==''){$name=$tabla."_".$value;}else{$name = "$nombre";}
 
-$resultado=" <table class='table table-striped table-responsive' >
+$resultado=" <table class='table table-striped table-responsive table-hover' >
 <legend>$name</legend>
 <tr ><th>Id</th><th>$campo1</th><th>$campo2</th><th>$campo3</th><th>$campo4</th><th></th></tr>
 				" ;
@@ -9725,12 +9725,13 @@ $linea++;
 	}
 
 $resultado .= "
-<tr>
+
+<tr class='warning'>
 <td colspan='4' >
 <form role='form' id='agregar' name='agregar'>
 <input type='hidden' name='estado' id='estado' value='1'>
 <input type='hidden' name='orden' id='orden' value='$linea'>
-<div class='col-xs-2'>Agregar área</div>
+<div class='col-xs-2'>Crear Área</div>
 <div class='col-xs-4'>
 <input placeholder='$campo1' class='form-control' type='text' id='$campo1'  name='$campo1' >
 </div>
@@ -12534,8 +12535,8 @@ if($contenido_original !="") {
 			}else {$metadatos='';}
 	$resultado .= "
 	<div  id='contenedor_$row[id_campo]' class='contenedor_campo'>
-		<pdata-toc-skip class='campo_contenido' id='contenido_$row[id_campo]'>
-				<span tiple= '$campo_tipo' class='campo_titulo campo_nombre' id='nombre_$row[id_campo]'>$campo_nombre[0]</span><span class='pull-right'> $metadatos </span><br>
+		<p data-toc-skip class='campo_contenido' id='contenido_$row[id_campo]'>
+				<span type= '$campo_tipo' class='campo_titulo campo_nombre' id='nombre_$row[id_campo]'>$campo_nombre[0]</span><span class='pull-right'> $metadatos </span><br>
 				$contenido</p>
 	</div>";
 	
@@ -14028,7 +14029,7 @@ $resultado .= "
 </div>";
 $resultado = "
 <br>
-<div class='alert alert-warning'>
+<div class='alert alert-info'>
 	<legend>Crear un nuevo campo</legend>
 	$resultado
 </div>
@@ -14061,7 +14062,7 @@ $consulta_campos ="SELECT id, campo_nombre, campo_descripcion, tipo_campo_accion
 if($campo ==''){
 
 	$listado_campos = select('form_campos','id','campo_nombre',"xajax_formulario_crear_campo('',(this.value),'$div')","id_empresa = '$_SESSION[id_empresa]' AND activo = '1'",'campo_editar','');
-$areas = tabla_areas('form_areas','id','nombre,descripcion,estado,orden','',"",'Areas','');
+$areas = tabla_areas('form_areas','id','nombre,descripcion,estado,orden','',"",'Áreas o Grupos de campo','');
 $tabla_campos = campos_tabla('id_especialista','','20','0','');
 	$buscador = campos_buscador("","");
 $campos_formulario = "
@@ -14077,7 +14078,7 @@ $campos_formulario = "
 			$areas
 			</div>
 			<div class='col-sm-6'>
-				<div class='btn btn-block   btn-default'  OnClick=\"xajax_crear_campos_formulario(xajax.getFormValues('nuevo_campo'),'');\"><i class='glyphicon glyphicon-plus-sign'></i> Crear un nuevo campo</div>
+				<div class='btn btn-block   btn-primary '  OnClick=\"xajax_crear_campos_formulario(xajax.getFormValues('nuevo_campo'),'');\"><i class='glyphicon glyphicon-plus-sign'></i> Crear un nuevo campo</div>
 			</div>
 			<!-- <div class='col-sm-4'>
 			<div class='input-group'><span class='input-group-addon'>Modificar campo</span> $listado_campos</div>
@@ -16948,8 +16949,8 @@ function milfs(){
 			</li>";
 	$menu =
 "    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class='collapse navbar-collapse' id='bs-example-navbar-collapse-1'>
-      <ul class='nav navbar-nav'>
+    <div class='collapse navbar-collapse navbar-fixed-top' id='bs-example-navbar-collapse-1'>
+      <ul class='nav navbar-nav navbar-fixed-top' id='menu_milfs'>
 
       <li><a href='https://$url_home' target='web'><i class='glyphicon glyphicon-home'></i></a></li>
         <li>$crear_campos</li>
@@ -16959,7 +16960,7 @@ function milfs(){
          <li >$configuracion</li>
 
       </ul>
-       <ul class='nav navbar-nav navbar-right'>
+       <ul class='nav navbar-nav navbar-right '>
 
      $login
 
diff --git a/milfs/index.php b/milfs/index.php
index 47f1c35..4cf5819 100644
--- a/milfs/index.php
+++ b/milfs/index.php
@@ -48,7 +48,7 @@ if (isset($_REQUEST['t'])) {$t = $_REQUEST['t'];} else {$t = "";}
 	<link rel="apple-touch-icon-precomposed" href="favicon-152.png">
 <!-- 	<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha256-k2/8zcNbxVIh5mnQ52A0r3a6jAgMGxFJFE2707UxGCk= sha512-ZV9KawG2Legkwp3nAlxLIVFudTauWuBpC10uEafMHYL0Sarrz5A7G79kXh5+5+woxQ5HM559XX2UZjMJ36Wplg==" crossorigin="anonymous"> -->
 	<?php if($form !='') { echo "<link href='css/embebidoXXX.css' rel='stylesheet'>";}else{ echo "<link href='css/estilos.php?dd' rel='stylesheet'>";} ?>
-
+  <link rel="stylesheet" type="text/css" media="screen" href="css/milfs.css">
 	<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap.css">
 	<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.css">
 	<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.min.css">
@@ -194,7 +194,7 @@ else{}
 <?php echo @$onload; ?>
 <?php 
  if ( isset ( $_SESSION['id'] ) ) {	?>
-<div class="navbar navbar-inverse nav-bar-fixed-top " role="navigation">
+<div class="navbar navbar-inverse navbar-fixed-top " role="navigation">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
@@ -216,7 +216,7 @@ else{}
 
 
 <div id='debug'></div>
-	<div class='container'>
+	<div class='container' id='contenedor_principal'>
 		<div id='contenido'>