From 607fad77ac7549732b2ab13eb8a4aefb62480878 Mon Sep 17 00:00:00 2001
From: JotaJota96 <jjap96@gmail.com>
Date: Sat, 12 Oct 2019 01:44:47 -0300
Subject: [PATCH] A medio mergear

---
 .../src/java/com/uytube/ModificarVideo.java   | 28 +------------------
 UyTube_web/web/AltaUsuario.jsp                |  2 +-
 UyTube_web/web/AltaVideo.jsp                  |  2 +-
 UyTube_web/web/ConsultaUsuario.jsp            |  4 +--
 UyTube_web/web/ModificarVideo.jsp             |  2 +-
 5 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/UyTube_web/src/java/com/uytube/ModificarVideo.java b/UyTube_web/src/java/com/uytube/ModificarVideo.java
index ef4c119..d9abf8c 100644
--- a/UyTube_web/src/java/com/uytube/ModificarVideo.java
+++ b/UyTube_web/src/java/com/uytube/ModificarVideo.java
@@ -28,32 +28,6 @@ import javax.servlet.http.HttpServletResponse;
  */
 public class ModificarVideo extends HttpServlet {
 
-    /**
-     * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
-     * methods.
-     *
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");
-        try (PrintWriter out = response.getWriter()) {
-            /* TODO output your page here. You may use following sample code. */
-            out.println("<!DOCTYPE html>");
-            out.println("<html>");
-            out.println("<head>");
-            out.println("<title>Servlet ModificarVideo</title>");
-            out.println("</head>");
-            out.println("<body>");
-            out.println("<h1>Servlet ModificarVideo at " + request.getContextPath() + "</h1>");
-            out.println("</body>");
-            out.println("</html>");
-        }
-    }
-
     // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
     /**
      * Handles the HTTP <code>GET</code> method.
@@ -131,7 +105,7 @@ public class ModificarVideo extends HttpServlet {
             DtVideo vid = new DtVideo(0, pNombre, pDescripcion, duracion, data, pUrl, Priv, pCategoria, 0, 0);
 
             sys.modificarVideo(vid);
-            response.sendRedirect("/uytube/buscar?texto="+vid.getNombre());
+            response.sendRedirect("buscar?texto="+vid.getNombre());
         } catch (Exception e) {
             System.out.println(e.getMessage());
             RequestDispatcher rd; //objeto para despachar
diff --git a/UyTube_web/web/AltaUsuario.jsp b/UyTube_web/web/AltaUsuario.jsp
index 9c9b468..07a4696 100644
--- a/UyTube_web/web/AltaUsuario.jsp
+++ b/UyTube_web/web/AltaUsuario.jsp
@@ -20,7 +20,7 @@
        	<link rel="stylesheet" type="text/css" href="css/contenido-alta-usuario.css">
         <link rel="stylesheet" type="text/css" href="iconos/style.css">
         
-        <title>UyTube</title>
+        <title>UyTube - Registrarse</title>
     </head>
     <body>
 
diff --git a/UyTube_web/web/AltaVideo.jsp b/UyTube_web/web/AltaVideo.jsp
index ecb3aec..ba45b55 100644
--- a/UyTube_web/web/AltaVideo.jsp
+++ b/UyTube_web/web/AltaVideo.jsp
@@ -26,7 +26,7 @@
         <link rel="stylesheet" type="text/css" href="css/contenido-alta-video.css">	
         <link rel="stylesheet" type="text/css" href="iconos/style.css">
         <link rel="icon" type="image/png" href="imagenes/icono.png" />
-        <title>UyTube</title>
+        <title>UyTube - Agregar video</title>
     </head>
     <body>
 
diff --git a/UyTube_web/web/ConsultaUsuario.jsp b/UyTube_web/web/ConsultaUsuario.jsp
index 54f30d1..2badb60 100644
--- a/UyTube_web/web/ConsultaUsuario.jsp
+++ b/UyTube_web/web/ConsultaUsuario.jsp
@@ -180,7 +180,7 @@
                                                 </div>
                                                 <div class="p-1 flex-shrink-1 bd-highlight ">
                                                     <div class="overflow-auto p-1 mb-3 mb-md-0 mr-md-3 bg-light" style="max-width: 530px; max-height: 170px;">
-                                                        <a href="/video-consultar?id=<%= v.getId()%>">
+                                                        <a href="video-consultar?id=<%= v.getId()%>">
                                                             <h5 class="mt-0"><%= v.getNombre()%></h5>
                                                         </a>
                                                         <p><%= v.getDescripcion()%></p>
@@ -208,7 +208,7 @@
                                                     for (DtListaDeReproduccion l : listasRep) {
                                                 %>
                                                 <li class="list-group-item d-flex justify-content-between align-items-center">
-                                                    <a href="/lista-consultar?id=<%= l.getId()%>">
+                                                    <a href="lista-consultar?id=<%= l.getId()%>">
                                                         <%= l.getNombre()%>
                                                     </a>
                                                 </li>
diff --git a/UyTube_web/web/ModificarVideo.jsp b/UyTube_web/web/ModificarVideo.jsp
index 2d548ff..167f5c5 100644
--- a/UyTube_web/web/ModificarVideo.jsp
+++ b/UyTube_web/web/ModificarVideo.jsp
@@ -30,7 +30,7 @@
         <link rel="stylesheet" type="text/css" href="css/contenido-alta-video.css">	
         <link rel="stylesheet" type="text/css" href="iconos/style.css">
         <link rel="icon" type="image/png" href="imagenes/icono.png" />
-        <title>UyTube</title>
+        <title>UyTube - Modificar <%= video.getNombre() %></title>
     </head>
     <body>
 
-- 
GitLab