Merge branch 'master' of kleper/milfskleper into master

This commit is contained in:
Fredy Rivera 2018-10-25 08:25:26 -05:00 committed by Gitea
commit eca95ef096
5 changed files with 179 additions and 102 deletions

View File

@ -2,10 +2,18 @@
el otro archivo css style.css que está en la carpeta milfs el otro archivo css style.css que está en la carpeta milfs
no está referenciado en index.php de milfs*/ no está referenciado en index.php de milfs*/
#barra_milfs{
position: absolute;
}
#contenedor_principal{ #contenedor_principal{
padding-top: 10em; padding-top: 10em;
} }
#empresa_pie{
display: block;
}
@media (max-width: 768px) { @media (max-width: 768px) {
#panel_administrador{ #panel_administrador{
padding: 0px !important; padding: 0px !important;

View File

@ -17,7 +17,6 @@ h1, h2, h3, h4, h5, h6 {
#toc { #toc {
font-size: 1em; font-size: 1em;
padding-top: 50px;
max-height: 95% !important; max-height: 95% !important;
overflow: auto !important; overflow: auto !important;
} }
@ -26,6 +25,30 @@ h1, h2, h3, h4, h5, h6 {
opacity: 1; opacity: 1;
} }
#navbar-principal{
border-color: transparent;
}
#asistento{
padding-top: 5em;
}
#lo_ultimo{
padding-bottom: 3em;
}
.lo_ultimo>img{
max-height: 300px;'
}
.titulo_seccion{
padding-top: 3em;
padding-bottom: 1em;
font-family: "Helvetica", times, sans-serif !important;
font-weight: 500 !important;
line-height: 1.1 !important;
font-size: 36px;
}
.navbar-inverse { .navbar-inverse {
background-color: #222; background-color: #222;
border-color: #090909; border-color: #090909;
@ -43,6 +66,10 @@ h1, h2, h3, h4, h5, h6 {
border-color: transparent; border-color: transparent;
} }
#cabecera{
padding-top: 20em;
}
#contenedor_cabecera { #contenedor_cabecera {
padding-top: 0em; padding-top: 0em;
} }
@ -70,34 +97,17 @@ h1, h2, h3, h4, h5, h6 {
} }
#menu_administrador{ #menu_administrador{
background-color: gray; background-color: white;
} }
.btn-botonera-admin { .dropdown-menu>li>a:hover{
float: left; background-color: #e95420!important;
color: white;
} }
#botonera-admin, #botonera-admin>a {
color: white !important;
}
.btn-botonera-admin:hover {
background-color: black;
}
.btn.btn-botonera-admin:hover {
color: white !important;
}
.intro-social-buttons { .intro-social-buttons {
padding-top: 10px !important; padding-top: 10px !important;
} }
#div_panel_aplicaciones {
padding-top: 21em;
}
/*NAVBAR BRAND*/ /*NAVBAR BRAND*/
#menu_mobil{ #menu_mobil{
display: grid !important; display: grid !important;
@ -109,7 +119,7 @@ h1, h2, h3, h4, h5, h6 {
#menu_hamburguesa{ #menu_hamburguesa{
color: white; color: white;
background-color: none !important; background-color: transparent !important;
} }
.navbar-brand { .navbar-brand {
transform: translateX(-50%); transform: translateX(-50%);
@ -182,8 +192,6 @@ h1, h2, h3, h4, h5, h6 {
padding-left: 80px !important; padding-left: 80px !important;
} }
#encabezado_proyecto { #encabezado_proyecto {
padding-top: 30px; padding-top: 30px;
} }
@ -198,6 +206,7 @@ h1, h2, h3, h4, h5, h6 {
#proyectos { #proyectos {
background-color: #d4d4d4; background-color: #d4d4d4;
padding-top: 4em;
} }
.div_proyecto { .div_proyecto {
@ -250,8 +259,6 @@ h1, h2, h3, h4, h5, h6 {
height: 100% !important; height: 100% !important;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
padding: 0px 0px 70px 0px;
;
border: none; border: none;
} }
@ -259,7 +266,7 @@ h1, h2, h3, h4, h5, h6 {
/* 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);*/ transition: all 0.3s cubic-bezier(.25, .8, .25, 1);*/
border-radius: 0px !important; border-radius: 0px !important;
padding: 50px; padding: 3em;
border-bottom: 1px solid lightgrey; border-bottom: 1px solid lightgrey;
} }
@ -364,7 +371,7 @@ span.etiquetatam10 {
margin-top: -13px; margin-top: -13px;
} }
.navbar-principal>li>a, { .navbar-principal>li>a {
padding-top: 0px !important; padding-top: 0px !important;
padding-bottom: 0 !important; padding-bottom: 0 !important;
height: 30px; height: 30px;
@ -409,7 +416,8 @@ box-shadow: none;
} }
} }
< !-- ESTILOS PRIORITARIOS -->.modal-dialog { /*ESTILOS PRIORITARIOS*/
.modal-dialog {
width: 95% !important; width: 95% !important;
height: auto; height: auto;
padding: 0; padding: 0;
@ -457,7 +465,6 @@ legend.legend-area {
.fh5co-post-entry article h2 { .fh5co-post-entry article h2 {
font-size: 28px ; font-size: 28px ;
!important;
} }
#fh5co-offcanvas .fh5co-bio img { #fh5co-offcanvas .fh5co-bio img {
@ -493,19 +500,31 @@ RESPONSIVE */
margin-right: 20px; margin-right: 20px;
} }
} }
@media only screen and (max-width: 1440px) {
@media only screen and (max-width: 1200px) { .titulo_seccion{
#logo_cabecera { padding-top: 1em;
padding-top: 3em; }
#asistento{
padding-top: 1em;
}
} }
#div_panel_aplicaciones{ @media only screen and (max-width: 1200px) {
padding-top: 23em; #cabecera{
padding-top: 20em;
}
#logo_cabecera {
padding-top: 2em;
} }
.img-gris { .img-gris {
filter: grayscale(0); filter: grayscale(0);
} }
.lead{
padding-left: 5em;
padding-right: 5em;
}
} }
@media only screen and (max-width: 992px) { @media only screen and (max-width: 992px) {
@ -515,62 +534,113 @@ RESPONSIVE */
} }
@media only screen and (max-width: 767px) { @media only screen and (max-width: 769px) {
.navbar-inverse .navbar-nav>li>a:hover {
background: transparent;
}
.navbar-header { .navbar-header {
margin: 0px !important; margin: 0px !important;
float: left; float: left;
} }
li.dropdown.open{
z-index: -1;
}
#slogan_cabecera{ #slogan_cabecera{
font-size: 1.5em; font-size: 1.5em;
} }
#logo_cabecera { #logo_cabecera {
padding-top: 0em; padding-top: 2em;
} }
#div_panel_aplicaciones { #caja{
padding-top: 21em; padding: 0px;
} }
} }
@media only screen and (max-width: 586px) { @media only screen and (max-width: 586px) {
#contenedor_cabecera { #cabecera{
padding-top: 0em; padding-top: 21em;
} }
#div_panel_aplicaciones {
padding-top: 15em; #lo_ultimo{
padding-left: 0px;
padding-right: 0px;
} }
#contenedor_landingpage {
padding-left: 0px !important;
padding-right: 0px !important;
}
#logo_cabecera { #logo_cabecera {
max-width: 65% !important; max-width: 65% !important;
} }
#principal_general {
padding-left: 2em;
}
#texto_articulo{ #texto_articulo{
padding: 0px !important padding: 0px !important
} }
} }
@media only screen and (max-width: 495px) { @media only screen and (max-width: 495px) {
#contenedor_cabecera { #cabecera{
padding-top: 0em; padding-top: 15em;
} }
#principal_general {
padding-left: 3em;
}
#proyectos{ #proyectos{
display: grid !important; display: grid !important;
} }
.lead {
padding-left: 0px;
padding-right: 0px;
}
.articulo_cuadro{
padding-left: 0px;
padding-right: 0px;
}
div#contenedor_landingpage {
padding-left: 0px !important;
padding-right: 0px !important;
}
.box-secciones{
padding: 1em;
padding-bottom: 4em;
}
} }
@media only screen and (max-width: 320px) { @media only screen and (max-width: 375px) {
#cabecera{
padding-top: 15em;
}
#principal_general{
padding-left: 0px;
padding-right: 0px;
}
#caja{
padding-left: 0px;
padding-right: 0px;
margin-left: 0px;
margin-right: 0px;
}
#slogan_cabecera { #slogan_cabecera {
font-size: 1em; font-size: 1em;
} }
#div_panel_aplicaciones { .articulo_cuadro{
padding-top: 10em; padding-left: 0px;
padding-right: 0px;
} }
.btn-group-sm>.btn, .btn-sm {
padding: 5px 7px;
font-size: 11px;
line-height: 1.5;
border-radius: 3px;
} }
}

