Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamu <samurey@gmail.com>2013-05-15 20:20:01 (GMT)
committer Samu <samurey@gmail.com>2013-05-15 20:20:01 (GMT)
commite3d531ea9870f72dd677fc84484020eca617fb4c (patch)
treeb95ac87d6269a284745a01749ae1d9a07ecfad47
parent42b83a85293bc32882faa2d03b8b96971e138346 (diff)
template en todas las vistas
Diffstat
-rw-r--r--EjercitarWeb/WebContent/Asignatura.jsp4
-rw-r--r--EjercitarWeb/WebContent/Concepto.jsp5
-rw-r--r--EjercitarWeb/WebContent/Ejercicios.jsp7
-rw-r--r--EjercitarWeb/WebContent/Tema.jsp6
-rw-r--r--EjercitarWeb/WebContent/menu_principal.jsp4
-rw-r--r--EjercitarWeb/WebContent/profesor.jsp5
-rw-r--r--EjercitarWeb/WebContent/vista_asignatura.jsp12
-rw-r--r--EjercitarWeb/src/src/CargarConceptosServlet.java2
8 files changed, 35 insertions, 10 deletions
diff --git a/EjercitarWeb/WebContent/Asignatura.jsp b/EjercitarWeb/WebContent/Asignatura.jsp
index 760a027..7ad70b0 100644
--- a/EjercitarWeb/WebContent/Asignatura.jsp
+++ b/EjercitarWeb/WebContent/Asignatura.jsp
@@ -1,6 +1,8 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ include file="templateCSS.jsp" %>
+
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -8,6 +10,7 @@
</head>
<body>
<%@page import="model.Curso" import="java.util.List" %>
+<div id="content">
<form id="form1" name="form1" method="post" action="">
<div>
<p class="Estilo1">Ingresar Nueva Asignatura:</p>
@@ -45,5 +48,6 @@
</tr>
</table>
</form>
+</div>
</body>
</html> \ No newline at end of file
diff --git a/EjercitarWeb/WebContent/Concepto.jsp b/EjercitarWeb/WebContent/Concepto.jsp
index 5eed961..701676c 100644
--- a/EjercitarWeb/WebContent/Concepto.jsp
+++ b/EjercitarWeb/WebContent/Concepto.jsp
@@ -1,6 +1,8 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ include file="templateCSS.jsp" %>
+
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -8,7 +10,7 @@
</head>
<body>
<%@page import="java.util.List" import="model.Tema" import = "model.Profesor" %>
-
+ <div id="content">
<form style="width: 1071px; height: 521px;" method="post" name="ejercicio_form">
<br>
<% Profesor profesor = (Profesor) request.getSession().getAttribute("profesor");%>
@@ -41,6 +43,7 @@
<input type="submit" name="Aceptar" value="Aceptar1">
</form>
+ </div>
</body>
diff --git a/EjercitarWeb/WebContent/Ejercicios.jsp b/EjercitarWeb/WebContent/Ejercicios.jsp
index 02bd5bd..f2045f6 100644
--- a/EjercitarWeb/WebContent/Ejercicios.jsp
+++ b/EjercitarWeb/WebContent/Ejercicios.jsp
@@ -1,14 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
+<%@ include file="templateCSS.jsp" %>
+
<head><meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
<title></title>
<script src="http://code.jquery.com/jquery-latest.js"></script>
</head>
<body>
-
+
<%@page import="java.util.List" import="model.Tema" import="model.Profesor"%>
-
+ <div id="content">
<form style="width: 1071px; height: 521px;" method="post" name="ejercicio_form">
@@ -68,5 +70,6 @@
$("#conceptos").load("CargarConceptosServlet", {tema_id:tema_id})
}
</script>
+ <div id="content">
</body>
</html> \ No newline at end of file
diff --git a/EjercitarWeb/WebContent/Tema.jsp b/EjercitarWeb/WebContent/Tema.jsp
index c5f90b2..cf1459a 100644
--- a/EjercitarWeb/WebContent/Tema.jsp
+++ b/EjercitarWeb/WebContent/Tema.jsp
@@ -2,13 +2,15 @@
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
+<%@ include file="templateCSS.jsp" %>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Tema</title>
</head>
<body>
<%@page import="java.util.List" import="model.Asignatura" %>
-
+
+<div id="content">
<form style="width: 1071px; height: 521px;" method="post" name="ejercicio_form">
<br>
Profesor: <input name="profesor" id="profesor">
@@ -32,5 +34,7 @@
<input type="submit" name="Aceptar" value="Aceptar1">
</form>
+
+</div>
</body>
</html> \ No newline at end of file
diff --git a/EjercitarWeb/WebContent/menu_principal.jsp b/EjercitarWeb/WebContent/menu_principal.jsp
index e9ca2f6..8fb0c3e 100644
--- a/EjercitarWeb/WebContent/menu_principal.jsp
+++ b/EjercitarWeb/WebContent/menu_principal.jsp
@@ -56,8 +56,8 @@ Ceci Godoy - Samu Reyes - FP-UNA
<% for(Asignatura asignatura : asignaturaList) {%>
<tr bordercolor="#000000">
<td bgcolor="#CCCCCC"><span class="Estilo17"><a href="/EjercitarWeb/VistaAsignaturaServlet?asignatura=<%= asignatura.getIdAsignatura() %>"><%= asignatura.getNombre() %></a>></span></td>
- <td bgcolor="#CCCCCC"><span class="Estilo17"><%= asignatura.getNombre() %></span></td>
- <td bgcolor="#CCCCCC" ><span class="Estilo17"><%= asignatura.getDescripcion() %></span></td>
+ <td bgcolor="#CCCCCC"><span class="Estilo17"><%= asignatura.getCurso().getSeccion() %></span></td>
+ <td bgcolor="#CCCCCC" ><span class="Estilo17"><%= asignatura.getCurso().getEscuela().getNombre() %></span></td>
</tr>
<% } %>
</table>
diff --git a/EjercitarWeb/WebContent/profesor.jsp b/EjercitarWeb/WebContent/profesor.jsp
index 0211b4e..718013d 100644
--- a/EjercitarWeb/WebContent/profesor.jsp
+++ b/EjercitarWeb/WebContent/profesor.jsp
@@ -1,6 +1,8 @@
<%@ page contentType="text/html; charset=iso-8859-1" language="java" import="java.sql.*" errorPage="" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
+<%@ include file="templateCSS.jsp" %>
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Documento sin t&iacute;tulo</title>
@@ -15,7 +17,9 @@
</head>
<body>
+<div id="content">
<form id="form1" name="form1" method="post" action="">
+
<div>
<p class="Estilo1">Ingresar Nuevo Profesor:</p>
</div>
@@ -71,5 +75,6 @@
</tr>
</table>
</form>
+</div>
</body>
</html>
diff --git a/EjercitarWeb/WebContent/vista_asignatura.jsp b/EjercitarWeb/WebContent/vista_asignatura.jsp
index d3f75e3..90a54dd 100644
--- a/EjercitarWeb/WebContent/vista_asignatura.jsp
+++ b/EjercitarWeb/WebContent/vista_asignatura.jsp
@@ -2,6 +2,7 @@
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
+<%@ include file="templateCSS.jsp" %>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Insert title here</title>
@@ -9,12 +10,16 @@
<body>
<%@page import="model.Profesor" import="model.Concepto" import="model.Asignatura" import="model.Tema" import="java.util.List"%>
+
+<div id="content">
+
+<div >
<% Asignatura asignatura = (Asignatura) request.getAttribute("asignatura"); %>
Asignatura: <%= asignatura.getNombre() %>
+<br>
Descripcion: <%= asignatura.getDescripcion() %>
-
-
-<div align="center">
+<br>
+<br>
<a href="/EjercitarWeb/NuevoTemaServlet">Nuevo tema</a>
<br>
<a href="/EjercitarWeb/NuevoConceptoServlet">Nuevo concepto</a>
@@ -59,5 +64,6 @@ Descripcion: <%= asignatura.getDescripcion() %>
$("#tabla").load("CargarConceptosServlet", {tema_id:tema_id})
}
</script>
+</div>
</body>
</html> \ No newline at end of file
diff --git a/EjercitarWeb/src/src/CargarConceptosServlet.java b/EjercitarWeb/src/src/CargarConceptosServlet.java
index c8eb43c..47ffbac 100644
--- a/EjercitarWeb/src/src/CargarConceptosServlet.java
+++ b/EjercitarWeb/src/src/CargarConceptosServlet.java
@@ -22,7 +22,7 @@ import model.Tema;
/**
* Servlet implementation class CargarConceptosServlet
*/
-@WebServlet("/CargarConceptosServlet")
+@WebServlet("/CargarConceptosServlet")
public class CargarConceptosServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
generated by cgit v0.9.1 at 2024-05-07 13:08:49 (GMT)