From 0519bfe51161a856338ee9352249a4a9da739712 Mon Sep 17 00:00:00 2001 From: humano Date: Sun, 14 Oct 2018 09:32:59 -0500 Subject: [PATCH 001/140] mejoras en api rest --- funciones/funciones.php | 30 +++++++++++++++++++++--------- rest/src/rutas/aplicaciones.php | 2 +- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/funciones/funciones.php b/funciones/funciones.php index 3c76c5a..256f66a 100644 --- a/funciones/funciones.php +++ b/funciones/funciones.php @@ -2691,7 +2691,7 @@ $listado .= "
  • - - + - + -
    +
    - +
      @@ -15457,38 +15457,38 @@ $item .= " - + - +
      - +
      API - +
      - +
      - +
      - - + + Portal
    • @@ -15497,7 +15497,7 @@ $item .= " min='0' max='1' > SIMostrar en el portal
      - +
    • NO @@ -15518,7 +15518,7 @@ $item .= "
    - +
    From be2c3d71d1fb1ddb4e73b2a98ee88d70e56aaf4f Mon Sep 17 00:00:00 2001 From: humano Date: Wed, 24 Oct 2018 05:50:07 -0500 Subject: [PATCH 016/140] correccion html --- funciones/funciones.php | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/funciones/funciones.php b/funciones/funciones.php index b9a9d8f..8b61273 100644 --- a/funciones/funciones.php +++ b/funciones/funciones.php @@ -3120,7 +3120,7 @@ if($accion =="enviar" OR $accion =="preview" ) { $web = remplacetas("empresa","id",$id_empresa,"web",""); $slogan = remplacetas("empresa","id",$id_empresa,"slogan",""); $headers = "MIME-Version: 1.0\r\n"; - $headers .= "Content-type: text/html; charset=iso-utf-8\r\n"; + $headers .= "Content-type: text/html; charset=utf-8\r\n"; $headers .= "From: $razon_social[0] ".$administrador[0]."\r\n"; $headers .= "Reply-To: $razon_social[0] ".$email[0]."\r\n"; $headers .= "Return-path: $email[0]\r\n"; @@ -3821,6 +3821,8 @@ while( $row = mysqli_fetch_array( $datos_consulta ) ) { if( !is_null($row['orden'])) { $orden_multiple ="and orden ='$row[orden]' ";}else { $orden_multiple ="";} $contenido = remplacetas('form_datos','form_id',"$row[form_id]",'contenido'," id_campo ='$row[id_campo]' and control ='$identificador' $orden_multiple ") ; $contenido[0]= str_replace('\n','
    ',$contenido[0]); + $contenido[0]= stripslashes($contenido[0]); + //$contenido[0] = "mas $contenido[0]"; if($contenido[0] !="" AND $privado !="1") { $tipo_campo = remplacetas('form_campos','id',"$row[id_campo]",'campo_tipo',"") ; @@ -3834,9 +3836,18 @@ 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]);} + + else { + $render=html_entity_decode($contenido[0]);} if($tipo_campo[0]=='24' or $tipo_campo[0]=='30'){ $render= json_render("$contenido[0]","html","$control");} - + /*if($tipo_campo[0] =='2'){ + $render="$contenido[0] xxx"; + //$contenido[0]="$contenido[0] xxx"; + $contenido[0]= str_replace('\"','"',$contenido[0]); + $contenido[0]= str_replace("\'","'",$contenido[0]); + $contenido[0]="$contenido[0] xxx"; + } +*/ $json_array[$row['campo_nombre']."_titulo"] = "$contenido[0]"; //imprimir_buscador_campo($id_campo,$valor) @@ -13016,6 +13027,8 @@ 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]; // $contenido = formulario_valor_campo("$id","$row[id_campo]","","$control"); @@ -13026,6 +13039,7 @@ if (mysqli_num_rows($sql)!='0'){ + if($campo_tipo =='15' AND $tipo==""){if($contenido !=""){ $contenido = " Mostrar @@ -13114,7 +13128,11 @@ if (mysqli_num_rows($sql)!='0'){ "; } } - + elseif(($campo_tipo=='2' OR $campo_tipo=='7')AND $contenido !=""){ + + $contenido= html_entity_decode(stripslashes("$contenido")); + + } else { $html ="$contenido"; @@ -16326,7 +16344,7 @@ while( $row = mysqli_fetch_array( $sql ) ) { $existe[]= $control; $existe[] = $timestamp; $existe[] = $consulta; -$existe[] = "$contenido"; +$existe[] = $contenido; $existe[] = $md5_contenido; $existe[] = $orden; $existe[] = $id_usuario; From 968582d9bad1294738ee05219e684a96d56aed05 Mon Sep 17 00:00:00 2001 From: humano Date: Wed, 24 Oct 2018 07:28:25 -0500 Subject: [PATCH 017/140] boton para cerrar estadisticas en notas --- funciones/funciones.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/funciones/funciones.php b/funciones/funciones.php index 8b61273..442bc7a 100644 --- a/funciones/funciones.php +++ b/funciones/funciones.php @@ -778,7 +778,10 @@ foreach($clasificacion as $clave => $v){ } $tabla_clasificacion = "$tabla_clasificacion
    "; $contenido =" +
    +Cerrar [x]
    +
    • Estadísticas
      • @@ -798,8 +801,9 @@ $contenido ="
    • $corpus
    -
    +
    + "; @@ -1056,10 +1060,11 @@ function notas_tablero($form) {
    • - + + $administracion - Tupale.co + Tupale.co From e8e069d60a0552ff50f52962f37d6b7826b9c4e8 Mon Sep 17 00:00:00 2001 From: humano Date: Wed, 24 Oct 2018 07:30:48 -0500 Subject: [PATCH 018/140] boton para cerrar estadisticas en notas --- funciones/funciones.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/funciones/funciones.php b/funciones/funciones.php index 442bc7a..9f7674c 100644 --- a/funciones/funciones.php +++ b/funciones/funciones.php @@ -357,6 +357,8 @@ function aplicacion_configuracion($tipo,$div,$form) { $parametrizaciones_listado = notas_papelera($form,$accion); $contenido =" +
    +Cerrar [x]

    Configuración

    @@ -390,6 +392,7 @@ $contenido ="
    + From a72575cc36f0524f633a550064eff4846787d089 Mon Sep 17 00:00:00 2001 From: kleper Date: Wed, 24 Oct 2018 09:27:20 -0500 Subject: [PATCH 019/140] correccion de estilos para mejorar landingpage --- css/style.css | 57 ++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/css/style.css b/css/style.css index 934513a..f1fc0b7 100644 --- a/css/style.css +++ b/css/style.css @@ -17,7 +17,7 @@ h1, h2, h3, h4, h5, h6 { #toc { font-size: 1em; - padding-top: 11em; + padding-top: 50px; max-height: 95% !important; overflow: auto !important; } @@ -43,16 +43,6 @@ h1, h2, h3, h4, h5, h6 { border-color: transparent; } -.btn_hover:hover{ -background-color: #fb4f59; -border-radius: 0px; -color: white; -} - -.btn_hover>a:hover{ -background-color: transparent !important; -} - #contenedor_cabecera { padding-top: 0em; } @@ -79,6 +69,31 @@ background-color: transparent !important; overflow: auto; } +#menu_administrador{ + background-color: gray; +} + +.btn-botonera-admin { + float: left; +} + +#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; } @@ -154,25 +169,6 @@ background-color: transparent !important; padding: 4px 5px; } - -.btn-botonera-admin { - /* margin-left: 20px; */ - /* margin-right: 20px; */ - float: left; -} - -.btn-botonera-admin:hover { - background-color: black; -} - -.btn.btn-botonera-admin:hover { - color: white !important; -} - -.intro-social-buttons { - padding-top: 10px !important; -} - #botonera_landing { display: inline-flex; } @@ -577,3 +573,4 @@ RESPONSIVE */ padding-top: 10em; } } + From b6e9a6cc1e9be0b4f34b1e8ea55c6c9a6874e922 Mon Sep 17 00:00:00 2001 From: kleper Date: Wed, 24 Oct 2018 10:29:06 -0500 Subject: [PATCH 020/140] Correccion de error de merge --- index.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/index.php b/index.php index 19ad215..d8d6ead 100644 --- a/index.php +++ b/index.php @@ -186,13 +186,8 @@ legend.legend-area { -<<<<<<< HEAD - - >>>>>> 3373ee1dd17019a91f63696fdfc00277dd6ad88a if($form!=''){ echo formulario_embebido($form,$opciones);} elseif($identificador !='') { echo mostrar_identificador($identificador,$id);} //elseif($_REQUEST['psi'] !='') { include("psi.php") ; echo $aviso;} @@ -316,9 +311,6 @@ $(document).ready(function() { $('.wysiwyg_auto').summernote({dialogsInBody: true}); }); -<<<<<<< HEAD - -======= @@ -327,6 +319,5 @@ $(document).ready(function() { Reload "; } ?> ->>>>>>> 3373ee1dd17019a91f63696fdfc00277dd6ad88a From b437cdbf14a1f0701368f3b1c50cf8e044d3d253 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Wed, 24 Oct 2018 16:40:40 -0500 Subject: [PATCH 021/140] =?UTF-8?q?hice=20varias=20cosas,=20primero=20orga?= =?UTF-8?q?nic=C3=A9=20el=20imput=20de=20cierre=20de=20sesion=20para=20que?= =?UTF-8?q?=20no=20chocara=20arriba=20en=20la=20navbar=20con=20el=20logo?= =?UTF-8?q?=20y=20que=20tales,=20luego=20busqu=C3=A9=20cerrar=20un=20div?= =?UTF-8?q?=20de=20la=20parte=20de=20lo=20ultimo=20y=20agregue=20unos=20id?= =?UTF-8?q?s=20para=20diferencias=20ese=20container,=20tambien=20le=20quit?= =?UTF-8?q?=C3=A9=20el=20margin=20y=20padding=20a=20los=20contenedores=20e?= =?UTF-8?q?n=20general,=20es=20mejor=20trabajar=20as=C3=AD=20para=20tener?= =?UTF-8?q?=20control=20de=20lo=20que=20pasa=20con=20las=20cajas=20lo=20mi?= =?UTF-8?q?smo=20en=20=20submodulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/milfs.css | 4 ++ css/style.css | 82 +++++++++++++++++++++++++---------------- funciones/funciones.php | 22 +++++------ index.php | 33 ++++++++--------- js/scripts.js | 2 +- 5 files changed, 82 insertions(+), 61 deletions(-) diff --git a/css/milfs.css b/css/milfs.css index c708726..1fdefdc 100644 --- a/css/milfs.css +++ b/css/milfs.css @@ -6,6 +6,10 @@ el otro archivo css style.css que está en la carpeta milfs padding-top: 10em; } +#empresa_pie{ + display: block; +} + @media (max-width: 768px) { #panel_administrador{ padding: 0px !important; diff --git a/css/style.css b/css/style.css index f1fc0b7..254b1d2 100644 --- a/css/style.css +++ b/css/style.css @@ -26,6 +26,26 @@ h1, h2, h3, h4, h5, h6 { opacity: 1; } +.container,#principal_general{ + padding-left: 0px; + padding-right: 0px; +} + +.container-fluid,#caja{ + padding-left: 0px; + padding-right: 0px; + margin-left: 0px; + margin-right: 0px; +} + +#lo_ultimo{ + background: white; +} + +.lo_ultimo>img{ + max-height: 300px;' +} + .navbar-inverse { background-color: #222; border-color: #090909; @@ -70,25 +90,13 @@ 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; } @@ -109,7 +117,7 @@ h1, h2, h3, h4, h5, h6 { #menu_hamburguesa{ color: white; - background-color: none !important; + background-color: transparent !important; } .navbar-brand { transform: translateX(-50%); @@ -364,7 +372,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 +417,8 @@ box-shadow: none; } } -< !-- ESTILOS PRIORITARIOS -->.modal-dialog { +/*ESTILOS PRIORITARIOS*/ +.modal-dialog { width: 95% !important; height: auto; padding: 0; @@ -456,8 +465,7 @@ legend.legend-area { } .fh5co-post-entry article h2 { - font-size: 28px; - !important; + font-size: 28px ; } #fh5co-offcanvas .fh5co-bio img { @@ -496,7 +504,7 @@ RESPONSIVE */ @media only screen and (max-width: 1200px) { #logo_cabecera { - padding-top: 3em; + padding-top: 2em; } #div_panel_aplicaciones{ @@ -506,6 +514,10 @@ RESPONSIVE */ .img-gris { filter: grayscale(0); } + .lead{ + padding-left: 5em; + padding-right: 5em; + } } @media only screen and (max-width: 992px) { @@ -515,17 +527,24 @@ 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; @@ -540,12 +559,11 @@ RESPONSIVE */ #div_panel_aplicaciones { padding-top: 15em; } + #logo_cabecera { max-width: 65% !important; } - #principal_general { - padding-left: 2em; - } + #texto_articulo{ padding: 0px !important } @@ -555,22 +573,22 @@ RESPONSIVE */ #contenedor_cabecera { padding-top: 0em; } - - #principal_general { - padding-left: 3em; -} #proyectos{ display: grid !important; } } -@media only screen and (max-width: 320px) { +@media only screen and (max-width: 360px) { + #slogan_cabecera { font-size: 1em; } #div_panel_aplicaciones { padding-top: 10em; } + + } + diff --git a/funciones/funciones.php b/funciones/funciones.php index d3d447e..0d5dac4 100644 --- a/funciones/funciones.php +++ b/funciones/funciones.php @@ -782,7 +782,7 @@ foreach($clasificacion as $clave => $v){ $tabla_clasificacion = "$tabla_clasificacion
    "; $contenido ="
    -Cerrar [x] +Cerrar [x]
    @@ -1064,7 +1064,7 @@ function notas_tablero($form) {
    - + $administracion Tupale.co @@ -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");} @@ -5362,7 +5362,7 @@ $link=Conectarse(); } //$impresion = mostrar_identificador("$row[campo]","","landingpage","",""); $contenido .= " -
    "; @@ -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 { diff --git a/index.php b/index.php index d8d6ead..dd3a21d 100644 --- a/index.php +++ b/index.php @@ -187,7 +187,7 @@ legend.legend-area { - -