From 9c965a307c88015c00815f8be80617e39561e882 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sat, 13 Oct 2018 21:09:51 -0500 Subject: [PATCH 1/8] ultimos cambios --- index.php | 114 +++++++++++++++++++++--------------------------------- 1 file changed, 45 insertions(+), 69 deletions(-) diff --git a/index.php b/index.php index 8e2b6aa..e56d717 100644 --- a/index.php +++ b/index.php @@ -1110,72 +1110,52 @@ $uri = $_SERVER['REQUEST_URI']; } /// echo " "; -$panel_aplicaciones = panel_aplicaciones('1',"",""); - - if(isset($_SESSION['id'])){ $boton_ingresar=" - - -
  • - $_SESSION[username] - -
    • - - - ";} - - - - else{$boton_ingresar="
  • Ingresar
    • " - - ;} - + if(isset($_SESSION['id'])){ $boton_ingresar="
  • $_SESSION[username]
  • SALIR
    • ";} + else{$boton_ingresar="
  • Ingresar
    • ";} if($tema=="") { $barra="
    - -
    + + "; @@ -1346,16 +1326,16 @@ document.oncopy = addLink; $id_empresa_portada='1'; if($_SESSION['grupo'] == '3'){ - //echo "
  • ".panel_aplicaciones('1',"","")."
    • "; + echo "
  • ".panel_aplicaciones('1',"","")."
    • "; } else{ $usuario = $_SESSION['username']; - //echo "
  • ".panel_aplicaciones('1',"$_SESSION[id_empresa]","")."
    • "; + echo "
  • ".panel_aplicaciones('1',"$_SESSION[id_empresa]","")."
    • "; } }else{ echo " - +
  • - "; + Ingresar Aportar a la inteligencia colectiva
    • "; } @@ -1531,9 +1511,6 @@ echo $css_adicional;
    -
    - -

    ">

    @@ -1541,7 +1518,6 @@ echo $css_adicional;
    -
    Date: Sat, 13 Oct 2018 21:11:10 -0500 Subject: [PATCH 2/8] inconsistencias entre versiones --- milfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milfs b/milfs index 4dd54bd..3c6495d 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 4dd54bdcb7aafd35004718b1d8cf1ea1153948c3 +Subproject commit 3c6495d52903d861bc565f2fed14915c442db7ea From 8bd943a523a008676b4458eb0ccfe3833457aaf3 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sat, 13 Oct 2018 23:25:13 -0500 Subject: [PATCH 3/8] organizando media qweryes color de la imagen de los proyectos --- index.php | 115 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 70 insertions(+), 45 deletions(-) diff --git a/index.php b/index.php index e56d717..672e9df 100644 --- a/index.php +++ b/index.php @@ -1110,52 +1110,72 @@ $uri = $_SERVER['REQUEST_URI']; } /// echo " "; +$panel_aplicaciones = panel_aplicaciones('1',"",""); + + if(isset($_SESSION['id'])){ $boton_ingresar=" + + +
  • + $_SESSION[username] +
      +
    • + $panel_aplicaciones +
      • +
    • +
    • SALIR
      • +
    +
    • + + + ";} + + + + else{$boton_ingresar="
  • Ingresar
    • " + + ;} + - if(isset($_SESSION['id'])){ $boton_ingresar="
  • $_SESSION[username]
  • SALIR
    • ";} - else{$boton_ingresar="
  • Ingresar
    • ";} if($tema=="") { $barra="
    - -
    + +
    "; @@ -1326,16 +1346,16 @@ document.oncopy = addLink; $id_empresa_portada='1'; if($_SESSION['grupo'] == '3'){ - echo "
  • ".panel_aplicaciones('1',"","")."
    • "; + //echo "
  • ".panel_aplicaciones('1',"","")."
    • "; } else{ $usuario = $_SESSION['username']; - echo "
  • ".panel_aplicaciones('1',"$_SESSION[id_empresa]","")."
    • "; + //echo "
  • ".panel_aplicaciones('1',"$_SESSION[id_empresa]","")."
    • "; } }else{ echo " -
  • + - Ingresar Aportar a la inteligencia colectiva
    • "; + "; } @@ -1511,6 +1531,10 @@ echo $css_adicional;
    +
    + +
    +

    ">

    @@ -1518,6 +1542,7 @@ echo $css_adicional;
    +
    Date: Sat, 13 Oct 2018 23:25:50 -0500 Subject: [PATCH 4/8] organizando media qweryes color de la imagen de los proyectos submodulo actualizado --- milfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milfs b/milfs index 3c6495d..14a79cb 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 3c6495d52903d861bc565f2fed14915c442db7ea +Subproject commit 14a79cb75b5ed7e309c1fd758245c97db381a90f From 800b863d6a044ebebf796f8d3566364aeafb2243 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sun, 14 Oct 2018 01:18:18 -0500 Subject: [PATCH 5/8] ajustes de css --- index.php | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/index.php b/index.php index 672e9df..983a590 100644 --- a/index.php +++ b/index.php @@ -952,7 +952,7 @@ $aplicacion_pie=" "; -$soporte = "
  • SOPORTE
    • "; +$soporte = "
  • SOPORTE
    • "; } $css_adicional = remplacetas('form_parametrizacion','campo',"index",'descripcion'," tabla='css' and opcion = 'adicional' and id_empresa = '$id_empresa'") ; @@ -1141,22 +1141,24 @@ $panel_aplicaciones = panel_aplicaciones('1',"",""); $barra="
    From 01f307c5a74f17b484b75860c961ab9c09a72c20 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sun, 14 Oct 2018 01:18:48 -0500 Subject: [PATCH 6/8] ajustes de css submodulo actualizacion --- milfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milfs b/milfs index 14a79cb..2b46012 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 14a79cb75b5ed7e309c1fd758245c97db381a90f +Subproject commit 2b460123907355516bad9eb0c7a59cf7ef81de4e From 5a96b63fd6a86461262fd58ef03ce68f9b838553 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sun, 14 Oct 2018 01:53:38 -0500 Subject: [PATCH 7/8] =?UTF-8?q?ultimos=20ajustes=20en=20la=20navegaci?= =?UTF-8?q?=C3=B3n=20implementaci=C3=B3n=20landingpage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.php | 2 +- librerias/landingjs/scripts_landing.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 983a590..8ee1bd0 100644 --- a/index.php +++ b/index.php @@ -1159,7 +1159,7 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
  • -
      +
      • Portal
      • $sigla[0] Inicio
      • Blog
        • diff --git a/librerias/landingjs/scripts_landing.js b/librerias/landingjs/scripts_landing.js index b3dda70..055fa74 100644 --- a/librerias/landingjs/scripts_landing.js +++ b/librerias/landingjs/scripts_landing.js @@ -1,5 +1,5 @@ $(window).scroll(function() { - if ($(document).scrollTop() > 5) { + if ($(document).scrollTop() > 0) { $('nav').addClass('shrink'); } else { $('nav').removeClass('shrink'); From 7b2d0f63449b4fb25c1644ffb07d15d6fc39d28b Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sun, 14 Oct 2018 02:32:04 -0500 Subject: [PATCH 8/8] =?UTF-8?q?ultimos=20ajustes=20en=20la=20navegaci?= =?UTF-8?q?=C3=B3n=20implementaci=C3=B3n=20landingpage=20actualizacion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- milfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milfs b/milfs index 2b46012..32e6c8a 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 2b460123907355516bad9eb0c7a59cf7ef81de4e +Subproject commit 32e6c8adeda85f7bdf2efc6f6d00b085ab5089b2