diff --git a/UyTube_web/src/java/com/uytube/CerrarSesion.java b/UyTube_web/src/java/com/uytube/CerrarSesion.java
index 7f85a1ae4fc7d11d5a274ada7b30ad0445779077..d63171c0dfdb0931ee20647e08ab44770383fa61 100644
--- a/UyTube_web/src/java/com/uytube/CerrarSesion.java
+++ b/UyTube_web/src/java/com/uytube/CerrarSesion.java
@@ -44,7 +44,7 @@ public class CerrarSesion extends HttpServlet {
if (sys.sesionIniciada()) {
sys.cerrarSesion();
}
- response.sendRedirect("");
+ response.sendRedirect("/uytube/");
} catch (Exception e) {
System.out.println(e.getMessage());
RequestDispatcher rd; //objeto para despachar
diff --git a/UyTube_web/web/Presentacion.jsp b/UyTube_web/web/Presentacion.jsp
index 5b88c6147e6f7032d0fe6bde3d140e77c9c4956a..bfbf9d30dfb0736d521daf314d1408e9a7aac5d4 100644
--- a/UyTube_web/web/Presentacion.jsp
+++ b/UyTube_web/web/Presentacion.jsp
@@ -103,6 +103,6 @@
<script src="js/bootstrap.bundle.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="js/funciones.js"></script>
- <script src="js/index.js"></script>
+
</body>
</html>
diff --git a/UyTube_web/web/css/contenido-index.css b/UyTube_web/web/css/contenido-index.css
index 584a1ca5b02ff19e56686b06f47834f088c95fd4..0e33721d54a9bb7dc68e83cd06429fa54abc1e4a 100644
--- a/UyTube_web/web/css/contenido-index.css
+++ b/UyTube_web/web/css/contenido-index.css
@@ -38,7 +38,7 @@
left: 0px;
height: 175.112px; }
.header nav {
- height: 175.112px; }
+ height: 100%; }
.header .item-header2 {
order: 3;
width: 100%; }
@@ -98,7 +98,7 @@
height: 175.112px;
left: 0px; }
.header nav {
- height: 175.112px; }
+ height: 100%; }
.header .item-header2 {
order: 3;
width: 100%; }
@@ -155,7 +155,7 @@
left: 0px;
height: 127.176px; }
.header nav {
- height: 127.176px; }
+ height: 100%; }
.header .item-header2 {
order: 3;
width: 100%; }
@@ -214,7 +214,7 @@
left: 0px;
height: 129.176px; }
.header nav {
- height: 129.176px; }
+ height: 100%; }
.header .item-header2 {
order: 3;
width: 100%; }
@@ -272,8 +272,8 @@
width: 100%;
left: 0rem;
height: 124.117px; }
- .header .nav {
- height: 124.117px; }
+ .header nav {
+ height: 100%; }
.header .item-header2 {
order: 3;
width: 100%; }
@@ -372,7 +372,7 @@
width: 98%;
height: 56px; }
.header nav {
- height: 56px; }
+ height: 100%; }
.relleno-header {
height: 56px; }
diff --git a/UyTube_web/web/css/contenido-index.css.map b/UyTube_web/web/css/contenido-index.css.map
index d9e42ee4aa45270996c79e6ce8eb8218413ca095..5dcbbbecc23756f79eabfa61cdcaf178f253cd14 100644
--- a/UyTube_web/web/css/contenido-index.css.map
+++ b/UyTube_web/web/css/contenido-index.css.map
@@ -1,7 +1,7 @@
{
"version": 3,
-"mappings": "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",
+"mappings": "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",
"sources": ["../sass/contenido-index.sass","../sass/_colores.sass"],
"names": [],
"file": "contenido-index.css"
-}
+}
\ No newline at end of file
diff --git a/UyTube_web/web/css/menu.css b/UyTube_web/web/css/menu.css
index aca1c9d23ce8f93e5d376e6249d248cc4ee3c045..aa1fa636abf47878fe35e7ef0317b544a5cd9d5c 100644
--- a/UyTube_web/web/css/menu.css
+++ b/UyTube_web/web/css/menu.css
@@ -1,13 +1,14 @@
.menu {
- position: absolute;
+ position: fixed;
+ max-height: 450px;
z-index: 10;
width: 0px;
- top: -60px;
+ top: 56px;
left: 0px;
padding-top: 20px;
background-color: #00001a;
- overflow: hidden;
- transition: all 300ms; }
+ overflow: auto;
+ transition: all 400ms; }
.menu ul {
list-style: none;
padding: 0px;
diff --git a/UyTube_web/web/css/menu.css.map b/UyTube_web/web/css/menu.css.map
index 7f3180ffbfbf76d9baac831e12a7762fa06f0ad5..015a9e42c74ef9f8229faf494eb4767426ba96fb 100644
--- a/UyTube_web/web/css/menu.css.map
+++ b/UyTube_web/web/css/menu.css.map
@@ -1,6 +1,6 @@
{
"version": 3,
-"mappings": "AAEA,KAAK;EACD,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,EAAE;EACX,KAAK,EAAE,GAAG;EACV,GAAG,EAAE,KAAK;EACV,IAAI,EAAE,GAAG;EACT,WAAW,EAAE,IAAI;EACjB,gBAAgB,ECAI,OAAO;EDC3B,QAAQ,EAAE,MAAM;EAChB,UAAU,EAAE,SAAS;EACrB,QAAE;IACE,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,KAAK,EAAE,IAAI;IACX,iCAAe;MACX,UAAU,EAAE,mBAAqB;IAErC,gBAAO;MACH,UAAU,EAAE,MAAM;MAClB,OAAO,EAAE,MAAM;MACf,MAAM,EAAE,IAAI;MACZ,KAAK,ECnBV,OAAO;IDoBN,WAAE;MACE,UAAU,EAAE,WAAW;MACvB,gBAAgB,EAAE,OAAO;MACzB,OAAO,EAAE,KAAK;MACd,KAAK,EAAE,IAAI;MACX,iBAAK;QACD,MAAM,EAAE,IAAI;MAChB,uBAAW;QACP,KAAK,ECtBP,IAAI;QDuBF,MAAM,EAAE,qBAAqB;QAC7B,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,OAAO;MACnB,gBAAI;QACA,UAAU,EAAE,MAAM;QAClB,KAAK,EAAE,IAAI;QACX,KAAK,EC7BP,IAAI;QD8BF,WAAW,EAAE,IAAI;QACjB,YAAY,EAAE,IAAI;QAElB,0BAAS;UACL,MAAM,EAAE,IAAI;UACZ,aAAa,EAAE,IAAI;MAE3B,aAAC;QACG,KAAK,ECtCP,IAAI;QDuCF,OAAO,EAAE,+BAA+B;QACxC,OAAO,EAAE,KAAK;QACd,eAAe,EAAE,IAAI;;AAIrC,gBAAgB;EACZ,eAAe,EAAE,IAAI;EACrB,gBAAgB,EC5CP,SAAS;;AD8CtB,MAAM;EACF,KAAK,EAAE,SAAS",
+"mappings": "AAEA,KAAK;EACD,QAAQ,EAAE,KAAK;EACf,UAAU,EAAE,KAAK;EACjB,OAAO,EAAE,EAAE;EACX,KAAK,EAAE,GAAG;EACV,GAAG,EAAE,IAAI;EACT,IAAI,EAAE,GAAG;EACT,WAAW,EAAE,IAAI;EACjB,gBAAgB,ECDI,OAAO;EDE3B,QAAQ,EAAE,IAAI;EACd,UAAU,EAAE,SAAS;EACrB,QAAE;IACE,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,KAAK,EAAE,IAAI;IACX,iCAAe;MACX,UAAU,EAAE,mBAAqB;IAErC,gBAAO;MACH,UAAU,EAAE,MAAM;MAClB,OAAO,EAAE,MAAM;MACf,MAAM,EAAE,IAAI;MACZ,KAAK,ECpBV,OAAO;IDqBN,WAAE;MACE,UAAU,EAAE,WAAW;MACvB,gBAAgB,EAAE,OAAO;MACzB,OAAO,EAAE,KAAK;MACd,KAAK,EAAE,IAAI;MACX,iBAAK;QACD,MAAM,EAAE,IAAI;MAChB,uBAAW;QACP,KAAK,ECvBP,IAAI;QDwBF,MAAM,EAAE,qBAAqB;QAC7B,SAAS,EAAE,OAAO;QAClB,MAAM,EAAE,OAAO;MACnB,gBAAI;QACA,UAAU,EAAE,MAAM;QAClB,KAAK,EAAE,IAAI;QACX,KAAK,EC9BP,IAAI;QD+BF,WAAW,EAAE,IAAI;QACjB,YAAY,EAAE,IAAI;QAElB,0BAAS;UACL,MAAM,EAAE,IAAI;UACZ,aAAa,EAAE,IAAI;MAE3B,aAAC;QACG,KAAK,ECvCP,IAAI;QDwCF,OAAO,EAAE,+BAA+B;QACxC,OAAO,EAAE,KAAK;QACd,eAAe,EAAE,IAAI;;AAIrC,gBAAgB;EACZ,eAAe,EAAE,IAAI;EACrB,gBAAgB,EC7CP,SAAS;;AD+CtB,MAAM;EACF,KAAK,EAAE,SAAS",
"sources": ["../sass/menu.sass","../sass/_colores.sass"],
"names": [],
"file": "menu.css"
diff --git a/UyTube_web/web/include/menu-usuario.jsp b/UyTube_web/web/include/menu-usuario.jsp
index 622821355e5800b1cb715a450f774d6668c12b4d..736093330ef4482417a6ef79e54007d3dc0691b8 100644
--- a/UyTube_web/web/include/menu-usuario.jsp
+++ b/UyTube_web/web/include/menu-usuario.jsp
@@ -12,13 +12,7 @@ Menú para el usuario logueado
DtUsuario usu = sys.obtenerUsuarioActual();
%>
- <ul>
- <li>
- <span>
- <label class="icon-menu1"></label>
- <img class="fotoLogo" src="imagenes/logoChico.jpeg" alt="UyTube">
- </span>
- </li>
+ <ul>
<li class="titulo"> Inicio </li>
<li><a href="/uytube/presentacion"><span class="icon-home1"></span> Inicio</a></li>
<li class="titulo"> <%= usu.getNickname()%> </li>
diff --git a/UyTube_web/web/include/menu-visitante.jsp b/UyTube_web/web/include/menu-visitante.jsp
index 7db16b20d2036d71a98620f1b86784582a188d89..4aa67aa355113176099fd7adbf2aa7daa53e8922 100644
--- a/UyTube_web/web/include/menu-visitante.jsp
+++ b/UyTube_web/web/include/menu-visitante.jsp
@@ -5,15 +5,9 @@ Menú para el Visitante
-->
<aside class="menu" >
<ul>
- <li>
- <span>
- <label class="icon-menu1"></label>
- <img class="fotoLogo" src="imagenes/logoChico.jpeg" alt="UyTube">
- </span>
- </li>
<li class="titulo"> Inicio </li>
<li><a href="/uytube/presentacion"><span class="icon-home1"></span> Inicio</a></li>
-
+
<li class="titulo">Cuenta</li>
<li><a href="/uytube/buscar"><span class="icon-magnifying-glass"></span> Buscar</a></li>
<li class="titulo">Cuenta</li>
diff --git a/UyTube_web/web/js/funciones.js b/UyTube_web/web/js/funciones.js
index e531fef1a01e12e7d2f630f4ced29c1567dd2cca..5eb6afcd583dfb3a5b5eeb65a2840dc24c4962d3 100644
--- a/UyTube_web/web/js/funciones.js
+++ b/UyTube_web/web/js/funciones.js
@@ -1,7 +1,9 @@
-// Muesta u oculta el menu
-$(".icon-menu1").on("click", function(){
- $(".menu").toggleClass('abrir');
-});
+// Muestra u oculta el menu y ajusta su posicion en altura
+$(".icon-menu1").on("click", function () {
+ var posicionMenu = parseInt($(".header").css("height"));
+ $(".menu").css("top", posicionMenu);
+ $(".menu").toggleClass('abrir');
+});
/*
$(".icon-menu1").on("click", function(){
@@ -10,4 +12,25 @@ $(".icon-menu1").on("click", function(){
scrollTop: posicion
}, 2000);
});
-*/
\ No newline at end of file
+*/
+
+screenWidth = $(window).width();
+screenHeight = $(window).height();
+
+setInterval(function () {
+ if ($(window).width() !== screenWidth || $(window).height() !== screenHeight) {
+ screenHeight = 0;
+ altoMenu = 0;
+ screenHeight = $(window).height();
+ altoHeader = parseFloat($(".header").css('height'));
+ altoMenu = parseFloat($(".menu").css('height'));
+ if(screenHeight < (altoHeader+altoMenu) ){
+ console.log('el alto de menu es superior a la pantalla');
+ $(".menu").css('height',(screenHeight-altoHeader));
+ }else{
+ $(".menu").css('height','350px');
+ console.log('el alto de menu es: 350px');
+ }
+ console.log('ancho: ' + screenWidth + ", alto: " + screenHeight);
+ }
+}, 50);
\ No newline at end of file
diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-index.sassc b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-index.sassc
index 371538f5e58dc30336a2ba5e57c08a2ff073ae99..56428e82fb88021bc2738709a801d12b77ee738a 100644
Binary files a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-index.sassc and b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/contenido-index.sassc differ
diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/header.sassc b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/header.sassc
new file mode 100644
index 0000000000000000000000000000000000000000..c022544a3829ed119d75f474be80c2dad234e0b8
Binary files /dev/null and b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/header.sassc differ
diff --git a/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/menu.sassc b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/menu.sassc
new file mode 100644
index 0000000000000000000000000000000000000000..007c81084a2aa826fae1707fd02651e39f2ed91e
Binary files /dev/null and b/UyTube_web/web/sass/.sass-cache/042c9dafa673dd92eaea364b901f2a9b0e4518b6/menu.sassc differ
diff --git a/UyTube_web/web/sass/contenido-index.sass b/UyTube_web/web/sass/contenido-index.sass
index 05a04c42c8e1a4ef9d1ee0ba76b65892157c7bfe..05e93225013446b73e052b6e0255026104d5d714 100644
--- a/UyTube_web/web/sass/contenido-index.sass
+++ b/UyTube_web/web/sass/contenido-index.sass
@@ -6,7 +6,7 @@
border-bottom: 2px solid $colorCelesteClaro
border-top: 2px solid $colorCelesteClaro
width: 100%
-
+
.contenido
background-color: $colorGrisClaro
border-radius: 5px
@@ -42,8 +42,8 @@
width: 100%
left: 0px
height: 175.112px
- nav
- height: 175.112px
+ nav
+ height: 100%
.item-header2
order: 3
width: 100%
@@ -102,8 +102,8 @@
width: 100%
height: 175.112px
left: 0px
- nav
- height: 175.112px
+ nav
+ height: 100%
.item-header2
order: 3
width: 100%
@@ -161,8 +161,8 @@
width: 100%
left: 0px
height: 127.176px
- nav
- height: 127.176px
+ nav
+ height: 100%
.item-header2
order: 3
width: 100%
@@ -226,8 +226,8 @@
width: 100%
left: 0px
height: 129.176px
- nav
- height: 129.176px
+ nav
+ height: 100%
.item-header2
order: 3
width: 100%
@@ -289,11 +289,12 @@
width: 100%
left: 0rem
height: 124.117px
- .nav
- height: 124.117px
+ nav
+ height: 100%
.item-header2
order: 3
width: 100%
+
//Espacio de relleno
.relleno-header
height: 124.117px
@@ -395,8 +396,8 @@
.header
width: 98%
height: 56px
- nav
- height: 56px
+ nav
+ height: 100%
//Espacio de relleno
.relleno-header
height: 56px
diff --git a/UyTube_web/web/sass/menu.sass b/UyTube_web/web/sass/menu.sass
index 30f842c8ec8958781e7321a631334e948c5d2652..20a9980d52fc7ae9ca23867b5df95e0fdc63f58b 100644
--- a/UyTube_web/web/sass/menu.sass
+++ b/UyTube_web/web/sass/menu.sass
@@ -1,15 +1,16 @@
@import _colores
//Estilos del menu
.menu
- position: absolute
+ position: fixed
+ max-height: 450px
z-index: 10
width: 0px
- top: -60px
+ top: 56px
left: 0px
padding-top: 20px
background-color: $colorHeaderMenuFooter
- overflow: hidden
- transition: all 300ms
+ overflow: auto
+ transition: all 400ms
ul
list-style: none
padding: 0px
@@ -60,4 +61,3 @@
.abrir
width: 17.625rem
-