View File

@ -1751,7 +1751,7 @@ $tipo= array("linea_planilla","","$area_principal","checkeo");
$cabecera=" $cabecera="
<div class='cabecera_planilla row'> <div class='cabecera_planilla row'>
<div class='col-xs-2'> <div class='col-xs-2 col-sm-4'>
<img src='milfs/images/secure/?file=150/$imagen[0]' class='img img_planilla'> <img src='milfs/images/secure/?file=150/$imagen[0]' class='img img_planilla'>
</div> </div>
<div class=''col-xs-10> <div class=''col-xs-10>
@ -1864,7 +1864,7 @@ mysqli_data_seek($sql_total, 0);
$cabecera=" $cabecera="
<div class='cabecera_planilla row'> <div class='cabecera_planilla row'>
<div class='col-xs-2'> <div class='col-sm-3 col-xs-2'>
<img src='milfs/images/secure/?file=150/$imagen[0]' class='img img_planilla'> <img src='milfs/images/secure/?file=150/$imagen[0]' class='img img_planilla'>
</div> </div>
<div class=''col-xs-10> <div class=''col-xs-10>
@ -5330,7 +5330,7 @@ $cols = (12/$divider);
$titulo[]=""; $titulo[]="";
if ($form !=""){ $w_form = "AND form_id='$form' ";}else{ $w_form="";} if ($form !=""){ $w_form = "AND form_id='$form' ";}else{ $w_form="";}
if($tipo =="ultimos") { if($tipo =="ultimos") {
$titulo="LO ÚLTIMO"; $titulo="Lo Último";
$consulta ="SELECT * FROM `form_datos`, form_id WHERE `form_datos`.form_id = form_id.id AND form_id.publico = '1' $w_form GROUP BY form_datos.control ORDER BY form_datos.timestamp DESC LIMIT $limite"; $consulta ="SELECT * FROM `form_datos`, form_id WHERE `form_datos`.form_id = form_id.id AND form_id.publico = '1' $w_form GROUP BY form_datos.control ORDER BY form_datos.timestamp DESC LIMIT $limite";
} }
elseif($tipo =="aleatorios" ){ elseif($tipo =="aleatorios" ){
@ -5362,7 +5362,7 @@ $link=Conectarse();
} }
//$impresion = mostrar_identificador("$row[campo]","","landingpage","",""); //$impresion = mostrar_identificador("$row[campo]","","landingpage","","");
$contenido .= " $contenido .= "
<article class='col-lg-$cols col-md-$cols col-sm-$cols col-xs-6 col-xxs-12 animate-box'> <article class='col-lg-$cols col-md-$cols col-sm-$cols col-xs-6 col-xxs-12 animate-box mas_visto'>
<figure class='vistos_figure'> <figure class='vistos_figure'>
<a href='i$row[campo]'> <a href='i$row[campo]'>
<img style=' max-height:320px;' class=' img-responsive img-rounded ' src ='milfs/images/secure/?file=300/$imagen[0]'> <img style=' max-height:320px;' class=' img-responsive img-rounded ' src ='milfs/images/secure/?file=300/$imagen[0]'>
@ -5438,10 +5438,10 @@ $link=Conectarse();
$contenido_campo =substr($contenido_campo,0,$maximo)."... "; $contenido_campo =substr($contenido_campo,0,$maximo)."... ";
} }
$contenido .= " $contenido .= "
<article class='col-lg-$cols col-md-$cols col-sm-$cols col-xs-6 col-xxs-12 animate-box'> <article class='col-lg-$cols col-md-$cols col-sm-$cols col-xs-6 col-xxs-12 animate-box lo_ultimo'>
<figure> <figure>
<a href='i$row[control]'> <a href='i$row[control]'>
<img style=' max-height:320px;' class=' img-responsive img-rounded' src ='milfs/images/secure/?file=150/$imagen[0]'> <img style=' max-height:350px;' class=' img-responsive img-rounded' src ='milfs/images/secure/?file=150/$imagen[0]'>
</a> </a>
</figure> </figure>
<span class='fh5co-meta'><a href='i$row[control]'>$titulo_post[0] </a></span> <span class='fh5co-meta'><a href='i$row[control]'>$titulo_post[0] </a></span>
@ -5450,7 +5450,7 @@ $link=Conectarse();
"; ";
} }
$resultado = " $resultado = "
<legend class='text-center'>$titulo</legend> <legend class='text-center titulo_seccion'>$titulo</legend>
$contenido"; $contenido";
} }
else{} else{}
@ -5883,7 +5883,7 @@ $sm = 4;
$i =0; $i =0;
while( $row = mysqli_fetch_array( $sql ) ) { while( $row = mysqli_fetch_array( $sql ) ) {
if($i % $divider==0) { if($i % $divider==0) {
$encontrados .= "<div class='container-fluid box text-center' role='row' id='grid_$i' style=''>"; $encontrados .= "<div class='container-fluid text-center box_proyectos' role='row' id='grid_$i' style=''>";
} }
$i++; $i++;
if($row['imagen'] !="") { if($row['imagen'] !="") {
@ -5918,7 +5918,7 @@ while( $row = mysqli_fetch_array( $sql ) ) {
} }
$resultado =" $resultado ="
<!-- PROYECTOS --> <!-- PROYECTOS -->
<section class='container-fluid' id='proyectos'> <div class='col-md-12' id='proyectos'>
<div class=' text-center'> <div class=' text-center'>
<h1>Proyectos</h1> <h1>Proyectos</h1>
<p class='lead'>Conoce los proyectos que usan Tupale.co para la implementación de sus herramientas, selecciona para conocer más</p> <p class='lead'>Conoce los proyectos que usan Tupale.co para la implementación de sus herramientas, selecciona para conocer más</p>
@ -5929,7 +5929,7 @@ while( $row = mysqli_fetch_array( $sql ) ) {
</div> </div>
</div> </div>
</section> </div>
<!-- FIN Proyectos --> <!-- FIN Proyectos -->
"; ";
@ -6489,7 +6489,7 @@ if($ver_data[0] !="0") {$boton_ver_data =" <a target='datos'class='boton_land bt
if($publico[0] =='1') { if($publico[0] =='1') {
$linea .= " $linea .= "
<div style=' ' class=' articulo_cuadro col-xs-12 col-sm-push-2 col-sm-11 col-md-12 col-lg-push-1 col-lg-11' id='b_articulo_formulario_$row[id]'> <div style=' ' class=' articulo_cuadro col-xs-12 col-sm-12 col-md-12 col-lg-10' id='b_articulo_formulario_$row[id]'>
<div class=' thumbnail box-secciones' id='b_articulo_formulario_$row[id]'> <div class=' thumbnail box-secciones' id='b_articulo_formulario_$row[id]'>
<a name='formulario_$row[id]'></a> <a name='formulario_$row[id]'></a>
<div class='row rp-b '> <div class='row rp-b '>
@ -6510,7 +6510,7 @@ if($publico[0] =='1') {
}else{ }else{
if($llenar[0] !="0"){ if($llenar[0] !="0"){
$linea .=" $linea .="
<div style=' ' class=' articulo_cuadro col-xs-12 col-sm-push-2 col-sm-11 col-md-12 col-lg-push-1 col-lg-11' id='b_articulo_formulario_$row[id]'> <div style=' ' class=' articulo_cuadro col-xs-12 col-sm-12 col-md-12 col-lg-10' id='b_articulo_formulario_$row[id]'>
<div class=' thumbnail box-secciones ' id='b_articulo_formulario_$row[id]'> <div class=' thumbnail box-secciones ' id='b_articulo_formulario_$row[id]'>
<a name='formulario_$row[id]'></a> <a name='formulario_$row[id]'></a>
<div class='row rp-b '> <div class='row rp-b '>
@ -6538,7 +6538,7 @@ if($publico[0] =='1') {
} }
} }
$linea =" $linea ="
<div class='container-fluid' id='contenedor_landingpage '> <div class='container' id='contenedor_landingpage '>
$linea $linea
</div> </div>
@ -6692,7 +6692,7 @@ $consulta= " SELECT * FROM form_campos WHERE id = id $w_empresa $w_especialista
</legend> </legend>
<table class='table table-condensed table-striped table-hover'> <table class='table table-condensed table-bordered table-striped table-hover'>
<tr><th>id</th><th>Nombre</th><th>Descripcion</th><th><i class='glyphicon glyphicon-list' title='Tipo'></i> Tipo</th>$metacampo_titulo<th><i data-placement='top' data-toggle='tooltip' title='Área' class='glyphicon glyphicon-object-group'></i></th><th><i title='Estado' class='glyphicon glyphicon-eye-open'></i></th><th><i title='Empresa' class='glyphicon glyphicon-hospital-o'></i></th><th><i title='Propietario' class='glyphicon glyphicon-user'></i></th><td></td></tr> <tr><th>id</th><th>Nombre</th><th>Descripcion</th><th><i class='glyphicon glyphicon-list' title='Tipo'></i> Tipo</th>$metacampo_titulo<th><i data-placement='top' data-toggle='tooltip' title='Área' class='glyphicon glyphicon-object-group'></i></th><th><i title='Estado' class='glyphicon glyphicon-eye-open'></i></th><th><i title='Empresa' class='glyphicon glyphicon-hospital-o'></i></th><th><i title='Propietario' class='glyphicon glyphicon-user'></i></th><td></td></tr>
$lineas $lineas
</table> </table>
@ -12522,7 +12522,7 @@ function configuracion($accion) {
$div='contenido'; $div='contenido';
if($accion =='') { if($accion =='') {
$link ="<a title='Configuración' href='#' onclick=\"xajax_configuracion('mostrar') \"><i class='glyphicon glyphicon-cog'></i></a>"; $link ="<a data-toggle='collapse' data-target='.navbar-collapse' title='Configuración' href='#' onclick=\"xajax_configuracion('mostrar') \"><i class='glyphicon glyphicon-cog'></i></a>";
return $link; return $link;
}elseif($accion=='mostrar') { }elseif($accion=='mostrar') {
@ -15270,7 +15270,7 @@ return $respuesta;
if(isset($_SESSION['id_empresa'])) {$id_empresa= $_SESSION['id_empresa'];} if($div==''){ if(isset($_SESSION['id_empresa'])) {$id_empresa= $_SESSION['id_empresa'];} if($div==''){
$div = "contenido"; $div = "contenido";
if(isset($_SESSION['grupo_formularios'])) { $sesion_grupo_formularios = $_SESSION['grupo_formularios'];}else { $sesion_grupo_formularios = "";} if(isset($_SESSION['grupo_formularios'])) { $sesion_grupo_formularios = $_SESSION['grupo_formularios'];}else { $sesion_grupo_formularios = "";}
$resultado = "<li id='link_formulario'><a href='#' onclick=\"xajax_formulario_listado('$sesion_grupo_formularios','$div',''); \"><i class='glyphicon glyphicon-list'></i> Formularios</a></li> "; $resultado = "<li data-toggle='collapse' data-target='.navbar-collapse' id='link_formulario'><a href='#' onclick=\"xajax_formulario_listado('$sesion_grupo_formularios','$div',''); \"><i class='glyphicon glyphicon-list'></i> Formularios</a></li> ";
return $resultado;; return $resultado;;
} }
@ -17725,20 +17725,20 @@ function milfs(){
$login = login_boton(''); $login = login_boton('');
$usuarios = " $usuarios = "
<li> <li>
<a title='agregar usuarios' class='btn link pull-left' onclick=\"xajax_registro_express(xajax.getFormValues('login'),'nuevo');\"> <a data-toggle='collapse' data-target='.navbar-collapse' title='agregar usuarios' class='btn link pull-left' onclick=\"xajax_registro_express(xajax.getFormValues('login'),'nuevo');\">
<i class='glyphicon glyphicon-user'></i> Gestión de usuarios</a> <i class='glyphicon glyphicon-user'></i> Gestión de usuarios</a>
</li>"; </li>";
$menu = $menu =
" <!-- Collect the nav links, forms, and other content for toggling --> " <!-- Collect the nav links, forms, and other content for toggling -->
<div class='collapse navbar-collapse' id='bs-example-navbar-collapse-1'> <div class='collapse navbar-collapse' id='.navbar-collapse'>
<ul class='nav navbar-nav' id='menu_milfs'> <ul class='nav navbar-nav' id='menu_milfs'>
<li><a href='https://$url_home' target='web'><i class='glyphicon glyphicon-home'></i></a></li> <li><a href='https://$url_home' data-toggle='collapse' data-target='.navbar-collapse' target='web'><i class='glyphicon glyphicon-home'></i></a></li>
<li>$crear_campos</li> <li data-toggle='collapse' data-target='.navbar-collapse'>$crear_campos</li>
$listado $listado
$usuarios $usuarios
<li >$configuracion</li> <li style='float: right;'>$configuracion</li>
</ul> </ul>
<ul class='nav navbar-nav navbar-right'> <ul class='nav navbar-nav navbar-right'>

View File

@ -199,11 +199,11 @@ else{}
<?php echo @$onload; ?> <?php echo @$onload; ?>
<?php <?php
if ( isset ( $_SESSION['id'] ) ) { ?> if ( isset ( $_SESSION['id'] ) ) { ?>
<div class="navbar navbar-inverse navbar-fixed-top " role="navigation"> <div class="navbar navbar-inverse navbar-fixed-top " id="barra_milfs" role="navigation">
<div class="container-fluid"> <div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">MILFS</span> <span class="sr-only">MILFS</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
@ -231,8 +231,13 @@ else{}
<div class='row'> <div class='row'>
<div id='' class='col-sm-6'> <div id='' class='col-sm-6'>
<?php if(isset($_SESSION['id'])){ echo "
<form id='manejo_sesion' name='form_session' class='navbar-form navbar-left'>
<div class='input-group'>
<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'><span class='glyphicon glyphicon-refresh' aria-hidden='true'></span></a></span>
</div>
</form> "; } ?>
<?php <?php
///echo adjuntar_basico('33'); ///echo adjuntar_basico('33');
@ -312,12 +317,6 @@ $(document).ready(function() {
}); });
</script> </script>
<?php if(isset($_SESSION['id'])){ echo "
<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>
</div>
</form> "; } ?>
</body> </body>
</html> </html>

View File

@ -8,7 +8,7 @@
restante = (tiempo - transcurrido_minutos) restante = (tiempo - transcurrido_minutos)
prefin = (tiempo*60)-transcurrido prefin = (tiempo*60)-transcurrido
document.form_session.tiempo_session.value = "Cerrar en: "+restante+" minutos "; document.form_session.tiempo_session.value = "Cierra en: "+restante+" minutos ";
if(restante == 1 ){ if(restante == 1 ){
//alert(transcurrido); //alert(transcurrido);