Merge pull request #35 from cheapy-ispp/009-cambiarVistas

Cambiado el logout y algunos cambios visuales más

src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java

@@ -51,6 +51,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 		.antMatchers("/clients/new").permitAll()
 		.antMatchers("/offers/**").hasAnyAuthority("admin", "cliente")
 
+
 		.and().formLogin()
 			.loginPage("/login").permitAll()
 			.failureUrl("/login?error")

src/main/java/org/springframework/cheapy/web/FoodOfferController.java

@@ -1,6 +1,7 @@
 
 package org.springframework.cheapy.web;
 
+import java.time.format.DateTimeFormatter;
 import java.util.Map;
 import javax.validation.Valid;
 import org.springframework.cheapy.model.Client;

src/main/java/org/springframework/cheapy/web/OfertaController.java

@@ -1,5 +1,6 @@
 package org.springframework.cheapy.web;
 
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 
@@ -43,6 +44,9 @@ public class OfertaController {
 		model.put("speedOfferLs", speedOfferLs);
 		model.put("timeOfferLs", timeOfferLs);
 		
+		//Se añade formateador de fecha al modelo	
+		model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm"));
+		
 		return "offers/offersList";
 
 	}

src/main/java/org/springframework/cheapy/web/SpeedOfferController.java

@@ -79,6 +79,9 @@ public class SpeedOfferController {
 
 		SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId);
 		model.put("speedOffer", speedOffer);
+		
+		//Se añade formateador de fecha al modelo	
+		model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm"));
 		return "speedOffers/speedOffersShow";
 	}
 

src/main/java/org/springframework/cheapy/web/TimeOfferController.java

@@ -150,6 +150,7 @@ public class TimeOfferController {
 
 		return "redirect:/offers";
 
+
 	}
 
 }

src/main/less/cheapy.less

@@ -47,10 +47,10 @@
 
 @pagination-active-bg:                    @spring-brown;
 @pagination-active-border:                @spring-blue;
-@table-border-color:                      @spring-brown;
+@table-border-color:                      rgb(0, 64, 128);
 
