diff options
| author | ceci <caggsld@gmail.com> | 2013-06-30 20:19:02 (GMT) |
|---|---|---|
| committer | ceci <caggsld@gmail.com> | 2013-06-30 20:19:02 (GMT) |
| commit | 5d9b3a6e41ccffa78ad07389e4d3f7c6f4d7e610 (patch) | |
| tree | 6758f033bd21560cb8c64d3dc70611e3a5f56951 | |
| parent | 2ccffcf6a7cd7e686c3a5fbb6d82874b6478cdaf (diff) | |
| parent | 2d5efabade0164b78cc394d5adfba4b4c140fe6f (diff) | |
Merge remote-tracking branch 'remotes/origin/samu' into Cecilia
19 files changed, 65 insertions, 71 deletions
diff --git a/EjercitarWeb/WebContent/Asignatura.jsp b/EjercitarWeb/WebContent/Asignatura.jsp index 7e111a7..f7323eb 100644 --- a/EjercitarWeb/WebContent/Asignatura.jsp +++ b/EjercitarWeb/WebContent/Asignatura.jsp @@ -41,7 +41,8 @@ </select> </p> <p class="nolabel"> - <input type="submit" name="Submit" value="Guardar" /> + <button type="submit" name="Submit"> <img src="css/img/guardar.png" align="middle"/> Guardar </button> + </p> diff --git a/EjercitarWeb/WebContent/Concepto.jsp b/EjercitarWeb/WebContent/Concepto.jsp index 84f3ce6..94cae20 100644 --- a/EjercitarWeb/WebContent/Concepto.jsp +++ b/EjercitarWeb/WebContent/Concepto.jsp @@ -58,7 +58,8 @@ </p> </fieldset> <p class="nolabel"> - <input type="submit" name="Aceptar" value="Guardar"> + <button type="submit" name="Submit"> <img src="css/img/guardar.png" align="middle"/> Guardar </button> + </p> </fieldset> diff --git a/EjercitarWeb/WebContent/Ejercicios.jsp b/EjercitarWeb/WebContent/Ejercicios.jsp index f8475f5..335f48b 100644 --- a/EjercitarWeb/WebContent/Ejercicios.jsp +++ b/EjercitarWeb/WebContent/Ejercicios.jsp @@ -73,7 +73,8 @@ </select> <p class="nolabel"> - <input type="submit" name="Aceptar" value="Guardar" /> + <button type="submit" name="Submit"> <img src="css/img/guardar.png" align="middle"/> Guardar </button> + </p> </fieldset> diff --git a/EjercitarWeb/WebContent/Tarea.jsp b/EjercitarWeb/WebContent/Tarea.jsp index a3bf225..47c5f60 100644 --- a/EjercitarWeb/WebContent/Tarea.jsp +++ b/EjercitarWeb/WebContent/Tarea.jsp @@ -11,8 +11,8 @@ <script src="http://code.jquery.com/jquery-1.8.2.js" type="text/javascript"></script> <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js" type="text/javascript"></script> <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/themes/ui-lightness/jquery-ui.css" type="text/javascript"></script> -<script src="jquery.multiselect.js" type="text/javascript"></script> -<link rel="stylesheet" href="jquery.multiselect.css" type="text/css" /> +<script src="js/jquery.multiselect.js" type="text/javascript"></script> +<link rel="stylesheet" href="css/jquery.multiselect.css" type="text/css" /> <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/themes/ui-lightness/jquery-ui.css" type="text/css" /> </head> <body> @@ -30,12 +30,13 @@ <label>Concepto:</label> <select id="conceptos" multiple="multiple" name="concepto"></select> - <input name="lista_conceptos" id="lista_conceptos" value="asdf"> + <input type="hidden" name="lista_conceptos" id="lista_conceptos" value="asdf"> <input type="hidden" name="asignatura" id="asignatura" value=<%= request.getParameter("asignatura") %>> <p class="nolabel"> - <input type="submit" name="Aceptar" value="Guardar" /> + <button type="submit" name="Submit"> <img src="css/img/guardar.png" align="middle"/> Guardar </button> + </p> </form> </div> diff --git a/EjercitarWeb/WebContent/Tema.jsp b/EjercitarWeb/WebContent/Tema.jsp index c75d7b1..775e646 100644 --- a/EjercitarWeb/WebContent/Tema.jsp +++ b/EjercitarWeb/WebContent/Tema.jsp @@ -26,21 +26,14 @@ <label>Descripción</label> <input type="text" name="descripcion" id="descripcion"></input> </p> - <p> - <label>Asignatura:</label> - <select id="asignaturas" name="asignatura"> - <% List<Asignatura> asignaturas = (List<Asignatura>)request.getAttribute("lista_asignaturas"); %> - <% for(Asignatura asignatura : asignaturas) {%> - <option value="<%= asignatura.getIdAsignatura() %>"><%= asignatura.getNombre() %></option> - <% } %> - </select> - </p> + <p> <label>Peso:</label> <input type="text" name="peso" id= "peso"> </p> <p class="nolabel"> - <input type="submit" name="Aceptar" value="Guardar"> + <button type="submit" name="Submit"> <img src="css/img/guardar.png" align="middle"/> Guardar </button> + </p> </fieldset> diff --git a/EjercitarWeb/WebContent/concepto_ed.jsp b/EjercitarWeb/WebContent/concepto_ed.jsp index 9a7c6ee..1aa74ee 100644 --- a/EjercitarWeb/WebContent/concepto_ed.jsp +++ b/EjercitarWeb/WebContent/concepto_ed.jsp @@ -62,8 +62,8 @@ </p> </fieldset> <p class="nolabel"> - <input type="submit" name="Aceptar" value="Guardar"> - <input type="submit" name="Eliminar" value="Eliminar"> + <button type="submit" name="Submit"> <img src="css/img/guardar.png" align="middle"/> Guardar </button> + <button type="submit" name="Eliminar"> <img src="css/img/eliminar.png" align="middle"/> Eliminar </button> </p> </fieldset> diff --git a/EjercitarWeb/WebContent/css/estilo_ejercitar.css b/EjercitarWeb/WebContent/css/estilo_ejercitar.css index b90f939..4101dc6 100644 --- a/EjercitarWeb/WebContent/css/estilo_ejercitar.css +++ b/EjercitarWeb/WebContent/css/estilo_ejercitar.css @@ -40,24 +40,24 @@ div#content padding: 1em; position:absolute; top:80px; - +overflow: auto; right:180px; left:180px; } div#sidebar { -width:160px; -height:100%; -top:100px; -position:fixed; -left:0; +width: 160px; +height: 100%; +top: 100px; +position: absolute; +left: 0; } div#rsidebar { -width:160px; -height:100%; -top:100px; -position:fixed; -right:0; +width: 160px; +height: 100%; +top: 100px; +position: absolute; +right: 0; } diff --git a/EjercitarWeb/WebContent/css/grey.css b/EjercitarWeb/WebContent/css/grey.css index c764dd3..97c8ba2 100644 --- a/EjercitarWeb/WebContent/css/grey.css +++ b/EjercitarWeb/WebContent/css/grey.css @@ -92,6 +92,7 @@ button, input[type=submit] { background: -webkit-gradient(linear, left top, left 25, from(#FFFFFF), color-stop(4%, #EEEEEE), to(#FFFFFF)); background: -moz-linear-gradient(top, #FFFFFF, #EEEEEE 1px, #FFFFFF 25px); padding: 10px; + text-align: left; } input[type=text]:hover, input[type=password]:hover, textarea:hover, input[type=submit]:hover, button:hover, input[type=radio]:hover:before, input[type=checkbox]:hover:before, select:hover { -webkit-box-shadow: #666 0 0 3px; diff --git a/EjercitarWeb/WebContent/css/img/agregar.png b/EjercitarWeb/WebContent/css/img/agregar.png Binary files differnew file mode 100644 index 0000000..dbb1e94 --- /dev/null +++ b/EjercitarWeb/WebContent/css/img/agregar.png diff --git a/EjercitarWeb/WebContent/css/img/eliminar.png b/EjercitarWeb/WebContent/css/img/eliminar.png Binary files differnew file mode 100644 index 0000000..e6d7af0 --- /dev/null +++ b/EjercitarWeb/WebContent/css/img/eliminar.png diff --git a/EjercitarWeb/WebContent/css/img/guardar.png b/EjercitarWeb/WebContent/css/img/guardar.png Binary files differnew file mode 100644 index 0000000..e71398f --- /dev/null +++ b/EjercitarWeb/WebContent/css/img/guardar.png diff --git a/EjercitarWeb/WebContent/css/img/home.png b/EjercitarWeb/WebContent/css/img/home.png Binary files differnew file mode 100644 index 0000000..dc25ef4 --- /dev/null +++ b/EjercitarWeb/WebContent/css/img/home.png diff --git a/EjercitarWeb/WebContent/css/img/resultados.png b/EjercitarWeb/WebContent/css/img/resultados.png Binary files differnew file mode 100644 index 0000000..be88409 --- /dev/null +++ b/EjercitarWeb/WebContent/css/img/resultados.png diff --git a/EjercitarWeb/WebContent/login.jsp b/EjercitarWeb/WebContent/login.jsp index 41465ae..f4a5f71 100644 --- a/EjercitarWeb/WebContent/login.jsp +++ b/EjercitarWeb/WebContent/login.jsp @@ -3,6 +3,7 @@ <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> </head> <style type="text/css"> @@ -24,31 +25,24 @@ a:link { --> </style> <body> - -<form id="form1" name="form1" method="post" action=""> +<div align="center"> +<form id="form1" name="form1" method="post" action="" > <p> </p> <p> </p> <p> </p> - <table width="100" border="0" align="center"> - <tr> - <th bgcolor="#FFFFFF" class="Estilo2" scope="col">Usuario:</th> - <th scope="col"><label> - <input type="text" name="usuario" /> - </label></th> - </tr> - <tr> - <th scope="row"><span class="Estilo2">Contraseña</span></th> - <th scope="row"><label> - <input type="text" name="password" /> - </label></th> - </tr> - <tr> - <th scope="row"> </th> - <th scope="row" row="2"><p> - <input type="submit" name="Submit" value="Aceptar" /> - </p> - <a href="/EjercitarWeb/NuevoProfesorServlet">Crear cuenta </a></th> - </tr> - </table> + + <p> + <label style="color: black;">Usuario:</label> + <input type="text" name="usuario" /> + </p> + <p> + <label style="color: black;"> Contraseñ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> </body> </html> diff --git a/EjercitarWeb/WebContent/profesor.jsp b/EjercitarWeb/WebContent/profesor.jsp index 718013d..be721d2 100644 --- a/EjercitarWeb/WebContent/profesor.jsp +++ b/EjercitarWeb/WebContent/profesor.jsp @@ -1,4 +1,4 @@ -<%@ 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" %> diff --git a/EjercitarWeb/WebContent/tema_ed.jsp b/EjercitarWeb/WebContent/tema_ed.jsp index d33be12..3e0a8c0 100644 --- a/EjercitarWeb/WebContent/tema_ed.jsp +++ b/EjercitarWeb/WebContent/tema_ed.jsp @@ -30,16 +30,17 @@ <input type="text" name="descripcion" id="descripcion" value=<%= valor %>> </p> <p> - <label>Asignatura:</label> - <input name="asignatura" id="asignatura" value=<%= request.getParameter("asignatura") %>> + + <input type="hidden" name="asignatura" id="asignatura" value=<%= request.getParameter("asignatura") %>> </p> <p> <label>Peso:</label> <input type="text" name="peso" id= "peso" value=<%= tema.getPeso() %> > </p> <p class="nolabel"> - <input type="submit" name="Aceptar" value="Guardar"> - <input type="submit" name="Eliminar" value="Eliminar"> + <button type="submit" name="Submit"> <img src="css/img/guardar.png" align="middle"/> Guardar </button> + <button type="submit" name="Eliminar"> <img src="css/img/eliminar.png" align="middle"/> Eliminar </button> + </p> </fieldset> </form> diff --git a/EjercitarWeb/WebContent/templateCSS.jsp b/EjercitarWeb/WebContent/templateCSS.jsp index 23efd37..3d8f886 100644 --- a/EjercitarWeb/WebContent/templateCSS.jsp +++ b/EjercitarWeb/WebContent/templateCSS.jsp @@ -25,10 +25,7 @@ addMouseOver(tbl); /* make the table scrollable with a fixed header */ - $("table.scroll").createScrollableTable({ - width: '300px', - height: '200px' - }); + }); @@ -59,10 +56,10 @@ <DIV id="rsidebar"> <a>aaaa</a> </DIV> -<DIV id="header"> +<DIV id="header" style="overflow: visible;"> </DIV> -<DIV id="footer"> +<DIV id="footer" style="overflow: visible;"> Ejercitar:Un Modelo de aprendizaje asistido por computadora</br> Ceci Godoy - Samu Reyes - FP-UNA </DIV> diff --git a/EjercitarWeb/WebContent/ver_resultados.jsp b/EjercitarWeb/WebContent/ver_resultados.jsp index 2d384e2..da3b642 100644 --- a/EjercitarWeb/WebContent/ver_resultados.jsp +++ b/EjercitarWeb/WebContent/ver_resultados.jsp @@ -15,13 +15,17 @@ <div id="content">
<form id="form1" name="form1" method="post" action="">
+ <fieldset>
+ <legend> Seleccione un tema </legend>
<label> Tema: </label>
<select id="temas" name="Tema" onchange="cargarResultados(<%= request.getParameter("asignatura") %>)">
+ <option value='-1'> Seleccione un tema... </option>
<% List<Tema> temas = (List<Tema>)request.getAttribute("lista_temas"); %>
<% for(Tema tema : temas) {%>
<option value="<%= tema.getIdTema() %>"><%= tema.getNombre() %></option>
<% } %>
</select>
+ </fieldset>
<br>
<div id="tabla">
@@ -37,7 +41,7 @@ var tema_id=$("#temas").val(); //ya se tiene el objeto select
//llama al servlet con el parametro seleccionado
- $("#tab_resultado").load("CargarResultadosServlet", {asignatura:asignatura, tema_id:tema_id});
+ $("#tabla").load("CargarResultadosServlet", {asignatura:asignatura, tema_id:tema_id});
//$("#conceptos").multiselect("refresh");
}
diff --git a/EjercitarWeb/WebContent/vista_asignatura.jsp b/EjercitarWeb/WebContent/vista_asignatura.jsp index 725555b..4931afc 100644 --- a/EjercitarWeb/WebContent/vista_asignatura.jsp +++ b/EjercitarWeb/WebContent/vista_asignatura.jsp @@ -74,7 +74,7 @@ <%for(Tarea tarea : tareaList) {%> <tbody> <tr> - <td class="lname"><a <%=tarea.getDescripcion()%>> </a></td> + <td class="lname"><a> <%=tarea.getDescripcion()%> </a></td> <td class="motto"> <%List<Concepto> conceptoList = (List<Concepto>) tarea.getConceptoList();%> <%for(Concepto concepto : conceptoList) {%> @@ -96,11 +96,11 @@ <form id="form1" name="form1" method="post" action=""> - <p><button type="button" style="width:70px;height:50px;" onclick="location.href='/EjercitarWeb/NuevoTemaServlet';">Nuevo Tema</button></p> - <p><button type="button" onclick="location.href='/EjercitarWeb/NuevoConceptoServlet';">Nuevo Concepto</button></p> - <p><button type="button" onclick="location.href='/EjercitarWeb/NuevoEjercicioServlet?asignatura=<%=asignatura.getIdAsignatura()%>';">Nuevo Ejercicio</button></p> - <p><button type="button" onclick="location.href='/EjercitarWeb/NuevaTareaServlet?curso=<%=asignatura.getCurso().getIdCurso()%>&asignatura=<%=asignatura.getIdAsignatura()%>';">Nueva Tarea</button></p> - <p><button type="button" onclick="location.href='/EjercitarWeb/VerResultadosServlet?asignatura=<%=asignatura.getIdAsignatura()%>';">Resultados</button></p> + <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/NuevoTemaServlet?asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/agregar.png" align="middle"/> Tema</button></p> + <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/NuevoConceptoServlet?asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/agregar.png" align="middle"/> Concepto</button></p> + <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/NuevoEjercicioServlet?asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/agregar.png"align="middle"/> Ejercicio</button></p> + <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/NuevaTareaServlet?curso=<%=asignatura.getCurso().getIdCurso()%>&asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/agregar.png" align="middle"/> Tarea</button></p> + <p><button type="button" style="width:150px" onclick="location.href='/EjercitarWeb/VerResultadosServlet?asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/resultados.png"align="middle"/> Resultados</button></p> </form> |
