se modifico el css para login y menu gral. se modifico tareas para agregar cant ejercicios.

author: cecigg <caggsld@gmail.com> 2013-11-13 11:54:57 (GMT)
committer: cecigg <caggsld@gmail.com> 2013-11-13 11:54:57 (GMT)
commit: b8fb0a6e6bf3b65cf20010b797a8b3b14951793f (patch)
tree: c007e09bd0300f77347bce120f1325e6d7c704ad /EjercitarWeb
parent: 7b12a8598a2b6f492f6e586cd480bf225cbbebcc (diff)
6 files changed, 160 insertions, 182 deletions
diff --git a/EjercitarWeb/WebContent/Tarea.jsp b/EjercitarWeb/WebContent/Tarea.jsp
index 47c5f60..f55a2ae 100644
--- a/EjercitarWeb/WebContent/Tarea.jsp
+++ b/EjercitarWeb/WebContent/Tarea.jsp
@@ -27,8 +27,15 @@
 		<input type="text" name="descripcion" id="descripcion"></input>
 	</p>
 	
+	<p>
 	<label>Concepto:</label> 
 	<select id="conceptos" multiple="multiple" name="concepto"></select>
+	</p>
+	
+	<p>
+	<label>Cantidad Ejercicios a Resolver:</label> 
+	<input type="text" name="cantejercicio" id="cantejercicio"></input>	
+	</p>
 	
 	<input type="hidden" name="lista_conceptos" id="lista_conceptos" value="asdf">
 	<input type="hidden" name="asignatura" id="asignatura" value=<%= request.getParameter("asignatura") %>>
diff --git a/EjercitarWeb/WebContent/css/estilo_ejercitar.css b/EjercitarWeb/WebContent/css/estilo_ejercitar.css
index 4101dc6..cf53787 100644
--- a/EjercitarWeb/WebContent/css/estilo_ejercitar.css
+++ b/EjercitarWeb/WebContent/css/estilo_ejercitar.css
@@ -1,63 +1,62 @@
 @CHARSET "ISO-8859-1";
 * {
-margin:0;
+	margin:0;
 }
 body
 {
-margin: 0;
-color: #000;
-background: #589188;
+	margin: 0;
+	color: #000;
+	background: #589188;
 }
 div#header {
-width: 100%;
-background-color: #FFFFFF;
-text-align: center;
-height: 80px;
-position: absolute;
-background-image: url("./img/ejercitar.png");
-background-repeat: no-repeat;
-background-position: z;
+	width: 100%;
+	background-color: #FFFFFF;
+	text-align: center;
+	height: 80px;
+	position: absolute;
+	background-image: url("./img/ejercitar.png");
+	background-repeat: no-repeat;
+	background-position: z;
 }
 
 
 div#footer
 {
-overflow: auto;
-width: 100%;
-height: 50px;
-position: absolute;
-bottom: 0;
-left: 0;
-color: #000;
-background: #D0D0D0;
-text-align:center;
-padding-top: 13px;
-clear: both;
-font-size: 90%;
+	overflow: auto;
+	width: 100%;
+	height: 50px;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	color: #000;
+	background: #D0D0D0;
+	text-align:center;
+	padding-top: 13px;
+	clear: both;
+	font-size: 90%;
 }
 div#content
 {
-padding: 1em;
-position:absolute;
-top:80px;
-overflow: auto;
-right:180px;
-left:180px;
-
+	padding: 1em;
+	position:absolute;
+	top:80px;
+	overflow: auto;
+	right:180px;
+	left:180px;
 }
 
 div#sidebar {
-width: 160px;
-height: 100%;
-top: 100px;
-position: absolute;
-left: 0;
+	width: 160px;
+	height: 100%;
+	top: 100px;
+	position: absolute;
+	left: 0;
 }
 
 div#rsidebar {
-width: 160px;
-height: 100%;
-top: 100px;
-position: absolute;
-right: 0;
+	width: 160px;
+	height: 100%;
+	top: 100px;
+	position: absolute;
+	right: 0;
 }