-.table > thead > tr > th {
+ .table > thead > tr > th {
-  background-color: lighten(@spring-brown, 3%);
+  background-color: rgb(40, 140, 215);
   color: @spring-light-grey;
 }
 
@@ -237,7 +237,131 @@ img.img-responsive{
 
 
 .btn-home button:hover {
-  background-color: rgb(0, 64, 128);
+  background-color: rgb(40, 140, 215);
+}
+
+#foodOfferTable th {
+  width: 25%;
+}
+
+#nuOfferTable th {
+  width: 33%;
+}
+
+#speedOfferTable th {
+  width: 33%;
+}
+
+#timeOfferTable th {
+  width: 33%;
+}
+
+.btn-detalles button {
+  background-color: rgb(0, 64, 128); 
+  border: 1px solid rgb(0, 0, 160); 
+  color: white; 
+  padding: 10px 24px; 
+  cursor: pointer; 
+  display: block; 
+  float: right;
+}
+
+.btn-detalles button:not(:last-child) {
+  border-bottom: none; 
+}
+
+
+.btn-detalles button:hover {
+  background-color: rgb(40, 140, 215);
+}
+
+.btn-return{
+  display: table;
+  margin: 0 auto;
+  width: 100%;
+}
+
+.btn-return button {
+  background-color: rgb(0, 64, 128); 
+  border: 1px solid rgb(0, 0, 160); 
+  color: white; 
+  padding: 10px 24px; 
+  cursor: pointer; 
+  display: block;
+  left: 0%;
+}
+
+.btn-return button:not(:last-child) {
+  border-bottom: none; 
+}
+
+
+.btn-return button:hover {
+  background-color: rgb(40, 140, 215);
+}
+
+#foodOfferTable td{
+  vertical-align:middle;
+}
+
+#nuOfferTable td{
+  vertical-align:middle;
+}
+
+#speedOfferTable td{
+  vertical-align:middle;
+}
+
+#timeOfferTable td{
+  vertical-align:middle;
+}
+
+#nuOffer-table tr:nth-child(3){
+  background-color: rgb(255, 215, 0);
+}
+
+#nuOffer-table tr:nth-child(4){
+  background-color: rgb(255, 215, 0);
+}
+
+#nuOffer-table tr:nth-child(5){
+  background-color: rgb(192, 192, 192);
+}
+
+#nuOffer-table tr:nth-child(6){
+  background-color: rgb(192, 192, 192);
+}
+
+#nuOffer-table tr:nth-child(7){
+  background-color: rgb(204, 128, 51);
+}
+
+#nuOffer-table tr:nth-child(8){
+  background-color: rgb(204, 128, 51);
+}
+
+#speedOffer-table tr:nth-child(3){
+  background-color: rgb(255, 215, 0);
+}
+
+#speedOffer-table tr:nth-child(4){
+  background-color: rgb(255, 215, 0);
+}
+
+#speedOffer-table tr:nth-child(5){
+  background-color: rgb(192, 192, 192);
+}
+
+#speedOffer-table tr:nth-child(6){
+  background-color: rgb(192, 192, 192);
+}
+
+#speedOffer-table tr:nth-child(7){
+  background-color: rgb(204, 128, 51);
+}
+
+#speedOffer-table tr:nth-child(8){
+  background-color: rgb(204, 128, 51);
 }
 
 .alert-success {

src/main/resources/messages/messages.properties

@@ -1,4 +1,6 @@
-welcome=Welcome
+welcome=Welcome to
+listOffers=List Offers
+
 required=is required
 notFound=has not been found
 duplicate=is already in use

src/main/resources/messages/messages_es.properties

@@ -1,8 +1,34 @@
 welcome=Bienvenido a
-required=Es requerido
+listOffers=Ver Ofertas
+foodOffers=Ofertas por plato especifico
+foodOffer=Oferta por plato especifico
+nuOffers=Ofertas por numero de comensales
+nuOffer=Oferta por numero de comensales
+speedOffers=Ofertas rapidez comiendo
+speedOffer=Oferta por comer veloz
+timeOffers=Ofertas por franja horaria
+timeOffer=Oferta por franja horaria
+food=Plato
+foodInOffer=Plato en oferta
+cuantity=Cantidad
+discount=Descuento
+goldGoal=Meta oro
+goldDiscount=Descuento oro
+silverGoal=Meta plata
+silverDiscount=Descuento plata
+bronzeGoal=Meta bronce
+bronzeDiscount=Descuento bronce
+startDate=Fecha inicio
+offerBeginning=Inicio de la oferta
+endDate=Fecha fin
+offerEnding=Fin de la oferta
+details=Detalles
+offerCode=Codigo de la oferta
+return=Volver
+required=Es requeridOfertas por franja horariao
 notFound=No ha sido encontrado
 duplicate=Ya se encuentra en uso
 nonNumeric=Sólo debe contener numeros
 duplicateFormSubmission=No se permite el envío de formularios duplicados
 typeMismatch.date=Fecha invalida
-typeMismatch.birthDate=Fecha invalida
+typeMismatch.birthDate=Fecha invalida

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

@@ -5,7 +5,7 @@
 
 <cheapy:layout pageName="error">
 
-    <h2>Algo malo ha pasado...</h2>
+    <h2 style="text-align:center">Algo malo ha pasado...</h2>
     
     <spring:url value="/resources/images/Logo Cheapy.png" htmlEscape="true" var="cheapyImage"/>
     <img class="img-responsive" src="${cheapyImage}"/>

src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp

@@ -1,36 +1,52 @@
 <%@ page session="false" trimDirectiveWhitespaces="true" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ 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" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="foodOffer">
 
-    <h2>Oferta por plato espec<65>fico</h2>
+
+    <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffer"/></h2>
 
 
-    <table class="table table-striped">
+
+    <table class="table table-striped" id="foodOfferTable">
+    	<thead>
         <tr>
-            <th>Inicio de la oferta</th>
+            <th><fmt:message key="offerBeginning"/></th>
-            <td><b><c:out value="${foodOffer.start}"/></b></td>
+            <td><c:out value="${localDateTimeFormat.format(foodOffer.start)}"/></td>
         </tr>
         <tr>
-            <th>Fin de la oferta</th>
+            <th><fmt:message key="offerEnding"/></th>
-            <td><c:out value="${foodOffer.end}"/></td>
+            <td><c:out value="${localDateTimeFormat.format(foodOffer.end)}"/></td>
         </tr>
 		<tr>
-            <th>Plato en oferta</th>
+            <th><fmt:message key="foodInOffer"/></th>
             <td><c:out value="${foodOffer.food}"/></td>
         </tr>
         <tr>
-            <th>Descuento</th>
+            <th><fmt:message key="discount"/></th>
             <td><c:out value="${foodOffer.discount}"/></td>
         </tr>
         <tr>
-            <th>Codigo de la oferta</th>
+            <th><fmt:message key="cuantity"/></th>
+            <td><c:out value="${foodOffer.units}"/></td>
+        </tr>
+        <tr>
+            <th><fmt:message key="offerCode"/></th>
             <td><c:out value="${foodOffer.code}"/></td>
         </tr>
+        </thead>
     </table>
+    
+    <div class="btn-return">
+	    <button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;"> 
+	    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> 
+	    <fmt:message key="return"/> </button>
+    </div>
 
     <spring:url value="{foodOfferId}/edit" var="editUrl">
     <spring:param name="foodOfferId" value="${foodOffer.id}"/>

src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp

@@ -3,35 +3,37 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="nuOffer">
 
-    <h2>Oferta por n<>mero de comensales</h2>
+    <h2 style="text-align:center;padding:5px"><fmt:message key="nuOffer"/></h2>
 
 
-    <table class="table table-striped">
+    <table class="table table-striped" id="nuOffer-table">
         <tr>
-            <th>Inicio de la oferta</th>
+            <th><fmt:message key="offerBeginning"/></th>
-            <td><b><c:out value="${nuOffer.start}"/></b></td>
+            <td><c:out value="${localDateTimeFormat.format(nuOffer.start)}"/></td>
         </tr>
         <tr>
-            <th>Fin de la oferta</th>
+            <th><fmt:message key="offerEnding"/></th>
-            <td><c:out value="${nuOffer.end}"/></td>
+            <td><c:out value="${localDateTimeFormat.format(nuOffer.end)}"/></td>
         </tr>
         <tr>
-            <th>Meta oro</th>
+            <th><fmt:message key="goldGoal"/></th>
             <td><c:out value="${nuOffer.gold}"/></td>
         </tr>
         <tr>
-            <th>Descuento oro</th>
+            <th><fmt:message key="goldDiscount"/></th>
             <td><c:out value="${nuOffer.discountGold}"/></td>
         </tr>
         <tr>
-            <th>Meta plata</th>
+            <th><fmt:message key="silverGoal"/></th>
             <td><c:out value="${nuOffer.silver}"/></td>
         </tr>
         <tr>
-            <th>Descuento plata</th>
+            <th><fmt:message key="silverDiscount"/></th>
             <td><c:out value="${nuOffer.discountSilver}"/></td>
         </tr>
         <tr>
@@ -39,14 +41,20 @@
             <td><c:out value="${nuOffer.bronze}"/></td>
         </tr>
         <tr>
-            <th>Descuento bronce</th>
+            <th><fmt:message key="bronzeDiscount"/></th>
             <td><c:out value="${nuOffer.discountBronze}"/></td>
         </tr>
         <tr>
-            <th>Codigo de la oferta</th>
+            <th><fmt:message key="offerCode"/></th>
             <td><c:out value="${nuOffer.code}"/></td>
         </tr>
     </table>
+    
+    <div class="btn-return">
+	    <button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;">
+	    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+	    <fmt:message key="return"/> </button>
+    </div>
 
     <spring:url value="{nuOfferId}/edit" var="editUrl">
     <spring:param name="nuOfferId" value="${nuOffer.id}"/>

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

@@ -4,17 +4,18 @@
 <%@ 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" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertas">
-    <h2>Ofertas por plato específico</h2>
+    <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2>
 
     <table id="foodOfferTable" class="table table-striped">
         <thead>
         <tr>
         	<!-- <th style="width: 150px;">Restaurante</th> -->
-        	<th style="width: 150px;">Plato</th>
+        	<th><fmt:message key="food"/></th>
-            <th style="width: 150px;">Fecha inicio</th>
+            <th><fmt:message key="startDate"/></th>
-            <th style="width: 200px;">Fecha fin</th>
+            <th><fmt:message key="endDate"/></th>
             <th> </th>
         </tr>
         </thead>
@@ -25,16 +26,20 @@
                     <c:out value="${foodOffer.food}"/>
                 </td>
                 <td>
-                    <c:out value="${foodOffer.start}"/>
+                    <c:out value="${localDateTimeFormat.format(foodOffer.start)}"/>
                 </td>
                 <td>
-                    <c:out value="${foodOffer.end}"/>
+                    <c:out value="${localDateTimeFormat.format(foodOffer.end)}"/>
                 </td>
                 <td>
-                <spring:url value="/offers/food/{foodOfferId}" var="foodOfferUrl">
+	                <spring:url value="/offers/food/{foodOfferId}" var="foodOfferUrl">
-                        <spring:param name="foodOfferId" value="${foodOffer.id}"/>
+	                        <spring:param name="foodOfferId" value="${foodOffer.id}"/>
-                    </spring:url>
+	                </spring:url>
-                    <a href="${fn:escapeXml(foodOfferUrl)}"/>Enlace</a>
+	                <div class="btn-detalles">
+                		<button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+                		<span class="glyphicon glyphicon-info-sign" aria-hidden="true" style="padding: 5px"> </span>
+	                	<fmt:message key="details"/></button>
+            		</div>
                 </td> 
                   
             </tr>
@@ -42,14 +47,14 @@
         </tbody>
     </table>
     
-    <h2>Ofertas por número de comensales</h2>
+    <h2 style="text-align:center;padding:5px"><fmt:message key="nuOffers"/></h2>
 
     <table id="nuOfferTable" class="table table-striped">
         <thead>
         <tr>
         	<!-- <th style="width: 150px;">Restaurante</th> -->
-            <th style="width: 150px;">Fecha inicio</th>
+            <th><fmt:message key="startDate"/></th>
-            <th style="width: 200px;">Fecha fin</th>
+            <th><fmt:message key="endDate"/></th>
             <th> </th>
             
         </tr>
@@ -59,29 +64,33 @@
             <tr>
                 
                 <td>
-                    <c:out value="${nuOffer.start}"/>
+                    <c:out value="${localDateTimeFormat.format(nuOffer.start)}"/>
                 </td>
                 <td>
-                    <c:out value="${nuOffer.end}"/>
+                    <c:out value="${localDateTimeFormat.format(nuOffer.end)}"/>
                 </td>
                 <td>
-                <spring:url value="/offers/nu/{nuOfferId}" var="nuOfferUrl">
+	                <spring:url value="/offers/nu/{nuOfferId}" var="nuOfferUrl">
-                        <spring:param name="nuOfferId" value="${nuOffer.id}"/>
+	                        <spring:param name="nuOfferId" value="${nuOffer.id}"/>
-                    </spring:url>
+	                </spring:url>
-                    <a href="${fn:escapeXml(nuOfferUrl)}"/>Enlace</a>
+	                <div class="btn-detalles">
+		                <button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferUrl)}'" class="btn-detalles" style="font-family: 'Lobster'; font-size: 20px;">
+		                <span class="glyphicon glyphicon-info-sign" aria-hidden="true" style="padding: 5px"> </span>
+		                <fmt:message key="details"/> </button>
+		            </div>
                 </td>  
             </tr>
         </c:forEach>
         </tbody>
     </table>
