Merge pull request #120 from cheapy-ispp/039-fixVistas

Intento de arreglo de la codificación del proyecto y cambio en algunas

src/main/java/org/springframework/cheapy/model/Client.java

@@ -27,13 +27,13 @@ public class Client extends BaseEntity {
 	// (id, name, email, address, init, finish, telephone, description, code, food,
 	// usuar)
 
-	@NotEmpty
+	@NotEmpty(message="No debe estar vacío")
 	private String				name;
 
-	@NotEmpty
+	@NotEmpty(message="No debe estar vacío")
 	private String				email;
 
-	@NotEmpty
+	@NotEmpty(message="No debe estar vacío")
 	private String				address;
 
 	@NotNull

src/main/java/org/springframework/cheapy/model/Municipio.java

@@ -2,5 +2,30 @@
 package org.springframework.cheapy.model;
 
 public enum Municipio {
-	Dos_Hermanas, Sevilla
+	Dos_Hermanas{
+		@Override
+		public String toString() {
+			return "Dos Hermanas";
+		}
+		
+	}
+	
+	, Sevilla{
+		@Override
+		public String toString() {
+			return "Sevilla";
+			
+		}
+		
+	}
+	
+	, Carmona{
+		@Override
+		public String toString() {
+			return "Carmona";
+			
+		}
+		
+	}
+	
 }

src/main/java/org/springframework/cheapy/model/StatusOffer.java

@@ -1,5 +1,31 @@
 package org.springframework.cheapy.model;
 
 public enum StatusOffer {
-	active, inactive, hidden
+	active{
+		@Override
+		public String toString() {
+			return "Activa";
+			
+		}
+		
+	}
+	
+	, inactive{
+		@Override
+		public String toString() {
+			return "Inactiva";
+			
+		}
+		
+	}
+	
+	
+	, hidden{
+		@Override
+		public String toString() {
+			return "Oculta";
+			
+		}
+		
+	}
 }

src/main/java/org/springframework/cheapy/model/Usuario.java

@@ -19,20 +19,20 @@ public class Usuario extends BaseEntity{
 	
 	private static final long serialVersionUID = 1L;
 
-	@NotBlank
+	@NotBlank(message="No debe estar vacío")
 	private String	nombre;
 
-	@NotBlank
+	@NotBlank(message="No debe estar vacío")
 	private String	apellidos;
 
-	@NotBlank
+	@NotBlank(message="No debe estar vacío")
 	private String	direccion;
 
 	@Enumerated(value = EnumType.STRING)
 	private Municipio municipio;
 	
 	@Email
-	@NotBlank
+	@NotBlank(message="No debe estar vacío")
 	private String	email;
 
 	@OneToOne(cascade = CascadeType.ALL)

src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java

@@ -13,7 +13,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.Transactional;
 
-public interface TimeOfferRepository extends PagingAndSortingRepository<FoodOffer, Integer> {
+public interface TimeOfferRepository extends PagingAndSortingRepository<TimeOffer, Integer> {
 
 	TimeOffer findTimeOfferById(int timeOfferId);
 
@@ -21,7 +21,7 @@ public interface TimeOfferRepository extends PagingAndSortingRepository<FoodOffe
 	@Transactional(readOnly = true)
 	List<TimeOffer> findAllTimeOffer(Pageable p);
 
-	void save(TimeOffer timeOffer);
+	//void save(TimeOffer timeOffer);
 
 	@Query("SELECT timeOffer FROM TimeOffer timeOffer WHERE timeOffer.status =:status")
 	@Transactional(readOnly = true)

src/main/less/cheapy.less

@@ -227,6 +227,7 @@ img.img-responsive{
 .btn-filter{
 	background:	rgb(40, 140, 215);
 	color: white;
+	border: none;
 }
 
 .btn-filter:hover{
@@ -237,6 +238,14 @@ img.img-responsive{
 .btn-filter-active{
 	background:	rgb(0, 64, 128);
 	color: white;
+	border: none;
+	
+}
+
+.select-municipio{
+	padding:10px; 
+	border:solid;
+	border-color: rgb(0, 64, 128);
 	
 }
 
@@ -246,6 +255,47 @@ img.img-responsive{
 	
 }
 
+.btn-mas{
+	background:	rgb(40, 140, 215);
+	color: white;
+	padding: 10px;
+	margin:10px;
+	border: none;
+}
+
+.btn-mas:hover{
+	background:	rgb(0, 64, 128);
+	color: white;
+}
+
+.btn-pag{
+	background:	rgb(40, 140, 215);
+	color: white;
+	padding: 10px;
+	margin:10px;
+	border: none;
+}
+
+.btn-pag:hover{
+	background:	rgb(0, 64, 128);
+	color: white;
+}
+
+.btn-search{
+	background:	rgb(40, 140, 215);
+	color: white;
+	padding: 5px;
+	margin:10px;
+	border: none;
+	border-radius: 30%;
+}
+
+.btn-search:hover{
+	background:	rgb(0, 64, 128);
+	color: white;
+}
+
+
 .btn-home {
   display: flex;
   justify-content: center;
@@ -339,24 +389,28 @@ img.img-responsive{
 }
 
 #foodOfferTable th {
-  width: 20%;
+  width: 15%;
   text-align: center;
+
   
 }
 
 #nuOfferTable th {
-  width: 20%;
+  width: 15%;
 text-align: center;
+vertical-align: middle;
 }
 
 #speedOfferTable th {
-  width: 20%;
+  width: 15%;
 text-align: center;
+vertical-align: middle;
 }
 
 #timeOfferTable th {
-  width: 20%;
+  width: 15%;
 text-align: center;
+vertical-align: middle;
 }
 
 .btn-detalles button {

src/main/resources/db/mysql/data.sql

@@ -14,10 +14,10 @@ INSERT INTO users (username,password,enabled) VALUES ('pepe','pepe', TRUE );
 INSERT INTO authorities (username,authority) VALUES ('pepe','usuario');
 
 
-INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (1, 'admin', 'admin',  'C/admin', 'carmona', 'admin@gmail.com','admin');
-INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (2, 'Paco', 'Naranjo', 'C/Esperanza', 'sevilla', 'Paco@gmail.com','paco');
-INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (3, 'Lolo', 'Lopez',  'C/Macarena', 'dos_hermanas', 'Lolo@gmail.com','lolo');
-INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (4, 'Pepe', 'Lopez', 'C/Macarena', 'carmona', 'Pepe@gmail.com','pepe');
+INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (1, 'admin', 'admin',  'C/admin', 'Carmona', 'admin@gmail.com','admin');
+INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (2, 'Paco', 'Naranjo', 'C/Esperanza', 'Sevilla', 'Paco@gmail.com','paco');
+INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (3, 'Lolo', 'Lopez',  'C/Macarena', 'Dos_Hermanas', 'Lolo@gmail.com','lolo');
+INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (4, 'Pepe', 'Lopez', 'C/Macarena', 'Carmona', 'Pepe@gmail.com','pepe');
 
 INSERT INTO codes (id,code,activo) VALUES (1,'code1',FALSE);
 INSERT INTO codes (id,code,activo) VALUES (2,'code2',FALSE);

src/main/resources/messages/messages_es.properties

@@ -1,5 +1,5 @@
 welcome=Bienvenido a
-new=Nueva 
+new=Nuevo 
 deleteOffer=Eliminar Oferta
 cancel=Cancelar
 deleteOfferMessage=Confirme que quiere eliminar su oferta

src/main/webapp/WEB-INF/jsp/clients/clientActivate.jsp

@@ -5,11 +5,13 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="client">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere activar esta cuenta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere activar esta cuenta?</em></h2>
 
       		<form:form modelAttribute="client" class="form-horizontal">
 

src/main/webapp/WEB-INF/jsp/clients/clientDisable.jsp

@@ -5,11 +5,13 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="client">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su cuenta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su cuenta?</em></h2>
       		
       		<form:form modelAttribute="client" class="form-horizontal">
             

src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp

@@ -5,11 +5,12 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="client">
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="client"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="client"/></h2>
 
 
 	

src/main/webapp/WEB-INF/jsp/clients/clientsList.jsp

@@ -5,10 +5,11 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="clients">
-    <h2 style="text-align:center;padding:5px"><fmt:message key="clients"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="clients"/></h2>
     
 	<c:if test="${empty clientLs }">
 		<p id="vacio" >No hay ningun Cliente.</p>

src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp

@@ -5,33 +5,36 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="clients">
-    <h2 style="text-align:center;padding:5px">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <fmt:message key="client"/>
     </h2>
     
     <form:form modelAttribute="client" class="form-horizontal" id="add-client-form">
         <div class="form-group has-feedback">
 			                
-            <cheapy:passwordField label="Contraseña" placeholder="Restaurante pepito" name="usuar.password"/>		
+            <cheapy:passwordField label="Contrase<EFBFBD>a" placeholder="Restaurante pepito" name="usuar.password"/>		
             <cheapy:inputField label="Hora de inicio" placeholder="HH:mm" name="init"/>
             <cheapy:inputField label="Hora de fin" placeholder="HH:mm" name="finish"/>
             <cheapy:inputField label="Nombre" placeholder="Restaurante pepito" name="name"/>
             <cheapy:inputField label="Email" placeholder="" name="email"/>
-            <cheapy:inputField label="Dirección" placeholder="" name="address"/>
-            <div class="form-group">                   
-            <label>Municipio: </label>
-			<select name="municipio">
-				<c:forEach items="${municipio}" var="entry">
-					<option value="${entry}">${entry}</option>
-				</c:forEach>
-			</select>
-			</div>
-            <cheapy:inputField label="Teléfono" placeholder="" name="telephone"/>
-            <cheapy:inputField label="descripción" placeholder="" name="description"/>
+            <cheapy:inputField label="Direcci<63>n" placeholder="" name="address"/>           
+            <cheapy:inputField label="Tel<65>fono" placeholder="" name="telephone"/>
+            <cheapy:inputField label="descripci<63>n" placeholder="" name="description"/>
             <cheapy:inputField label="Comida" placeholder="food" name="food"/>
+            <div class="form-group">                   
+	            <label class="col-sm-2 control-label">Municipio: </label>
+	            <div class="col-sm-10">
+					<select name="municipio" class="select-municipio" style="width:80%;text-align-last:center;">
+						<c:forEach items="${municipio}" var="entry">
+							<option value="${entry}">${entry.toString()}</option>
+						</c:forEach>
+					</select>
+				</div>
+			</div>
         </div>
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">

src/main/webapp/WEB-INF/jsp/clients/restaurantShow.jsp

@@ -5,11 +5,12 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="client">
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="client"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="client"/></h2>
 
 
 	

src/main/webapp/WEB-INF/jsp/error.jsp

@@ -1,7 +1,7 @@
 <%@ page session="false" trimDirectiveWhitespaces="true" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
-
+<%@ page contentType="text/html; charset=UTF-8" %>
 
 <cheapy:layout pageName="error">
 	<h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>Algo malo ha pasado...</em></h2>

src/main/webapp/WEB-INF/jsp/login.jsp

@@ -5,6 +5,7 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
@@ -284,7 +285,7 @@
 	    <div class="fadeIn first">
 	      <img src="/resources/images/Logo Cheapy.png" id="icon" />
 	      <c:if test= "${not empty param}" > 
-	      	<p class="text-danger"> El usuario y/o la contraseña son incorrectos </p> 
+	      	<p class="text-danger"> El usuario y/o la contraseña son incorrectos </p> 
 	      
 	      </c:if>
 	    </div>
@@ -292,16 +293,16 @@
 	    <!-- Login Form -->
 	    <form class='form-signin' action="/login" method='POST'>
 	      <input type="text" id="username" class="fadeIn second" name="username" placeholder="Usuario" required autofocus>
-	      <input type="password" id="password" class="fadeIn third" name="password" placeholder="Contraseña" required>
+	      <input type="password" id="password" class="fadeIn third" name="password" placeholder="Contraseña" required>
 	      <sec:csrfInput />  
 	      <div style="text-align: center;">
-		  	<input type="submit" class="fadeIn fourth" value="Iniciar sesión">
+		  	<input type="submit" class="fadeIn fourth" value="Iniciar sesión">
 		  </div>
 	    </form>
 	
 	    <!-- Remind Passowrd 
 	    <div id="formFooter">
-	      <a class="underlineHover" href="#">¿Olvidó su contraseña?</a>
+	      <a class="underlineHover" href="#">¿Olvidó su contraseña?</a>
 	    </div>
 	-->
 	  </div>

src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp

@@ -5,10 +5,11 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="foodOffers">
-    <h2 style="text-align:center;padding:5px">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <c:if test="${foodOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="foodOffer"/>
     </h2>
     

src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp

@@ -5,11 +5,13 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="foodOffer">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
       		
       		<form:form modelAttribute="foodOffer" class="form-horizontal">
             

src/main/webapp/WEB-INF/jsp/offers/food/foodOffersList.jsp

@@ -5,6 +5,7 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertas de plato especifico">
@@ -42,10 +43,10 @@
 		</div>
 	</div>
 	
-    <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="foodOffers"/>:</h2>
     
 	<c:if test="${empty foodOfferLs }">
-		<p id="vacio" >No hay ninguna oferta por plato espec<EFBFBD>fico activa.</p>
+		<p id="vacio" >No hay ninguna oferta por plato específico activa.</p>
 	</c:if>
 	<c:if test="${not empty foodOfferLs }">
     <table id="foodOfferTable" class="table table-striped">
@@ -57,6 +58,7 @@
         	<th><fmt:message key="discount"/></th>
             <th><fmt:message key="startDate"/></th>
             <th><fmt:message key="endDate"/></th>
+            <th><fmt:message key="municipio"/></th>
             
             <th> </th>
         </tr>
@@ -79,6 +81,9 @@
                 <td>
                     <c:out value="${localDateTimeFormat.format(foodOffer.end)}"/>
                 </td>
+                <td>
+                    <c:out value="${foodOffer.client.municipio}"/>
+                </td>
                 
                 <td>
 	                <spring:url value="/offers/food/{foodOfferId}" var="foodOfferUrl">
@@ -95,23 +100,33 @@
         </c:forEach>
         </tbody>
     </table>
+    <div class="text-center">
+    	<c:out value='Página ${page}'></c:out>
+    </div>
+    <div>
     <c:if test='${page!=0}'>
+   	<div class="text-left">
     	<spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl">
     		<spring:param name="page" value="${page-1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P<>g. anterior</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. anterior</button>
+	</div>	
     </c:if>
-    <c:out value='${page}'></c:out>
+    
     <c:if test="${fn:length(foodOfferLs) == 5}">
+    <div class="text-right">
+    	
     	<spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl">
     		<spring:param name="page" value="${page+1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P<>g. siguiente</button>
+    	<button type="button" class="btn-pag"  role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-right" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. siguiente</button>
+	</div>	
 	</c:if>
+	</div>
     </c:if>
 	
 </cheapy:layout>

src/main/webapp/WEB-INF/jsp/offers/food/foodOffersShow.jsp

@@ -5,16 +5,22 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="foodOffer">
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffer"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:left; font-size:200%;  color: rgb(0, 64, 128); padding:10px; margin-bottom:20px;"><fmt:message key="foodOffer"/>:</h2>
 
 
 	
     <table class="table table-striped" id="foodOfferTable">
     	<thead>
+    	<tr>
+            <th><fmt:message key="client"/></th>
+            <td><c:out value="${foodOffer.client.name}"/> </td>
+        </tr>
         <tr>
             <th><fmt:message key="offerBeginning"/></th>
             <td><c:out value="${localDateTimeFormat.format(foodOffer.start)}"/></td>
@@ -31,6 +37,10 @@
             <th><fmt:message key="discount"/></th>
             <td><c:out value="${foodOffer.discount}%"/> </td>
         </tr>
+        <tr>
+            <th><fmt:message key="municipio"/></th>
+            <td><c:out value="${foodOffer.client.municipio}"/> </td>
+        </tr>
 
         <tr>
             <th><fmt:message key="offerCode"/></th>

src/main/webapp/WEB-INF/jsp/offers/myOffersList.jsp

@@ -4,12 +4,16 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertasM">
-    <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2>
+
+	
+
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="foodOffers"/>:</h2>
 	<c:if test="${empty foodOfferLs }">
-		<p id="vacio" >No hay ninguna oferta por plato específico creada.</p>
+		<p id="vacio" >No hay ninguna oferta por plato específico creada.</p>
 	</c:if>
 	<c:if test="${not empty foodOfferLs }">
 		<div class="table-responsive">
@@ -21,6 +25,7 @@
 		            <th><fmt:message key="startDate"/></th>
 		            <th><fmt:message key="endDate"/></th>
 		            <th><fmt:message key="status"/></th>
+		            <th><fmt:message key="municipio"/></th>
 		            <th> <spring:url value="/offers/food/new" var="newFoodUrl">
 		    </spring:url>
 		    <!--  <a href="${fn:escapeXml(newFoodUrl)}" class="btn btn-default">Nueva oferta</a></th>-->
@@ -41,6 +46,9 @@
 		                <td>
 		                    <c:out value="${foodOffer.status}"/>
 		                </td>
+		                <td>
+		                    <c:out value="${foodOffer.client.municipio}"/>
+		                </td>
 		                <td>
 			                <spring:url value="/offers/food/{foodOfferId}" var="foodOfferUrl">
 			                        <spring:param name="foodOfferId" value="${foodOffer.id}"/>
@@ -58,9 +66,9 @@
 		    </table>
 		</div>
     </c:if>
-    <h2 style="text-align:center;padding:5px"><fmt:message key="nuOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="nuOffers"/>:</h2>
 	<c:if test="${empty nuOfferLs }">
-		<p id="vacio" >No hay ninguna oferta por número de comensales creada.</p>
+		<p id="vacio" >No hay ninguna oferta por número de comensales creada.</p>
 	</c:if>
 	<c:if test="${not empty nuOfferLs }">
 		<div class="table-responsive">
@@ -71,6 +79,7 @@
 		            <th><fmt:message key="startDate"/></th>
 		            <th><fmt:message key="endDate"/></th>
 		            <th><fmt:message key="status"/></th>
+		            <th><fmt:message key="municipio"/></th>
 		            <th> <spring:url value="/offers/nu/new" var="newNuUrl">
 		    </spring:url>
 		    <!--  <a href="${fn:escapeXml(newNuUrl)}" class="btn btn-default">Nueva oferta</a></th>-->
@@ -90,6 +99,9 @@
 		                <td>
 		                    <c:out value="${nuOffer.status}"/>
 		                </td>
+		                <td>
+		                    <c:out value="${nuOffer.client.municipio}"/>
+		                </td>
 		                <td>
 			                <spring:url value="/offers/nu/{nuOfferId}" var="nuOfferUrl">
 			                        <spring:param name="nuOfferId" value="${nuOffer.id}"/>
@@ -107,7 +119,7 @@
     	</div>
     </c:if>
     
-    <h2 style="text-align:center;padding:5px"><fmt:message key="speedOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="speedOffers"/>:</h2>
 	<c:if test="${empty speedOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por tiempo empleado en comer creada.</p>
 	</c:if>
@@ -120,6 +132,7 @@
 		            <th><fmt:message key="startDate"/></th>
 		            <th><fmt:message key="endDate"/></th>
 		            <th><fmt:message key="status"/></th>
+		            <th><fmt:message key="municipio"/></th>
 		            <th> <spring:url value="/offers/speed/new" var="newSpeedUrl">
 		    </spring:url>
 		   <!-- <a href="${fn:escapeXml(newSpeedUrl)}" class="btn btn-default">Nueva oferta</a></th>-->
@@ -139,6 +152,9 @@
 		                <td>
 		                    <c:out value="${speedOffer.status}"/>
 		                </td>
+		                <td>
+		                    <c:out value="${speedOffer.client.municipio}"/>
+		                </td>
 		                <td>
 		                    <spring:url value="/offers/speed/{speedOfferId}" var="speedOfferUrl">
 		                        <spring:param name="speedOfferId" value="${speedOffer.id}"/>
@@ -157,7 +173,7 @@
     	</div>
     </c:if>
     
-    <h2 style="text-align:center;padding:5px"><fmt:message key="timeOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="timeOffers"/>:</h2>
 	<c:if test="${empty timeOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por franja horaria creada.</p>
 	</c:if>
@@ -170,6 +186,7 @@
 		            <th><fmt:message key="startDate"/></th>
 		            <th><fmt:message key="endDate"/></th>
 		            <th><fmt:message key="status"/></th>
+		            <th><fmt:message key="municipio"/></th>
 		            <th><spring:url value="/offers/time/new" var="newTimeUrl">
 		    </spring:url>
 		    <!--<a href="${fn:escapeXml(newTimeUrl)}" class="btn btn-default">Nueva oferta</a> </th>-->
@@ -188,6 +205,9 @@
 		                <td>
 		                    <c:out value="${timeOffer.status}"/>
 		                </td>
+		                <td>
+		                    <c:out value="${timeOffer.client.municipio}"/>
+		                </td>
 		                <td>
 		                	<spring:url value="/offers/time/{timeOfferId}" var="timeOfferUrl">
 		                        <spring:param name="timeOfferId" value="${timeOffer.id}"/>

src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp

@@ -5,6 +5,7 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
@@ -32,7 +33,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/2.4.4/js/bootstrap-datetimepicker.min.js"></script>
 
 <cheapy:layout pageName="NumOffers">
-    <h2 style="text-align:center;padding:5px">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <c:if test="${nuOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="nuOffer"/>
     </h2>    
     
@@ -66,11 +67,11 @@
 			
 			<cheapy:inputField label="Fecha de Inicio" placeholder="dd/MM/yyyy HH:mm" name="start"/>
             <cheapy:inputField label="Fecha de Fin"  placeholder="dd/MM/yyyy HH:mm" name="end"/> 
-            <cheapy:inputField label="Número de comensales (nivel Oro)" placeholder="XX (Ej. 6)" name="gold"/>
+            <cheapy:inputField label="Número de comensales (nivel Oro)" placeholder="XX (Ej. 6)" name="gold"/>
             <cheapy:inputField label="Descuento de nivel oro" placeholder="XX% (Ej. 30)" name="discountGold"/>
-            <cheapy:inputField label="Número de comensales (nivel Plata)" placeholder="XX (Ej. 4)" name="silver"/>
+            <cheapy:inputField label="Número de comensales (nivel Plata)" placeholder="XX (Ej. 4)" name="silver"/>
             <cheapy:inputField label="Descuento de plata" placeholder="XX% (Ej. 15)" name="discountSilver"/>
-            <cheapy:inputField label="Número de comensales (nivel Bronce)" placeholder="XX (Ej. 2)" name="bronze"/>
+            <cheapy:inputField label="Número de comensales (nivel Bronce)" placeholder="XX (Ej. 2)" name="bronze"/>
 			<cheapy:inputField label="Descuento de bronce" placeholder="XX% (Ej. 5)" name="discountBronze"/>
  
             </div>

src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp

@@ -5,11 +5,14 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="nuOfferDisable">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
       		
       		 <form:form modelAttribute="nuOffer" class="form-horizontal">
 

src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersList.jsp

@@ -5,6 +5,7 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertas por numero de comensales">
@@ -15,7 +16,7 @@
 		    </spring:url>
 		    <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
 			<span class="glyphicon 	glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
-			Ofertas de plato especifico</button>
+			Ofertas de plato específico</button>
 			
 			<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
 				<spring:param name="page" value="0"/>
@@ -40,9 +41,9 @@
 		</div>
 	</div>
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="nuOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="nuOffers"/>:</h2>
 	<c:if test="${empty nuOfferLs }">
-		<p id="vacio" >No hay ninguna oferta por n<EFBFBD>mero de comensales activa.</p>
+		<p id="vacio" >No hay ninguna oferta por número de comensales activa.</p>
 	</c:if>
 	<c:if test="${not empty nuOfferLs }">
     <table id="nuOfferTable" class="table table-striped">
@@ -90,22 +91,31 @@
         </c:forEach>
         </tbody>
     </table>
-        <c:if test='${page!=0}'>
+    <div class="text-center">
+    	<c:out value='Página ${page}'></c:out>
+    </div>
+    
+    <c:if test='${page!=0}'>
+    <div class="text-left">
     	<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
     		<spring:param name="page" value="${page-1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P<>g. anterior</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. anterior</button>	
+	</div>
     </c:if>
-    <c:out value='${page}'></c:out>
+    
+    
     <c:if test="${fn:length(nuOfferLs) == 5}">
+    <div class="text-right">
     	<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
     		<spring:param name="page" value="${page+1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P<>g. siguiente</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-right" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. siguiente</button>
+	</div>
 	</c:if>
     </c:if>
 	

src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp

@@ -5,15 +5,20 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="nuOffer">
 
-	<h2 style="text-align: center; padding: 5px">
+	<h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
 		<fmt:message key="nuOffer" />
 	</h2>
 
     <table class="table table-striped" id="nuOffer-table">
+    	<tr>
+            <th><fmt:message key="client"/></th>
+            <td><c:out value="${nuOffer.client.name}"/> </td>
+        </tr>
         <tr>
             <th><fmt:message key="offerBeginning"/></th>
             <td><c:out value="${localDateTimeFormat.format(nuOffer.start)}"/></td>
@@ -50,6 +55,12 @@
             <th><fmt:message key="offerCode"/></th>
             <td><c:out value="${nuOffer.code}"/></td>
         </tr>
+        <tr>
+            <th><fmt:message key="municipio"/></th>
+            <td><c:out value="${nuOffer.client.municipio}"/></td>
+        </tr>
+                    
+                
     </table>
 
     <div class="btn-menu">

src/main/webapp/WEB-INF/jsp/offers/offersCreate.jsp

@@ -4,6 +4,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="crearOfertas">

src/main/webapp/WEB-INF/jsp/offers/offersList.jsp

@@ -6,6 +6,7 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertas">
@@ -46,36 +47,38 @@
 	</div>		
 	
 	<form class="example" action="/offersByName">
-		<h2 class="text-center" style="font-size: 100%" >Búsqueda por nombre del bar/restaurante: </h2>
+		<h2 class="text-center" style="font-family: 'Lobster'; text-align:center; font-size:150%;  color: rgb(0, 64, 128); padding:10px;" >Búsqueda por nombre del bar/restaurante: </h2>
 		<div class="text-center">
-	  		<input type="text" placeholder="Búsqueda por nombre" name="name">
-	  		<button type="submit"><i class="fa fa-search"></i>
+	  		<input type="text" placeholder="Búsqueda por nombre" name="name" style="border:solid; border-color: rgb(0, 64, 128);">
+	  		<button type="submit" class="btn-search"><i class="fa fa-search"></i>
 	  		<span class="glyphicon 	glyphicon glyphicon-search" aria-hidden="true" style="padding: 5px"> </span>
 	  		</button>
   		</div>
 	</form>
 	
 	<form class="example" action="/offersByFood">
-		<h2 class="text-center" style="font-size: 100%" >Búsqueda por comida: </h2>
+		<h2 class="text-center" style="font-family: 'Lobster'; text-align:center; font-size:150%;  color: rgb(0, 64, 128); padding:10px;" >Búsqueda por tipo de comida: </h2>
 		<div class="text-center">
-	  		<input type="text" placeholder="Búsqueda por comida (Ej: Macarrones)" name="name">
-	  		<button type="submit"><i class="fa fa-search"></i>
+	  		<input type="text" placeholder="Búsqueda por tipo comida (Ej: americana)" name="name" style="border:solid; border-color: rgb(0, 64, 128);">
+	  		<button type="submit" class="btn-search"><i class="fa fa-search"></i>
 	  		<span class="glyphicon 	glyphicon glyphicon-search" aria-hidden="true" style="padding: 5px"> </span>
 	  		</button>
   		</div>
 	</form>
 	
 	<form class="example" action="/offersByPlace">
-		<select name="municipio">
-		<option value="">Escoge municipio</option>
-		<c:forEach items="${municipios}" var="entry">
-			<option value="${entry}">${entry}</option>
-		</c:forEach>
-		</select>
-		<button type="submit">Buscar por municipio</button>
+		<div class="text-center">
+			<select name="municipio" class="select-municipio" >
+			
+			<c:forEach items="${municipios}" var="entry">
+				<option value="${entry}">${entry.toString()}</option>
+			</c:forEach>
+			</select>
+			<button type="submit" class="btn-mas">Buscar por municipio</button>
+		</div>
 	</form>
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="foodOffers"/>:</h2>
     
 	<c:if test="${empty foodOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por plato específico activa.</p>
@@ -134,19 +137,21 @@
         </c:forEach>
         </tbody>
     </table>
-    <button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-	<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-	Ver más</button>
+    <div class="text-center">
+	    <button type="button" class="btn-mas" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-plus" aria-hidden="true" style="padding: 5px"> </span>
+		Ver más</button>
+	</div>
     </div>
     
     </c:if>
-    <h2 style="text-align:center;padding:5px"><fmt:message key="nuOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="nuOffers"/>:</h2>
 	<c:if test="${empty nuOfferLs }">
-		<p id="vacio" >No hay ninguna oferta por n<EFBFBD>mero de comensales activa.</p>
+		<p id="vacio" >No hay ninguna oferta por número de comensales activa.</p>
 	</c:if>
 	<c:if test="${not empty nuOfferLs }">
 
- 		<div class="table-responsive">        
+ 	<div class="table-responsive">        
     <table id="nuOfferTable" class="table table-striped">
         <thead>
         <tr>
@@ -156,6 +161,7 @@
             <th><fmt:message key="endDate"/></th>
             <th><fmt:message key="goldGoal"/></th>
             <th><fmt:message key="goldDiscount"/></th>
+            <th><fmt:message key="municipio"/></th>
             <th> </th>
             
         </tr>
@@ -178,6 +184,9 @@
                 <td>
                     <c:out value="${nuOffer.discountGold}%"/>
                 </td>
+                <td>
+                    <c:out value="${nuOffer.client.municipio}"/>
+                </td>
                 <td>
 	                <spring:url value="/offers/nu/{nuOfferId}" var="nuOfferUrl">
 	                        <spring:param name="nuOfferId" value="${nuOffer.id}"/>
@@ -192,14 +201,16 @@
         </c:forEach>
         </tbody>
     </table>
-    <button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-	<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-	Ver más</button>
+    <div class="text-center">
+	    <button type="button" class="btn-mas" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-plus" aria-hidden="true" style="padding: 5px"> </span>
+		Ver más</button>
+	</div>
     </div>
 
     </c:if>
     
-    <h2 style="text-align:center;padding:5px"><fmt:message key="speedOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="speedOffers"/>:</h2>
 	<c:if test="${empty speedOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por tiempo empleado en comer activa.</p>
 	</c:if>
@@ -215,6 +226,7 @@
 		            <th><fmt:message key="endDate"/></th>
 		            <th><fmt:message key="goldGoal"/></th>
 		            <th><fmt:message key="goldDiscount"/></th>
+		            <th><fmt:message key="municipio"/></th>
 		            <th> </th>
 		            
 		        </tr>
@@ -237,6 +249,9 @@
 		                <td>
 		                    <c:out value="${speedOffer.discountGold}%"/>
 		                </td>
+		                <td>
+		                    <c:out value="${speedOffer.client.municipio}"/>
+		                </td>
 		                <td>
 		                    <spring:url value="/offers/speed/{speedOfferId}" var="speedOfferUrl">
 		                        <spring:param name="speedOfferId" value="${speedOffer.id}"/>
@@ -252,15 +267,17 @@
 		        </c:forEach>
 		        </tbody>
 		    </table>
-		  	<spring:url value="/offers/speedOfferList" var="speedOfferUrl"></spring:url>
-   			<button type="button" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-			<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-			Ver más</button>
+		    <div class="text-center">
+			  	<spring:url value="/offers/speedOfferList" var="speedOfferUrl"></spring:url>
+	   			<button type="button" class="btn-mas" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+				<span class="glyphicon 	glyphicon glyphicon-plus" aria-hidden="true" style="padding: 5px"> </span>
+				Ver más</button>
+			</div>
 	    </div>
 
     </c:if>
     
-    <h2 style="text-align:center;padding:5px"><fmt:message key="timeOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="timeOffers"/>:</h2>
 	<c:if test="${empty timeOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por franja horaria activa.</p>
 	</c:if>
@@ -276,6 +293,7 @@
 		            <th><fmt:message key="endDate"/></th>
 		            <th><fmt:message key="init"/></th>
 		            <th><fmt:message key="finishOffer"/></th>
+		            <th><fmt:message key="municipio"/></th>
 		            <th> </th>
 		        </tr>
 		        </thead>
@@ -297,6 +315,9 @@
 		                <td>
 		                    <c:out value="${timeOffer.finish}h"/>
 		                </td>
+		                <td>
+		                    <c:out value="${timeOffer.client.municipio}"/>
+		                </td>
 		                
 		                <td>
 		                	<spring:url value="/offers/time/{timeOfferId}" var="timeOfferUrl">
@@ -311,10 +332,12 @@
 		            </tr>
 		        </c:forEach>
 		    </table>
-		    <spring:url value="/offers/timeOfferList" var="timeOfferUrl"></spring:url>
-    		<button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-			<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-			Ver más</button>
+		    <div class="text-center">
+			    <spring:url value="/offers/timeOfferList" var="timeOfferUrl"></spring:url>
+	    		<button type="button" class="btn-mas" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+				<span class="glyphicon 	glyphicon glyphicon-plus" aria-hidden="true" style="padding: 5px"> </span>
+				Ver más</button>
+			</div>
   	  </div>
     </c:if>
   

src/main/webapp/WEB-INF/jsp/offers/offersListSearch.jsp

@@ -6,6 +6,7 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertas">
@@ -13,7 +14,7 @@
     <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2>
     
 	<c:if test="${empty foodOfferLs }">
-		<p id="vacio" >No hay ninguna oferta por plato específico activa.</p>
+		<p id="vacio" >No hay ninguna oferta por plato específico activa.</p>
 	</c:if>
 	<c:if test="${not empty foodOfferLs }">
 

src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp

@@ -4,10 +4,11 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertasM">
-    <h2 style="text-align:center;padding:5px">Registro de Ofertas</h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">Historial de Ofertas</h2>
 	<c:if test="${empty datos }">
 		<p id="vacio" >No hay ninguna oferta creada.</p>
 	</c:if>

src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp

@@ -5,10 +5,12 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="speedOffers">
-    <h2 style="text-align:center;padding:5px">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <c:if test="${speedOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="speedOffer"/>
     </h2>
     <form:form modelAttribute="speedOffer" class="form-horizontal" id="add-speedOffer-form">

src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp

@@ -5,11 +5,14 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="speedOffer">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
       		
       		 <form:form modelAttribute="speedOffer" class="form-horizontal">
 

src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersList.jsp

@@ -5,6 +5,8 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertas por rapidez">
@@ -15,7 +17,7 @@
 		    </spring:url>
 		    <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
 			<span class="glyphicon 	glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
-			Ofertas de plato especifico</button>
+			Ofertas de plato específico</button>
 			
 			<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
 				<spring:param name="page" value="0"/>
@@ -39,7 +41,7 @@
 			Ofertas de franja horaria</button>
 		</div>
 	</div>
-    <h2 style="text-align:center;padding:5px"><fmt:message key="speedOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="speedOffers"/>:</h2>
 	<c:if test="${empty speedOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por tiempo empleado en comer activa.</p>
 	</c:if>
@@ -90,22 +92,29 @@
         </c:forEach>
         </tbody>
     </table>
-        <c:if test='${page!=0}'>
+    <div class="text-center">
+    	<c:out value='Página ${page}'></c:out>
+    </div>
+    <c:if test='${page!=0}'>
+    <div class="text-right">
     	<spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl">
     		<spring:param name="page" value="${page-1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P<>g. anterior</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. anterior</button>
+	</div>
     </c:if>
-    <c:out value='${page}'></c:out>
+    
     <c:if test="${fn:length(speedOfferLs) == 5}">
+    <div class="text-right">
     	<spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl">
     		<spring:param name="page" value="${page+1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P<>g. siguiente</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-right" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. siguiente</button>
+	</div>
 	</c:if>
     </c:if>
 </cheapy:layout>

src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersShow.jsp

@@ -5,15 +5,21 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="speedOffer">
 
-	<h2 style="text-align: center; padding: 5px">
+	<h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
 		<fmt:message key="speedOffer" />
 	</h2>
 
     <table class="table table-striped" id="speedOffer-table">
+    	<tr>
+            <th><fmt:message key="client"/></th>
+            <td><c:out value="${speedOffer.client.name}"/> </td>
+        </tr>
         <tr>
             <th><fmt:message key="offerBeginning"/></th>
             <td><c:out value="${localDateTimeFormat.format(speedOffer.start)}"/></td>
@@ -50,6 +56,10 @@
             <th><fmt:message key="offerCode"/></th>
             <td><c:out value="${speedOffer.code}"/></td>
         </tr>
+        <tr>
+            <th><fmt:message key="municipio"/></th>
+            <td><c:out value="${speedOffer.client.municipio}"/></td>
+        </tr>
     </table>
 
     <div class="btn-menu">

src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp

@@ -5,10 +5,11 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="TimeOffers">
-    <h2 style="text-align:center;padding:5px">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <c:if test="${timeOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="timeOffer"/>
     </h2>
     <form:form modelAttribute="timeOffer" class="form-horizontal" id="add-timeOffer-form">

src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp

@@ -5,11 +5,13 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 <cheapy:layout pageName="timeOffer">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
       		
       		<form:form modelAttribute="timeOffer" class="form-horizontal">
 

src/main/webapp/WEB-INF/jsp/offers/time/timeOffersList.jsp

@@ -5,6 +5,7 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertas por intervalo de tiempo">
@@ -15,7 +16,7 @@
 		    </spring:url>
 		    <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
 			<span class="glyphicon 	glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
-			Ofertas de plato especifico</button>
+			Ofertas de plato específico</button>
 			
 			<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
 				<spring:param name="page" value="0"/>
@@ -40,7 +41,7 @@
 		</div>
 	</div>
     
-    <h2 style="text-align:center;padding:5px"><fmt:message key="timeOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="timeOffers"/>:</h2>
 	<c:if test="${empty timeOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por franja horaria activa.</p>
 	</c:if>
@@ -90,22 +91,29 @@
         </c:forEach>
         </tbody>
     </table>
-        <c:if test='${page!=0}'>
+    <div class="text-center">
+    	<c:out value='Página ${page}'></c:out>
+    </div>
+    <c:if test='${page!=0}'>
+    <div class="text-left">
     	<spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl">
     		<spring:param name="page" value="${page-1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P<>g. anterior</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. anterior</button>
+	</div>
     </c:if>
-    <c:out value='${page}'></c:out>
+    
     <c:if test="${fn:length(timeOfferLs) == 5}">
-    	<spring:url value="/offers/foodOfferList/{page}" var="timeOfferListUrl">
+    <div class="text-right">
+    	<spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl">
     		<spring:param name="page" value="${page+1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P<>g. siguiente</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-right" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. siguiente</button>
+	</div>
 	</c:if>
     </c:if>
 	

src/main/webapp/WEB-INF/jsp/offers/time/timeOffersShow.jsp

@@ -5,15 +5,21 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="timeOffer">
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="timeOffer"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:left; font-size:200%;  color: rgb(0, 64, 128); padding:10px; margin-bottom:20px;"><fmt:message key="timeOffer"/>:</h2>
 
 
     <table id="timeOfferTable" class="table table-striped">
         <thead>
+        <tr>
+            <th><fmt:message key="client"/></th>
+            <td><c:out value="${timeOffer.client.name}"/> </td>
+        </tr>
         <tr>
             <th><fmt:message key="offerBeginning"/></th>
             <td><c:out value="${localDateTimeFormat.format(timeOffer.start)}"/></td>
@@ -38,6 +44,10 @@
             <th><fmt:message key="offerCode"/></th>
             <td><c:out value="${timeOffer.code}"/></td>
         </tr>
+        <tr>
+            <th><fmt:message key="municipio"/></th>
+            <td><c:out value="${timeOffer.client.municipio}"/> </td>
+        </tr>
         </thead>
     </table>
 

src/main/webapp/WEB-INF/jsp/reviews/createOrUpdateReviewForm.jsp

@@ -5,17 +5,19 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="reviewsN">
-    <h2>
-        <c:if test="${review['new']}">Nueva </c:if> Reseña
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
+    	<c:if test="${review['new']}">Nueva </c:if> Reseña
     </h2>
     <form:form modelAttribute="review" class="form-horizontal" id="add-review-form">
         <div class="form-group has-feedback">
         	<form:hidden path="id"/>
-            <cheapy:textAreaField label="Opinión" name="opinion"/>
+            <cheapy:textAreaField label="Opinión" name="opinion"/>
            <!-- <cheapy:inputField label="Estrellas" name="stars"/>  -->
-            <cheapy:ratingStar label="Valoración" name="stars" disabled="false"></cheapy:ratingStar>
+            <cheapy:ratingStar label="Valoración" name="stars" disabled="false"></cheapy:ratingStar>
         </div>
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
@@ -24,10 +26,10 @@
                     <c:when test="${review['new']}">
                         <button class="btn btn-default" type="submit" style="font-family: 'Lobster'; font-size: 20px;">
 	                        <span class="glyphicon glyphicon-floppy-save" aria-hidden="true" style="padding: 5px"> </span>
-	                        Crear reseña</button>
+	                        Crear reseña</button>
                     </c:when>
                     <c:otherwise>
-                        <button class="btn btn-default" type="submit">Modificar Reseña</button>
+                        <button class="btn btn-default" type="submit">Modificar Reseña</button>
                     </c:otherwise>
                 </c:choose>
                 </div>

src/main/webapp/WEB-INF/jsp/reviews/reviewsList.jsp

@@ -5,10 +5,12 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="reviews">
-    <h2 style="text-align:center;padding:5px"><fmt:message key="reviews"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="reviews"/></h2>
 
     <table id="reviewTable" class="table table-striped">
         <thead>
@@ -23,7 +25,7 @@
         <tbody>
         <c:choose>
 	        <c:when test="${empty reviewsLs}">
-	        	<tr><td colspan="4"><em><c:out value="No se ha realizado ninguna valoración por el momento."/></em></td></tr>
+	        	<tr><td colspan="4"><em><c:out value="No se ha realizado ninguna valoración por el momento."/></em></td></tr>
 	        </c:when>
 	        <c:otherwise>
 	        <c:forEach items="${reviewsLs}" var="review">
@@ -62,21 +64,28 @@
         </c:choose>
         </tbody>
     </table>
-        <c:if test='${page!=0}'>
+    <div class="text-center">
+    	<c:out value='Página ${page}'></c:out>
+    </div>
+    <c:if test='${page!=0}'>
+    <div class="text-left">
     	<spring:url value="/reviewsList/{page}" var="reviewsListUrl">
     		<spring:param name="page" value="${page-1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(reviewsListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		Pág. anterior</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(reviewsListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. anterior</button>
+ 	</div>
     </c:if>
-    <c:out value='${page}'></c:out>
+    
     <c:if test="${fn:length(reviewsLs) == 6}">
+    <div class="text-right">
     	<spring:url value="/reviewsList/{page}" var="reviewsListUrl">
     		<spring:param name="page" value="${page+1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(reviewsListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		Pág. siguiente</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(reviewsListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-right" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. siguiente</button>
+	</div>
 	</c:if>
 </cheapy:layout>

src/main/webapp/WEB-INF/jsp/reviews/reviewsShow.jsp

@@ -5,15 +5,19 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 
 <cheapy:layout pageName="review">
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="review"/></h2>
+
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="review"/></h2>
+
     <form:form modelAttribute="review" class="form-horizontal" id="add-review-form">
 
 
+
     <table class="table table-striped" id="review-table">
         <tr>
             <th><fmt:message key="stars"/></th>
@@ -38,7 +42,7 @@
 		    
 			<button type="button" role="link" onclick="window.location='${fn:escapeXml(editUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
 	        <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		        Editar opinión</button>
+		        Editar opinión</button>
     	</c:if>
     </div>
     

src/main/webapp/WEB-INF/jsp/singup/singUpClient.jsp

@@ -6,6 +6,7 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
@@ -273,31 +274,25 @@
 
 </style>
 <cheapy:layout pageName="singUp">
-    <h2 style="text-align:center;padding:5px">
+<div class="text-center">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <fmt:message key="new"/><fmt:message key="client"/>
     </h2>
+</div>
 	<form:form modelAttribute="cliente" class="form-horizontal"
 		id="add-client-form">
 		<div class="form-group has-feedback">
 			<cheapy:inputField label="Nombre" placeholder="Ponga aqui su nombre"
 				name="name" />
-			<cheapy:inputField label="Direccion" placeholder="Ponga aqui su dirección"
-				name="address" />
-			<div class="form-group">                   
-            <label>Municipio: </label>
-			<select name="municipio">
-				<c:forEach items="${municipio}" var="entry">
-					<option value="${entry}">${entry}</option>
-				</c:forEach>
-			</select>
-			</div>
+			<cheapy:inputField label="Direccion" placeholder="Ponga aqui su dirección"
+				name="address" />			
 			<cheapy:inputField label="Hora de apertura" placeholder="Ponga aqui su hora de apertura (formato HH:mm)"
 				name="init" />
 			<cheapy:inputField label="Hora de cierre" placeholder="Ponga aqui su hora de cierre (formato HH:mm)"
 				name="finish" />
-			<cheapy:inputField label="Teléfono" placeholder="Ponga aqui el teléfono del local"
+			<cheapy:inputField label="Teléfono" placeholder="Ponga aqui el teléfono del local"
 				name="telephone" />
-			<cheapy:inputField label="Descripción" placeholder="Ponga aqui su descripción"
+			<cheapy:inputField label="Descripción" placeholder="Ponga aqui su descripción"
 				name="description" />
 			<cheapy:inputField label="Email" placeholder="Ponga aqui su email"
 				name="email" />
@@ -305,11 +300,23 @@
 				name="food" />
 			<cheapy:inputField label="Nombre de usuario" placeholder="Ponga aqui su nombre de usuario"
 				name="usuar.username" />
-			<cheapy:inputField label="Contraseña" placeholder="Ponga aqui su contraseña"
+			<cheapy:passwordField label="Contraseña" placeholder="Ponga aqui su contraseña"
 				name="usuar.password" />
-			<cheapy:inputField label="Código de activación" placeholder="Ponga aqui el código que se le suministro al firmar el contrato"
+			<cheapy:inputField label="Código de activación" placeholder="Ponga aqui el código que se le suministro al firmar el contrato"
 				name="code.code" />
-			<input type="submit" class="fadeIn fourth" value="Registrarse">
+			<div class="form-group">                   
+	            <label class="col-sm-2 control-label">Municipio: </label>
+	            <div class="col-sm-10">
+				<select name="municipio" class="select-municipio" style="width:80%;text-align-last:center;">
+					<c:forEach items="${municipio}" var="entry">
+						<option value="${entry}">${entry.toString()}</option>
+					</c:forEach>
+				</select>
+				</div>
+			</div>	
+			<div class="text-center">
+				<input type="submit" class="fadeIn fourth" value="Registrarse">
+			</div>
 		</div>
 	</form:form>
 

src/main/webapp/WEB-INF/jsp/singup/singUpUser.jsp

@@ -6,6 +6,7 @@
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
@@ -273,33 +274,41 @@
 
 </style>
 <cheapy:layout pageName="singUp">
-    <h2 style="text-align:center;padding:5px">
-        <fmt:message key="new"/><fmt:message key="user"/>
+<div class="text-center">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
+        <fmt:message key="new"/><fmt:message key="usuario"/>
     </h2>
+</div>
 	<form:form modelAttribute="usuario" class="form-horizontal"
-		id="add-foodOffer-form">
+		id="add-user-form">
 		<div class="form-group has-feedback">
 			<cheapy:inputField label="Nombre" placeholder="Ponga aqui su nombre"
 				name="nombre" />
 			<cheapy:inputField label="Apellidos" placeholder="Ponga aqui sus apellidos"
 				name="apellidos" />
-			<cheapy:inputField label="Direccion" placeholder="Ponga aqui su dirección"
+			<cheapy:inputField label="Direccion" placeholder="Ponga aqui su dirección"
 				name="direccion" />
-			<div class="form-group">                   
-            <label>Municipio: </label>
-			<select name="municipio">
-				<c:forEach items="${municipio}" var="entry">
-					<option value="${entry}">${entry}</option>
-				</c:forEach>
-			</select>
-			</div>
+			
 			<cheapy:inputField label="Email" placeholder="Ponga aqui su email"
 				name="email" />
 			<cheapy:inputField label="Nombre de usuario" placeholder="Ponga aqui su nombre de usuario"
 				name="usuar.username" />
-			<cheapy:inputField label="Contraseña" placeholder="Ponga aqui su contraseña"
+			<cheapy:passwordField label="Contraseña" placeholder="Ponga aqui su contraseña" 
 				name="usuar.password" />
-			<input type="submit" class="fadeIn fourth" value="Registrarse">
+			<div class="form-group">                   
+	            <label class="col-sm-2 control-label">Municipio </label>
+	            <div class="col-sm-10">
+				<select name="municipio" class="select-municipio" style="width:80%;text-align-last:center;" >
+					
+					<c:forEach items="${municipio}" var="entry">
+						<option value="${entry}">${entry.toString()}</option>
+					</c:forEach>
+				</select>
+				</div>
+			</div>
+			<div class="text-center">
+				<input type="submit" class="fadeIn fourth" value="Registrarse">
+			</div>
 		</div>
 	</form:form>
 

src/main/webapp/WEB-INF/jsp/usuarios/createOrUpdateUsuarioForm.jsp

@@ -5,10 +5,11 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="usuarios">
-    <h2 style="text-align:center;padding:5px">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <c:if test="${usuario['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="usuario"/>
     </h2>
     

src/main/webapp/WEB-INF/jsp/usuarios/usuariosDisable.jsp

@@ -5,11 +5,14 @@
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="usuario">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su cuenta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su cuenta?</em></h2>
       		
       		 <form:form modelAttribute="usuario" class="form-horizontal">
 

src/main/webapp/WEB-INF/jsp/usuarios/usuariosList.jsp

@@ -5,13 +5,15 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="usuarios">
-    <h2 style="text-align:center;padding:5px"><fmt:message key="users"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="users"/></h2>
     
 	<c:if test="${empty usuarioLs }">
-		<p id="vacio" >No hay ningún usuario.</p>
+		<p id="vacio" >No hay ningún usuario.</p>
 	</c:if>
 	<c:if test="${not empty usuarioLs }">
     <table id="usuarioTable" class="table table-striped">

src/main/webapp/WEB-INF/jsp/usuarios/usuariosShow.jsp

@@ -5,11 +5,13 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="usuario">
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="usuario"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="usuario"/></h2>
 
     <table class="table table-striped" id="usuarioTable">
     	<thead>

src/main/webapp/WEB-INF/jsp/welcome.jsp

@@ -7,6 +7,7 @@
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 <!-- %@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %-->  
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 
 <cheapy:layout pageName="home"> 
     <h2 class="text-center" style="font-family: 'Lobster'; font-size: 300%; color: rgb(0, 64, 128); padding:30px"><fmt:message key="welcome"/></h2>

src/main/webapp/WEB-INF/tags/menu.tag

@@ -57,7 +57,7 @@
 				<sec:authorize access="hasAnyAuthority('admin')">
 				<cheapy:menuItem active="${name eq 'registro'}" url="/offersRecord" title="offersRecord">
 					<span class="glyphicon " aria-hidden="true"></span>
-					<span>Registro de ofertas</span>
+					<span>Historial de ofertas</span>
 				</cheapy:menuItem>
 				</sec:authorize>
 				<!--  

src/main/webapp/WEB-INF/tags/passwordField.tag

@@ -15,7 +15,7 @@
         <label class="col-sm-2 control-label">${label}</label>
 		
         <div class="col-sm-10">
-            <form:input type="password" class="form-control" placeholder="${placeholder }" path="${name}"/>
+            <form:input type="password" class="form-control" style="width:80%;" placeholder="${placeholder }" path="${name}"/>
             <c:if test="${valid}">
                 <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
             </c:if>