Merge branch 'develop' of…

Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp into sendemail3

Merge branch 'develop' of…
Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp into sendemail3
67f08ed1 · Nahuel Mereles Rodriguez · bf925f0c · e5804c67 · 67f08ed1 · 67f08ed1
Commit 67f08ed1 authored May 18, 2022 by Nahuel Mereles Rodriguez
6 changed files
--- a/src/main/webapp/formulario_bootcamp.jsp
+++ b/src/main/webapp/formulario_bootcamp.jsp
@@ -23,6 +23,10 @@
    </head>

    <body>
+        <div class="botones"><a href="logout">LOGOUT</a><br>
+        <a href="index.html">INICIO</a><br>
+        <a href="menu.jsp">MENU</a><br>
+        </div>
        <div class="container">
            <h1> CREAR BOOTCAMP </h1>


--- a/src/main/webapp/formulario_lenguaje.jsp
+++ b/src/main/webapp/formulario_lenguaje.jsp
@@ -25,7 +25,15 @@
    </head>

    <body>
+        <div class="botones"><a href="logout">LOGOUT</a><br>
+                    <a href="index.html">INICIO</a><br>
+                    <a href="menu.jsp">MENU</a><br>
+                    </div>
+
+
+
        <div>
+
            <h1> CREAR LENGUAJE </h1>

            <%@ page import="com.roshka.proyectofinal.entity.Lenguaje, com.roshka.proyectofinal.lenguaje.LenguajeDao, java.util.List,java.util.Iterator" %>

--- a/src/main/webapp/formulario_profesor.jsp
+++ b/src/main/webapp/formulario_profesor.jsp
@@ -25,8 +25,12 @@
    </head>

    <body>
-
+        <div class="botones"><a href="logout">LOGOUT</a><br>
+        <a href="index.html">INICIO</a><br>
+        <a href="menu.jsp">MENU</a><br>
+        </div>
        <div>
+
            <h1> CREAR PROFESOR Y FILTRAR </h1>

            <%@ page import="com.roshka.proyectofinal.entity.Profesor, com.roshka.proyectofinal.profesor.ProfesorDao, java.util.List,java.util.Iterator" %>

--- a/src/main/webapp/menu.css
+++ b/src/main/webapp/menu.css
@@ -52,3 +52,7 @@
  .menu li:hover {
    background-color: rgb(18, 18, 98);
  }
+
+ .botones a{
+    color: black;
+ }
\ No newline at end of file
--- a/src/main/webapp/menu.jsp
+++ b/src/main/webapp/menu.jsp
@@ -8,10 +8,6 @@

            }%>

-
-
-
-
 <!DOCTYPE html>
 <html>

@@ -52,6 +48,10 @@
    a {
        color: white;
    }
+    .botones a {
+
+    color: black;
+    }
    
    .menu {
        width: 50%;
@@ -81,6 +81,12 @@
 </head>

 <body>
+     <div class="botones">
+            <a href="logout">LOGOUT</a><br>
+            <a href="index.html">INICIO</a><br>
+     </div>
+
+

    <div class="header">
        <h1> MENU TH</h1>

--- a/src/main/webapp/postulante-consulta.jsp
+++ b/src/main/webapp/postulante-consulta.jsp
+   <%@ page import= "jakarta.servlet.http.* , java.lang.Object" %>
+			<%HttpSession session1 = request.getSession(true);
+			Object done = session1.getAttribute("logon.isDone");
+			 if (done == null) {
+				session1.setAttribute("login.target", HttpUtils.getRequestURL(request).toString());
+				response.sendRedirect(request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() +"/login.jsp");
+				return;
+
+            }%>
+
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
 <%@ taglib uri = "http://java.sun.com/jsp/jstl/core" prefix = "c" %>
 <!DOCTYPE html>