se corrigieron los calculos de probabilidades de temas y asignaturas.

se arreglo el estilo de las vistas

18 files changed, 2893 insertions, 479 deletions

diff --git a/EjercitarJPA/src/model/Asignatura.java b/EjercitarJPA/src/model/Asignatura.java
index b237f51..f9c4b17 100644
--- a/EjercitarJPA/src/model/Asignatura.java
+++ b/EjercitarJPA/src/model/Asignatura.java
@@ -17,6 +17,7 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -62,6 +63,7 @@ public class Asignatura implements Serializable {
     @ManyToOne
     private Curso curso;
     @OneToMany(mappedBy = "asignatura")
+    @OrderBy("idTema ASC")
     private List<Tema> temaList;
 
     public Asignatura() {
diff --git a/EjercitarJPA/src/model/Tema.java b/EjercitarJPA/src/model/Tema.java
index b8d349b..9da9eec 100644
--- a/EjercitarJPA/src/model/Tema.java
+++ b/EjercitarJPA/src/model/Tema.java
@@ -18,6 +18,7 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -56,6 +57,7 @@ public class Tema implements Serializable {
     @Column(name = "peso")
     private Double peso;
     @OneToMany(mappedBy = "tema")
+    @OrderBy("idConcepto ASC")
     private List<Concepto> conceptoList;
     @OneToMany(mappedBy = "tema")
     private List<Tarea> tareaList;
diff --git a/EjercitarServer/ejbModule/beans/AdministracionBean.java b/EjercitarServer/ejbModule/beans/AdministracionBean.java
index 8368297..a47f7a6 100644
--- a/EjercitarServer/ejbModule/beans/AdministracionBean.java
+++ b/EjercitarServer/ejbModule/beans/AdministracionBean.java
@@ -9,6 +9,7 @@ import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
 import javax.servlet.http.Part;
 
 import smile.Network;
@@ -59,18 +60,20 @@ public class AdministracionBean implements AdministracionBeanRemote{
     	//em.getTransaction().commit();
     }
     
-    private double [] calcularProbabilidadesCCI(Ejercicio ejercicio) {
+    public double [] calcularProbabilidadesCCI(Ejercicio ejercicio) {
 		// TODO Auto-generated method stub
-    	int dimension = (int) Math.pow(2, ejercicio.getConceptoList().size());
-    	double [] ejercicioDef = new double[dimension * 2];
+    	Double dimension =  Math.pow(2, ejercicio.getConceptoList().size());
+    	double [] ejercicioDef = new double[dimension.intValue() * 2];
     	
     	int j = 0;
     	int contador = 0;
     	double x = calcularXasterisco(ejercicio);
     	for(int i = 0; i < dimension; i++) {
-    		double multiplicador = 0 / (dimension - 1);
+    		double multiplicador = i / (dimension - 1);
+    		System.out.println("i: " + i + " /dimension: "+ dimension);
     		System.out.println("mult " + multiplicador);
-    		ejercicioDef[j] = funcionGx((multiplicador * x), dimension, ejercicio);
+    		ejercicioDef[j] = funcionGx((multiplicador * x), dimension.intValue(), ejercicio);
+    		System.out.println("funcionGx: " + ejercicioDef[j]);
     		j++;
     		ejercicioDef[j] = 1 - ejercicioDef[j-1];
     		j++;
@@ -158,11 +161,11 @@ public class AdministracionBean implements AdministracionBeanRemote{
 		// TODO Auto-generated method stub
     	String nombreRed = "red_asignatura_" + tema.getAsignatura().getIdAsignatura() + ".xdsl";
     	Network net = new Network();
-		net.readFile("redes/" + nombreRed);
+		net.readFile("/home/redes/" + nombreRed);
 		//cambiar formato nombre
 		String nom = sp.convertirEspacioToGuion(tema.getNombre());
 		net.deleteNode(nom);
-		net.writeFile("redes/" + nombreRed);
+		net.writeFile("/home/redes/" + nombreRed);
 	}
 
 	public void agregarConcepto(Concepto concepto) {
@@ -199,7 +202,7 @@ public class AdministracionBean implements AdministracionBeanRemote{
     		// = em.find(Ejercicio.class,idEjercicio);
     		
     	}
-    	calcuarlarProbalidadesEval(ejercicios, idAsignatura);
+    	calcularProbabilidadesCCI(ejercicios, idAsignatura);
     }
     
     
@@ -220,7 +223,7 @@ public class AdministracionBean implements AdministracionBeanRemote{
         		ejercicios.add(em.find(Ejercicio.class,idEjercicio));
         		
         	}
-        	calcuarlarProbalidadesEval(ejercicios, concepto.getTema().getAsignatura().getIdAsignatura().toString());
+        	calcularProbabilidadesCCI(ejercicios, concepto.getTema().getAsignatura().getIdAsignatura().toString());
                	
         	
     	em.remove(concepto);
@@ -234,12 +237,12 @@ public class AdministracionBean implements AdministracionBeanRemote{
     	String nombreRed = "red_asignatura_" + concepto.getTema().getAsignatura().getIdAsignatura() + ".xdsl";  	
     	
     	Network net = new Network();
-		net.readFile("redes/" + nombreRed);
+		net.readFile("/home/redes/" + nombreRed);
 		//cambiar formato nodo
 		String nom = sp.convertirEspacioToGuion(concepto.getNombre());
 
 		net.deleteNode(nom);
-		net.writeFile("redes/" + nombreRed);
+		net.writeFile("/home/redes/" + nombreRed);
 		
 	}
 
@@ -252,7 +255,7 @@ public class AdministracionBean implements AdministracionBeanRemote{
     	em.persist(asignatura);
     	Network net = new Network();
     	String nombreRed = "red_asignatura_" + asignatura.getIdAsignatura() + ".xdsl";
-    	net.writeFile("redes/" + nombreRed);
+    	net.writeFile("/home/redes/" + nombreRed);
 
     }*/
    
@@ -268,14 +271,14 @@ public class AdministracionBean implements AdministracionBeanRemote{
     	// Calculo de las probabilidades condicionales de las relaciones de agregacion
     	
     	String nombreRed = "red_asignatura_" + idAsignatura + ".xdsl";
-		System.out.println("redes/" + nombreRed);
+		System.out.println("/home/redes/" + nombreRed);
 		Network net = new Network();
-		net.readFile("redes/" + nombreRed);
+		net.readFile("/home/redes/" + nombreRed);
 		String nomTem;
 		Asignatura asignatura = em.find(Asignatura.class, idAsignatura);
 
-    	List<Tema> temaList = (List<Tema>) em.createQuery("Select e from Tema e where e.profesor = :profesor and e.asignatura=:asignatura" )
-				.setParameter("profesor", asignatura.getProfesor()).setParameter("asignatura", asignatura).getResultList();
+    	List<Tema> temaList = (List<Tema>) em.createQuery("Select e from Tema e where e.profesor = :profesor and e.asignatura=:asignatura order by e.idTema" )
+				.setParameter("profesor", asignatura.getProfesor()).setParameter("asignatura", asignatura).getResultList() ;
     	
     	for(Tema tema : temaList) {
     		double[] temaDef = calcularProbabilidadesTema(tema);
@@ -292,16 +295,18 @@ public class AdministracionBean implements AdministracionBeanRemote{
     	net.setNodeDefinition(nomTem, asignaturaDef);
     	
     	
-    	net.writeFile("redes/" + nombreRed);
+    	net.writeFile("/home/redes/" + nombreRed);
     }
     
     private double[] calcularProbabilidadesAsignatura(Asignatura asignatura) {
     	int dimension = (int) Math.pow(2, asignatura.getTemaList().size());
     	double [] asignaturaDef = new double[dimension * 2];
     	
+		System.out.println("DimensionAsignatura "+ dimension );
+
     	int j = 0;
     	for(int i = 0; i < dimension; i++) {
-    		asignaturaDef[j] = cpAsignatura(asignatura, i);
+    		asignaturaDef[j] = 1 - cpAsignatura(asignatura, i);
     		j++;
     		asignaturaDef[j] = 1 - asignaturaDef[j-1];
     		j++;
@@ -320,102 +325,37 @@ public class AdministracionBean implements AdministracionBeanRemote{
     	while(comb.length() != dimension){
     		comb = "0" + comb;
     	}
-    	int k = dimension - 1;
+    	
     	double valTemp = 0;
 		List<Tema> temaList = em.createQuery("Select e from Tema e where e.asignatura = :asignatura")
 				.setParameter("asignatura", asignatura).getResultList(); 
 		System.out.println(temaList);
     	for (int j = 0; j < temaList.size(); j++) {
-    		 if(comb.charAt(k) == '1') {
+    		 if(comb.charAt(j) == '1') {
     			 valTemp = valTemp + temaList.get(j).getPeso();
     		 } 
-    		 k--;
-    	}
+    		    	}
     	
     	return valTemp;
 	}
 
-	private double [] calcularProbabilidadesEval(Ejercicio ejercicio) {
-    	//Calculo de las probabilidades condicionales 
-    	int dimension = (int) Math.pow(2, ejercicio.getConceptoList().size());
-    	double [] ejercicioDef = new double[dimension * 2];
-    	
-    	int j = 0;
-    	for(int i = 0; i < dimension; i++) {
-    		ejercicioDef[j] = cp(ejercicio, i);
-    		j++;
-    		ejercicioDef[j] = 1 - ejercicioDef[j-1];
-    		j++;
-    		
-    	}
-    	
-    	return ejercicioDef;
-    }
-	
-	private double cpTest(Ejercicio ejercicio, int i) {
-    	
-		//ejercicio.getConceptoList().size()
-		
-    	String comb = Integer.toBinaryString(i);
-    	while(comb.length() < ejercicio.getConceptoList().size()){
-    		comb = "0" + comb;
-    		System.out.println(comb);
-    	}
-    	int k = ejercicio.getConceptoList().size() - 1;
-    	double valTemp = 1;
-    	for (int j = 0; j < ejercicio.getConceptoList().size(); j++) {
-    		 if(comb.charAt(k) == '0') {
-    			 valTemp = valTemp * ejercicio.getConceptoList().get(j).getAdivinanza();
-    		 } else {
-    			 valTemp = valTemp * (1 - 
-    					 ejercicio.getConceptoList().get(j).getDescuido());
-    		 }
-    		 
-    		 k--;
-    	}
-    	
-    	return valTemp;
-    	
-    }
-	
-    
-    private double cp(Ejercicio ejercicio, int i) {
-    	
-    	String comb = Integer.toBinaryString(i);
-    	while(comb.length() < ejercicio.getConceptoList().size()){
-    		comb = "0" + comb;
-    		System.out.println(comb);
-    	}
-    	int k = ejercicio.getConceptoList().size() - 1;
-    	double valTemp = 1;
-    	for (int j = 0; j < ejercicio.getConceptoList().size(); j++) {
-    		 if(comb.charAt(k) == '0') {
-    			 valTemp = valTemp * ejercicio.getConceptoList().get(j).getAdivinanza();
-    		 } else {
-    			 valTemp = valTemp * (1 - 
-    					 ejercicio.getConceptoList().get(j).getDescuido());
-    		 }
-    		 
-    		 k--;
-    	}
-    	
-    	return valTemp;
-    	
-    }
-    
+   
     private double [] calcularProbabilidadesTema(Tema tema) {
     	//Calculo de las probabilidades condicionales 
     	int dimension = (int) Math.pow(2, tema.getConceptoList().size());
+    	System.out.println("dimension " + dimension);
     	double [] temaDef = new double[dimension * 2];
-    	
+    	System.out.println("**************************************************************");
     	int j = 0;
     	for(int i = 0; i < dimension; i++) {
-    		temaDef[j] = cpTema(tema, i);
+    		temaDef[j] = 1- cpTema(tema, i);
     		j++;
     		temaDef[j] = 1 - temaDef[j-1];
     		j++;
     		
     	}
+    	System.out.println("**************************************************************");
+
     	
     	return temaDef;
     }
@@ -426,13 +366,22 @@ public class AdministracionBean implements AdministracionBeanRemote{
     	while(comb.length() < tema.getConceptoList().size()){
     		comb = "0" + comb;
     	}
-    	int k = tema.getConceptoList().size() - 1;
+    
+
     	double valTemp = 0;
     	for (int j = 0; j < tema.getConceptoList().size(); j++) {
-    		 if(comb.charAt(k) == '1') {
+    		 System.out.println("--------------------------------------------------------");
+				System.out.println("j: " + j);
+
+			    System.out.println("comb: " + comb);
+    		 if(comb.charAt(j) == '1') {
+ 				   
+    				System.out.println("concepto: " +  tema.getConceptoList().get(j));
+    				System.out.println("peso: " +  tema.getConceptoList().get(j).getPeso());
+ 				    System.out.println("--------------------------------------------------------");
+
     			 valTemp = valTemp + tema.getConceptoList().get(j).getPeso();
     		 } 
-    		 k--;
     	}
     	
     	return valTemp;
@@ -442,9 +391,9 @@ public class AdministracionBean implements AdministracionBeanRemote{
     private void agregarEjercicioRed(Ejercicio ejercicio, int idAsignatura) {
     	//operaciones sobre la red bayesiana con smile
     	String nombreRed = "red_asignatura_" + idAsignatura + ".xdsl";
-		System.out.println("redes/" + nombreRed);
+		System.out.println("/home/redes/" + nombreRed);
 		Network net = new Network();
-		net.readFile("redes/" + nombreRed);
+		net.readFile("/home/redes/" + nombreRed);
 		
 		//agregar nodo ejercicio
 		String titulo = "E" + Integer.toString(ejercicio.getIdEjercicio());
@@ -464,15 +413,15 @@ public class AdministracionBean implements AdministracionBeanRemote{
 		double[] ejercicioDef = calcularProbabilidadesCCI(ejercicio);
 		net.setNodeDefinition(titulo, ejercicioDef);
 		
-		net.writeFile("redes/" + nombreRed);
+		net.writeFile("/home/redes/" + nombreRed);
     }
     
     private void agregarTemaRed(Tema tema) {
     	//operaciones sobre la red bayesiana con smile
     	String nombreRed = "red_asignatura_" + tema.getAsignatura().getIdAsignatura() + ".xdsl";
-		System.out.println("redes/" + nombreRed);
+		System.out.println("/home/redes/" + nombreRed);
 		Network net = new Network();
-		net.readFile("redes/" + nombreRed);
+		net.readFile("/home/redes/" + nombreRed);
 	
 		
 		//agregar nodo ejercicio
@@ -488,16 +437,16 @@ public class AdministracionBean implements AdministracionBeanRemote{
 		net.addArc(titulo, sp.convertirEspacioToGuion(tema.getAsignatura().getNombre()));
 
 		
-		net.writeFile("redes/" + nombreRed);
+		net.writeFile("/home/redes/" + nombreRed);
     }
     
     private void agregarConceptoRed(Concepto concepto) {
     	//operaciones sobre la red bayesiana con smile
     	String nombreRed = "red_asignatura_" + concepto.getTema().getAsignatura().getIdAsignatura() + ".xdsl";
     	String titulo;
-		System.out.println("redes/" + nombreRed);
+		System.out.println("/home/redes/" + nombreRed);
 		Network net = new Network();
-		net.readFile("redes/" + nombreRed);
+		net.readFile("/home/redes/" + nombreRed);
 		
 		//agregar nodo concepto
 		//cambiar formato nodo
@@ -518,7 +467,7 @@ public class AdministracionBean implements AdministracionBeanRemote{
 		conceptoDef[0] = 1 - conceptoDef[1];
 		//cambiar formato nodo
 		net.setNodeDefinition(titulo, conceptoDef);
-		net.writeFile("redes/" + nombreRed);
+		net.writeFile("/home/redes/" + nombreRed);
     }
 
 	@Override
@@ -536,21 +485,23 @@ public class AdministracionBean implements AdministracionBeanRemote{
 	}
 
 	@Override
-	public void agregarAsignatura(Asignatura asignatura) {
-    	em.persist(asignatura);
+	public Asignatura agregarAsignatura(Asignatura asignatura) {
+    	
     	Network net = new Network();
 		String titulo =  sp.convertirEspacioToGuion(asignatura.getNombre());
-
+		em.persist(asignatura);
     	////cambiar formato nodo
 		net.addNode(Network.NodeType.Cpt, titulo);
 		net.setOutcomeId(titulo, 0, "No_conoce");
 		net.setOutcomeId(titulo, 1, "Conoce");
     	String nombreRed = "red_asignatura_" + asignatura.getIdAsignatura() + ".xdsl";
-    	net.writeFile("redes/" + nombreRed);
+    	System.out.println("/home/redes/" + nombreRed);
+    	net.writeFile("/home/redes/" + nombreRed);
 
+    	System.out.println("iiiiid asignaturaaaaa  " + asignatura.getIdAsignatura());
 		// TODO Auto-generated method stub
-		
-		
+    	
+		return asignatura;
 	}
 
 	@Override
@@ -559,7 +510,7 @@ public class AdministracionBean implements AdministracionBeanRemote{
     	String nombreRed = "red_alumno_" + idAlumno + "_asignatura_" + idAsignatura + ".xdsl";
 
 		Network net = new Network();
-		net.readFile("redes/" + nombreRed);
+		net.readFile("/home/redes/" + nombreRed);
 		
 		net.updateBeliefs();
 		//cambiar formato nodo
@@ -586,13 +537,13 @@ public class AdministracionBean implements AdministracionBeanRemote{
 		
 		String nombreRed = "red_asignatura_" + idAsignatura + ".xdsl";
 		Network net = new Network();
-		net.readFile("redes/" + nombreRed);
+		net.readFile("/home/redes/" + nombreRed);
 		
         
 		for (Alumno alumno : alumnoList) {
 
 			String nombreRedAlumno = "red_alumno_" + alumno.getIdAlumno() + "_asignatura_" + idAsignatura + ".xdsl";
-			net.writeFile("redes/" + nombreRedAlumno);
+			net.writeFile("/home/redes/" + nombreRedAlumno);
 			
 		}
 		
@@ -609,7 +560,7 @@ public class AdministracionBean implements AdministracionBeanRemote{
     	String nombreRed = "red_asignatura_" + tema.getAsignatura().getIdAsignatura() + ".xdsl";
 		
 		Network net = new Network();
-		net.readFile("redes/" + nombreRed);
+		net.readFile("/home/redes/" + nombreRed);
 		
 	
 		String tituloNuevo = sp.convertirEspacioToGuion(tema.getNombre());
@@ -622,24 +573,24 @@ public class AdministracionBean implements AdministracionBeanRemote{
 	    net.setNodeName(tituloNuevo, tituloNuevo);
 		
 		
-		net.writeFile("redes/" + nombreRed);
+		net.writeFile("/home/redes/" + nombreRed);
     }
     
     
-    private void calcuarlarProbalidadesEval(List <Ejercicio>ejercicios, String idAsignatura){
+    private void calcularProbabilidadesCCI(List <Ejercicio>ejercicios, String idAsignatura){
     	String nombreRed = "red_asignatura_" + idAsignatura + ".xdsl";
-		System.out.println("redes/" + nombreRed);
+		System.out.println("/home/redes/" + nombreRed);
 		Network net = new Network();
-		net.readFile("redes/" + nombreRed);
+		net.readFile("/home/redes/" + nombreRed);
     	
     	for(Ejercicio ejercicio : ejercicios){
     		
-    		double[] ejercicioDef = calcularProbabilidadesEval(ejercicio);
+    		double[] ejercicioDef = calcularProbabilidadesCCI(ejercicio);
     		net.setNodeDefinition("E"+ejercicio.getIdEjercicio(), ejercicioDef);
 
     	}
 		
-		net.writeFile("redes/" + nombreRed);
+		net.writeFile("/home/redes/" + nombreRed);
     }
     
     
@@ -648,9 +599,9 @@ public class AdministracionBean implements AdministracionBeanRemote{
     	//operaciones sobre la red bayesiana con smile
     	String nombreRed = "red_asignatura_" + concepto.getTema().getAsignatura().getIdAsignatura() + ".xdsl";
 
-		System.out.println("redes/" + nombreRed);
+		System.out.println("/home/redes/" + nombreRed);
 		Network net = new Network();
-		net.readFile("redes/" + nombreRed);
+		net.readFile("/home/redes/" + nombreRed);
 		
 		//se modifica el nombre del concepto
 		String titulo = sp.convertirEspacioToGuion(concepto.getNombre());
@@ -673,7 +624,7 @@ public class AdministracionBean implements AdministracionBeanRemote{
 		conceptoDef[0] = 1 - conceptoDef[1];
 		net.setNodeDefinition(titulo, conceptoDef);
 		
-		net.writeFile("redes/" + nombreRed);
+		net.writeFile("/home/redes/" + nombreRed);
     }
     
 
@@ -681,6 +632,8 @@ public class AdministracionBean implements AdministracionBeanRemote{
 		
 		
 		Asignatura asignaturaPlantilla = em.find( Asignatura.class, idAsignaturaPlanitilla);
+		
+		em.persist(asignatura);
 		Profesor profesor = asignatura.getProfesor();
 		//Asignatura asignatura = new Asignatura();
 		Concepto concepto;
@@ -688,7 +641,7 @@ public class AdministracionBean implements AdministracionBeanRemote{
 		Ejercicio ejercicio;
 		Respuesta respuesta;
 		ArrayList <Respuesta> respuestaList = new ArrayList();
-		
+		ArrayList <Concepto> conceptosList = new ArrayList();
 		//Cargar los temas a una asignatura
 		for(Tema temaPlantilla: asignaturaPlantilla.getTemaList()){
 			
@@ -702,11 +655,11 @@ public class AdministracionBean implements AdministracionBeanRemote{
 			
 			System.out.print("asignaturaaaaa " + asignatura.getIdAsignatura());
 			//persiste el tema y agrega a la red
-			agregarTema(tema);
+			em.persist(tema);
 			
 			System.out.println("tema: " + temaPlantilla.getNombre());
 			//crear conceptos
-			for(Concepto conceptoPlantilla : tema.getConceptoList()){
+			for(Concepto conceptoPlantilla : temaPlantilla.getConceptoList()){
 				System.out.println("concepto " + conceptoPlantilla.getNombre());
 				concepto = new Concepto();
 				concepto.setAdivinanza(conceptoPlantilla.getAdivinanza());
@@ -717,41 +670,10 @@ public class AdministracionBean implements AdministracionBeanRemote{
 				concepto.setPeso(conceptoPlantilla.getPeso());
 				concepto.setProfesor(profesor);
 				concepto.setTema(tema);
-			
-				//persistir el concepto y agregar a la red
-				agregarConcepto(concepto);
-				
-				
-				//crear ejercicios
-				
-				for(Ejercicio ejercicioPlantilla : concepto.getEjercicioList()){
-					
-					ejercicio = new Ejercicio();
-					ejercicio.setAdivinanza(ejercicioPlantilla.getAdivinanza());
-					ejercicio.setEnunciado(ejercicioPlantilla.getEnunciado());
-					ejercicio.setImagen(ejercicioPlantilla.getImagen());
-					ejercicio.setNivelDificultad(ejercicioPlantilla.getNivelDificultad());
-					ejercicio.setProfesor(profesor);
-					ejercicio.setRespuesta(ejercicioPlantilla.getRespuesta());
-					
-			
-					//crear Respuestas para ejercicios
-					for(Respuesta respuestaPlantilla : ejercicio.getRespuestaList()){
-						
-						respuesta = new Respuesta();
-						respuesta.setDescripcion(respuestaPlantilla.getDescripcion());
-						respuestaList.add(respuesta);
-						
-					}
-					
-					ejercicio.setRespuestaList(respuestaList);
-					
-					//agregar ejercicio a la red
-					
-					agregarEjercicio(ejercicioPlantilla, asignatura.getIdAsignatura());
-					;
-				}
+								//persistir el concepto y agregar a la red
 				
+				em.persist(concepto);
+							
 				
 				
 				
@@ -759,10 +681,72 @@ public class AdministracionBean implements AdministracionBeanRemote{
 			
 			
 			
+		}
+				
+/*		List<Concepto> conceptoList = new ArrayList();
+		String queryConceptosPlantillas = "select c from Concepto c  join c.tema t where t.asignatura = :asignatura";
+		String queryEjercicios = "select e from Ejercicio e join e.conceptoList c where c in (:conceptos)";
+
+		String queryConceptos = "Select c from Concepto c where c.nombre = :nombre and c.descripcion = :descripcion and c.profesor = :profe order by c.idConcepto asc";
+		List<Concepto> conceptos = em.createQuery(queryConceptosPlantillas)
+				.setParameter("asignatura", asignaturaPlantilla).getResultList();
+
+		System.out.println("tamanooooo conceptos " + conceptos.size());
+
+		List<Ejercicio> ejercicios = em.createQuery(queryEjercicios)
+				.setParameter("conceptos", conceptos).getResultList();
+
+		System.out.println("tamanooooo " + ejercicios.size());
+
+		for (Ejercicio ejercicioPlantilla : ejercicios) {
+
+			ejercicio = new Ejercicio();
+			ejercicio.setAdivinanza(ejercicioPlantilla.getAdivinanza());
+			ejercicio.setEnunciado(ejercicioPlantilla.getEnunciado());
+			ejercicio.setImagen(ejercicioPlantilla.getImagen());
+			ejercicio.setNivelDificultad(ejercicioPlantilla
+					.getNivelDificultad());
+			ejercicio.setProfesor(profesor);
+			ejercicio.setRespuesta(ejercicioPlantilla.getRespuesta());
+
+			// ejercicio.setConceptoList(ejercicioPlantilla.getConceptoList());
+			// crear Respuestas para ejercicios
+			for (Concepto conceptoP : ejercicioPlantilla.getConceptoList()) {
+
+				Concepto nuev = (Concepto) em
+						.createQuery(queryConceptos)
+						.setParameter("nombre", conceptoP.getNombre())
+						.setParameter("descripcion", conceptoP.getDescripcion())
+						.setParameter("profe", profesor).setMaxResults(1)
+						.getSingleResult();
+
+				conceptoList.add(nuev);
+
+			}
+			for (Respuesta respuestaPlantilla : ejercicioPlantilla
+					.getRespuestaList()) {
+
+				respuesta = new Respuesta();
+				respuesta.setDescripcion(respuestaPlantilla.getDescripcion());
+
+				respuestaList.add(respuesta);
+
+			}
+			ejercicio.setConceptoList(conceptoList);
+			ejercicio.setRespuestaList(respuestaList);
+
+			// agregar ejercicio a la red
+
+			em.persist(ejercicio);
+			;
+
+		}
+			*/
 			
 		}
 		
-	}
+		
+	
 	
 
 
diff --git a/EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java b/EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java
index 8071ee7..47cfeef 100644
--- a/EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java
+++ b/EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java
@@ -22,7 +22,7 @@ public interface AdministracionBeanRemote {
     public void agregarTema(Tema tema);
     public void agregarProfesor(Profesor profesor);
 	public Profesor logIn(String usuario, String password);
-	public void agregarAsignatura(Asignatura asignatura);
+	public Asignatura agregarAsignatura(Asignatura asignatura);
 	public void editarTema(Tema tema);
 	public void editarConcepto(Concepto concepto, String asignatura);
 	public void eliminarConcepto(int idConcepto);
@@ -40,7 +40,6 @@ public interface AdministracionBeanRemote {
 	
 	public void copiarRedAsignatura(Integer idAsignaturaPlanitilla, Asignatura asignatura);
 
-		
 	
     
 }
diff --git a/EjercitarServer/ejbModule/beans/EjercitarWSBean.java b/EjercitarServer/ejbModule/beans/EjercitarWSBean.java
index 1ddec16..b98f3cb 100644
--- a/EjercitarServer/ejbModule/beans/EjercitarWSBean.java
+++ b/EjercitarServer/ejbModule/beans/EjercitarWSBean.java
@@ -6,6 +6,7 @@ import java.util.Date;
 import java.util.List;

 import java.util.Random;

 

+import javax.ejb.EJB;

 import javax.ejb.LocalBean;

 import javax.ejb.Remote;

 import javax.ejb.Stateless;

@@ -21,6 +22,7 @@ import javax.persistence.Query;
 import smile.Network;

 

 import model.Alumno;

+import model.Asignatura;

 import model.Concepto;

 import model.Curso;

 import model.Ejercicio;

@@ -41,6 +43,8 @@ public class EjercitarWSBean implements EjercitarWSRemote {
 

     EntityManager em;

 

+    @EJB

+    AdministracionBean admin;

 	/**

 

      * Default constructor. 

@@ -132,7 +136,7 @@ public class EjercitarWSBean implements EjercitarWSRemote {
 		Network net1 = new Network();

 

 		String nombreRed = "red_alumno_" + alumno.getIdAlumno() + "_asignatura_" + idAsignatura + ".xdsl";

-		net1.readFile("redes/" + nombreRed);

+		net1.readFile("/home/redes/" + nombreRed);

 		net1.updateBeliefs();

 		String nombreEjercicio = "E" + idEjercicio;

 		System.out.println("proba d");

@@ -154,7 +158,7 @@ public class EjercitarWSBean implements EjercitarWSRemote {
 

 		net1.clearEvidence(nombreEjercicio);

 		net1.updateBeliefs();

-		net1.writeFile("redes/" + nombreRed);

+		net1.writeFile("/home/redes/" + nombreRed);

 	}

 

 	@WebMethod

@@ -178,18 +182,20 @@ public class EjercitarWSBean implements EjercitarWSRemote {
 

 	private Ejercicio seleccionUtilidadMax(Tarea tarea, Alumno alumno) {

 

-	

+	try{

 		List<Concepto> conceptoList = em.createQuery("Select c from Concepto c inner join c.tareaList t where t = :tarea").setParameter("tarea", tarea).getResultList();

 		// inicializacion

 

 		double utilidadMax = 0;

 

 		Ejercicio ejercicio = null;

+		

 		for (Concepto concepto : conceptoList) {

 			Network net1 = new Network();

 			String nombreRed = "red_alumno_" + alumno.getIdAlumno() + "_asignatura_" + tarea.getAsignatura().getIdAsignatura() +".xdsl";

-			System.out.println("redes/" + nombreRed);

-			net1.readFile("redes/" + nombreRed);

+			System.out.println("seleccionUtilidadMax - /home/redes/" + nombreRed);

+			

+			net1.readFile("/home/redes/" + nombreRed);

 			net1.updateBeliefs();

 			String nombreConcepto = concepto.getNombre();

 			double [] values = net1.getNodeValue(nombreConcepto);

@@ -226,6 +232,10 @@ public class EjercitarWSBean implements EjercitarWSRemote {
 			}	

 		}

 		return ejercicio;

+	}catch(Exception e){

+		 e.printStackTrace();

+	 }

+		return null;

 	}

 

 	@WebMethod

@@ -365,5 +375,42 @@ public class EjercitarWSBean implements EjercitarWSRemote {
 		

 	}

 	

+	@WebMethod

+	public void corregirProbabilidadesEjercicios() {

+		

+		

+		Asignatura asignatura = em.find(Asignatura.class, 3);

+		

+		System.out.println(asignatura.getNombre());

+		 List<Tema> temas = (List<Tema>) em.createQuery("select t from Tema t where t.asignatura = :asignatura").setParameter("asignatura", asignatura).getResultList();

+			System.out.println("tema " + temas.size());

+

+		 List<Concepto> conceptos = (List<Concepto>) em.createQuery("select c from Concepto c where c.tema in :temas").setParameter("temas", temas).getResultList();

+		 

+			System.out.println("conceptos " + conceptos.size() );

+		       Network net = new Network();

+

+		       net.readFile("/home/redes/red_asignatura_3.xdsl");

+

+				System.out.println("########## leido #############");

+

+        for(Concepto concepto : conceptos){

+        	

+        	for(Ejercicio ejercicio : concepto.getEjercicioList()){

+        		

+        		  String titulo = "E" + Integer.toString(ejercicio.getIdEjercicio());

+                  

+             		System.out.println(titulo);

+

+                     double[] ejercicioDef = admin.calcularProbabilidadesCCI(ejercicio);

+                     net.setNodeDefinition(titulo, ejercicioDef);

+        	}

+        	

+        }

+        net.writeFile("/home/redes/red_asignatura_3.xdsl");

+

+   

+}

+	

 

 }

diff --git a/EjercitarServer/ejbModule/beans/EjercitarWSRemote.java b/EjercitarServer/ejbModule/beans/EjercitarWSRemote.java
index 6cfbfe4..f7c8c95 100644
--- a/EjercitarServer/ejbModule/beans/EjercitarWSRemote.java
+++ b/EjercitarServer/ejbModule/beans/EjercitarWSRemote.java
@@ -34,6 +34,8 @@ public interface EjercitarWSRemote {
 	public  String obtenerCantidadEjercicioTarea(Integer idAlumno, Integer idTarea);
 	
 	public void terminarTarea(Integer idSesion);
+	
+	public void corregirProbabilidadesEjercicios();
 
 	
 }
\ No newline at end of file
diff --git a/EjercitarWeb/WebContent/Asignatura.jsp b/EjercitarWeb/WebContent/Asignatura.jsp
index 80213cf..a13d303 100644
--- a/EjercitarWeb/WebContent/Asignatura.jsp
+++ b/EjercitarWeb/WebContent/Asignatura.jsp
@@ -1,23 +1,22 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
+<%@page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
 <!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">
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<title>Asignatura</title>
-	<%@ include file="templateHEAD.jsp"%>
+	<%@include file="templateHEAD.jsp" %>
 	<!-- validaciones -->  
 	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/validaciones.js"></script>
 </head>
 <body class="e-body">
-	<%@ page import="model.Curso"  import="java.util.List" %>
+	<%@page import="model.Curso"  import="java.util.List" %>
 	<div class="container e-viewport">
 		<div class="row e-panel-header">
 			<div class="e-logo"></div>
 		</div>
 		<div class="row e-panel-center">
-			<div class="e-panel-bd panel panel-success">
+			<div class="e-panel-bd panel panel-primary">
 				<div class="panel-heading">Nueva Asignatura</div>
 				<div class="panel-body">
 					<form class="form-horizontal" role="form" name="form" method="post" action="">
@@ -28,7 +27,7 @@
 							</div>
 						</div>
 					    <div class="form-group">
-					    	<label for="descripcion" class="col-sm-2 control-label">Descripción:</label>
+					    	<label for="descripcion" class="col-sm-2 control-label">Descripci&oacute;n:</label>
 							<div class="col-sm-10">
 								<input type="text" class="form-control" name="descripcion" />
 							</div>
@@ -39,7 +38,7 @@
 								<select class="form-control" id="curso" name="curso">
 									<% List<Curso> cursos = (List<Curso>) request.getAttribute("lista_cursos"); %>
 									<% for(Curso curso : cursos) {%>
-										<option value="<%= curso.getIdCurso() %>"><%= curso.getEscuela().getNombre() + " " + curso.getSeccion() + " " + curso.getTurno()   %></option>
+										<option value="<%=curso.getIdCurso()%>"><%=curso.getEscuela().getNombre() + " " + curso.getSeccion() + " " + curso.getTurno()%></option>
 									<% } %>
 								</select>
 							</div>
@@ -48,7 +47,7 @@
 					    	<label for="plantilla" class="col-sm-2 control-label">Usar plantilla:</label>
 							<div class="col-sm-10">
 								<select class="form-control" id="plantilla" name="plantilla" value="Seleccione una plantilla" default="asdf">
-									<option value="0">Seleccione una opcion..</option> 
+									<option value="0">Seleccione una opción..</option> 
 									<option value="1">Matematica </option>
 								</select>
 							</div>
diff --git a/EjercitarWeb/WebContent/Concepto.jsp b/EjercitarWeb/WebContent/Concepto.jsp
index 0a09af8..870c5b8 100644
--- a/EjercitarWeb/WebContent/Concepto.jsp
+++ b/EjercitarWeb/WebContent/Concepto.jsp
@@ -1,100 +1,111 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
+<%@page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <!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">
-<title>Concepto</title>
-	<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
-<script src="http://code.jquery.com/jquery-1.9.1.js"></script>
-<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
-<script src="js/jquery.validate.min.js"></script>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Concepto</title>
+	<!-- <%@include file="templateHEAD.jsp" %> -->
+	<!-- Styles -->
+	<link rel="stylesheet" href="css/themes/smoothness/jquery-ui-1.10.4.css" />
+	<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
+	<link rel="stylesheet" href="css/ejercitar-base.css" />
+	<!-- Scripts -->
+	<script src="js/smoothness/jquery-1.10.2.js"></script>
+	<script src="js/smoothness/jquery-ui-1.10.4.custom.js"></script>
+	<script src="lib/bootstrap/js/bootstrap.min.js"></script>
+	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/validaciones.js"></script>
-	
-
 </head>
-<body>
+<body class="e-body">
 	<%@page import="java.util.List" import="model.Tema" import = "model.Profesor" import="model.Concepto"%> 
-	<div id="content">
-<form  id="form1" name="form1" method="post" action="">
-		<br>
-		<% Profesor profesor = (Profesor) request.getSession().getAttribute("profesor");%>
-		
-		<input name="profesor" type=hidden id="profesor" value=<%=profesor.getIdProfesor() %>>
-		<fieldset> 
-		
-			<p>
-				<label>Nombre:</label>
-				 <input type="text" name="nombre" id= "nombre"/>
-			</p>
-			
-			<p>
-				<label>Descripción:</label>
-			   <input type="text" name="descripcion" id="descripcion"></input>
-			</p>
-			<p>
-				<label>Tema:</label>
-			   <select id="temas" name="tema">
-					<% List<Tema> temas = (List<Tema>)request.getAttribute("lista_temas"); %>
-					<% for(Tema tema : temas) {%>
-						<option value="<%= tema.getIdTema() %>"><%= tema.getNombre() %></option>
-					<% } %>
-			  </select>
-			</p>
-		
-			<fieldset>
-				<legend> Probabilidades </legend>
-				<p>
-					<label>A priori:</label>
-				   <input type="text" name="a_priori" id= "a_priori" value="0.5" />
-				</p>
-				<p>
-					<label>Adivinanza:</label>
-				   <input type="text" name="adivinanza" id="adivinanza" value="0.2"  />
-				</p>
-				<p>
-					<label>Descuido:</label>
-				   <input type="text" name="descuido" id="descuido" value="0.2"  />
-				</p>
-			</fieldset>
-			<p class="nolabel">
-			        <button type="submit" name="Submit"> <img src="css/img/guardar.png" align="middle"/> Guardar </button>
-
-			</p>
-		</fieldset>
-
-	</form>
+	<div class="container e-viewport">
+		<div class="row e-panel-header">
+			<div class="e-logo"></div>
+		</div>
+		<div class="row e-panel-center">
+			<div class="e-panel-bd panel panel-primary">
+				<div class="panel-heading">Nuevo Concepto</div>
+				<div class="panel-body">
+					<form id="form1" class="form-horizontal" role="form" name="form" method="post" action="">
+						<% Profesor profesor = (Profesor) request.getSession().getAttribute("profesor");%>
+						<input name="profesor" type="hidden" id="profesor" value=<%=profesor.getIdProfesor() %>>
+						<div class="form-group">
+							<label for="nombre" class="col-sm-2 control-label">Nombre:</label>
+							<div class="col-sm-10">
+								<input type="text" class="form-control" name="nombre" id="nombre"/>
+							</div>
+						</div>
+						<div class="form-group">
+							<label for="descripcion" class="col-sm-2 control-label">Descripción:</label>
+						   	<div class="col-sm-10">
+								<input type="text" class="form-control" name="descripcion" id="descripcion"></input>
+							</div>
+						</div>
+						<div class="form-group">
+							<label for="tema" class="col-sm-2 control-label">Tema:</label>
+						   	<div class="col-sm-10">
+								<select id="temas" class="form-control" name="tema">
+									<% List<Tema> temas = (List<Tema>) request.getAttribute("lista_temas"); %>
+									<% for(Tema tema: temas) { %>
+										<option value="<%= tema.getIdTema() %>"><%= tema.getNombre() %></option>
+									<% } %>
+							  	</select>
+						  	</div>
+						</div>
+						<fieldset class="span4">
+							<legend>Probabilidades</legend>
+							<div class="form-group">
+								<label for="a_priori" class="col-sm-2 control-label">A priori:</label>
+							   	<div class="col-sm-10">
+									<input type="text" name="a_priori" id="a_priori" value="0.5" />
+							  	</div>
+							</div>
+							<div class="form-group">
+								<label for="adivinanza" class="col-sm-2 control-label">Adivinanza:</label>
+							   	<div class="col-sm-10">
+									<input type="text" name="adivinanza" id="adivinanza" value="0.2" />
+							  	</div>
+							</div>
+							<div class="form-group">
+								<label for="descuido" class="col-sm-2 control-label">Descuido:</label>
+							   	<div class="col-sm-10">
+									<input type="text" name="descuido" id="descuido" value="0.2" />
+							  	</div>
+							</div>
+						</fieldset>
+						<button class="btn btn-default btn-primary" type="submit" name="Submit">
+					    	<span class="e-button-text">Guardar</span>
+				    	</button>
+					</form>
+				</div>
+			</div>
+		</div>
+		<div class="row e-panel-footer">
+			<span>Ejercitar: Un Modelo de aprendizaje asistido por computadora</span>
+			<span>Ceci Godoy - Samu Reyes - FP-UNA</span>
+		</div>
 	</div>
 
 	<script>
-	
-	$( "#a_priori" ).spinner({
-	step: 0.01,
-	numberFormat: "n",
-	max:1,
-	min:0
-	});
-
-	$( "#adivinanza" ).spinner({
-		step: 0.1,
-		numberFormat: "n",
-		max:1,
-		min:0
+		$("#a_priori").spinner({
+			step: 0.01,
+			numberFormat: "n",
+			max:1,
+			min:0
 		});
-
-	$( "#descuido" ).spinner({
-		step: 0.1,
-		numberFormat: "n",
-		max:1,
-		min:0
+		$("#adivinanza").spinner({
+			step: 0.1,
+			numberFormat: "n",
+			max:1,
+			min:0
+		});
+		$( "#descuido" ).spinner({
+			step: 0.1,
+			numberFormat: "n",
+			max:1,
+			min:0
 		});
-	
 	</script>
-
 </body>
 
         
diff --git a/EjercitarWeb/WebContent/Tema.jsp b/EjercitarWeb/WebContent/Tema.jsp
index 32ebe36..385780f 100644
--- a/EjercitarWeb/WebContent/Tema.jsp
+++ b/EjercitarWeb/WebContent/Tema.jsp
@@ -1,50 +1,52 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
 <!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>
-
-<!-- validaciones -->  
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Tema</title>
+	<%@include file="templateHEAD.jsp" %>
+	<!-- validaciones -->  
 	<script src="js/jquery-1.7.1.min.js"></script>
 	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/validaciones.js"></script>
-	
 </head>
-<body>
-<%@page import="java.util.List" import="model.Asignatura" import="model.Profesor" import="model.Tema"%> 
-
-<div id="content">
-<form  id="form1" name="form1" method="post" action="">
-		<br>
-		<% Profesor profesor = (Profesor) request.getSession().getAttribute("profesor");%>
-
-		<input name="profesor" type="hidden" id="profesor" value=<%= profesor.getIdProfesor() %>>
-		
-		<fieldset>
-			<p>
-				<label>Nombre:</label>
-				 <input type="text" name="nombre" id= "nombre">
-			</p>
-			<p>
-				<label>Descripción</label>
-				<input type="text"  name="descripcion" id="descripcion"></input>
-			</p>
-		
-			<!-- >p>
-				<label>Peso:</label>
-				 <input  type="text" name="peso" id= "peso"> 
-			</p-->
-			<p class="nolabel">
-			        <button type="submit" name="Submit"> <img src="css/img/guardar.png" align="middle"/> Guardar </button>
-
-				</p>
-		</fieldset>
-		
-	</form>
-	
-</div>
+<body class="e-body">
+	<%@page import="java.util.List" import="model.Asignatura" import="model.Profesor" import="model.Tema"%> 
+	<div class="container e-viewport">
+		<div class="row e-panel-header">
+			<div class="e-logo"></div>
+		</div>
+		<div class="row e-panel-center">
+			<div class="e-panel-bd panel panel-primary">
+				<div class="panel-heading">Nuevo Tema</div>
+				<div class="panel-body">
+					<form id="form1" class="form-horizontal" role="form" name="form" method="post" action="">
+						<% Profesor profesor = (Profesor) request.getSession().getAttribute("profesor");%>
+						<input name="profesor" type="hidden" id="profesor" value=<%= profesor.getIdProfesor() %>>
+						<div class="form-group">
+							<label for="nombre" class="col-sm-2 control-label">Nombre:</label>
+							<div class="col-sm-10">
+								<input type="text" class="form-control" name="nombre" id="nombre"/>
+							</div>
+						</div>
+					    <div class="form-group">
+					    	<label for="descripcion" class="col-sm-2 control-label">Descripci&oacute;n:</label>
+							<div class="col-sm-10">
+								<input type="text" class="form-control" name="descripcion" />
+							</div>
+					    </div>
+					    <button class="btn btn-default btn-primary" type="submit" name="Submit">
+					    	<span class="e-button-text">Guardar</span>
+				    	</button>
+					</form>
+				</div>
+			</div>
+		</div>
+		<div class="row e-panel-footer">
+			<span>Ejercitar: Un Modelo de aprendizaje asistido por computadora</span>
+			<span>Ceci Godoy - Samu Reyes - FP-UNA</span>
+		</div>
+	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/EjercitarWeb/WebContent/css/ejercitar-base.css b/EjercitarWeb/WebContent/css/ejercitar-base.css
index c30a2c9..8818676 100644
--- a/EjercitarWeb/WebContent/css/ejercitar-base.css
+++ b/EjercitarWeb/WebContent/css/ejercitar-base.css
@@ -1,11 +1,15 @@
 /** 
  * Ejercitar Base Style
- * @author Fernando Caballero
+ * @author Fernando Caballero (fercaba01@gmail.com)
  */
 body {
 	background-color: #FEFEFE;
 }
 
+a {
+	cursor: pointer;
+}
+
 .e-viewport {
 	width: 100%;
 	height: 100%;
@@ -17,7 +21,7 @@ body {
 	height: 56px;
 	padding: 0px 5px;
 	line-height: 50px;
-	background-color: #85FF85;
+	background-color: rgb(119, 209, 119);
 }
 
 .e-panel-footer {
@@ -54,6 +58,10 @@ body {
 	width: 80%;
 }
 
+.panel-heading span {
+    display: block;
+}
+
 .e-form {
 	padding: 5px 0px;
 }
diff --git a/EjercitarWeb/WebContent/css/themes/smoothness/jquery-ui-1.10.4.css b/EjercitarWeb/WebContent/css/themes/smoothness/jquery-ui-1.10.4.css
new file mode 100644
index 0000000..533b351
--- /dev/null
+++ b/EjercitarWeb/WebContent/css/themes/smoothness/jquery-ui-1.10.4.css
@@ -0,0 +1,1178 @@
+/*! jQuery UI - v1.10.4 - 2014-07-01
+* http://jqueryui.com
+* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden {
+	display: none;
+}
+.ui-helper-hidden-accessible {
+	border: 0;
+	clip: rect(0 0 0 0);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+}
+.ui-helper-reset {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	line-height: 1.3;
+	text-decoration: none;
+	font-size: 100%;
+	list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+	content: "";
+	display: table;
+	border-collapse: collapse;
+}
+.ui-helper-clearfix:after {
+	clear: both;
+}
+.ui-helper-clearfix {
+	min-height: 0; /* support: IE7 */
+}
+.ui-helper-zfix {
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	position: absolute;
+	opacity: 0;
+	filter:Alpha(Opacity=0);
+}
+
+.ui-front {
+	z-index: 100;
+}
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled {
+	cursor: default !important;
+}
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	display: block;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+}
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+.ui-resizable {
+	position: relative;
+}
+.ui-resizable-handle {
+	position: absolute;
+	font-size: 0.1px;
+	display: block;
+}
+.ui-resizable-disabled .ui-resizable-handle,
+.ui-resizable-autohide .ui-resizable-handle {
+	display: none;
+}
+.ui-resizable-n {
+	cursor: n-resize;
+	height: 7px;
+	width: 100%;
+	top: -5px;
+	left: 0;
+}
+.ui-resizable-s {
+	cursor: s-resize;
+	height: 7px;
+	width: 100%;
+	bottom: -5px;
+	left: 0;
+}
+.ui-resizable-e {
+	cursor: e-resize;
+	width: 7px;
+	right: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-w {
+	cursor: w-resize;
+	width: 7px;
+	left: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-se {
+	cursor: se-resize;
+	width: 12px;
+	height: 12px;
+	right: 1px;
+	bottom: 1px;
+}
+.ui-resizable-sw {
+	cursor: sw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	bottom: -5px;
+}
+.ui-resizable-nw {
+	cursor: nw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	top: -5px;
+}
+.ui-resizable-ne {
+	cursor: ne-resize;
+	width: 9px;
+	height: 9px;
+	right: -5px;
+	top: -5px;
+}
+.ui-selectable-helper {
+	position: absolute;
+	z-index: 100;
+	border: 1px dotted black;
+}
+.ui-accordion .ui-accordion-header {
+	display: block;
+	cursor: pointer;
+	position: relative;
+	margin-top: 2px;
+	padding: .5em .5em .5em .7em;
+	min-height: 0; /* support: IE7 */
+}
+.ui-accordion .ui-accordion-icons {
+	padding-left: 2.2em;
+}
+.ui-accordion .ui-accordion-noicons {
+	padding-left: .7em;
+}
+.ui-accordion .ui-accordion-icons .ui-accordion-icons {
+	padding-left: 2.2em;
+}
+.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
+	position: absolute;
+	left: .5em;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-accordion .ui-accordion-content {
+	padding: 1em 2.2em;
+	border-top: 0;
+	overflow: auto;
+}
+.ui-autocomplete {
+	position: absolute;
+	top: 0;
+	left: 0;
+	cursor: default;
+}
+.ui-button {
+	display: inline-block;
+	position: relative;
+	padding: 0;
+	line-height: normal;
+	margin-right: .1em;
+	cursor: pointer;
+	vertical-align: middle;
+	text-align: center;
+	overflow: visible; /* removes extra width in IE */
+}
+.ui-button,
+.ui-button:link,
+.ui-button:visited,
+.ui-button:hover,
+.ui-button:active {
+	text-decoration: none;
+}
+/* to make room for the icon, a width needs to be set here */
+.ui-button-icon-only {
+	width: 2.2em;
+}
+/* button elements seem to need a little more width */
+button.ui-button-icon-only {
+	width: 2.4em;
+}
+.ui-button-icons-only {
+	width: 3.4em;
+}
+button.ui-button-icons-only {
+	width: 3.7em;
+}
+
+/* button text element */
+.ui-button .ui-button-text {
+	display: block;
+	line-height: normal;
+}
+.ui-button-text-only .ui-button-text {
+	padding: .4em 1em;
+}
+.ui-button-icon-only .ui-button-text,
+.ui-button-icons-only .ui-button-text {
+	padding: .4em;
+	text-indent: -9999999px;
+}
+.ui-button-text-icon-primary .ui-button-text,
+.ui-button-text-icons .ui-button-text {
+	padding: .4em 1em .4em 2.1em;
+}
+.ui-button-text-icon-secondary .ui-button-text,
+.ui-button-text-icons .ui-button-text {
+	padding: .4em 2.1em .4em 1em;
+}
+.ui-button-text-icons .ui-button-text {
+	padding-left: 2.1em;
+	padding-right: 2.1em;
+}
+/* no icon support for input elements, provide padding by default */
+input.ui-button {
+	padding: .4em 1em;
+}
+
+/* button icon element(s) */
+.ui-button-icon-only .ui-icon,
+.ui-button-text-icon-primary .ui-icon,
+.ui-button-text-icon-secondary .ui-icon,
+.ui-button-text-icons .ui-icon,
+.ui-button-icons-only .ui-icon {
+	position: absolute;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-button-icon-only .ui-icon {
+	left: 50%;
+	margin-left: -8px;
+}
+.ui-button-text-icon-primary .ui-button-icon-primary,
+.ui-button-text-icons .ui-button-icon-primary,
+.ui-button-icons-only .ui-button-icon-primary {
+	left: .5em;
+}
+.ui-button-text-icon-secondary .ui-button-icon-secondary,
+.ui-button-text-icons .ui-button-icon-secondary,
+.ui-button-icons-only .ui-button-icon-secondary {
+	right: .5em;
+}
+
+/* button sets */
+.ui-buttonset {
+	margin-right: 7px;
+}
+.ui-buttonset .ui-button {
+	margin-left: 0;
+	margin-right: -.3em;
+}
+
+/* workarounds */
+/* reset extra padding in Firefox, see h5bp.com/l */
+input.ui-button::-moz-focus-inner,
+button.ui-button::-moz-focus-inner {
+	border: 0;
+	padding: 0;
+}
+.ui-datepicker {
+	width: 17em;
+	padding: .2em .2em 0;
+	display: none;
+}
+.ui-datepicker .ui-datepicker-header {
+	position: relative;
+	padding: .2em 0;
+}
+.ui-datepicker .ui-datepicker-prev,
+.ui-datepicker .ui-datepicker-next {
+	position: absolute;
+	top: 2px;
+	width: 1.8em;
+	height: 1.8em;
+}
+.ui-datepicker .ui-datepicker-prev-hover,
+.ui-datepicker .ui-datepicker-next-hover {
+	top: 1px;
+}
+.ui-datepicker .ui-datepicker-prev {
+	left: 2px;
+}
+.ui-datepicker .ui-datepicker-next {
+	right: 2px;
+}
+.ui-datepicker .ui-datepicker-prev-hover {
+	left: 1px;
+}
+.ui-datepicker .ui-datepicker-next-hover {
+	right: 1px;
+}
+.ui-datepicker .ui-datepicker-prev span,
+.ui-datepicker .ui-datepicker-next span {
+	display: block;
+	position: absolute;
+	left: 50%;
+	margin-left: -8px;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-datepicker .ui-datepicker-title {
+	margin: 0 2.3em;
+	line-height: 1.8em;
+	text-align: center;
+}
+.ui-datepicker .ui-datepicker-title select {
+	font-size: 1em;
+	margin: 1px 0;
+}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year {
+	width: 49%;
+}
+.ui-datepicker table {
+	width: 100%;
+	font-size: .9em;
+	border-collapse: collapse;
+	margin: 0 0 .4em;
+}
+.ui-datepicker th {
+	padding: .7em .3em;
+	text-align: center;
+	font-weight: bold;
+	border: 0;
+}
+.ui-datepicker td {
+	border: 0;
+	padding: 1px;
+}
+.ui-datepicker td span,
+.ui-datepicker td a {
+	display: block;
+	padding: .2em;
+	text-align: right;
+	text-decoration: none;
+}
+.ui-datepicker .ui-datepicker-buttonpane {
+	background-image: none;
+	margin: .7em 0 0 0;
+	padding: 0 .2em;
+	border-left: 0;
+	border-right: 0;
+	border-bottom: 0;
+}
+.ui-datepicker .ui-datepicker-buttonpane button {
+	float: right;
+	margin: .5em .2em .4em;
+	cursor: pointer;
+	padding: .2em .6em .3em .6em;
+	width: auto;
+	overflow: visible;
+}
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
+	float: left;
+}
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi {
+	width: auto;
+}
+.ui-datepicker-multi .ui-datepicker-group {
+	float: left;
+}
+.ui-datepicker-multi .ui-datepicker-group table {
+	width: 95%;
+	margin: 0 auto .4em;
+}
+.ui-datepicker-multi-2 .ui-datepicker-group {
+	width: 50%;
+}
+.ui-datepicker-multi-3 .ui-datepicker-group {
+	width: 33.3%;
+}
+.ui-datepicker-multi-4 .ui-datepicker-group {
+	width: 25%;
+}
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
+	border-left-width: 0;
+}
+.ui-datepicker-multi .ui-datepicker-buttonpane {
+	clear: left;
+}
+.ui-datepicker-row-break {
+	clear: both;
+	width: 100%;
+	font-size: 0;
+}
+
+/* RTL support */
+.ui-datepicker-rtl {
+	direction: rtl;
+}
+.ui-datepicker-rtl .ui-datepicker-prev {
+	right: 2px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next {
+	left: 2px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-prev:hover {
+	right: 1px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next:hover {
+	left: 1px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane {
+	clear: right;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button {
+	float: left;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
+.ui-datepicker-rtl .ui-datepicker-group {
+	float: right;
+}
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
+	border-right-width: 0;
+	border-left-width: 1px;
+}
+.ui-dialog {
+	overflow: hidden;
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding: .2em;
+	outline: 0;
+}
+.ui-dialog .ui-dialog-titlebar {
+	padding: .4em 1em;
+	position: relative;
+}
+.ui-dialog .ui-dialog-title {
+	float: left;
+	margin: .1em 0;
+	white-space: nowrap;
+	width: 90%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.ui-dialog .ui-dialog-titlebar-close {
+	position: absolute;
+	right: .3em;
+	top: 50%;
+	width: 20px;
+	margin: -10px 0 0 0;
+	padding: 1px;
+	height: 20px;
+}
+.ui-dialog .ui-dialog-content {
+	position: relative;
+	border: 0;
+	padding: .5em 1em;
+	background: none;
+	overflow: auto;
+}
+.ui-dialog .ui-dialog-buttonpane {
+	text-align: left;
+	border-width: 1px 0 0 0;
+	background-image: none;
+	margin-top: .5em;
+	padding: .3em 1em .5em .4em;
+}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+	float: right;
+}
+.ui-dialog .ui-dialog-buttonpane button {
+	margin: .5em .4em .5em 0;
+	cursor: pointer;
+}
+.ui-dialog .ui-resizable-se {
+	width: 12px;
+	height: 12px;
+	right: -5px;
+	bottom: -5px;
+	background-position: 16px 16px;
+}
+.ui-draggable .ui-dialog-titlebar {
+	cursor: move;
+}
+.ui-menu {
+	list-style: none;
+	padding: 2px;
+	margin: 0;
+	display: block;
+	outline: none;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+	position: absolute;
+}
+.ui-menu .ui-menu-item {
+	margin: 0;
+	padding: 0;
+	width: 100%;
+	/* support: IE10, see #8844 */
+	list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+}
+.ui-menu .ui-menu-divider {
+	margin: 5px -2px 5px -2px;
+	height: 0;
+	font-size: 0;
+	line-height: 0;
+	border-width: 1px 0 0 0;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration: none;
+	display: block;
+	padding: 2px .4em;
+	line-height: 1.5;
+	min-height: 0; /* support: IE7 */
+	font-weight: normal;
+}
+.ui-menu .ui-menu-item a.ui-state-focus,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+
+.ui-menu .ui-state-disabled {
+	font-weight: normal;
+	margin: .4em 0 .2em;
+	line-height: 1.5;
+}
+.ui-menu .ui-state-disabled a {
+	cursor: default;
+}
+
+/* icon support */
+.ui-menu-icons {
+	position: relative;
+}
+.ui-menu-icons .ui-menu-item a {
+	position: relative;
+	padding-left: 2em;
+}
+
+/* left-aligned */
+.ui-menu .ui-icon {
+	position: absolute;
+	top: .2em;
+	left: .2em;
+}
+
+/* right-aligned */
+.ui-menu .ui-menu-icon {
+	position: static;
+	float: right;
+}
+.ui-progressbar {
+	height: 2em;
+	text-align: left;
+	overflow: hidden;
+}
+.ui-progressbar .ui-progressbar-value {
+	margin: -1px;
+	height: 100%;
+}
+.ui-progressbar .ui-progressbar-overlay {
+	background: url("images/animated-overlay.gif");
+	height: 100%;
+	filter: alpha(opacity=25);
+	opacity: 0.25;
+}
+.ui-progressbar-indeterminate .ui-progressbar-value {
+	background-image: none;
+}
+.ui-slider {
+	position: relative;
+	text-align: left;
+}
+.ui-slider .ui-slider-handle {
+	position: absolute;
+	z-index: 2;
+	width: 1.2em;
+	height: 1.2em;
+	cursor: default;
+}
+.ui-slider .ui-slider-range {
+	position: absolute;
+	z-index: 1;
+	font-size: .7em;
+	display: block;
+	border: 0;
+	background-position: 0 0;
+}
+
+/* For IE8 - See #6727 */
+.ui-slider.ui-state-disabled .ui-slider-handle,
+.ui-slider.ui-state-disabled .ui-slider-range {
+	filter: inherit;
+}
+
+.ui-slider-horizontal {
+	height: .8em;
+}
+.ui-slider-horizontal .ui-slider-handle {
+	top: -.3em;
+	margin-left: -.6em;
+}
+.ui-slider-horizontal .ui-slider-range {
+	top: 0;
+	height: 100%;
+}
+.ui-slider-horizontal .ui-slider-range-min {
+	left: 0;
+}
+.ui-slider-horizontal .ui-slider-range-max {
+	right: 0;
+}
+
+.ui-slider-vertical {
+	width: .8em;
+	height: 100px;
+}
+.ui-slider-vertical .ui-slider-handle {
+	left: -.3em;
+	margin-left: 0;
+	margin-bottom: -.6em;
+}
+.ui-slider-vertical .ui-slider-range {
+	left: 0;
+	width: 100%;
+}
+.ui-slider-vertical .ui-slider-range-min {
+	bottom: 0;
+}
+.ui-slider-vertical .ui-slider-range-max {
+	top: 0;
+}
+.ui-spinner {
+	position: relative;
+	display: inline-block;
+	overflow: hidden;
+	padding: 0;
+	vertical-align: middle;
+}
+.ui-spinner-input {
+	border: none;
+	background: none;
+	color: inherit;
+	padding: 0;
+	margin: .2em 0;
+	vertical-align: middle;
+	margin-left: .4em;
+	margin-right: 22px;
+}
+.ui-spinner-button {
+	width: 16px;
+	height: 50%;
+	font-size: .5em;
+	padding: 0;
+	margin: 0;
+	text-align: center;
+	position: absolute;
+	cursor: default;
+	display: block;
+	overflow: hidden;
+	right: 0;
+}
+/* more specificity required here to override default borders */
+.ui-spinner a.ui-spinner-button {
+	border-top: none;
+	border-bottom: none;
+	border-right: none;
+}
+/* vertically center icon */
+.ui-spinner .ui-icon {
+	position: absolute;
+	margin-top: -8px;
+	top: 50%;
+	left: 0;
+}
+.ui-spinner-up {
+	top: 0;
+}
+.ui-spinner-down {
+	bottom: 0;
+}
+
+/* TR overrides */
+.ui-spinner .ui-icon-triangle-1-s {
+	/* need to fix icons sprite */
+	background-position: -65px -16px;
+}
+.ui-tabs {
+	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+	padding: .2em;
+}
+.ui-tabs .ui-tabs-nav {
+	margin: 0;
+	padding: .2em .2em 0;
+}
+.ui-tabs .ui-tabs-nav li {
+	list-style: none;
+	float: left;
+	position: relative;
+	top: 0;
+	margin: 1px .2em 0 0;
+	border-bottom-width: 0;
+	padding: 0;
+	white-space: nowrap;
+}
+.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
+	float: left;
+	padding: .5em 1em;
+	text-decoration: none;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active {
+	margin-bottom: -1px;
+	padding-bottom: 1px;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,
+.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,
+.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor {
+	cursor: text;
+}
+.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor {
+	cursor: pointer;
+}
+.ui-tabs .ui-tabs-panel {
+	display: block;
+	border-width: 0;
+	padding: 1em 1.4em;
+	background: none;
+}
+.ui-tooltip {
+	padding: 8px;
+	position: absolute;
+	z-index: 9999;
+	max-width: 300px;
+	-webkit-box-shadow: 0 0 5px #aaa;
+	box-shadow: 0 0 5px #aaa;
+}
+body .ui-tooltip {
+	border-width: 2px;
+}
+
+/* Component containers
+----------------------------------*/
+.ui-widget {
+	font-family: Verdana,Arial,sans-serif;
+	font-size: 1.1em;
+}
+.ui-widget .ui-widget {
+	font-size: 1em;
+}
+.ui-widget input,
+.ui-widget select,
+.ui-widget textarea,
+.ui-widget button {
+	font-family: Verdana,Arial,sans-serif;
+	font-size: 1em;
+}
+.ui-widget-content {
+	border: 1px solid #aaaaaa;
+	background: #ffffff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;
+	color: #222222;
+}
+.ui-widget-content a {
+	color: #222222;
+}
+.ui-widget-header {
+	border: 1px solid #aaaaaa;
+	background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
+	color: #222222;
+	font-weight: bold;
+}
+.ui-widget-header a {
+	color: #222222;
+}
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default {
+	border: 1px solid #d3d3d3;
+	background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
+	font-weight: normal;
+	color: #555555;
+}
+.ui-state-default a,
+.ui-state-default a:link,
+.ui-state-default a:visited {
+	color: #555555;
+	text-decoration: none;
+}
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus {
+	border: 1px solid #999999;
+	background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
+	font-weight: normal;
+	color: #212121;
+}
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-hover a:link,
+.ui-state-hover a:visited,
+.ui-state-focus a,
+.ui-state-focus a:hover,
+.ui-state-focus a:link,
+.ui-state-focus a:visited {
+	color: #212121;
+	text-decoration: none;
+}
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active {
+	border: 1px solid #aaaaaa;
+	background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
+	font-weight: normal;
+	color: #212121;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+	color: #212121;
+	text-decoration: none;
+}
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight,
+.ui-widget-content .ui-state-highlight,
+.ui-widget-header .ui-state-highlight {
+	border: 1px solid #fcefa1;
+	background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
+	color: #363636;
+}
+.ui-state-highlight a,
+.ui-widget-content .ui-state-highlight a,
+.ui-widget-header .ui-state-highlight a {
+	color: #363636;
+}
+.ui-state-error,
+.ui-widget-content .ui-state-error,
+.ui-widget-header .ui-state-error {
+	border: 1px solid #cd0a0a;
+	background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
+	color: #cd0a0a;
+}
+.ui-state-error a,
+.ui-widget-content .ui-state-error a,
+.ui-widget-header .ui-state-error a {
+	color: #cd0a0a;
+}
+.ui-state-error-text,
+.ui-widget-content .ui-state-error-text,
+.ui-widget-header .ui-state-error-text {
+	color: #cd0a0a;
+}
+.ui-priority-primary,
+.ui-widget-content .ui-priority-primary,
+.ui-widget-header .ui-priority-primary {
+	font-weight: bold;
+}
+.ui-priority-secondary,
+.ui-widget-content .ui-priority-secondary,
+.ui-widget-header .ui-priority-secondary {
+	opacity: .7;
+	filter:Alpha(Opacity=70);
+	font-weight: normal;
+}
+.ui-state-disabled,
+.ui-widget-content .ui-state-disabled,
+.ui-widget-header .ui-state-disabled {
+	opacity: .35;
+	filter:Alpha(Opacity=35);
+	background-image: none;
+}
+.ui-state-disabled .ui-icon {
+	filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
+}
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	width: 16px;
+	height: 16px;
+}
+.ui-icon,
+.ui-widget-content .ui-icon {
+	background-image: url("images/ui-icons_222222_256x240.png");
+}
+.ui-widget-header .ui-icon {
+	background-image: url("images/ui-icons_222222_256x240.png");
+}
+.ui-state-default .ui-icon {
+	background-image: url("images/ui-icons_888888_256x240.png");
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon {
+	background-image: url("images/ui-icons_454545_256x240.png");
+}
+.ui-state-active .ui-icon {
+	background-image: url("images/ui-icons_454545_256x240.png");
+}
+.ui-state-highlight .ui-icon {
+	background-image: url("images/ui-icons_2e83ff_256x240.png");
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+	background-image: url("images/ui-icons_cd0a0a_256x240.png");
+}
+
+/* positioning */
+.ui-icon-blank { background-position: 16px 16px; }
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-left,
+.ui-corner-tl {
+	border-top-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-right,
+.ui-corner-tr {
+	border-top-right-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-left,
+.ui-corner-bl {
+	border-bottom-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-right,
+.ui-corner-br {
+	border-bottom-right-radius: 4px;
+}
+
+/* Overlays */
+.ui-widget-overlay {
+	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
+	opacity: .3;
+	filter: Alpha(Opacity=30);
+}
+.ui-widget-shadow {
+	margin: -8px 0 0 -8px;
+	padding: 8px;
+	background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
+	opacity: .3;
+	filter: Alpha(Opacity=30);
+	border-radius: 8px;
+}
diff --git a/EjercitarWeb/WebContent/css/themes/smoothness/jquery-ui-1.10.4.min.css b/EjercitarWeb/WebContent/css/themes/smoothness/jquery-ui-1.10.4.min.css
new file mode 100644
index 0000000..93d2474
--- /dev/null
+++ b/EjercitarWeb/WebContent/css/themes/smoothness/jquery-ui-1.10.4.min.css
@@ -0,0 +1,7 @@
+/*! jQuery UI - v1.10.4 - 2014-07-01
+* http://jqueryui.com
+* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css, jquery.ui.theme.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin-top:2px;padding:.5em .5em .5em .7em;min-height:0}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-noicons{padding-left:.7em}.ui-accordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:49%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-dialog{overflow:hidden;position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-menu{list-style:none;padding:2px;margin:0;display:block;outline:none}.ui-menu .ui-menu{margin-top:-3px;position:absolute}.ui-menu .ui-menu-item{margin:0;padding:0;width:100%;list-style-image:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}.ui-menu .ui-menu-divider{margin:5px -2px 5px -2px;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-menu-item a{text-decoration:none;display:block;padding:2px .4em;line-height:1.5;min-height:0;font-weight:normal}.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active{font-weight:normal;margin:-1px}.ui-menu .ui-state-disabled{font-weight:normal;margin:.4em 0 .2em;line-height:1.5}.ui-menu .ui-state-disabled a{cursor:default}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item a{position:relative;padding-left:2em}.ui-menu .ui-icon{position:absolute;top:.2em;left:.2em}.ui-menu .ui-menu-icon{position:static;float:right}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("images/animated-overlay.gif");height:100%;filter:alpha(opacity=25);opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:22px}.ui-spinner-button{width:16px;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top:none;border-bottom:none;border-right:none}.ui-spinner .ui-icon{position:absolute;margin-top:-8px;top:50%;left:0}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-spinner .ui-icon-triangle-1-s{background-position:-65px -16px}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #aaa;background:#fff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #aaa;background:#ccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #d3d3d3;background:#e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #999;background:#dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#212121;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #aaa;background:#fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fcefa1;background:#fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_888888_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_2e83ff_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cd0a0a_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{margin:-8px 0 0 -8px;padding:8px;background:#aaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px}
\ No newline at end of file
diff --git a/EjercitarWeb/WebContent/css/themes/smoothness/jquery-ui.css b/EjercitarWeb/WebContent/css/themes/smoothness/jquery-ui.css
new file mode 100644
index 0000000..4c1537c
--- /dev/null
+++ b/EjercitarWeb/WebContent/css/themes/smoothness/jquery-ui.css
@@ -0,0 +1,1175 @@
+/*! jQuery UI - v1.10.2 - 2013-03-14
+* http://jqueryui.com
+* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=gloss_wave&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=highlight_soft&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=glass&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=glass&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=highlight_soft&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=diagonals_thick&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=diagonals_thick&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=flat&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
+* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden {
+	display: none;
+}
+.ui-helper-hidden-accessible {
+	border: 0;
+	clip: rect(0 0 0 0);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+}
+.ui-helper-reset {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	line-height: 1.3;
+	text-decoration: none;
+	font-size: 100%;
+	list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+	content: "";
+	display: table;
+	border-collapse: collapse;
+}
+.ui-helper-clearfix:after {
+	clear: both;
+}
+.ui-helper-clearfix {
+	min-height: 0; /* support: IE7 */
+}
+.ui-helper-zfix {
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	position: absolute;
+	opacity: 0;
+	filter:Alpha(Opacity=0);
+}
+
+.ui-front {
+	z-index: 100;
+}
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled {
+	cursor: default !important;
+}
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	display: block;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+}
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+.ui-accordion .ui-accordion-header {
+	display: block;
+	cursor: pointer;
+	position: relative;
+	margin-top: 2px;
+	padding: .5em .5em .5em .7em;
+	min-height: 0; /* support: IE7 */
+}
+.ui-accordion .ui-accordion-icons {
+	padding-left: 2.2em;
+}
+.ui-accordion .ui-accordion-noicons {
+	padding-left: .7em;
+}
+.ui-accordion .ui-accordion-icons .ui-accordion-icons {
+	padding-left: 2.2em;
+}
+.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
+	position: absolute;
+	left: .5em;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-accordion .ui-accordion-content {
+	padding: 1em 2.2em;
+	border-top: 0;
+	overflow: auto;
+}
+.ui-autocomplete {
+	position: absolute;
+	top: 0;
+	left: 0;
+	cursor: default;
+}
+.ui-button {
+	display: inline-block;
+	position: relative;
+	padding: 0;
+	line-height: normal;
+	margin-right: .1em;
+	cursor: pointer;
+	vertical-align: middle;
+	text-align: center;
+	overflow: visible; /* removes extra width in IE */
+}
+.ui-button,
+.ui-button:link,
+.ui-button:visited,
+.ui-button:hover,
+.ui-button:active {
+	text-decoration: none;
+}
+/* to make room for the icon, a width needs to be set here */
+.ui-button-icon-only {
+	width: 2.2em;
+}
+/* button elements seem to need a little more width */
+button.ui-button-icon-only {
+	width: 2.4em;
+}
+.ui-button-icons-only {
+	width: 3.4em;
+}
+button.ui-button-icons-only {
+	width: 3.7em;
+}
+
+/* button text element */
+.ui-button .ui-button-text {
+	display: block;
+	line-height: normal;
+}
+.ui-button-text-only .ui-button-text {
+	padding: .4em 1em;
+}
+.ui-button-icon-only .ui-button-text,
+.ui-button-icons-only .ui-button-text {
+	padding: .4em;
+	text-indent: -9999999px;
+}
+.ui-button-text-icon-primary .ui-button-text,
+.ui-button-text-icons .ui-button-text {
+	padding: .4em 1em .4em 2.1em;
+}
+.ui-button-text-icon-secondary .ui-button-text,
+.ui-button-text-icons .ui-button-text {
+	padding: .4em 2.1em .4em 1em;
+}
+.ui-button-text-icons .ui-button-text {
+	padding-left: 2.1em;
+	padding-right: 2.1em;
+}
+/* no icon support for input elements, provide padding by default */
+input.ui-button {
+	padding: .4em 1em;
+}
+
+/* button icon element(s) */
+.ui-button-icon-only .ui-icon,
+.ui-button-text-icon-primary .ui-icon,
+.ui-button-text-icon-secondary .ui-icon,
+.ui-button-text-icons .ui-icon,
+.ui-button-icons-only .ui-icon {
+	position: absolute;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-button-icon-only .ui-icon {
+	left: 50%;
+	margin-left: -8px;
+}
+.ui-button-text-icon-primary .ui-button-icon-primary,
+.ui-button-text-icons .ui-button-icon-primary,
+.ui-button-icons-only .ui-button-icon-primary {
+	left: .5em;
+}
+.ui-button-text-icon-secondary .ui-button-icon-secondary,
+.ui-button-text-icons .ui-button-icon-secondary,
+.ui-button-icons-only .ui-button-icon-secondary {
+	right: .5em;
+}
+
+/* button sets */
+.ui-buttonset {
+	margin-right: 7px;
+}
+.ui-buttonset .ui-button {
+	margin-left: 0;
+	margin-right: -.3em;
+}
+
+/* workarounds */
+/* reset extra padding in Firefox, see h5bp.com/l */
+input.ui-button::-moz-focus-inner,
+button.ui-button::-moz-focus-inner {
+	border: 0;
+	padding: 0;
+}
+.ui-datepicker {
+	width: 17em;
+	padding: .2em .2em 0;
+	display: none;
+}
+.ui-datepicker .ui-datepicker-header {
+	position: relative;
+	padding: .2em 0;
+}
+.ui-datepicker .ui-datepicker-prev,
+.ui-datepicker .ui-datepicker-next {
+	position: absolute;
+	top: 2px;
+	width: 1.8em;
+	height: 1.8em;
+}
+.ui-datepicker .ui-datepicker-prev-hover,
+.ui-datepicker .ui-datepicker-next-hover {
+	top: 1px;
+}
+.ui-datepicker .ui-datepicker-prev {
+	left: 2px;
+}
+.ui-datepicker .ui-datepicker-next {
+	right: 2px;
+}
+.ui-datepicker .ui-datepicker-prev-hover {
+	left: 1px;
+}
+.ui-datepicker .ui-datepicker-next-hover {
+	right: 1px;
+}
+.ui-datepicker .ui-datepicker-prev span,
+.ui-datepicker .ui-datepicker-next span {
+	display: block;
+	position: absolute;
+	left: 50%;
+	margin-left: -8px;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-datepicker .ui-datepicker-title {
+	margin: 0 2.3em;
+	line-height: 1.8em;
+	text-align: center;
+}
+.ui-datepicker .ui-datepicker-title select {
+	font-size: 1em;
+	margin: 1px 0;
+}
+.ui-datepicker select.ui-datepicker-month-year {
+	width: 100%;
+}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year {
+	width: 49%;
+}
+.ui-datepicker table {
+	width: 100%;
+	font-size: .9em;
+	border-collapse: collapse;
+	margin: 0 0 .4em;
+}
+.ui-datepicker th {
+	padding: .7em .3em;
+	text-align: center;
+	font-weight: bold;
+	border: 0;
+}
+.ui-datepicker td {
+	border: 0;
+	padding: 1px;
+}
+.ui-datepicker td span,
+.ui-datepicker td a {
+	display: block;
+	padding: .2em;
+	text-align: right;
+	text-decoration: none;
+}
+.ui-datepicker .ui-datepicker-buttonpane {
+	background-image: none;
+	margin: .7em 0 0 0;
+	padding: 0 .2em;
+	border-left: 0;
+	border-right: 0;
+	border-bottom: 0;
+}
+.ui-datepicker .ui-datepicker-buttonpane button {
+	float: right;
+	margin: .5em .2em .4em;
+	cursor: pointer;
+	padding: .2em .6em .3em .6em;
+	width: auto;
+	overflow: visible;
+}
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
+	float: left;
+}
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi {
+	width: auto;
+}
+.ui-datepicker-multi .ui-datepicker-group {
+	float: left;
+}
+.ui-datepicker-multi .ui-datepicker-group table {
+	width: 95%;
+	margin: 0 auto .4em;
+}
+.ui-datepicker-multi-2 .ui-datepicker-group {
+	width: 50%;
+}
+.ui-datepicker-multi-3 .ui-datepicker-group {
+	width: 33.3%;
+}
+.ui-datepicker-multi-4 .ui-datepicker-group {
+	width: 25%;
+}
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
+	border-left-width: 0;
+}
+.ui-datepicker-multi .ui-datepicker-buttonpane {
+	clear: left;
+}
+.ui-datepicker-row-break {
+	clear: both;
+	width: 100%;
+	font-size: 0;
+}
+
+/* RTL support */
+.ui-datepicker-rtl {
+	direction: rtl;
+}
+.ui-datepicker-rtl .ui-datepicker-prev {
+	right: 2px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next {
+	left: 2px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-prev:hover {
+	right: 1px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next:hover {
+	left: 1px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane {
+	clear: right;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button {
+	float: left;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
+.ui-datepicker-rtl .ui-datepicker-group {
+	float: right;
+}
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
+	border-right-width: 0;
+	border-left-width: 1px;
+}
+.ui-dialog {
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding: .2em;
+	outline: 0;
+}
+.ui-dialog .ui-dialog-titlebar {
+	padding: .4em 1em;
+	position: relative;
+}
+.ui-dialog .ui-dialog-title {
+	float: left;
+	margin: .1em 0;
+	white-space: nowrap;
+	width: 90%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.ui-dialog .ui-dialog-titlebar-close {
+	position: absolute;
+	right: .3em;
+	top: 50%;
+	width: 21px;
+	margin: -10px 0 0 0;
+	padding: 1px;
+	height: 20px;
+}
+.ui-dialog .ui-dialog-content {
+	position: relative;
+	border: 0;
+	padding: .5em 1em;
+	background: none;
+	overflow: auto;
+}
+.ui-dialog .ui-dialog-buttonpane {
+	text-align: left;
+	border-width: 1px 0 0 0;
+	background-image: none;
+	margin-top: .5em;
+	padding: .3em 1em .5em .4em;
+}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+	float: right;
+}
+.ui-dialog .ui-dialog-buttonpane button {
+	margin: .5em .4em .5em 0;
+	cursor: pointer;
+}
+.ui-dialog .ui-resizable-se {
+	width: 12px;
+	height: 12px;
+	right: -5px;
+	bottom: -5px;
+	background-position: 16px 16px;
+}
+.ui-draggable .ui-dialog-titlebar {
+	cursor: move;
+}
+.ui-menu {
+	list-style: none;
+	padding: 2px;
+	margin: 0;
+	display: block;
+	outline: none;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+	position: absolute;
+}
+.ui-menu .ui-menu-item {
+	margin: 0;
+	padding: 0;
+	width: 100%;
+}
+.ui-menu .ui-menu-divider {
+	margin: 5px -2px 5px -2px;
+	height: 0;
+	font-size: 0;
+	line-height: 0;
+	border-width: 1px 0 0 0;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration: none;
+	display: block;
+	padding: 2px .4em;
+	line-height: 1.5;
+	min-height: 0; /* support: IE7 */
+	font-weight: normal;
+}
+.ui-menu .ui-menu-item a.ui-state-focus,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+
+.ui-menu .ui-state-disabled {
+	font-weight: normal;
+	margin: .4em 0 .2em;
+	line-height: 1.5;
+}
+.ui-menu .ui-state-disabled a {
+	cursor: default;
+}
+
+/* icon support */
+.ui-menu-icons {
+	position: relative;
+}
+.ui-menu-icons .ui-menu-item a {
+	position: relative;
+	padding-left: 2em;
+}
+
+/* left-aligned */
+.ui-menu .ui-icon {
+	position: absolute;
+	top: .2em;
+	left: .2em;
+}
+
+/* right-aligned */
+.ui-menu .ui-menu-icon {
+	position: static;
+	float: right;
+}
+.ui-progressbar {
+	height: 2em;
+	text-align: left;
+	overflow: hidden;
+}
+.ui-progressbar .ui-progressbar-value {
+	margin: -1px;
+	height: 100%;
+}
+.ui-progressbar .ui-progressbar-overlay {
+	background: url("images/animated-overlay.gif");
+	height: 100%;
+	filter: alpha(opacity=25);
+	opacity: 0.25;
+}
+.ui-progressbar-indeterminate .ui-progressbar-value {
+	background-image: none;
+}
+.ui-resizable {
+	position: relative;
+}
+.ui-resizable-handle {
+	position: absolute;
+	font-size: 0.1px;
+	display: block;
+}
+.ui-resizable-disabled .ui-resizable-handle,
+.ui-resizable-autohide .ui-resizable-handle {
+	display: none;
+}
+.ui-resizable-n {
+	cursor: n-resize;
+	height: 7px;
+	width: 100%;
+	top: -5px;
+	left: 0;
+}
+.ui-resizable-s {
+	cursor: s-resize;
+	height: 7px;
+	width: 100%;
+	bottom: -5px;
+	left: 0;
+}
+.ui-resizable-e {
+	cursor: e-resize;
+	width: 7px;
+	right: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-w {
+	cursor: w-resize;
+	width: 7px;
+	left: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-se {
+	cursor: se-resize;
+	width: 12px;
+	height: 12px;
+	right: 1px;
+	bottom: 1px;
+}
+.ui-resizable-sw {
+	cursor: sw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	bottom: -5px;
+}
+.ui-resizable-nw {
+	cursor: nw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	top: -5px;
+}
+.ui-resizable-ne {
+	cursor: ne-resize;
+	width: 9px;
+	height: 9px;
+	right: -5px;
+	top: -5px;
+}
+.ui-selectable-helper {
+	position: absolute;
+	z-index: 100;
+	border: 1px dotted black;
+}
+.ui-slider {
+	position: relative;
+	text-align: left;
+}
+.ui-slider .ui-slider-handle {
+	position: absolute;
+	z-index: 2;
+	width: 1.2em;
+	height: 1.2em;
+	cursor: default;
+}
+.ui-slider .ui-slider-range {
+	position: absolute;
+	z-index: 1;
+	font-size: .7em;
+	display: block;
+	border: 0;
+	background-position: 0 0;
+}
+
+/* For IE8 - See #6727 */
+.ui-slider.ui-state-disabled .ui-slider-handle,
+.ui-slider.ui-state-disabled .ui-slider-range {
+	filter: inherit;
+}
+
+.ui-slider-horizontal {
+	height: .8em;
+}
+.ui-slider-horizontal .ui-slider-handle {
+	top: -.3em;
+	margin-left: -.6em;
+}
+.ui-slider-horizontal .ui-slider-range {
+	top: 0;
+	height: 100%;
+}
+.ui-slider-horizontal .ui-slider-range-min {
+	left: 0;
+}
+.ui-slider-horizontal .ui-slider-range-max {
+	right: 0;
+}
+
+.ui-slider-vertical {
+	width: .8em;
+	height: 100px;
+}
+.ui-slider-vertical .ui-slider-handle {
+	left: -.3em;
+	margin-left: 0;
+	margin-bottom: -.6em;
+}
+.ui-slider-vertical .ui-slider-range {
+	left: 0;
+	width: 100%;
+}
+.ui-slider-vertical .ui-slider-range-min {
+	bottom: 0;
+}
+.ui-slider-vertical .ui-slider-range-max {
+	top: 0;
+}
+.ui-spinner {
+	position: relative;
+	display: inline-block;
+	overflow: hidden;
+	padding: 0;
+	vertical-align: middle;
+}
+.ui-spinner-input {
+	border: none;
+	background: none;
+	color: inherit;
+	padding: 0;
+	margin: .2em 0;
+	vertical-align: middle;
+	margin-left: .4em;
+	margin-right: 22px;
+}
+.ui-spinner-button {
+	width: 16px;
+	height: 50%;
+	font-size: .5em;
+	padding: 0;
+	margin: 0;
+	text-align: center;
+	position: absolute;
+	cursor: default;
+	display: block;
+	overflow: hidden;
+	right: 0;
+}
+/* more specificity required here to overide default borders */
+.ui-spinner a.ui-spinner-button {
+	border-top: none;
+	border-bottom: none;
+	border-right: none;
+}
+/* vertical centre icon */
+.ui-spinner .ui-icon {
+	position: absolute;
+	margin-top: -8px;
+	top: 50%;
+	left: 0;
+}
+.ui-spinner-up {
+	top: 0;
+}
+.ui-spinner-down {
+	bottom: 0;
+}
+
+/* TR overrides */
+.ui-spinner .ui-icon-triangle-1-s {
+	/* need to fix icons sprite */
+	background-position: -65px -16px;
+}
+.ui-tabs {
+	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+	padding: .2em;
+}
+.ui-tabs .ui-tabs-nav {
+	margin: 0;
+	padding: .2em .2em 0;
+}
+.ui-tabs .ui-tabs-nav li {
+	list-style: none;
+	float: left;
+	position: relative;
+	top: 0;
+	margin: 1px .2em 0 0;
+	border-bottom-width: 0;
+	padding: 0;
+	white-space: nowrap;
+}
+.ui-tabs .ui-tabs-nav li a {
+	float: left;
+	padding: .5em 1em;
+	text-decoration: none;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active {
+	margin-bottom: -1px;
+	padding-bottom: 1px;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a,
+.ui-tabs .ui-tabs-nav li.ui-state-disabled a,
+.ui-tabs .ui-tabs-nav li.ui-tabs-loading a {
+	cursor: text;
+}
+.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
+	cursor: pointer;
+}
+.ui-tabs .ui-tabs-panel {
+	display: block;
+	border-width: 0;
+	padding: 1em 1.4em;
+	background: none;
+}
+.ui-tooltip {
+	padding: 8px;
+	position: absolute;
+	z-index: 9999;
+	max-width: 300px;
+	-webkit-box-shadow: 0 0 5px #aaa;
+	box-shadow: 0 0 5px #aaa;
+}
+body .ui-tooltip {
+	border-width: 2px;
+}
+
+/* Component containers
+----------------------------------*/
+.ui-widget {
+	font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;
+	font-size: 1.1em;
+}
+.ui-widget .ui-widget {
+	font-size: 1em;
+}
+.ui-widget input,
+.ui-widget select,
+.ui-widget textarea,
+.ui-widget button {
+	font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;
+	font-size: 1em;
+}
+.ui-widget-content {
+	border: 1px solid #dddddd;
+	background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x;
+	color: #333333;
+}
+.ui-widget-content a {
+	color: #333333;
+}
+.ui-widget-header {
+	border: 1px solid #e78f08;
+	background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x;
+	color: #ffffff;
+	font-weight: bold;
+}
+.ui-widget-header a {
+	color: #ffffff;
+}
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default {
+	border: 1px solid #cccccc;
+	background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x;
+	font-weight: bold;
+	color: #1c94c4;
+}
+.ui-state-default a,
+.ui-state-default a:link,
+.ui-state-default a:visited {
+	color: #1c94c4;
+	text-decoration: none;
+}
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus {
+	border: 1px solid #fbcb09;
+	background: #fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x;
+	font-weight: bold;
+	color: #c77405;
+}
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-hover a:link,
+.ui-state-hover a:visited {
+	color: #c77405;
+	text-decoration: none;
+}
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active {
+	border: 1px solid #fbd850;
+	background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
+	font-weight: bold;
+	color: #eb8f00;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+	color: #eb8f00;
+	text-decoration: none;
+}
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight,
+.ui-widget-content .ui-state-highlight,
+.ui-widget-header .ui-state-highlight {
+	border: 1px solid #fed22f;
+	background: #ffe45c url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x;
+	color: #363636;
+}
+.ui-state-highlight a,
+.ui-widget-content .ui-state-highlight a,
+.ui-widget-header .ui-state-highlight a {
+	color: #363636;
+}
+.ui-state-error,
+.ui-widget-content .ui-state-error,
+.ui-widget-header .ui-state-error {
+	border: 1px solid #cd0a0a;
+	background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat;
+	color: #ffffff;
+}
+.ui-state-error a,
+.ui-widget-content .ui-state-error a,
+.ui-widget-header .ui-state-error a {
+	color: #ffffff;
+}
+.ui-state-error-text,
+.ui-widget-content .ui-state-error-text,
+.ui-widget-header .ui-state-error-text {
+	color: #ffffff;
+}
+.ui-priority-primary,
+.ui-widget-content .ui-priority-primary,
+.ui-widget-header .ui-priority-primary {
+	font-weight: bold;
+}
+.ui-priority-secondary,
+.ui-widget-content .ui-priority-secondary,
+.ui-widget-header .ui-priority-secondary {
+	opacity: .7;
+	filter:Alpha(Opacity=70);
+	font-weight: normal;
+}
+.ui-state-disabled,
+.ui-widget-content .ui-state-disabled,
+.ui-widget-header .ui-state-disabled {
+	opacity: .35;
+	filter:Alpha(Opacity=35);
+	background-image: none;
+}
+.ui-state-disabled .ui-icon {
+	filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
+}
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	width: 16px;
+	height: 16px;
+}
+.ui-icon,
+.ui-widget-content .ui-icon {
+	background-image: url(images/ui-icons_222222_256x240.png);
+}
+.ui-widget-header .ui-icon {
+	background-image: url(images/ui-icons_ffffff_256x240.png);
+}
+.ui-state-default .ui-icon {
+	background-image: url(images/ui-icons_ef8c08_256x240.png);
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon {
+	background-image: url(images/ui-icons_ef8c08_256x240.png);
+}
+.ui-state-active .ui-icon {
+	background-image: url(images/ui-icons_ef8c08_256x240.png);
+}
+.ui-state-highlight .ui-icon {
+	background-image: url(images/ui-icons_228ef1_256x240.png);
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+	background-image: url(images/ui-icons_ffd27a_256x240.png);
+}
+
+/* positioning */
+.ui-icon-blank { background-position: 16px 16px; }
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-left,
+.ui-corner-tl {
+	border-top-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-right,
+.ui-corner-tr {
+	border-top-right-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-left,
+.ui-corner-bl {
+	border-bottom-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-right,
+.ui-corner-br {
+	border-bottom-right-radius: 4px;
+}
+
+/* Overlays */
+.ui-widget-overlay {
+	background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat;
+	opacity: .5;
+	filter: Alpha(Opacity=50);
+}
+.ui-widget-shadow {
+	margin: -5px 0 0 -5px;
+	padding: 5px;
+	background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x;
+	opacity: .2;
+	filter: Alpha(Opacity=20);
+	border-radius: 5px;
+}
\ No newline at end of file
diff --git a/EjercitarWeb/WebContent/iniciar_curso.jsp b/EjercitarWeb/WebContent/iniciar_curso.jsp
index 7484abb..617e046 100644
--- a/EjercitarWeb/WebContent/iniciar_curso.jsp
+++ b/EjercitarWeb/WebContent/iniciar_curso.jsp
@@ -1,11 +1,9 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
+<%@page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <!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">
-<title>Iniciar Curso</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Iniciar Curso</title>
 	<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js" type="text/javascript"></script>
 	<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/themes/ui-lightness/jquery-ui.css" type="text/css" />
 	<script src="http://code.jquery.com/jquery-1.9.1.js"></script>
diff --git a/EjercitarWeb/WebContent/menu_principal.jsp b/EjercitarWeb/WebContent/menu_principal.jsp
index 29f44eb..afae293 100644
--- a/EjercitarWeb/WebContent/menu_principal.jsp
+++ b/EjercitarWeb/WebContent/menu_principal.jsp
@@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-	<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+	<meta content="text/html; charset=utf-8" http-equiv="content-type">
 	<title>Ejercitar</title>
-	<%@ include file="templateHEAD.jsp"%>
+	<%@include file="templateHEAD.jsp"%>
 </head>
 <body>
 	<%@page
@@ -28,7 +28,7 @@
 							Nueva Asignatura
 						</button>
 					</div>
-					<div class="panel panel-success">
+					<div class="panel panel-primary">
 						<div class="panel-heading">Asignaturas disponibles</div>
 						<div class="panel-body">
 							<table class="table table-striped table-bordered table-hover">
diff --git a/EjercitarWeb/WebContent/tema_ed.jsp b/EjercitarWeb/WebContent/tema_ed.jsp
index 5765e0a..6c802d1 100644
--- a/EjercitarWeb/WebContent/tema_ed.jsp
+++ b/EjercitarWeb/WebContent/tema_ed.jsp
@@ -1,58 +1,58 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
 <!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>
-<!-- validaciones -->  
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Tema</title>
+	<%@include file="templateHEAD.jsp" %>
+	<!-- validaciones -->  
 	<script src="js/jquery-1.7.1.min.js"></script>
 	<script src="js/jquery.validate.min.js"></script>
 	<script src="js/validaciones.js"></script>
-	
 </head>
-<body>
-<%@page import="java.util.List" import="model.Asignatura" import="model.Profesor" import="model.Tema"%> 
-
-<div id="content">
-<form   id="form1" name="form1" method="post" action="">
-		<br>
-		<% Profesor profesor = (Profesor) request.getSession().getAttribute("profesor");%>
-		<% Tema tema = (Tema) request.getAttribute("tema");%>
-		<% Asignatura asignatura = (Asignatura) request.getAttribute("asignatura");%>
-		
-		<input name="profesor" type="hidden" id="profesor" value=<%=profesor.getIdProfesor() %>>
-		<fieldset>
-		<p>
-				<label>Nombre:</label>
-				 <input type="text" name="nombre" id= "nombre" value=<%= tema.getNombre() %> <% if(asignatura.getIniciado()==true){ %>disabled <%} %>>
-			</p>
-			<p>
-				<label>Descripción</label>
-				<% String valor ="";
-					if(tema.getDescripcion()!=null) valor= tema.getDescripcion();
-				%>
-				<input type="text"  name="descripcion" id="descripcion" value=<%= valor %> <% if(asignatura.getIniciado()==true){ %>disabled <%} %>>
-			</p>
-			<p>
-				
-			<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() %> <% if(asignatura.getIniciado()==true){ %>disabled <%} %> > 
-			</p-->
-			<p class="nolabel">
-			<% if(asignatura.getIniciado()!=true) {%>
-			        <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>
-	
-</div>
+<body class="e-body">
+	<%@page import="java.util.List" import="model.Asignatura" import="model.Profesor" import="model.Tema"%>
+	<div class="container e-viewport">
+		<div class="row e-panel-header">
+			<div class="e-logo"></div>
+		</div>
+		<div class="row e-panel-center">
+			<div class="e-panel-bd panel panel-primary">
+				<div class="panel-heading">Editar Tema</div>
+				<div class="panel-body">
+					<form id="form1" class="form-horizontal" role="form" name="form" method="post" action="">
+						<% Profesor profesor = (Profesor) request.getSession().getAttribute("profesor");%>
+						<% Tema tema = (Tema) request.getAttribute("tema");%>
+						<% Asignatura asignatura = (Asignatura) request.getAttribute("asignatura");%>
+						<input name="profesor" type="hidden" id="profesor" value=<%=profesor.getIdProfesor() %>>
+						<input type="hidden" name="asignatura" id="asignatura" value=<%= request.getParameter("asignatura") %>>
+						<div class="form-group">
+							<label for="nombre" class="col-sm-2 control-label">Nombre:</label>
+							<div class="col-sm-10">
+								<input type="text" class="form-control" name="nombre" id="nombre" value=<%= tema.getNombre() %> <% if(asignatura.getIniciado() == true) { %>disabled <% } %> />
+							</div>
+						</div>
+					    <div class="form-group">
+					    	<label for="descripcion" class="col-sm-2 control-label">Descripci&oacute;n:</label>
+							<div class="col-sm-10">
+								<input type="text" class="form-control" name="descripcion" value=<%= tema.getDescripcion() %> <% if(asignatura.getIniciado() == true) { %>disabled <% } %> />
+							</div>
+					    </div>
+					    <button class="btn btn-default btn-primary" type="submit" name="Submit">
+					    	<span class="e-button-text">Guardar</span>
+				    	</button>
+					    <button class="btn btn-default btn-danger" type="submit" name="Eliminar">
+					    	<span class="e-button-text">Eliminar</span>
+				    	</button>
+					</form>
+				</div>
+			</div>
+		</div>
+		<div class="row e-panel-footer">
+			<span>Ejercitar: Un Modelo de aprendizaje asistido por computadora</span>
+			<span>Ceci Godoy - Samu Reyes - FP-UNA</span>
+		</div>
+	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/EjercitarWeb/WebContent/templateCSS.jsp b/EjercitarWeb/WebContent/templateCSS.jsp
index 379ab01..822e0f9 100644
--- a/EjercitarWeb/WebContent/templateCSS.jsp
+++ b/EjercitarWeb/WebContent/templateCSS.jsp
@@ -1,5 +1,3 @@
-<%@ 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>
diff --git a/EjercitarWeb/WebContent/vista_asignatura.jsp b/EjercitarWeb/WebContent/vista_asignatura.jsp
index 0d25c0d..1acab01 100644
--- a/EjercitarWeb/WebContent/vista_asignatura.jsp
+++ b/EjercitarWeb/WebContent/vista_asignatura.jsp
@@ -1,129 +1,131 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
+<%@page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
 <!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>Asignatura</title>
-
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<title>Asignatura</title>
+	<%@include file="templateHEAD.jsp" %>
 </head>
-<body>
-<%@page import="model.Profesor" import="model.Concepto" import="model.Asignatura" import="model.Tarea" import="model.Tema" import="java.util.List"%>
-
-<div id="content">
-
-
-		<%
-			Asignatura asignatura = (Asignatura) request.getAttribute("asignatura");
-		%>
-		<form id="form1" name="form1" method="post" action="">
-		<p>
-			Asignatura: <%=asignatura.getNombre()%>
-		</p>
-		<p>
-			Descripción: <%=asignatura.getDescripcion()%>
-		</p>
-		
-		<p>
-		 
-		</p>
-		
-		<table class="tbl1 scroll">
-			<thead>
-				<tr>
-					<th>Tema</th>
-					<th>Concepto</th>
-				</tr>
-			</thead>
-			<tbody>
-			<%List<Tema> temaList = (List<Tema>) request.getAttribute("temaList");%>
-			<%for(Tema tema : temaList) {%>
-				<tr>
-					<td class="lname"><a
-						href="/EjercitarWeb/EditarTemaServlet?tema=<%=tema.getIdTema()%>&asignatura=<%=asignatura.getIdAsignatura()%>"><%=tema.getNombre()%></a></td>
-					<td class="motto">
-						<%List<Concepto> conceptoList = (List<Concepto>) tema.getConceptoList();%>
-						<%for(Concepto concepto : conceptoList) {%> 
-						<a href="/EjercitarWeb/EditarConceptoServlet?concepto=<%=concepto.getIdConcepto()%>&asignatura=<%=asignatura.getIdAsignatura()%>"><%=concepto.getNombre()%></a>
-
-						<%}%>
-
-					</td>
-
-				</tr>
-				<%}%>
-			</tbody>
-		</table>
-		
-		<p>&nbsp &nbsp</p>
-			<% if (asignatura.getIniciado()==true){ %>	
-		<p>
-			Tareas Asignadas:
-		</p>
-		
-		<table class="tbl1 scroll">
-
-			<thead>
-				<tr>
-					<th>Descripción</th>
-					<th>Concepto</th>
-				</tr>
-			</thead>
-			
-			<%List<Tarea> tareaList = (List<Tarea>) request.getAttribute("tareaList");%>
-			<%for(Tarea tarea : tareaList) {%>
-			<tbody>
-				<tr>
-					<td class="lname"><a> <%=tarea.getDescripcion()%> </a></td>
-					<td class="motto">
-						<%List<Concepto> conceptoList = (List<Concepto>) tarea.getConceptoList();%>
-						<%for(Concepto concepto : conceptoList) {%> 
-							<a><%=concepto.getNombre()%></a>
-						<%}%>
-
-					</td>
-				</tr>
-				<%}%>
-			</tbody>
-		</table>
-		<%}%>
-		
-		</form>
-		
-</div>
-
-<div id="rsidebar">
-
-	<form id="form1" name="form1" method="post" action="">
-		<% if (asignatura.getIniciado()!=true){ %>	
-			<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/IniciarCursoServlet?asignatura=<%=asignatura.getIdAsignatura()%>';"><img src="css/img/resultados.png"align="middle"/> Iniciar Curso</button></p>
-			
-		<%}else{%>
-					<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>
-					
-		<%}%>
-			<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>
-	
-	</form>
-
+<body class="e-body">
+	<%@page import="model.Profesor" import="model.Concepto" import="model.Asignatura" import="model.Tarea" import="model.Tema" import="java.util.List"%>
+	<div class="container e-viewport">
+		<div class="row e-panel-header">
+			<div class="e-logo"></div>
+		</div>
+		<div class="row e-panel-center">
+			<div class="e-panel-bd">
+				<% Asignatura asignatura = (Asignatura) request.getAttribute("asignatura"); %>
+				<div class="e-tbar">
+					<% if(asignatura.getIniciado() != true) { %>
+						<button class="btn btn-sm btn-default" type="button" onclick="location.href='/EjercitarWeb/NuevoTemaServlet?asignatura=<%=asignatura.getIdAsignatura()%>';">
+							<img class="e-button-icon" src="css/img/agregar.png" />
+							<span class="e-button-text">Tema</span>
+						</button>
+						<button class="btn btn-sm btn-default" type="button" onclick="location.href='/EjercitarWeb/NuevoConceptoServlet?asignatura=<%=asignatura.getIdAsignatura()%>';">
+							<img class="e-button-icon" src="css/img/agregar.png" />
+							<span class="e-button-text">Concepto</span>
+						</button>
+						<button class="btn btn-sm btn-default" type="button" onclick="location.href='/EjercitarWeb/IniciarCursoServlet?asignatura=<%=asignatura.getIdAsignatura()%>';">
+							<img class="e-button-icon" src="css/img/resultados.png" />
+							<span class="e-button-text">Iniciar Curso</span>
+						</button>
+					<% } else { %>
+						<button class="btn btn-sm btn-default" type="button" onclick="location.href='/EjercitarWeb/NuevaTareaServlet?curso=<%=asignatura.getCurso().getIdCurso()%>&asignatura=<%=asignatura.getIdAsignatura()%>';">
+							<img class="e-button-icon" src="css/img/agregar.png" />
+							<span class="e-button-text">Tarea</span>
+						</button>
+						<button class="btn btn-sm btn-default" type="button" onclick="location.href='/EjercitarWeb/VerResultadosServlet?asignatura=<%=asignatura.getIdAsignatura()%>';">
+							<img class="e-button-icon" src="css/img/resultados.png" />
+							<span class="e-button-text">Resultados</span>
+						</button>
+					<% } %>
+					<button class="btn btn-sm btn-default" type="button" onclick="location.href='/EjercitarWeb/NuevoEjercicioServlet?asignatura=<%=asignatura.getIdAsignatura()%>';">
+						<img class="e-button-icon" src="css/img/agregar.png" />
+						<span class="e-button-text">Ejercicio</span>
+					</button>
+				</div>
+				<div class="panel panel-primary">
+					<div class="panel-heading">
+						<span>Asignatura: <%= asignatura.getNombre() %></span>
+						<span>Descripci&oacute;n: <%= asignatura.getDescripcion() %></span>
+					</div>
+					<div class="panel-body">
+						<table class="table table-striped table-bordered table-hover">
+							<thead>
+								<tr>
+									<th>Tema</th>
+									<th>Concepto</th>
+								</tr>
+							</thead>
+							<tbody>
+								<% List<Tema> temaList = (List<Tema>) request.getAttribute("temaList"); %>
+								<% for(Tema tema: temaList) { %>
+									<tr>
+										<td>
+											<a href="/EjercitarWeb/EditarTemaServlet?tema=<%=tema.getIdTema()%>&asignatura=<%=asignatura.getIdAsignatura()%>"><%=tema.getNombre()%></a>
+										</td>
+										<td>
+											<% List<Concepto> conceptoList = (List<Concepto>) tema.getConceptoList();%>
+											<% for(Concepto concepto: conceptoList) { %> 
+												<a href="/EjercitarWeb/EditarConceptoServlet?concepto=<%=concepto.getIdConcepto()%>&asignatura=<%=asignatura.getIdAsignatura()%>"><%=concepto.getNombre()%></a>
+											<% } %>
+										</td>
+									</tr>
+								<% } %>
+							</tbody>
+						</table>
+					</div>
+					<% if(asignatura.getIniciado() == true) { %>
+						<div class="panel panel-info" style="margin: 0px 15px 15px 15px;">
+							<div class="panel-heading">
+								<span>Tareas Asignadas:</span>
+							</div>
+							<div class="panel-body">
+								<table class="table table-striped table-bordered table-hover">
+									<thead>
+										<tr>
+											<th>Descripci&oacute;n</th>
+											<th>Concepto</th>
+										</tr>
+									</thead>
+									<tbody>
+										<% List<Tarea> tareaList = (List<Tarea>) request.getAttribute("tareaList"); %>
+										<% for(Tarea tarea: tareaList) { %>
+											<tr>
+												<td>
+													<a><%=tarea.getDescripcion()%></a>
+												</td>
+												<td>
+													<% List<Concepto> conceptoList = (List<Concepto>) tarea.getConceptoList(); %>
+													<% for(Concepto concepto: conceptoList) { %> 
+														<a><%=concepto.getNombre()%></a>
+													<% } %>
+												</td>
+											</tr>
+										<% } %>
+									</tbody>
+								</table>
+							</div>
+						</div>
+					<% } %>
+				</div>
+			</div>
+		</div>
+		<div class="row e-panel-footer">
+			<span>Ejercitar: Un Modelo de aprendizaje asistido por computadora</span>
+			<span>Ceci Godoy - Samu Reyes - FP-UNA</span>
+		</div>
 	</div>
-
-
-<script type="text/javascript">
+	<!-- NOT USED -->
+	<script type="text/javascript">
 		function cargarConceptos(tema_id) {
 			//obtiene los objetos productCode, y obtiene el valor del objeto
 			//var tema_id=$("#temas").val(); //ya se tiene el objeto select
 			//llama al servlet con el parametro seleccionado
 			$("#tabla").load("CargarConceptosServlet", {
-				tema_id : tema_id
-			})
+				tema_id: tema_id
+			});
 		}
 	</script>
-
-
 </body>
 </html>
\ No newline at end of file