-    <h2>Ofertas rapidez comiendo</h2>
+    <h2 style="text-align:center;padding:5px"><fmt:message key="speedOffers"/></h2>
 
     <table id="speedOfferTable" class="table table-striped">
         <thead>
         <tr>
         	<!-- <th style="width: 150px;">Restaurante</th> -->
-            <th style="width: 150px;">Fecha inicio</th>
+            <th><fmt:message key="startDate"/></th>
-            <th style="width: 200px;">Fecha fin</th>
+            <th><fmt:message key="endDate"/></th>
             <th> </th>
             
         </tr>
@@ -91,30 +100,34 @@
             <tr>
                 
                 <td>
-                    <c:out value="${speedOffer.start}"/>
+                    <c:out value="${localDateTimeFormat.format(speedOffer.start)}"/>
                 </td>
                 <td>
-                    <c:out value="${speedOffer.end}"/>
+                    <c:out value="${localDateTimeFormat.format(speedOffer.end)}"/>
                 </td>
                 <td>
                     <spring:url value="/offers/speed/{speedOfferId}" var="speedOfferUrl">
                         <spring:param name="speedOfferId" value="${speedOffer.id}"/>
                     </spring:url>
-                    <a href="${fn:escapeXml(speedOfferUrl)}"/>Enlace</a>
+                    <div class="btn-detalles">
+	                    <button type="button" role="link" onclick="window.location='${fn:escapeXml(speedOfferUrl)}'" class="btn-detalles" style="font-family: 'Lobster'; font-size: 20px;">
+	                    <span class="glyphicon glyphicon-info-sign" aria-hidden="true" style="padding: 5px"> </span>
+	                    <fmt:message key="details"/> </button>
+	                </div>
                 </td>
                   
             </tr>
         </c:forEach>
         </tbody>
     </table>
