Merge branch 'master' of kleper/milfskleper into master

This commit is contained in:
Fredy Rivera 2018-07-11 19:01:04 -05:00 committed by Gogs
commit c2ad752f2f
2 changed files with 43 additions and 29 deletions

View File

@ -1,5 +1,6 @@
body {overflow-x:hidden!important;}
#cabecera-botonera-admin {
background-color: #777677;
}
@ -43,7 +44,7 @@ body {overflow-x:hidden!important;}
}
#logo_cabecera {
max-width: 60% !important;
max-width: 80% !important;
margin: 0 auto;
}
@ -327,14 +328,15 @@ legend.legend-area {
padding-top: 0px !important;
}
#logo_cabecera {
max-width: 100% !important;
padding-top: 0px !important;
#contenedor_cabecera{
padding-top: 30px !important;
}
#buscador_blog {
padding: 0px;;
}
}
@media (max-width: 768px) {
@ -342,6 +344,9 @@ legend.legend-area {
max-height: calc(100vh - 100px) !important;
min-height: calc(100vh - 100px) !important;
}
#contenedor_cabecera{
padding-top: 30px !important;
}
#menu_tupale {
background-color: #dfdfdf;
@ -390,13 +395,22 @@ legend.legend-area {
padding-bottom: 30px;
padding-left: 0px !important;
}
#caja,
#texto_articulo,
.articulo_contenido{
padding: 0px !important;
}
.box-secciones{
padding: 40px !important;
}
}
/*FIN responsive*/

View File

@ -1,16 +1,16 @@
<?php
date_default_timezone_set('America/Bogota');
/*
/*
* Formulario validar
*
*
*
*
* */
function formulario_validar($formulario,$accion,$tipo) {
$formulario_original = $formulario;
$error ='0';
if($accion == "api"){
$respuesta = new xajaxResponse('utf-8');
$Formulario_original = $formulario;
@ -18,9 +18,9 @@ function formulario_validar($formulario,$accion,$tipo) {
//$formulario = print_r($formulario,true);
//$respuesta->addAssign("resultado_triage","innerHTML","hOLA $formulario_original" );
//return $respuesta;
}
$debug="";
$respuesta = new xajaxResponse('utf-8');
$datos="";
@ -30,13 +30,13 @@ $control = $formulario['control']; //
$form_id = $formulario['form_id']; //
$tipo_formulario = $formulario['tipo']; //
//if($tipo=='validar'){return $error;}
$metadatos = json_decode($formulario['metadatos']);
$consulta_form = "SELECT * FROM form_contenido_campos,form_campos
WHERE form_contenido_campos.id_campo = form_campos.id
@ -50,8 +50,8 @@ $tipo_formulario = $formulario['tipo']; //
}
if(isset ( $_SESSION['equipo'])){$equipo = $_SESSION['equipo']; }else { $equipo = NULL;}
foreach($formulario as $c=>$v){
@ -160,7 +160,7 @@ if (is_array($v) ){
}
}
}
}
@ -170,10 +170,10 @@ if($tipo=='validar'){return $error;}
$xajax->registerFunction("formulario_validar");
/*
/*
* Formulario validar
*
*
*
*
* */
function banner_empresa($id_empresa,$form){
@ -6161,7 +6161,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-1 col-sm-9 col-lg-push-1 col-lg-10' id='b_articulo_formulario_$row[id]'>
<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 class=' thumbnail box-secciones' id='b_articulo_formulario_$row[id]'>
<a name='formulario_$row[id]'></a>
<div class='row rp-b '>
@ -6182,7 +6182,7 @@ if($publico[0] =='1') {
}else{
if($llenar[0] !="0"){
$linea .="
<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 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 class=' thumbnail box-secciones ' id='b_articulo_formulario_$row[id]'>
<a name='formulario_$row[id]'></a>
<div class='row rp-b '>