diff --git a/EjercitarWeb/WebContent/login.jsp b/EjercitarWeb/WebContent/login.jsp
index cbe2e1b..0eb63e3 100644
--- a/EjercitarWeb/WebContent/login.jsp
+++ b/EjercitarWeb/WebContent/login.jsp
@@ -2,48 +2,30 @@
 <!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">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<link rel="stylesheet" href="css/grey.css" />
-<title>Login</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<!--  <link rel="stylesheet" href="css/grey.css" /> -->
+	<title>Login</title>
+	<link rel="stylesheet" href="css/ejercitar-base.css" />
 </head>
-<style type="text/css">
-<!--
-
-body,td,th {
-	color: #FDDAA6;
-}
-a:link {
-	color: #00CCFF;
-}
-.Estilo2 {
-	font-family: Georgia, "Times New Roman", Times, serif;
-	color: #589188;
-	font-weight: bold;
-	font-size: 12px;
-}
-.Estilo3 {color: #CC3333}
--->
-</style>
 <body>
-<div align="center">
-<p> <%= request.getAttribute("error") %></p>
-<form id="form1" name="form1" method="post" action="" >
-  <p>&nbsp;</p>
-  <p>&nbsp;</p>
-  <p>&nbsp;</p>
-
-	<p>
-		<label style="color: black;">Usuario:</label>
-    	<input type="text" name="usuario" />
-	</p>
-    <p>
-    	<label style="color: black;"> Contrase&ntilde;a:</label>
-    	 <input type="text" name="password" />
-    </p>    
-        <button type="submit" name="Submit"> <img src="css/img/guardar.png" align="middle"/> Aceptar </button>
-        <button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/NuevoProfesorServlet';"> <img src="css/img/agregar.png" align="middle"/> Crear Cuenta</button>
-
-</form>
-</div>
+	<div class="e-window">
+		<div class="e-msg e-msg-error e-hide-display-mode"><%= request.getAttribute("error") %></div>
+		<form class="e-form" id="form1" name="form1" method="post" action="" >
+			<div class="e-form-body">
+				<div class="e-form-field">
+					<label for="usuario">Usuario:</label>
+			    	<input type="text" name="usuario" />
+				</div>
+			    <div class="e-form-field">
+			    	<label for="password">Contrase&ntilde;a:</label>
+			    	<input type="password" name="password" />
+			    </div>
+		    </div>
+		    <div class="e-form-footer">
+		        <button class="e-button e-button-submit" type="submit" name="Submit">Aceptar</button>
+		        <button class="e-button" type="button" onclick="location.href='/EjercitarWeb/NuevoProfesorServlet';">Crear Cuenta</button>
+	        </div>
+		</form>
+	</div>
 </body>
 </html>
diff --git a/EjercitarWeb/WebContent/menu_principal.jsp b/EjercitarWeb/WebContent/menu_principal.jsp
index 13cef3d..c7bc15b 100644
--- a/EjercitarWeb/WebContent/menu_principal.jsp
+++ b/EjercitarWeb/WebContent/menu_principal.jsp
@@ -1,71 +1,76 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
-<%@ include file="templateCSS.jsp"%>
 <head>
-<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
-<title>Ejercitar</title>
-
+	<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+	<title>Ejercitar</title>
+	<%@ include file="templateHEAD.jsp"%>
+	<style>
+		.e-border-center {
+			width: 1000px;
+			margin: 2px auto;
+		}
+		.e-form {
+			width: 100%;
+		}
+	</style>
 </head>
-
-<body>
-	<%@page import="model.Profesor" import="model.Asignatura"
-		import="java.util.List"%>
-
-
-	<div id="content">
-
-		<form id="form1" name="form1" method="get" action="/EjercitarWeb/NuevaAsignaturaServlet">
-			<%
-				Profesor profesor = (Profesor) request.getSession().getAttribute("profesor");
-			%>
-			<p>Bienvenido Profesor <%=profesor.getNombre()%></p>
-			<p>Asignaturas Disponibles:</p>
-			<p>&nbsp;</p>
-
-
-			
-				<button type="submit"><img src="css/img/pencil.png" alt="x" width="16" height="16" />
-					Nueva Asignatura
-				</button>
-			
-
-			<div style="width: 800px; margin: 10px auto;">
-				<table class="tbl1 scroll">
-
-					<thead>
-						<tr>
-							<th>Asignatura</th>
-
-							<th>Curso</th>
-							<th>Escuela</th>
-
-						</tr>
-					</thead>
-
-					<tbody>
-
-						<%
-							List<Asignatura> asignaturaList = (List<Asignatura>)request.getAttribute("lista_asignatura");
-						%>
-						<%
-							for (Asignatura asignatura : asignaturaList) {
-						%>
-						<tr>
-							<td class="fname"><a
-								href="/EjercitarWeb/VistaAsignaturaServlet?asignatura=<%=asignatura.getIdAsignatura()%>"><%=asignatura.getNombre()%></a></td>
-							<td class="lname"><%=asignatura.getCurso().getSeccion()%></td>
-							<td class="motto"><%=asignatura.getCurso().getEscuela().getNombre()%></td>
-						</tr>
-						<%
-							}
-						%>
-
-					</tbody>
-				</table>
-			</div>
-
-		</form>
+<body class="e-body">
+	<%@page
+		import="model.Profesor"
+		import="model.Asignatura"
+		import="java.util.List"
+	%>
+	<div class="e-viewport">
+		<div class="e-border-north"></div>
+		<div class="e-border-center">
+			<form class="e-form" name="form1" method="get" action="/EjercitarWeb/NuevaAsignaturaServlet">
+				<%
+					Profesor profesor = (Profesor) request.getSession().getAttribute("profesor");
+				%>
+				<div class="e-panel e-h1">
+					Bienvenido Profesor/a <%=profesor.getNombre()%><br>
+					Asignaturas Disponibles:
+				</div>
+				<div class="e-panel">
+					<div class="e-tbar">
+						<button class="e-button" type="submit">
+							<img class="e-button-icon" src="css/img/pencil.png" alt="x" />
+							Nueva Asignatura
+						</button>
+					</div>
+					<table class="e-grid">
+						<thead>
+							<tr>
+								<th>Asignatura</th>
+								<th>Curso</th>
+								<th>Escuela</th>
+							</tr>
+						</thead>
+						<tbody>
+							<%
+								List<Asignatura> asignaturaList = (List<Asignatura>)request.getAttribute("lista_asignatura");
+							%>
+							<%
+								for (Asignatura asignatura : asignaturaList) {
+							%>
+							<tr>
+								<td class="fname"><a
+									href="/EjercitarWeb/VistaAsignaturaServlet?asignatura=<%=asignatura.getIdAsignatura()%>"><%=asignatura.getNombre()%></a></td>
+								<td class="lname"><%=asignatura.getCurso().getSeccion()%></td>
+								<td class="motto"><%=asignatura.getCurso().getEscuela().getNombre()%></td>
+							</tr>
+							<%
+								}
+							%>
+						</tbody>
+					</table>
+				</div>
+			</form>
+		</div>
+		<div class="e-border-south">
+			Ejercitar: Un Modelo de aprendizaje asistido por computadora</br>
+			Ceci Godoy - Samu Reyes - FP-UNA
+		</div>
 	</div>
-
 </body>
-</html>
+</html>
+\ No newline at end of file
diff --git a/EjercitarWeb/WebContent/templateCSS.jsp b/EjercitarWeb/WebContent/templateCSS.jsp
index 5459dab..379ab01 100644
--- a/EjercitarWeb/WebContent/templateCSS.jsp
+++ b/EjercitarWeb/WebContent/templateCSS.jsp
@@ -8,25 +8,19 @@
 <link href="http://fonts.googleapis.com/css?family=Cantarell:regular,italic,bold,bolditalic" rel="stylesheet" />
 <link href="http://fonts.googleapis.com/css?family=Droid+Serif:regular,italic,bold,bolditalic" rel="stylesheet" />
 <link rel="stylesheet" href="css/grey.css" />
-
-<link href="./css/styleTable.css" rel="stylesheet" type="text/css" />
-    
+<link href="./css/styleTable.css" rel="stylesheet" type="text/css" />    
 <script src="js/modernizr-1.5.min.js"></script>
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.0/jquery.min.js"></script>
 <script src="js/main.js" type="text/javascript"></script>
 <script src="js/jquery-1.3.2.min.js"  type="text/javascript"></script>
 <script src="js/scrolltable.js"  type="text/javascript"></script>
 <script type="text/javascript">
-
 	    $(document).ready(function() {
 			/* zebra stripe the tables (not necessary for scrolling) */
 	        var tbl = $("table.tbl1");
 	        addZebraStripe(tbl);
 	        addMouseOver(tbl);
-			
 			/* make the table scrollable with a fixed header */
-
-
 	    });
 
 	    function addZebraStripe(table) {
@@ -35,37 +29,26 @@
 
         function addMouseOver(table) {
             table.find("tbody tr").hover(
-                    function() {
-                        $(this).addClass("over");
-                    },
-                    function() {
-                        $(this).removeClass("over");
-                    }
-                );
+                 function() {
+                     $(this).addClass("over");
+                 },
+                 function() {
+                     $(this).removeClass("over");
+                 }
+             );
         }
-
 	</script>
-	
-	
 </head>
 <body>
-<FORM>
-<DIV id="sidebar">
-
-</DIV>
-<DIV id="rsidebar">
-
-</DIV>
-<DIV id="header" style="overflow: visible;">
-</DIV>
-
-<DIV id="footer" style="overflow: visible;">
-Ejercitar:Un Modelo de aprendizaje asistido por computadora</br>
-Ceci Godoy - Samu Reyes - FP-UNA
-</DIV>
-<DIV id="content"></DIV>
-</FORM>
-
-
+	<form>
+		<div id="sidebar"></div>
+		<div id="rsidebar"></DIV>
+		<div id="header" style="overflow: visible;"></div>
+		<div id="footer" style="overflow: visible;">
+			Ejercitar:Un Modelo de aprendizaje asistido por computadora</br>
+			Ceci Godoy - Samu Reyes - FP-UNA
+		</div>
+		<div id="content"></div>
+	</form>
 </body>
 </html>
 \ No newline at end of file
diff --git a/EjercitarWeb/src/src/NuevaTareaServlet.java b/EjercitarWeb/src/src/NuevaTareaServlet.java
index 683ce7b..2ea99a4 100644
--- a/EjercitarWeb/src/src/NuevaTareaServlet.java
+++ b/EjercitarWeb/src/src/NuevaTareaServlet.java
@@ -58,6 +58,8 @@ public class NuevaTareaServlet extends HttpServlet {
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		Tarea tarea = new Tarea();
 		
+		String cantEjer= request.getParameter("cantejercicio");
+		tarea.setCantidadEjercicioParada(Integer.valueOf(cantEjer));
 		String descripcion= request.getParameter("descripcion");
 		System.out.println(descripcion);
 		tarea.setDescripcion(descripcion);
author	cecigg <caggsld@gmail.com>	2013-11-13 11:54:57 (GMT)
committer	cecigg <caggsld@gmail.com>	2013-11-13 11:54:57 (GMT)
commit	b8fb0a6e6bf3b65cf20010b797a8b3b14951793f (patch)
tree	c007e09bd0300f77347bce120f1325e6d7c704ad /EjercitarWeb
parent	7b12a8598a2b6f492f6e586cd480bf225cbbebcc (diff)