-    <h2>Ofertas por franja horaria</h2>
+    <h2 style="text-align:center;padding:5px"><fmt:message key="timeOffers"/></h2>
 
     <table id="timeOfferTable" class="table table-striped">
         <thead>
         <tr>
         	<!-- <th style="width: 150px;">Restaurante</th> -->
-            <th style="width: 150px;">Fecha inicio</th>
+            <th><fmt:message key="startDate"/></th>
-            <th style="width: 200px;">Fecha fin</th>
+            <th><fmt:message key="endDate"/></th>
             <th> </th>
         </tr>
         </thead>
@@ -123,16 +136,20 @@
             <tr>
                 
                 <td>
-                    <c:out value="${timeOffer.start}"/>
+                    <c:out value="${localDateTimeFormat.format(timeOffer.start)}"/>
                 </td>
                 <td>
-                    <c:out value="${timeOffer.end}"/>
+                    <c:out value="${localDateTimeFormat.format(timeOffer.end)}"/>
                 </td>
                 <td>
-                <spring:url value="/offers/time/{timeOfferId}" var="timeOfferUrl">
+                	<spring:url value="/offers/time/{timeOfferId}" var="timeOfferUrl">
                         <spring:param name="timeOfferId" value="${timeOffer.id}"/>
                     </spring:url>
