diff --git a/UyTube_web/src/java/com/uytube/AltaListaReproduccion.java b/UyTube_web/src/java/com/uytube/AltaListaReproduccion.java
index 2a476617a4a10fb16e818451df2512c60954c08b..57653f7f7ad0ec092870c3cef997e932323b75f9 100644
--- a/UyTube_web/src/java/com/uytube/AltaListaReproduccion.java
+++ b/UyTube_web/src/java/com/uytube/AltaListaReproduccion.java
@@ -7,6 +7,7 @@ package com.uytube;
import java.io.IOException;
import java.io.PrintWriter;
+import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -35,7 +36,7 @@ public class AltaListaReproduccion extends HttpServlet {
out.println("<!DOCTYPE html>");
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet AltaListaReproduccion</title>");
+ out.println("<title>Servlet AltaListaReproduccion</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet AltaListaReproduccion at " + request.getContextPath() + "</h1>");
@@ -56,7 +57,9 @@ public class AltaListaReproduccion extends HttpServlet {
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- processRequest(request, response);
+ RequestDispatcher rd; //objeto para despachar
+ rd = request.getRequestDispatcher("/AltaListaReproduccion.jsp");
+ rd.forward(request, response);
}
/**
diff --git a/UyTube_web/src/java/com/uytube/Buscar.java b/UyTube_web/src/java/com/uytube/Buscar.java
index 670edd871522ca7d9609463397b023079c238d1e..f0a4477ac457392bd0ca21fc1360797ff61c8e88 100644
--- a/UyTube_web/src/java/com/uytube/Buscar.java
+++ b/UyTube_web/src/java/com/uytube/Buscar.java
@@ -74,6 +74,8 @@ public class Buscar extends HttpServlet {
Ret = sys.buscar(Texto, Fil, ord);
+
+
} else {
Ret = sys.buscar(Categoria);
}
diff --git a/UyTube_web/src/java/com/uytube/ConsultaListaReproducion.java b/UyTube_web/src/java/com/uytube/ConsultaListaReproducion.java
index 88a5a944850dde9765061ac16488b6fa84287115..cd1fbb4f91c3faa56ca2daf72fd298db1408144d 100644
--- a/UyTube_web/src/java/com/uytube/ConsultaListaReproducion.java
+++ b/UyTube_web/src/java/com/uytube/ConsultaListaReproducion.java
@@ -57,9 +57,9 @@ public class ConsultaListaReproducion extends HttpServlet {
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- //processRequest(request, response);
+
RequestDispatcher rd; //objeto para despachar
- rd = request.getRequestDispatcher("/ConsultaVideo.jsp");
+ rd = request.getRequestDispatcher("/ConsultarListaReproduccion.jsp");
rd.forward(request, response);
}
diff --git a/UyTube_web/src/java/com/uytube/ConsultaUsuario.java b/UyTube_web/src/java/com/uytube/ConsultaUsuario.java
index 513832417c65e2df2476fc0f82babe96a5142224..5a6a44b4dbd6b4e96eaf1ebc46250c39cad74c26 100644
--- a/UyTube_web/src/java/com/uytube/ConsultaUsuario.java
+++ b/UyTube_web/src/java/com/uytube/ConsultaUsuario.java
@@ -39,6 +39,10 @@ public class ConsultaUsuario extends HttpServlet {
try {
IUsuario sys = Fabrica.getInstancia().getIUsuario();
String nick = request.getParameter("id");
+ String ps = request.getParameter("ps");
+ if(ps == null || ps.equals("")){
+ ps = "VIDEOS";
+ }
DtUsuario usuario = sys.seleccionarUsuario(nick);
DtCanal canal = sys.obtenerCanalDeUsuario();
@@ -53,6 +57,7 @@ public class ConsultaUsuario extends HttpServlet {
usuarioPropietario = sys.obtenerUsuarioActual().getNickname().equals(nick);
}
+ request.setAttribute("ps", ps);
request.setAttribute("usuario", usuario);
request.setAttribute("canal", canal);
request.setAttribute("seguidos", seguidos);
diff --git a/UyTube_web/src/java/com/uytube/ModificarListaReproduccion.java b/UyTube_web/src/java/com/uytube/ModificarListaReproduccion.java
index 2c5bd2104f136416d5d8d14595890e2e638216d7..a737f189328e457f7fcf7206cb929a1c1f0a1315 100644
--- a/UyTube_web/src/java/com/uytube/ModificarListaReproduccion.java
+++ b/UyTube_web/src/java/com/uytube/ModificarListaReproduccion.java
@@ -7,6 +7,7 @@ package com.uytube;
import java.io.IOException;
import java.io.PrintWriter;
+import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -56,7 +57,15 @@ public class ModificarListaReproduccion extends HttpServlet {
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- processRequest(request, response);
+ try {
+ RequestDispatcher rd; //objeto para despachar
+ rd = request.getRequestDispatcher("/ModificarListaReproduccion.jsp");
+ rd.forward(request, response);
+ } catch (Exception e) {
+ RequestDispatcher rd; //objeto para despachar
+ rd = request.getRequestDispatcher("/404.jsp");
+ rd.forward(request, response);
+ }
}
/**
diff --git a/UyTube_web/web/404.jsp b/UyTube_web/web/404.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..3feb7b96486de8c56bd4fc63b1cc21bc94ab638e
--- /dev/null
+++ b/UyTube_web/web/404.jsp
@@ -0,0 +1,267 @@
+<%--
+ Document : 404_2
+ Created on : 12/10/2019, 04:17:57 AM
+ Author : Carlos BM
+--%>
+
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html lang="es">
+ <head>
+ <meta charset="UTF-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+ <link rel="stylesheet" type="text/css" href="css/bootstrap.css">
+ <link rel="stylesheet" type="text/css" href="iconos/style.css">
+ <link rel="icon" type="image/png" href="imagenes/icono.png" />
+ <title>UyTube-404</title>
+
+ <style>
+ *
+ {
+ font-family: 'PT Sans Caption', sans-serif, 'arial', 'Times New Roman';
+ }
+
+ /* Error Page */
+ .error .clip .shadow
+ {
+ height: 180px; /*Contrall*/
+ }
+ .error .clip:nth-of-type(2) .shadow
+ {
+ width: 130px; /*Contrall play with javascript*/
+ }
+ .error .clip:nth-of-type(1) .shadow, .error .clip:nth-of-type(3) .shadow
+ {
+ width: 250px; /*Contrall*/
+ }
+ .error .digit
+ {
+ width: 150px; /*Contrall*/
+ height: 150px; /*Contrall*/
+ line-height: 150px; /*Contrall*/
+ font-size: 120px;
+ font-weight: bold;
+ }
+ .error h2 /*Contrall*/
+ {
+ font-size: 32px;
+ }
+ .error .msg /*Contrall*/
+ {
+ top: -190px;
+ left: 30%;
+ width: 80px;
+ height: 80px;
+ line-height: 80px;
+ font-size: 32px;
+ }
+ .error span.triangle /*Contrall*/
+ {
+ top: 70%;
+ right: 0%;
+ border-left: 20px solid #535353; /*triandulito del uy*/
+ border-top: 15px solid transparent;
+ border-bottom: 15px solid transparent;
+ }
+
+
+ .error .container-error-404
+ {
+ margin-top: 10%;
+ position: relative;
+ height: 250px;
+ padding-top: 40px;
+ }
+ .error .container-error-404 .clip
+ {
+ display: inline-block;
+ transform: skew(-45deg);
+ }
+ .error .clip .shadow
+ {
+
+ overflow: hidden;
+ }
+ .error .clip:nth-of-type(2) .shadow
+ {
+ overflow: hidden;
+ position: relative;
+ box-shadow: inset 20px 0px 20px -15px rgba(150, 150, 150,0.8), 20px 0px 20px -15px rgba(150, 150, 150,0.8);
+ }
+
+ .error .clip:nth-of-type(3) .shadow:after, .error .clip:nth-of-type(1) .shadow:after
+ {
+ content: "";
+ position: absolute;
+ right: -8px;
+ bottom: 0px;
+ z-index: 9999;
+ height: 100%;
+ width: 10px;
+ background: linear-gradient(90deg, transparent, rgba(173,173,173, 0.8), transparent);
+ border-radius: 50%;
+ }
+ .error .clip:nth-of-type(3) .shadow:after
+ {
+ left: -8px;
+ }
+ .error .digit
+ {
+ position: relative;
+ top: 8%;
+ color: white;
+ background: #1870FF; /* fondo de los circulos*/
+ border-radius: 50%;
+ display: inline-block;
+ transform: skew(45deg);
+ }
+ .error .clip:nth-of-type(2) .digit
+ {
+ left: -10%;
+ }
+ .error .clip:nth-of-type(1) .digit
+ {
+ right: -20%;
+ }.error .clip:nth-of-type(3) .digit
+ {
+ left: -20%;
+ }
+ .error h2
+ {
+ color: #A2A2A2; /*uy tube se cayó*/
+ font-weight: bold;
+ padding-bottom: 20px;
+ }
+ .error .msg
+ {
+ position: relative;
+ z-index: 9999;
+ display: block;
+ background: #535353; /*logo*/
+ color: #A2A2A2; /*uy*/
+ border-radius: 50%;
+ font-style: italic;
+ }
+ .error .triangle
+ {
+ position: absolute;
+ z-index: 999;
+ transform: rotate(45deg);
+ content: "";
+ width: 0;
+ height: 0;
+ }
+
+ /* Error Page */
+ @media(max-width: 767px)
+ {
+ /* Error Page */
+ .error .clip .shadow
+ {
+ height: 100px; /*Contrall*/
+ }
+ .error .clip:nth-of-type(2) .shadow
+ {
+ width: 80px; /*Contrall play with javascript*/
+ }
+ .error .clip:nth-of-type(1) .shadow, .error .clip:nth-of-type(3) .shadow
+ {
+ width: 100px; /*Contrall*/
+ }
+ .error .digit
+ {
+ width: 80px; /*Contrall*/
+ height: 80px; /*Contrall*/
+ line-height: 80px; /*Contrall*/
+ font-size: 52px;
+ }
+ .error h2 /*Contrall*/
+ {
+ font-size: 24px;
+ }
+ .error .msg /*Contrall*/
+ {
+ top: -110px;
+ left: 15%;
+ width: 40px;
+ height: 40px;
+ line-height: 40px;
+ font-size: 18px;
+ }
+ .error span.triangle /*Contrall*/
+ {
+ top: 70%;
+ right: -3%;
+ border-left: 10px solid #535353; /*no se*/
+ border-top: 8px solid transparent;
+ border-bottom: 8px solid transparent;
+ }
+ .error .container-error-404
+ {
+ height: 150px;
+ }
+ /* Error Page */
+ }
+
+ /*--------------------------------------------Framework --------------------------------*/
+
+ .overlay { position: relative; z-index: 20; } /*done*/
+ .ground-color { background: white; } /*done*/
+ .item-bg-color { background: #EAEAEA } /*done*/
+
+ /* Padding Section*/
+ .padding-top { padding-top: 10px; } /*done*/
+ .padding-bottom { padding-bottom: 10px; } /*done*/
+ .padding-vertical { padding-top: 10px; padding-bottom: 10px; }
+ .padding-horizontal { padding-left: 10px; padding-right: 10px; }
+ .padding-all { padding: 10px; } /*done*/
+
+ .no-padding-left { padding-left: 0px; } /*done*/
+ .no-padding-right { padding-right: 0px; } /*done*/
+ .no-vertical-padding { padding-top: 0px; padding-bottom: 0px; }
+ .no-horizontal-padding { padding-left: 0px; padding-right: 0px; }
+ .no-padding { padding: 0px; } /*done*/
+ /* Padding Section*/
+
+ /* Margin section */
+ .margin-top { margin-top: 10px; } /*done*/
+ .margin-bottom { margin-bottom: 10px; } /*done*/
+ .margin-right { margin-right: 10px; } /*done*/
+ .margin-left { margin-left: 10px; } /*done*/
+ .margin-horizontal { margin-left: 10px; margin-right: 10px; } /*done*/
+ .margin-vertical { margin-top: 10px; margin-bottom: 10px; } /*done*/
+ .margin-all { margin: 10px; } /*done*/
+ .no-margin { margin: 0px; } /*done*/
+
+ .no-vertical-margin { margin-top: 0px; margin-bottom: 0px; }
+ .no-horizontal-margin { margin-left: 0px; margin-right: 0px; }
+
+ .inside-col-shrink { margin: 0px 20px; } /*done - For the inside sections that has also Title section*/
+ /* Margin section */
+
+ hr
+ { margin: 0px; padding: 0px; border-top: 1px dashed #999; }
+ /*--------------------------------------------FrameWork------------------------*/
+ </style>
+</head>
+
+<body>
+
+ <!-- Error Page -->
+ <div class="error">
+ <div class="container-floud">
+ <div class="col-xs-12 ground-color text-center">
+ <div class="container-error-404">
+ <div class="clip"><div class="shadow"><span class="digit thirdDigit">4</span></div></div>
+ <div class="clip"><div class="shadow"><span class="digit secondDigit">0</span></div></div>
+ <div class="clip"><div class="shadow"><span class="digit firstDigit">4</span></div></div>
+ <div class="msg">Uy!<span class="triangle"></span></div>
+ </div>
+ <h2 class="h1">UyTube se cayó</h2>
+ </div>
+ </div>
+ </div>
+ <!-- Error Page -->
+</body>
+</html>
\ No newline at end of file
diff --git a/UyTube_web/web/AltaListaReproduccion.jsp b/UyTube_web/web/AltaListaReproduccion.jsp
index 270960ba08d4b717c17a67bfccda3fec6d522bac..19bd64ef8f144ac00c672c655a7511d38b4617ed 100644
--- a/UyTube_web/web/AltaListaReproduccion.jsp
+++ b/UyTube_web/web/AltaListaReproduccion.jsp
@@ -1,17 +1,108 @@
<%--
- Document : AltaListaReproduccion
- Created on : 09/10/2019, 07:34:34 PM
+ Document : ConsultaUsuario
+ Created on : 07/10/2019, 01:25:13 AM
Author : administrador
--%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
-<html>
+<html lang="es">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>JSP Page</title>
+ <meta charset="UTF-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+ <link rel="stylesheet" type="text/css" href="css/bootstrap.css">
+ <link rel="stylesheet" type="text/css" href="css/body.css">
+ <link rel="stylesheet" type="text/css" href="css/header.css">
+ <link rel="stylesheet" type="text/css" href="css/menu.css">
+ <link rel="stylesheet" type="text/css" href="css/widget.css">
+ <link rel="stylesheet" type="text/css" href="css/footer.css">
+ <link rel="stylesheet" type="text/css" href="css/contenido-consulta-usuario.css">
+ <link rel="stylesheet" type="text/css" href="iconos/style.css">
+ <link rel="icon" type="image/png" href="imagenes/icono.png" />
+ <title>UyTube - Nueva Lista</title>
</head>
<body>
- <h1>AltaListaReproduccion</h1>
+
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-12">
+ <!-- Inclusion de la barra superior -->
+ <%@ include file='include/header-visitante.jsp' %>
+ </div>
+ </div>
+ </div>
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-12">
+ <div class="relleno-header"></div>
+ </div>
+ </div>
+ </div>
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-12">
+ <section class="principal">
+ <!-- Inclusion del menu lateral -->
+ <%@ include file='include/menu-visitante.jsp' %>
+ <div class="contenido">
+ <section class="contenido-flexible">
+ <div class="container">
+
+ <!-- Agregar Listas-->
+ <div class="d-flex flex-row justify-content-center">
+ <form class="form-signin" action="/uytube/usuario-agregar" method="post">
+ <br>
+ <br>
+ <h1 class="h3 mb-4 font-weight-normal" id="Texto_ingrese">Ingrese sus datos</h1>
+ <div class="mb-5">
+ <input type="text" class="form-control" name="nombreL" id="nombreLista" placeholder="Nombre de la lista" required>
+ </div>
+
+
+ <div class="row">
+ <div class="col-md-5">
+ <label class="">Privacidad </label>
+ </div>
+ <div class="col-md-4 custom-control custom-radio">
+ <input id="publico_1" name="privacidad_1" type="radio" class="custom-control-input" checked >
+ <label class="custom-control-label" for="publico_1">Publico</label>
+ </div>
+ <div class="col-md-3 custom-control custom-radio">
+ <input id="privado_1" name="privacidad_1" type="radio" class="custom-control-input" >
+ <label class="custom-control-label" for="privado_1">Privado</label>
+ </div>
+ </div>
+
+
+ <hr class="mb-4">
+
+ <div class="bd-light " >
+ <div class="btn-toolbar justify-content-end" role="toolbar" aria-label="Toolbar with button groups">
+ <div class="p-2 btn-group mr-2" role="group" aria-label="Third group">
+ <button type="button" class="btn btn-danger">CANCELAR</button>
+ </div>
+ <div class="p-2 btn-group" role="group" aria-label="Third group">
+ <button type="button" class="btn btn-primary">ACEPTAR</button>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </section>
+ </div>
+ </section>
+ </div>
+ </div>
+ </div>
+
+ <%@ include file='include/widgets.html' %>
+ <%@ include file='include/footer.html' %>
+
+ <script src="js/jquery-3.4.1.min.js"></script>
+ <script src="js/bootstrap.bundle.min.js"></script>
+ <script src="js/bootstrap.min.js"></script>
+ <script src="js/funciones.js"></script>
</body>
</html>
diff --git a/UyTube_web/web/AltaUsuario.jsp b/UyTube_web/web/AltaUsuario.jsp
index 07a4696c91d80e9f969b4b2931d29a506027bf0c..4620cb5cec85fe290432a766c3efa16d4ec2a99b 100644
--- a/UyTube_web/web/AltaUsuario.jsp
+++ b/UyTube_web/web/AltaUsuario.jsp
@@ -27,7 +27,7 @@
<div class="container-fluid">
<div class="row">
<div class="col-12">
- <%@ include file='include/header-visitante.html' %>
+ <%@ include file='include/header-visitante.jsp' %>
</div>
</div>
</div>
@@ -42,7 +42,7 @@
<div class="row">
<div class="col-12">
<section class="principal">
- <%@ include file='include/menu-visitante.html' %>
+ <%@ include file='include/menu-visitante.jsp' %>
<div class="contenido">
<section class="contenido-flexible">
<div class="principal d-flex flex-row justify-content-center">
diff --git a/UyTube_web/web/AltaVideo.jsp b/UyTube_web/web/AltaVideo.jsp
index ba45b553b19b0773ec39ccbfe68009a94ad66d61..10f4be0e808fd7b91959f654ba8fad3e1ea56691 100644
--- a/UyTube_web/web/AltaVideo.jsp
+++ b/UyTube_web/web/AltaVideo.jsp
@@ -33,11 +33,11 @@
<%
if (sesionIniciada) {
%>
- <%@ include file='include/header-usuario.html' %>
+ <%@ include file='include/header-usuario.jsp' %>
<%
} else {
%>
- <%@ include file='include/header-visitante.html' %>
+ <%@ include file='include/header-visitante.jsp' %>
<%
}
%>
@@ -56,11 +56,11 @@
<%
if (sesionIniciada) {
%>
- <%@ include file='include/menu-usuario.html' %>
+ <%@ include file='include/menu-usuario.jsp' %>
<%
} else {
%>
- <%@ include file='include/menu-visitante.html' %>
+ <%@ include file='include/menu-visitante.jsp' %>
<%
}
%>
diff --git a/UyTube_web/web/Buscar.jsp b/UyTube_web/web/Buscar.jsp
index 06cb4e42be67b6f512840c1a566e486b47ee9618..c78a5339fe38be994c91432bdfc113ad8ba71da3 100644
--- a/UyTube_web/web/Buscar.jsp
+++ b/UyTube_web/web/Buscar.jsp
@@ -37,11 +37,11 @@
<%
if (false){
%>
- <%@ include file='include/header-usuario.html' %>
+ <%@ include file='include/header-usuario.jsp' %>
<%
}else{
%>
- <%@ include file='include/header-visitante.html' %>
+ <%@ include file='include/header-visitante.jsp' %>
<%
}
%>
@@ -60,7 +60,7 @@
<div class="row">
<div class="col-12">
<section class="principal">
- <%@ include file='include/menu-usuario.html' %>
+ <%@ include file='include/menu-usuario.jsp' %>
<div class="contenido">
<section class="contenido-flexible">
diff --git a/UyTube_web/web/ConsultaUsuario.jsp b/UyTube_web/web/ConsultaUsuario.jsp
index 2badb6062400c50181f93f94f0e69669d38dbad8..e476f7a74070d280b14ef15fc3f9798d62862c86 100644
--- a/UyTube_web/web/ConsultaUsuario.jsp
+++ b/UyTube_web/web/ConsultaUsuario.jsp
@@ -21,6 +21,7 @@
ArrayList<DtUsuario> seguidores = (ArrayList) request.getAttribute("seguidores");
ArrayList<DtVideo> videos = (ArrayList) request.getAttribute("videos");
ArrayList<DtListaDeReproduccion> listasRep = (ArrayList) request.getAttribute("listasRep");
+ String ps = (String) request.getAttribute("ps");
%>
<head>
<meta charset="UTF-8">
@@ -46,11 +47,11 @@
<%
if (sesionIniciada){
%>
- <%@ include file='include/header-usuario.html' %>
+ <%@ include file='include/header-usuario.jsp' %>
<%
}else{
%>
- <%@ include file='include/header-visitante.html' %>
+ <%@ include file='include/header-visitante.jsp' %>
<%
}
%>
@@ -72,11 +73,11 @@
<%
if (sesionIniciada) {
%>
- <%@ include file='include/menu-usuario.html' %>
+ <%@ include file='include/menu-usuario.jsp' %>
<%
} else {
%>
- <%@ include file='include/menu-visitante.html' %>
+ <%@ include file='include/menu-visitante.jsp' %>
<%
}
%>
@@ -153,8 +154,30 @@
<div class="bd-example bd-example-tabs">
<nav class="">
<div class="nav nav-tabs " id="nav-tab" role="tablist">
+ <%
+ if (ps.equals("VIDEOS")) {
+ %>
+
<a class="nav-item nav-link active" id="refVideos" data-toggle="tab" href="#videos" role="tab" aria-controls="nav-VIDEO" aria-selected="true">VIDEOS</a>
+ <%
+ } else {
+ %>
+ <a class="nav-item nav-link" id="refVideos" data-toggle="tab" href="#videos" role="tab" aria-controls="nav-VIDEO" aria-selected="true">VIDEOS</a>
+ <%
+ }
+ %>
+
+ <%
+ if (ps.equals("LISTAS")) {
+ %>
+ <a class="nav-item nav-link active" id="refListas" data-toggle="tab" href="#listas" role="tab" aria-controls="nav-LISTAS" aria-selected="false">LISTAS</a>
+ <%
+ } else {
+ %>
<a class="nav-item nav-link " id="refListas" data-toggle="tab" href="#listas" role="tab" aria-controls="nav-LISTAS" aria-selected="false">LISTAS</a>
+ <%
+ }
+ %>
<a class="nav-item nav-link " id="refSeguidores" data-toggle="tab" href="#seguidores" role="tab" aria-controls="nav-SEGUIDORES" aria-selected="false">SEGUIDORES</a>
<a class="nav-item nav-link " id="refSeguidos" data-toggle="tab" href="#seguidos" role="tab" aria-controls="nav-SEGUIDOS" aria-selected="false">SEGUIDOS</a>
</div>
@@ -163,8 +186,21 @@
<div class="tab-content" id="nav-tabContent">
<!-- Pestaña de videos -->
- <div class="tab-pane fade show active" id="videos" role="tabpanel" aria-labelledby="nav-VIDEO-tab">
- <br>
+ <%
+ if (ps.equals("VIDEOS")) {
+ %>
+
+ <div class="tab-pane fade show active" id="videos" role="tabpanel" aria-labelledby="nav-VIDEO-tab">
+ <br>
+ <%
+ } else {
+ %>
+ <div class="tab-pane fade show" id="videos" role="tabpanel" aria-labelledby="nav-VIDEO-tab">
+ <br>
+ <%
+ }
+ %>
+
<%
for (DtVideo v : videos) {
String urlEmbebida = Funciones.Funciones.obtenerEnlaceEmbebido(
@@ -202,8 +238,21 @@
</div>
<!-- Pestaña de listas de reproduccion -->
- <div class="tab-pane fade show" id="listas" role="tabpanel" aria-labelledby="nav-LISTAS-tab">
+
+ <%
+ if (ps.equals("LISTAS")) {
+ %>
+
+ <div class="tab-pane fade show active" id="listas" role="tabpanel" aria-labelledby="nav-LISTAS-tab">
<br><ul class="list-group">
+ <%
+ } else {
+ %>
+ <div class="tab-pane fade show" id="listas" role="tabpanel" aria-labelledby="nav-LISTAS-tab">
+ <br><ul class="list-group">
+ <%
+ }
+ %>
<%
for (DtListaDeReproduccion l : listasRep) {
%>
diff --git a/UyTube_web/web/ConsultaVideo.jsp b/UyTube_web/web/ConsultaVideo.jsp
index c3ae529bd6fc4cc093b38dba1f948360b454aba2..006d3b95bdad1de2f2715663c791231c592be3f5 100644
--- a/UyTube_web/web/ConsultaVideo.jsp
+++ b/UyTube_web/web/ConsultaVideo.jsp
@@ -49,11 +49,11 @@
<%
if (sesionIniciada) {
%>
- <%@ include file='include/header-usuario.html' %>
+ <%@ include file='include/header-usuario.jsp' %>
<%
} else {
%>
- <%@ include file='include/header-visitante.html' %>
+ <%@ include file='include/header-visitante.jsp' %>
<%
}
%>
@@ -75,11 +75,11 @@
<%
if (sesionIniciada) {
%>
- <%@ include file='include/menu-usuario.html' %>
+ <%@ include file='include/menu-usuario.jsp' %>
<%
} else {
%>
- <%@ include file='include/menu-visitante.html' %>
+ <%@ include file='include/menu-visitante.jsp' %>
<%
}
%>
diff --git a/UyTube_web/web/ConsultarListaReproduccion.jsp b/UyTube_web/web/ConsultarListaReproduccion.jsp
index e0975e328e263d8d32a4e734f451c6828f0a53b1..5ba62843d304c86dd23ecedac97f57b9664f233c 100644
--- a/UyTube_web/web/ConsultarListaReproduccion.jsp
+++ b/UyTube_web/web/ConsultarListaReproduccion.jsp
@@ -1,17 +1,150 @@
<%--
- Document : ConsultarListaReproduccion
- Created on : 09/10/2019, 07:35:55 PM
+ Document : Buscar
+ Created on : 09/10/2019, 07:55:42 PM
Author : administrador
--%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
-<html>
+
+<html lang="es">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>JSP Page</title>
+ <meta charset="UTF-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+ <link rel="stylesheet" type="text/css" href="css/bootstrap.css">
+ <link rel="stylesheet" type="text/css" href="css/body.css">
+ <link rel="stylesheet" type="text/css" href="css/header.css">
+ <link rel="stylesheet" type="text/css" href="css/menu.css">
+ <link rel="stylesheet" type="text/css" href="css/widget.css">
+ <link rel="stylesheet" type="text/css" href="css/footer.css">
+ <link rel="stylesheet" type="text/css" href="css/contenido-buscar.css">
+ <link rel="stylesheet" type="text/css" href="iconos/style.css">
+ <link rel="icon" type="image/png" href="imagenes/icono.png" />
+ <title>UyTube</title>
</head>
<body>
- <h1>ConsultarListaReproduccion</h1>
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-12">
+ <!-- Inclusion de la barra superior -->
+
+ <%@ include file='include/header-visitante.jsp' %>
+
+
+
+ </div>
+ </div>
+ </div>
+
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-12">
+ <div class="relleno-header"></div>
+ </div>
+ </div>
+ </div>
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-12">
+ <section class="principal">
+ <%@ include file='include/menu-visitante.jsp' %>
+
+ <div class="contenido">
+ <section class="contenido-flexible">
+ <div class="container">
+
+ <!-- INFORMACION LISTA.REP-->
+ <div class="d-flex bd-highlight">
+ <div class="bd-highlight">
+ <img src="imagenes/lista.jpg" width="246" height="138">
+ </div>
+ <div class="pl-3 p-2 bd-highlight">
+ <h5>Nombre: </h5>
+ <h5>Tipo:</h5>
+ <h5>Privacidad:</h5>
+ <h5>Categoria:</h5>
+ </div>
+ <div class="p-2 bd-highlight">
+ <h5>Las_pindongas_playList</h5>
+ <h5>PARTICULAR</h5>
+ <h5>PÚBLICA</h5>
+ <h5>MUSICA</h5>
+ </div>
+ <div class="p-2 d-flex align-items-end">
+ <button type="button" class="btn btn-primary">Modificar</button>
+ </div>
+ </div>
+
+ <!--FIN INFORMACION LISTA.REP-->
+ <hr>
+ <h3>VIDEOS:</h3>
+
+
+ <!--LISTA DE CONTENIDO-->
+
+ <div class="tab-pane fade show active" id="videos" role="tabpanel" aria-labelledby="nav-VIDEO-tab">
+ <!--PRIMER VIDEO-->
+ <div class="video">
+ <div class="bd-highlight caja-imagen">
+ <div class="bd-highlight">
+ <a href="#">
+ <img src="imagenes/ukp.jpg" width="246" height="138">
+ </a>
+ </div>
+ </div>
+ <div class="bd-highlight caja-texto justify-content-start">
+ <div class="bg-light" >
+ <h5 class="mt-0">
+ <a href="#">
+
+ </a>
+ </h5>
+ <h4>Descripcion:</h4>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+ </div>
+ </div>
+ </div>
+ <!--SEGUNDO VIDEO-->
+ <div class="video">
+ <div class="bd-highlight caja-imagen">
+ <div class="bd-highlight">
+ <a href="#">
+ <img src="imagenes/ukp.jpg" width="246" height="138">
+ </a>
+ </div>
+ </div>
+ <div class="bd-highlight caja-texto justify-content-start">
+ <div class="bg-light" >
+ <h5 class="mt-0">
+ <a href="#">
+
+ </a>
+ </h5>
+ <h4>Descripcion:</h4>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+ </div>
+ </div>
+ </div>
+ <br>
+ </div>
+
+ <!--FIN de LISTA DE CONTENIDO-->
+
+ </div>
+ </section>
+ </div>
+ </section>
+ </div>
+ </div>
+ </div>
+
+ <%@ include file='include/widgets.html' %>
+ <%@ include file='include/footer.html' %>
+
+ <script src="js/jquery-3.4.1.min.js"></script>
+ <script src="js/bootstrap.bundle.min.js"></script>
+ <script src="js/bootstrap.min.js"></script>
+ <script src="js/funciones.js"></script>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/UyTube_web/web/IniciarSesion.jsp b/UyTube_web/web/IniciarSesion.jsp
index 1b3af1e08438cd2498b3683940d165b7d2217045..590806ba7d314335f0ad68f0ddfad596b59602fa 100644
--- a/UyTube_web/web/IniciarSesion.jsp
+++ b/UyTube_web/web/IniciarSesion.jsp
@@ -27,7 +27,7 @@
<div class="container-fluid">
<div class="row">
<div class="col-12">
- <%@ include file='include/header-visitante.html' %>
+ <%@ include file='include/header-visitante.jsp' %>
</div>
</div>
</div>
@@ -42,7 +42,7 @@
<div class="row">
<div class="col-12">
<section class="principal">
- <%@ include file='include/menu-visitante.html' %>
+ <%@ include file='include/menu-visitante.jsp' %>
<div class="contenido">
<section class="contenido-flexible">
diff --git a/UyTube_web/web/ModificarListaReproduccion.jsp b/UyTube_web/web/ModificarListaReproduccion.jsp
index 2de32a02c18af20ee18f5a586ba85e06929e312e..19bd64ef8f144ac00c672c655a7511d38b4617ed 100644
--- a/UyTube_web/web/ModificarListaReproduccion.jsp
+++ b/UyTube_web/web/ModificarListaReproduccion.jsp
@@ -1,17 +1,108 @@
<%--
- Document : ModificarListaReproduccion
- Created on : 09/10/2019, 07:39:46 PM
+ Document : ConsultaUsuario
+ Created on : 07/10/2019, 01:25:13 AM
Author : administrador
--%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
-<html>
+<html lang="es">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>JSP Page</title>
+ <meta charset="UTF-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+ <link rel="stylesheet" type="text/css" href="css/bootstrap.css">
+ <link rel="stylesheet" type="text/css" href="css/body.css">
+ <link rel="stylesheet" type="text/css" href="css/header.css">
+ <link rel="stylesheet" type="text/css" href="css/menu.css">
+ <link rel="stylesheet" type="text/css" href="css/widget.css">
+ <link rel="stylesheet" type="text/css" href="css/footer.css">
+ <link rel="stylesheet" type="text/css" href="css/contenido-consulta-usuario.css">
+ <link rel="stylesheet" type="text/css" href="iconos/style.css">
+ <link rel="icon" type="image/png" href="imagenes/icono.png" />
+ <title>UyTube - Nueva Lista</title>
</head>
<body>
- <h1>ModificarListaReproduccion</h1>
+
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-12">
+ <!-- Inclusion de la barra superior -->
+ <%@ include file='include/header-visitante.jsp' %>
+ </div>
+ </div>
+ </div>
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-12">
+ <div class="relleno-header"></div>
+ </div>
+ </div>
+ </div>
+ <div class="container-fluid">
+ <div class="row">
+ <div class="col-12">
+ <section class="principal">
+ <!-- Inclusion del menu lateral -->
+ <%@ include file='include/menu-visitante.jsp' %>
+ <div class="contenido">
+ <section class="contenido-flexible">
+ <div class="container">
+
+ <!-- Agregar Listas-->
+ <div class="d-flex flex-row justify-content-center">
+ <form class="form-signin" action="/uytube/usuario-agregar" method="post">
+ <br>
+ <br>
+ <h1 class="h3 mb-4 font-weight-normal" id="Texto_ingrese">Ingrese sus datos</h1>
+ <div class="mb-5">
+ <input type="text" class="form-control" name="nombreL" id="nombreLista" placeholder="Nombre de la lista" required>
+ </div>
+
+
+ <div class="row">
+ <div class="col-md-5">
+ <label class="">Privacidad </label>
+ </div>
+ <div class="col-md-4 custom-control custom-radio">
+ <input id="publico_1" name="privacidad_1" type="radio" class="custom-control-input" checked >
+ <label class="custom-control-label" for="publico_1">Publico</label>
+ </div>
+ <div class="col-md-3 custom-control custom-radio">
+ <input id="privado_1" name="privacidad_1" type="radio" class="custom-control-input" >
+ <label class="custom-control-label" for="privado_1">Privado</label>
+ </div>
+ </div>
+
+
+ <hr class="mb-4">
+
+ <div class="bd-light " >
+ <div class="btn-toolbar justify-content-end" role="toolbar" aria-label="Toolbar with button groups">
+ <div class="p-2 btn-group mr-2" role="group" aria-label="Third group">
+ <button type="button" class="btn btn-danger">CANCELAR</button>
+ </div>
+ <div class="p-2 btn-group" role="group" aria-label="Third group">
+ <button type="button" class="btn btn-primary">ACEPTAR</button>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </section>
+ </div>
+ </section>
+ </div>
+ </div>
+ </div>
+
+ <%@ include file='include/widgets.html' %>
+ <%@ include file='include/footer.html' %>
+
+ <script src="js/jquery-3.4.1.min.js"></script>
+ <script src="js/bootstrap.bundle.min.js"></script>
+ <script src="js/bootstrap.min.js"></script>
+ <script src="js/funciones.js"></script>
</body>
</html>
diff --git a/UyTube_web/web/ModificarUsuario.jsp b/UyTube_web/web/ModificarUsuario.jsp
index 2a423efaa28e88d7a41776190164c5245867babb..5d3aec7e337d5bc08118b88d5bf13d3674956dd8 100644
--- a/UyTube_web/web/ModificarUsuario.jsp
+++ b/UyTube_web/web/ModificarUsuario.jsp
@@ -43,11 +43,11 @@
<%
if (sesionIniciada){
%>
- <%@ include file='include/header-usuario.html' %>
+ <%@ include file='include/header-usuario.jsp' %>
<%
}else{
%>
- <%@ include file='include/header-visitante.html' %>
+ <%@ include file='include/header-visitante.jsp' %>
<%
}
%>
@@ -69,11 +69,11 @@
<%
if (sesionIniciada) {
%>
- <%@ include file='include/menu-usuario.html' %>
+ <%@ include file='include/menu-usuario.jsp' %>
<%
} else {
%>
- <%@ include file='include/menu-visitante.html' %>
+ <%@ include file='include/menu-visitante.jsp' %>
<%
}
%>
diff --git a/UyTube_web/web/ModificarVideo.jsp b/UyTube_web/web/ModificarVideo.jsp
index 167f5c5f44de3795a8b75a0ea4ec2db03c56c310..13f02bede46e8f1a416e90cdb0d684a3a8641e7c 100644
--- a/UyTube_web/web/ModificarVideo.jsp
+++ b/UyTube_web/web/ModificarVideo.jsp
@@ -37,11 +37,11 @@
<%
if (sesionIniciada) {
%>
- <%@ include file='include/header-usuario.html' %>
+ <%@ include file='include/header-usuario.jsp' %>
<%
} else {
%>
- <%@ include file='include/header-visitante.html' %>
+ <%@ include file='include/header-visitante.jsp' %>
<%
}
%>
@@ -60,11 +60,11 @@
<%
if (sesionIniciada) {
%>
- <%@ include file='include/menu-usuario.html' %>
+ <%@ include file='include/menu-usuario.jsp' %>
<%
} else {
%>
- <%@ include file='include/menu-visitante.html' %>
+ <%@ include file='include/menu-visitante.jsp' %>
<%
}
%>
diff --git a/UyTube_web/web/Presentacion.jsp b/UyTube_web/web/Presentacion.jsp
index 9a942f03fd1007b5ac9191373de973b474aaff23..7204217fb048c627885be3e9986f1a738ce71d37 100644
--- a/UyTube_web/web/Presentacion.jsp
+++ b/UyTube_web/web/Presentacion.jsp
@@ -35,11 +35,11 @@
<%
if (sesionIniciada) {
%>
- <%@ include file='include/header-usuario.html' %>
+ <%@ include file='include/header-usuario.jsp' %>
<%
} else {
%>
- <%@ include file='include/header-visitante.html' %>
+ <%@ include file='include/header-visitante.jsp' %>
<%
}
%>
@@ -58,11 +58,11 @@
<%
if (sesionIniciada) {
%>
- <%@ include file='include/menu-usuario.html' %>
+ <%@ include file='include/menu-usuario.jsp' %>
<%
} else {
%>
- <%@ include file='include/menu-visitante.html' %>
+ <%@ include file='include/menu-visitante.jsp' %>
<%
}
%>
diff --git a/UyTube_web/web/include/header-usuario.html b/UyTube_web/web/include/header-usuario.jsp
similarity index 74%
rename from UyTube_web/web/include/header-usuario.html
rename to UyTube_web/web/include/header-usuario.jsp
index b19e3babee8dda7c5dfbef34b68bea6a6d2148d4..cdc1bcb044cf03d9e65d14cdd21f2c9a85c743ad 100644
--- a/UyTube_web/web/include/header-usuario.html
+++ b/UyTube_web/web/include/header-usuario.jsp
@@ -1,3 +1,6 @@
+<%@page import="Logica.DataType.DtUsuario"%>
+<%@page import="Logica.Interfaces.IUsuario"%>
+<%@page import="Logica.Fabrica"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<!--
@@ -6,13 +9,18 @@ To change this template file, choose Tools | Templates
and open the template in the editor.
-->
<div class="container-fluid">
+ <%
+ IUsuario sys = Fabrica.getInstancia().getIUsuario();
+ DtUsuario usu = sys.obtenerUsuarioActual();
+
+ %>
<div class="row">
<div class="col-12">
<header class="header">
<nav>
<div class="navbar-dark item-header item-header1" id="navLogo">
<label class="icon-menu1"></label>
- <img class="fotoLogo" src="imagenes/logoChico.jpeg" alt="UyTube">
+ <a href="/uytube/presentacion"><img class="fotoLogo" src="imagenes/logoChico.jpeg" alt="UyTube"></a>
</div>
<div class="navbar-dark item-header item-header2">
<div id="navbarSupportedContent">
@@ -24,10 +32,10 @@ and open the template in the editor.
</div>
<div class="perfil item-header item-header3 flex-row justify-content-lg-space-between">
<div class="flex-row justify-content-lg-space-between alig-content-center" id="nombrePerfil">
- <%= session.getAttribute("usuario")%>
+ <%= usu.getNickname() %>
</div>
<div>
- <img id="fotoPerfil" src=<%= session.getAttribute("imgen") %> alt="Perfil">
+ <img id="fotoPerfil" src=<%= usu.getImagen() %> alt="Perfil">
</div>
</div>
diff --git a/UyTube_web/web/include/header-visitante.html b/UyTube_web/web/include/header-visitante.jsp
similarity index 91%
rename from UyTube_web/web/include/header-visitante.html
rename to UyTube_web/web/include/header-visitante.jsp
index 5d8f9632b6088b9342798682306581197c059e61..479363670af5cf4bfb2159c797633f656a500522 100644
--- a/UyTube_web/web/include/header-visitante.html
+++ b/UyTube_web/web/include/header-visitante.jsp
@@ -10,7 +10,7 @@ Header para el visitante
<nav>
<div class="navbar-dark item-header item-header1" id="navLogo">
<label class="icon-menu1"></label>
- <img class="fotoLogo" src="imagenes/logoChico.jpeg" alt="UyTube">
+ <a href="/uytube/presentacion"><img class="fotoLogo" src="imagenes/logoChico.jpeg" alt="UyTube"></a>
</div>
<div class="navbar-dark item-header item-header2">
<div id="navbarSupportedContent">
diff --git a/UyTube_web/web/include/menu-usuario.html b/UyTube_web/web/include/menu-usuario.html
deleted file mode 100644
index f5c24391663d5f1b361aaf6db2a170b4251e5ce2..0000000000000000000000000000000000000000
--- a/UyTube_web/web/include/menu-usuario.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!--
-Menú para el usuario logueado
--->
-<aside class="menu" >
- <ul>
- <li>
- <span>
- <label class="icon-menu1"></label>
- <img class="fotoLogo" src="imagenes/logoChico.jpeg" alt="UyTube">
- </span>
- </li>
- <li><a href="/uytube/usuario-consultar"><span class="icon-user"></span> Mi Perfil</a></li>
- <li><a href="/uytube/video-agregar"><span class="icon-upload3"></span> Subir video</a></li>
- <li><a href=""><span class="icon-video-camera"></span> Ver videos</a></li>
- <li class="titulo">LISTAS</li>
- <li><a href="/uytube/lista-agregar"><span class="icon-add-to-list"></span> Crear lista</a></li>
-
- <li><a href="/uytube/categoria-listar"> CategorÃas</a></li>
- <li class="salir"><a href="/uytube/cerrar-sesion"><span class="icon-exit"></span> SALIR</a></li>
- </ul>
-</aside>
\ No newline at end of file
diff --git a/UyTube_web/web/include/menu-usuario.jsp b/UyTube_web/web/include/menu-usuario.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..77ffae5b8da7344d454d9909b173f9ea6c969cf4
--- /dev/null
+++ b/UyTube_web/web/include/menu-usuario.jsp
@@ -0,0 +1,32 @@
+<%@page import="Logica.DataType.DtUsuario"%>
+<%@page import="Logica.Interfaces.IUsuario"%>
+<%@page import="Logica.Fabrica"%>
+<!DOCTYPE html>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!--
+Menú para el usuario logueado
+-->
+<aside class="menu" >
+ <%
+ IUsuario sys = Fabrica.getInstancia().getIUsuario();
+ DtUsuario usu = sys.obtenerUsuarioActual();
+ %>
+ <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"> <%= usu.getNickname() %> </li>
+ <li><a href="/uytube/usuario-consultar?id=<%= usu.getNickname()%>" ><span class="icon-user"></span> Mi perfil</a></li>
+ <li><a href="usuario-consultar?id=<%= usu.getNickname()%>&ps=VIDEOS"><span class="icon-video-camera"></span> Mis videos</a></li>
+ <li><a href="usuario-consultar?id=<%= usu.getNickname()%>&ps=LISTAS"><span class="icon-list"></span> Mis listas</a></li>
+ <li class="titulo">Agregar</li>
+ <li><a href="/uytube/video-agregar"><span class="icon-upload3"></span> Subir video</a></li>
+ <li><a href="/uytube/lista-agregar"><span class="icon-add-to-list"></span> Crear lista</a></li>
+ <li class="salir"><a href="/uytube/cerrar-sesion"><span class="icon-exit"></span> SALIR</a></li>
+ </ul>
+</aside>
\ No newline at end of file
diff --git a/UyTube_web/web/include/menu-visitante.html b/UyTube_web/web/include/menu-visitante.html
deleted file mode 100644
index d8654f5e33b457c07f92cdea48b0c5e225b68e4c..0000000000000000000000000000000000000000
--- a/UyTube_web/web/include/menu-visitante.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!DOCTYPE html>
-<!--
-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><a href="/uytube/presentacion"><span class="icon-user"></span> Inicio</a></li>
- <!-- <li class="titulo">VIDEOS</li> -->
- <li><a href=""><span class="icon-video-camera"></span> Ver videos</a></li>
- <!-- <li class="titulo">LISTAS</li> -->
- <li><a href=""> Ver Listas</a></li>
- <li><a href=""> Ver CategorÃas</a></li>
- <!-- <li class="titulo">CATEGORIAS</li> -->
- <li><a href="/uytube/usuario-agregar"> Registrarse</a></li>
- </ul>
-</aside>
\ No newline at end of file
diff --git a/UyTube_web/web/include/menu-visitante.jsp b/UyTube_web/web/include/menu-visitante.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..f75ad7ca0162a4f8678c3ac765fbeb6e206c2f33
--- /dev/null
+++ b/UyTube_web/web/include/menu-visitante.jsp
@@ -0,0 +1,23 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<!--
+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?texto="><span class="icon-magnifying-glass"></span> Buscar</a></li>
+ <li class="titulo">Cuenta</li>
+ <li><a href="/uytube/usuario-agregar"><span class="icon-add-user"></span> Crear cuenta</a></li>
+ <li><a href="/uytube/inicio-sesion"><span class="icon-login"></span> Iniciar sesion</a></li>
+ </ul>
+</aside>
\ No newline at end of file
diff --git a/UyTube_web/web/index.jsp b/UyTube_web/web/index.jsp
index fa6390a4c7e59cbe89e25f3146d9bf6a48e10f85..a9e4a149ec84f26a8c858a160c70de96d5e75ce5 100644
--- a/UyTube_web/web/index.jsp
+++ b/UyTube_web/web/index.jsp
@@ -24,7 +24,7 @@
</head>
<body>
- <%@ include file='include/header-visitante.html' %>
+ <%@ include file='include/header-visitante.jsp' %>
<div class="container-fluid">
<div class="row">
<div class="col-12">