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
no está referenciado en index.php de milfs*/
#barra_milfs{
position: absolute;
}
#contenedor_principal{
padding-top: 10em;
}
#empresa_pie{
display: block;
}
@media (max-width: 768px) {
#panel_administrador{
padding: 0px !important;

View File

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

@ -782,7 +782,7 @@ foreach($clasificacion as $clave => $v){
$tabla_clasificacion = "<table class='table table-responsive'><tr>$tabla_clasificacion</tr></table>";
$contenido ="
<div class='container-fluid'>
<a onclick=\"xajax_limpia_div('contenido'); \" href='#menu-toggle' class=' pull-right' id='cerrar-toggle'>Cerrar [x] </a>
<a onclick=\"xajax_limpia_div('contenido'); \" href='#menu-toggle' class=' pull-right' id='cerrar-toggle'>Cerrar [x] </a>
<hr>
<div class='col-md-5'>
@ -1064,7 +1064,7 @@ function notas_tablero($form) {
</ul>
</div>
<a onclick=\"xajax_notas_estadisticas('$form','contenido',''); \" href='#menu-toggle' class='btn btn-default menu-toggle' id='estadisticas-toggle'><i class='fa fa-bar-chart' aria-hidden='true'></i></a>
$administracion
<a href='https://tupale.co' class=' pull-right'>Tupale.co </a>
@ -1751,7 +1751,7 @@ $tipo= array("linea_planilla","","$area_principal","checkeo");
$cabecera="
<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'>
</div>
<div class=''col-xs-10>
@ -1864,7 +1864,7 @@ mysqli_data_seek($sql_total, 0);
$cabecera="
<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'>
</div>
<div class=''col-xs-10>
@ -3844,7 +3844,7 @@ while( $row = mysqli_fetch_array( $datos_consulta ) ) {
if($tipo_campo[0]=='10'){
$render = relacion_render("$row[form_id]","$row[id_campo]",$contenido[0],'5','');
$contenido[0] = "$valor_actual";}
else {
$render=html_entity_decode($contenido[0]);}
if($tipo_campo[0]=='24' or $tipo_campo[0]=='30'){ $render= json_render("$contenido[0]","html","$control");}
@ -5330,7 +5330,7 @@ $cols = (12/$divider);
$titulo[]="";
if ($form !=""){ $w_form = "AND form_id='$form' ";}else{ $w_form="";}
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";
}
elseif($tipo =="aleatorios" ){
@ -5362,7 +5362,7 @@ $link=Conectarse();
}
//$impresion = mostrar_identificador("$row[campo]","","landingpage","","");
$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'>
<a href='i$row[campo]'>
<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 .= "
<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>
<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>
</figure>
<span class='fh5co-meta'><a href='i$row[control]'>$titulo_post[0] </a></span>
@ -5450,7 +5450,7 @@ $link=Conectarse();
";
}
$resultado = "
<legend class='text-center'>$titulo</legend>
<legend class='text-center titulo_seccion'>$titulo</legend>
$contenido";
}
else{}
@ -5883,7 +5883,7 @@ $sm = 4;
$i =0;
while( $row = mysqli_fetch_array( $sql ) ) {
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++;
if($row['imagen'] !="") {
@ -5918,7 +5918,7 @@ while( $row = mysqli_fetch_array( $sql ) ) {
}
$resultado ="
<!-- PROYECTOS -->
<section class='container-fluid' id='proyectos'>
<div class='col-md-12' id='proyectos'>
<div class=' text-center'>
<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>
@ -5929,7 +5929,7 @@ while( $row = mysqli_fetch_array( $sql ) ) {
</div>
</div>
</section>
</div>
<!-- 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') {
$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]'>
<a name='formulario_$row[id]'></a>
<div class='row rp-b '>
@ -6510,7 +6510,7 @@ if($publico[0] =='1') {
}else{
if($llenar[0] !="0"){
$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]'>
<a name='formulario_$row[id]'></a>
<div class='row rp-b '>
@ -6538,7 +6538,7 @@ if($publico[0] =='1') {
}
}
$linea ="
<div class='container-fluid' id='contenedor_landingpage '>
<div class='container' id='contenedor_landingpage '>
$linea
</div>
@ -6692,7 +6692,7 @@ $consulta= " SELECT * FROM form_campos WHERE id = id $w_empresa $w_especialista
</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>
$lineas
</table>
@ -9997,7 +9997,7 @@ if (mysqli_num_rows($sql)!='0'){
$logo = remplacetas('empresa','id',"$empresa",'imagen','') ;
$cabecera = "
<div class='' >
<div class=''>
<div class='row'>
<div class='col-md-3'>
@ -12522,7 +12522,7 @@ function configuracion($accion) {
$div='contenido';
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;
}elseif($accion=='mostrar') {
@ -13036,7 +13036,7 @@ if (mysqli_num_rows($sql)!='0'){
$campo_tipo =$campo_tipo[0];
$contenido = formulario_valor_campo("$id","$row[id_campo]","","$control",'',"$timestamp");
//$contenido= nl2br($contenido);
$contenido_array = $contenido;
$contenido_multiple= $contenido[10];
@ -13138,9 +13138,9 @@ if (mysqli_num_rows($sql)!='0'){
}
}
elseif(($campo_tipo=='2' OR $campo_tipo=='7')AND $contenido !=""){
$contenido= html_entity_decode(stripslashes("$contenido"));
}
else {
@ -15270,7 +15270,7 @@ return $respuesta;
if(isset($_SESSION['id_empresa'])) {$id_empresa= $_SESSION['id_empresa'];} if($div==''){
$div = "contenido";
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;;
}
@ -17725,20 +17725,20 @@ function milfs(){
$login = login_boton('');
$usuarios = "
<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>
</li>";
$menu =
" <!-- 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'>
<li><a href='https://$url_home' target='web'><i class='glyphicon glyphicon-home'></i></a></li>
<li>$crear_campos</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 data-toggle='collapse' data-target='.navbar-collapse'>$crear_campos</li>
$listado
$usuarios
<li >$configuracion</li>
<li style='float: right;'>$configuracion</li>
</ul>
<ul class='nav navbar-nav navbar-right'>

View File

@ -187,7 +187,7 @@ legend.legend-area {
</style>
</head>
<body onload="revisarSession()"; >
<?php if($embebido ==1) {
<?php if($embebido ==1) {
if($form!=''){ echo formulario_embebido($form,$opciones);}
elseif($identificador !='') { echo mostrar_identificador($identificador,$id);}
//elseif($_REQUEST['psi'] !='') { include("psi.php") ; echo $aviso;}
@ -199,22 +199,22 @@ else{}
<?php echo @$onload; ?>
<?php
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">
<!-- Brand and toggle get grouped for better mobile display -->
<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="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#"><img src="favicon-152.png" style="width:60px" alt="MILFS" title="Multi Interactive Light Form System"></a>
</div>
<?php echo milfs() ?>
</div><!-- /.container-fluid -->
@ -226,13 +226,18 @@ else{}
<div id='debug'></div>
<div class='container' id='contenedor_principal'>
<div id='contenido'>
<div class='row'>
<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
///echo adjuntar_basico('33');
@ -311,13 +316,7 @@ $(document).ready(function() {
$('.wysiwyg_auto').summernote({dialogsInBody: true});
});
</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> "; } ?>
</script>
</body>
</html>

View File

@ -8,7 +8,7 @@
restante = (tiempo - transcurrido_minutos)
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 ){
//alert(transcurrido);