-                    <a href="${fn:escapeXml(timeOfferUrl)}"/>Enlace</a>
+                    <div class="btn-detalles">
+	                    <button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferUrl)}'" class="btn-detalles" style="font-family: 'Lobster'; font-size: 20px;">
+	                    <span class="glyphicon glyphicon-info-sign" aria-hidden="true" style="padding: 5px"> </span>
+	                    <fmt:message key="details"/> </button>
+	                </div>
                 </td> 
             </tr>
         </c:forEach>

src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp

@@ -3,50 +3,58 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="speedOffer">
 
-    <h2>Oferta por comer veloz</h2>
+    <h2 style="text-align:center;padding:5px"><fmt:message key="speedOffer"/></h2>
 
 
-    <table class="table table-striped">
+    <table class="table table-striped" id="speedOffer-table">
         <tr>
-            <th>Inicio de la oferta</th>
+            <th><fmt:message key="offerBeginning"/></th>
-            <td><b><c:out value="${speedOffer.start}"/></b></td>
+            <td><c:out value="${localDateTimeFormat.format(speedOffer.start)}"/></td>
         </tr>
         <tr>
-            <th>Fin de la oferta</th>
+            <th><fmt:message key="offerEnding"/></th>
-            <td><c:out value="${speedOffer.end}"/></td>
+            <td><c:out value="${localDateTimeFormat.format(speedOffer.end)}"/></td>
         </tr>
         <tr>
-            <th>Meta oro</th>
+            <th><fmt:message key="goldGoal"/></th>
             <td><c:out value="${speedOffer.gold}"/></td>
         </tr>
         <tr>
-            <th>Descuento oro</th>
+            <th><fmt:message key="goldDiscount"/></th>
             <td><c:out value="${speedOffer.discountGold}"/></td>
         </tr>
         <tr>
-            <th>Meta plata</th>
+            <th><fmt:message key="silverGoal"/></th>
             <td><c:out value="${speedOffer.silver}"/></td>
         </tr>
         <tr>
-            <th>Descuento plata</th>
+            <th><fmt:message key="silverDiscount"/></th>
             <td><c:out value="${speedOffer.discountSilver}"/></td>
         </tr>
         <tr>
-            <th>Meta bronce</th>
+            <th><fmt:message key="bronzeGoal"/></th>
             <td><c:out value="${speedOffer.bronze}"/></td>
         </tr>
         <tr>
-            <th>Descuento bronce</th>
+            <th><fmt:message key="bronzeDiscount"/></th>
             <td><c:out value="${speedOffer.discountBronze}"/></td>
         </tr>
         <tr>
-            <th>Codigo de la oferta</th>
+            <th><fmt:message key="offerCode"/></th>
             <td><c:out value="${speedOffer.code}"/></td>
         </tr>
     </table>
+    
+    <div class="btn-return">
+	    <button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;">
+	    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+	    <fmt:message key="return"/> </button>
+    </div>
 
     <spring:url value="{speedOfferId}/edit" var="editUrl">
     <spring:param name="speedOfferId" value="${speedOffer.id}"/>

