Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcecigg <caggsld@gmail.com>2013-05-13 04:14:06 (GMT)
committer cecigg <caggsld@gmail.com>2013-05-13 04:14:06 (GMT)
commit6712e68e2564bbaf2ce604f368ef37b4c7056d8c (patch)
treedacf27f00bbe24274fe4139e12a8cf8d053b19b1
parent212cdc44666d259a1c9aa0d5e5c159459fa9037f (diff)
Se modifico el estilo del menu_principal
-rw-r--r--EjercitarWeb/WebContent/estilo_ejercitar.css84
-rw-r--r--EjercitarWeb/WebContent/menu_principal.jsp107
-rw-r--r--EjercitarWeb/WebContent/styles.css101
-rw-r--r--EjercitarWeb/WebContent/templateCSS.jsp35
-rw-r--r--EjercitarWeb/src/src/NuevaAsignaturaServlet.java2
5 files changed, 249 insertions, 80 deletions
diff --git a/EjercitarWeb/WebContent/estilo_ejercitar.css b/EjercitarWeb/WebContent/estilo_ejercitar.css
new file mode 100644
index 0000000..c41a98f
--- /dev/null
+++ b/EjercitarWeb/WebContent/estilo_ejercitar.css
@@ -0,0 +1,84 @@
+@CHARSET "ISO-8859-1";
+* {
+margin:0;
+}
+body
+{
+margin: 0;
+color: #000;
+background: #CC3333;
+}
+div#header {
+width:100%;
+background-color: #FFFFFF;
+text-align:center;
+height:80px;
+position:absolute;
+background-image: url('img/logo.png');
+background-repeat: no-repeat;
+}
+
+div#sidebar {
+width:160px;
+height:100%;
+top:80px;
+position:fixed;
+}
+
+div#psidebar {
+width:10px;
+height:100%;
+background:#505050;
+left:150px;
+top:80px;
+position:fixed;
+}
+
+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%;
+}
+div#content
+{
+padding: 1em;
+position:absolute;
+top:80px;
+bottom:80px;
+right:0;
+left:180px;
+overflow-y:auto;
+}
+td,th {
+ color: #F0F0F0;
+}
+a:link {
+ color: #00CCFF;
+}
+.Estilo2 {
+ font-family: Georgia, "Times New Roman", Times, serif;
+ color: #33CCFF;
+ font-weight: bold;
+ font-size: 12px;
+}
+.EstiloHeader {
+font: 18px georgia;
+color: #CC3300;
+line-height: 24px;
+letter-spacing: .4em;
+}
+.Estilo5 {
+ color: #003366;
+ font-weight: bold;
+ font-size: 12px;
+} \ No newline at end of file
diff --git a/EjercitarWeb/WebContent/menu_principal.jsp b/EjercitarWeb/WebContent/menu_principal.jsp
index 880b890..e9ca2f6 100644
--- a/EjercitarWeb/WebContent/menu_principal.jsp
+++ b/EjercitarWeb/WebContent/menu_principal.jsp
@@ -1,86 +1,41 @@
<%@ 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">
+<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel="stylesheet" href="estilo_ejercitar.css" type="text/css" />
+<link href="styles.css" rel="stylesheet" type="text/css">
<title>Ejercitar</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<link rel="stylesheet" href="mm_entertainment.css" type="text/css" />
-<style type="text/css">
-<!--
-body {
- background-color: #CC3333;
-}
-body,td,th {
- color: #F0F0F0;
-}
-a:link {
- color: #00CCFF;
-}
-.Estilo2 {
- font-family: Georgia, "Times New Roman", Times, serif;
- color: #33CCFF;
- font-weight: bold;
- font-size: 12px;
-}
-.Estilo4 {color: #FFFFFF}
-.Estilo5 {
- color: #003366;
- font-weight: bold;
- font-size: 12px;
-}
--->
-</style>
</head>
<body>
+
+<DIV id="header"> <p class="EstiloHeader" >
+Ejercitar!</br> Una forma divertida de hacer tareas :D
+</DIV>
+<div id="sidebar">
+<div id="cssmenu">
+<ul>
+ <li class='active'><a href='#'><span>Home</span></a></li>
+ <li><a href='#'><span>Mis Datos</span></a></li>
+ <li><a href='#'><span>Alumnos</span></a></li>
+ <li><a href='#'><span>Escuela</span></a></li>
+ <li class='last'><a href='#'><span>Contacto</span></a></li>
+</ul>
+</div>
+</div>
+<DIV id="footer">
+Ejercitar:Un Modelo de aprendizaje asistido por computadora</br>
+Ceci Godoy - Samu Reyes - FP-UNA
+</DIV>
+
+<DIV id="content">
<%@page import="model.Profesor" import="model.Asignatura" import="java.util.List"%>
-<table width="1043" border="0" cellspacing="0" cellpadding="0">
- <!--DWLayoutTable-->
- <tr bgcolor="#FFFFFF">
- <td width="155" rowspan="2" nowrap="nowrap"><img src="img/logo.png" width="138" height="111" /></td>
- <td height="58" colspan="2" valign="bottom" nowrap="nowrap" bgcolor="#FFFFFF" id="logo">EJERCITAR!!! </td>
- <td width="10">&nbsp;</td>
- <td width="12">&nbsp;</td>
- </tr>
- <tr bgcolor="#FFFFFF">
- <td height="57" colspan="2" valign="top" nowrap="nowrap" bgcolor="#FFFFFF" id="tagline">Una forma divertida de hacer tareas :D </td>
- <td>&nbsp;</td>
- <td>&nbsp;</td>
- </tr>
-
- <tr >
- <td height="19" >&nbsp; </td>
- <td width="11">&nbsp;</td>
- <td width="861">&nbsp;</td>
- <td>&nbsp;</td>
- <td>&nbsp;</td>
- </tr>
-
- <tr>
- <td rowspan="4" valign="top">
- <table border="0" cellspacing="0" cellpadding="0" width="155" id="navigation">
- <tr>
- <td width="155" height="40"><div align="center"><span class="Estilo2"><a href="Quienes somos.html" class="Estilo2">MIS DATOS </a></span></div></td>
- </tr>
- <tr>
- <td width="155" height="40"><div align="center"><a href="Recomendados.html">ALUMNOS</a></div></td>
- </tr>
- <tr>
- <td width="155" height="40"><div align="center"><a href="Contactos.html">ESCUELA</a></div></td>
- </tr>
- </table>
- </td>
- <td height="120" valign="top" bgcolor="#445DA0"><!--DWLayoutEmptyCell-->&nbsp;</td>
- <td rowspan="4" valign="top">
- <table width="798" height="251" border="0" cellpadding="0" cellspacing="0" id="navigation">
- <tr>
- <td>
<form id="form1" name="form1" method="get" action="/EjercitarWeb/NuevaAsignaturaServlet">
<% Profesor profesor = (Profesor)request.getSession().getAttribute("profesor"); %>
<p class="pageName Estilo12">Bienvenido Profesor <%= profesor.getNombre() %></p>
- <p class="pageName Estilo10">Cursos habilitados: </p>
+ <p class="pageName Estilo10">Asignaturas Disponibles: </p>
<p>&nbsp; </p>
@@ -96,7 +51,6 @@ a:link {
</div>
</span></th>
<th width="97" bgcolor="#666666"><span class="Estilo16">Escuela</span></span></th>
- <th width="48" bgcolor="#666666"><span class="Estilo16">Acci&oacute;n</span></span></th>
</tr>
<% List<Asignatura> asignaturaList = (List<Asignatura>) profesor.getAsignaturaList();%>
<% for(Asignatura asignatura : asignaturaList) {%>
@@ -104,16 +58,11 @@ a:link {
<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"> Ver </span></td>
</tr>
<% } %>
</table>
</form>
- <p>&nbsp;</p>
- </td>
- </tr>
- </table>
- </td>
-</table>
+ </DIV>
+
</body>
</html>
diff --git a/EjercitarWeb/WebContent/styles.css b/EjercitarWeb/WebContent/styles.css
new file mode 100644
index 0000000..64126d8
--- /dev/null
+++ b/EjercitarWeb/WebContent/styles.css
@@ -0,0 +1,101 @@
+/* CSS for Vertical Menu */
+#cssmenu {
+ padding: 0;
+ margin: 0;
+ border: 0; }
+
+#cssmenu ul, #cssmenu li {
+ list-style: none;
+ margin: 0;
+ padding: 0; }
+
+#cssmenu ul {
+ position: relative;
+ z-index: 597; }
+
+#cssmenu ul li {
+ min-height: 1px;
+ line-height: 1em; }
+
+#cssmenu a {
+ display: block;
+ text-decoration: none; }
+
+/* Custom CSS Styles */
+#cssmenu {
+ font-family: Helvetica, Arial, sans-serif;
+ font-weight: bold;
+ width: 160px; }
+ #cssmenu ul {
+ background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmNWY1ZjUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
+ background-color: #F1F1F1;
+ background-image: -webkit-linear-gradient(top, white, whitesmoke);
+ background-image: -moz-linear-gradient(top, white, whitesmoke);
+ background-image: -o-linear-gradient(top, white, whitesmoke);
+ background-image: linear-gradient(white, whitesmoke);
+ border: 1px solid #CCC;
+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
+ border-radius: 6px;
+ -moz-background-clip: padding;
+ -webkit-background-clip: padding-box;
+ background-clip: padding-box; }
+ #cssmenu li {
+ border-bottom: 1px solid #CCC;
+ -moz-box-shadow: 0 1px 0 white;
+ -webkit-box-shadow: 0 1px 0 white;
+ box-shadow: 0 1px 0 white;
+ padding: 1px; }
+ #cssmenu li:last-child, #cssmenu li.last {
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ border-bottom: 0 none; }
+ #cssmenu li.active {
+ -moz-box-shadow: 1px 2px 0 -1px rgba(0, 0, 0, 0.25);
+ -webkit-box-shadow: 1px 2px 0 -1px rgba(0, 0, 0, 0.25);
+ box-shadow: 1px 2px 0 -1px rgba(0, 0, 0, 0.25);
+ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAuCAIAAABmjeQ9AAAAA3NCSVQICAjb4U/gAAAAK0lEQVQImWO4mpzIxPD/PxPD//9M////Z2JgYEDlI2FS5THUMDBg10O6PABU/Fqb2xVCxgAAAABJRU5ErkJggg==);
+ background-image: -webkit-linear-gradient(top, #d56361, #ca3b39);
+ background-image: -moz-linear-gradient(top, #d56361, #ca3b39);
+ background-image: -o-linear-gradient(top, #d56361, #ca3b39);
+ background-image: linear-gradient(#d56361, #ca3b39);
+ position: relative;
+ left: -8px;
+ width: 170px; }
+ #cssmenu li.active a {
+ border: 1px dashed #e08b89;
+ border: 1px dashed rgba(255, 255, 255, 0.25);
+ border-right: 0 none;
+ position: relative;
+ color: #FFF;
+ text-shadow: 1px 1px 0 rgba(0, 0, 0, 0.3); }
+ #cssmenu li.active:before, #cssmenu li.active:after {
+ content: ''; }
+ #cssmenu li.active:before {
+ z-index: 1;
+ width: 0px;
+ height: 0px;
+ position: absolute;
+ left: 0;
+ bottom: -5px;
+ border-style: solid;
+ border-width: 0 8px 5px 0;
+ border-color: transparent #a42e2c transparent transparent; }
+ #cssmenu li.active:after {
+ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAwCAYAAAD6g+EuAAAFhElEQVR4Xq1Vb0yVVRh/znsvyEWpDL4JpYDVWvHF1Wa51dZS0pZJKKSClN/6UutbW5ubsw/NuVVr1VbLD83mMnNupc4vToVsCFeAi2gEAzBAJZxy4X3vxfc8Pecf58QVvJDn3cP7Ps957u93nn8c1rX7nRYAeIXkNjzg5QHCGgA8TfKwtCCSmG3nG1HqaGzyrXXrZOwKXDs/T/pJRFyG2smQoONscTADz/hbboRorLgYguFhgJCvZYAnAdj6p78/6MMiV9e7DcA0nyde+aWlOmRYh8BPkkNsseAmJCbA/cEh4L4vbUyF9hIJEexaFAGTWVSp9MQff2iQFC45mRcR30SAx7sa6hdKYMujwAWWDoZziK1aBSwSEU6vIuAviV31uQtG59zmnDRgyOVeGPhEUCp0EqhkwIlgZ5YEtrsYR/CQc9t29E4NDkLo+yo8Lu2bSA4n6rMjYIgzJKxz53bUdtNC7lIpCkOhHCOpfeaHQ+n5wBN1O9wJRdAiX44uqWJllCLPE/oWkkN0mMh9c+52CyrFVNbqHCGcCiCvtMzYqpkg2PF2JCtwRNR5Ugajo44kGOgHHsg5MNHV0Ptg5/Z7EqjfzT45cmPkbiSSNOjvt8SerEwdKd/NUVDTMxZcH9wCGxuRykemTNSgHBjzxEZDZ+22DAKJxYFEpwWckzKto1NUxm2qqE0FgQl/d0eNS2CguGrFjq1vkT7/YlpB3at5j68UtXDb9+uKn35+T+gd26rt79qrqzD72WPAZtlYJGrm4POKI0c/oMOaPZsWt/3cNCGJa3P8pSlWXgag5uD9juqqA+jUkGjRPZsKFO20ureRsaGTKwxSkF9eDlM9PYB3ww8ZwzRtfiRd2rZs1pi6GkyB20Rrhc19N8RKV4KXmycIVIoYfAKAH7NLb76BDFWxmPGWOgOGTjyCFIwj2fSbvNSZxN5/ffZGGecgl8mIbgmmDWjIdPqYAOZ2YMjd+nJUhLpEnjOueiB5xhjrCGxBbURqNnKXwLJnKyCnqFAW/3rgf0P2PSz++kY00dgA3G8GOm82GqajELZYHix98ilIDQ1Bevwf6Ll958eac+e/BYB+1S0usHkzErllT669zDTJZ5kAHugn4HHonZg4XHOuUQAr8vjGyiyGaO7LJGf5cpi+dQt6k8kjW881fqXNg/FNlX0s/toGnG8ebTy2UyMFBRBO3CGdSb0vmTxafb7pSwNMmH2ZN5H9VpicS9UWFiFa8BAsXf2E8gEOfRMTLvBQfMP6PucmIoCMS4Kbi9YSK5HjnrzSLfWBZPJYdePvM8Bk63W7LCo7T1cf3X632XUyzWCyuxvCySQMTPnHqxovfKE3rglgW3AFEzWKsZvpc6c9WlgEd8fGpEOYFMBTv1Y1XfjMAf5Lf9thg9lDZIisjQajCGKPlQDq59rU5AkCPqCx/rbAWpCLWqm0yEK5e7O+84pLIJlIAEMB7J/YfOGP/Xp7GBF7MttM/9Mw/3LRJDpzEXAn8FQKhv3g1CzgP+FeC0211O1vc6VlyYoVM+kJg4CA/VO1zRcN8IgBnhNcirmJuANcUgI5jxbO6CO+f7q2uWX/VBhyDXx1TmC3oCbnSlOHzXlkuUwFAoeRIDhdezH+qQYenRfYLRRy+fK0rk8PkOxKAE7fhVE/dcYFJrk/sNsSBjy/rNzma3oaRoPgTE1L6z4NfF0AI63ssG2Ko/mry4FFc8Gk50YqfbamNe4CXzHAWYODmVDm0Uhflrab6fTZra3xvRr4xsKArZg7NTp59aqcqLF0+nzdpfZ9DnD34oDRXjjN617AmykCbmvfOz5NlaQASC43v7gW4Z6zSzbn2kPjwzDT7bfn1jTVtXXsyQD+/0vSvqyVMQFMwheahrmWlwH8ANe/iT+0Ts8daFYAAAAASUVORK5CYII=) no-repeat;
+ display: block;
+ height: 48px;
+ width: 24px;
+ position: absolute;
+ right: -24px;
+ top: 0px;
+ z-index: 1; }
+ #cssmenu a {
+ border: 1px solid transparent;
+ color: #444;
+ height: 42px;
+ line-height: 40px;
+ padding: 0 12px;
+ text-align: right;
+ text-overflow: ellipsis; }
diff --git a/EjercitarWeb/WebContent/templateCSS.jsp b/EjercitarWeb/WebContent/templateCSS.jsp
new file mode 100644
index 0000000..5c7608d
--- /dev/null
+++ b/EjercitarWeb/WebContent/templateCSS.jsp
@@ -0,0 +1,35 @@
+<%@ 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">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<link rel="stylesheet" href="estilo_ejercitar.css" type="text/css" />
+<link href="styles.css" rel="stylesheet" type="text/css">
+<title>Insert title here</title>
+</head>
+<body>
+<FORM>
+
+<DIV id="header"> <p class="EstiloHeader" >
+Ejercitar!</br> Una forma divertida de hacer tareas :D
+</DIV>
+<DIV id="sidebar">
+<div id="cssmenu">
+<ul>
+ <li class='active'><a href='#'><span>Home</span></a></li>
+ <li><a href='#'><span>Mis Datos</span></a></li>
+ <li><a href='#'><span>Alumnos</span></a></li>
+ <li><a href='#'><span>Escuela</span></a></li>
+ <li class='last'><a href='#'><span>Contacto</span></a></li>
+</ul>
+</div>
+</DIV>
+<DIV id="footer">
+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/NuevaAsignaturaServlet.java b/EjercitarWeb/src/src/NuevaAsignaturaServlet.java
index 085bfff..954e20e 100644
--- a/EjercitarWeb/src/src/NuevaAsignaturaServlet.java
+++ b/EjercitarWeb/src/src/NuevaAsignaturaServlet.java
@@ -47,7 +47,7 @@ public class NuevaAsignaturaServlet extends HttpServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
// TODO Auto-generated method stub
response.setContentType("text/html;charset=UTF-8");
- RequestDispatcher rd = getServletContext().getRequestDispatcher("/Asignatura.jsp");
+ RequestDispatcher rd = getServletContext().getRequestDispatcher("/Asignatura.jsp");
Profesor profesor = (Profesor)request.getSession().getAttribute("profesor");
List cursos = profesor.getCursoList();