src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp

@@ -3,31 +3,35 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="timeOffer">
 
-    <h2>Oferta por franja horaria</h2>
+    <h2 style="text-align:center;padding:5px"><fmt:message key="timeOffer"/></h2>
 
 
     <table class="table table-striped">
+        <thead>
         <tr>
-            <th>Inicio de la oferta</th>
+            <th><fmt:message key="offerBeginning"/></th>
-            <td><b><c:out value="${timeOffer.start}"/></b></td>
+            <td><c:out value="${localDateTimeFormat.format(timeOffer.start)}"/></td>
         </tr>
         <tr>
-            <th>Fin de la oferta</th>
+            <th><fmt:message key="offerEnding"/></th>
-            <td><c:out value="${timeOffer.end}"/></td>
+            <td><c:out value="${localDateTimeFormat.format(timeOffer.end)}"/></td>
         </tr>
         <tr>
-            <th>Descuento</th>
+            <th><fmt:message key="discount"/></th>
             <td><c:out value="${timeOffer.discount}"/></td>
         </tr>
         <tr>
-            <th>Codigo de la oferta</th>
+            <th><fmt:message key="offerCode"/></th>
             <td><c:out value="${timeOffer.code}"/></td>
         </tr>
+        </thead>
     </table>
-    
+
     <spring:url value="{timeOfferId}/edit" var="editUrl">
     <spring:param name="timeOfferId" value="${timeOffer.id}"/>
     </spring:url>
@@ -38,4 +42,10 @@
     </spring:url>
     <a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Desactivar oferta</a>
 
+    <div class="btn-return">
+	    <button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;">
+	    <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+	    <fmt:message key="return"/> </button>
+    </div>
+  
 </cheapy:layout>

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

@@ -14,8 +14,9 @@
                 <img class="img-responsive" src="${cheapyImage}"/>
             </div>
             <div class="btn-home">
-                <a href="/offers"><button type="button" style="font-family: 'Lobster'; font-size: 20px;">
+                <button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;">
-                	<span class="glyphicon glyphicon-cutlery" aria-hidden="true" style="margin-right:8px"></span>Ver Ofertas</button></a>
+                <span class="glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
+                <fmt:message key="listOffers"/> </button>
             </div>
         </div>
     </div>

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

@@ -34,12 +34,13 @@
 					<span>Ver ofertas</span>
 				</cheapy:menuItem>
 				
+				<!--  
 				<cheapy:menuItem active="${name eq 'contactanos'}" url="/contactanos"
 					title="contactanos">
 					<span class="glyphicon glyphicon-earphone" aria-hidden="true"></span>
 					<span>Contáctanos</span>
 				</cheapy:menuItem>
-
+				-->
 				
 
 			</ul>
@@ -48,7 +49,7 @@
 			<ul class="nav navbar-nav navbar-right">
 				<sec:authorize access="!isAuthenticated()">
 					<li><a href="<c:url value="/login" />">Login</a></li>
-					<li><a href="<c:url value="/users/new" />">Register</a></li>
+					<!--<li><a href="<c:url value="/users/new" />">Register</a></li>-->
 				</sec:authorize>
 				<sec:authorize access="isAuthenticated()">
 					<li class="dropdown"><a href="#" class="dropdown-toggle"
@@ -59,10 +60,10 @@
 						<ul class="dropdown-menu">
 							<li>
 								<div class="navbar-login">
-									<div class="row">
+									<div class="row" >
-										<div class="col-lg-4">
+										<div class="col-lg-4" style="">
 											<p class="text-center">
-												<span class="glyphicon glyphicon-user icon-size"></span>
+												<span class="glyphicon glyphicon-user icon-size" ></span>
 											</p>
 										</div>
 										<div class="col-lg-8">
@@ -71,7 +72,7 @@
 											</p>
 											<form action="/logout" method=post>
 												<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
-												<input type="submit" value="logout">
+												<input type="submit" value="logout" style="align-content:center;color:white;background-color:#004080;padding:10px; border:none; text-align:center">
 											</form>
 										</div>
 									</div>

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

@@ -5,6 +5,6 @@
 <div class="container">
     <div class="row">
         <div class="col-12 text-center"><img src="<spring:url value="/resources/images/eslogan.png" htmlEscape="true" />"
-                                             alt="Sponsored by Pivotal"/></div>
+                                             alt="Eat fast, eat cheapy"/></div>
     </div>
 </div>