Avance en las vistas de modificacion de las ofertas

Se ha realizado la mayor parte de las vistas de modificacion de las ofertas, así como algunos cambios menores en las vistas de mostrar detalles

src/main/less/cheapy.less

@@ -240,6 +240,30 @@ img.img-responsive{
   background-color: rgb(40, 140, 215);
 }
 
+.btn-mod{
+  display: table;
+  margin: 0 auto;
+  float:left;
+}
+
+.btn-mod button {
+  background-color: rgb(0, 64, 128); 
+  border: 1px solid rgb(0, 0, 160); 
+  color: white; 
+  padding: 10px 24px; 
+  cursor: pointer;  
+  display: block; 
+}
+
+.btn-mod button:not(:last-child) {
+  border-bottom: none; 
+}
+
+
+.btn-mod button:hover {
+  background-color: rgb(40, 140, 215);
+}
+
 #foodOfferTable th {
   width: 25%;
 }
@@ -278,7 +302,52 @@ img.img-responsive{
 .btn-return{
   display: table;
   margin: 0 auto;
-  width: 100%;
+  float:left;
+}
+
+.btns-edit{
+  display: table;
+  margin: 0 auto;
+  float:right;
+}
+
+.btns-edit button{
+  background-color: rgb(0, 64, 128); 
+  border: 1px solid rgb(0, 0, 160); 
+  color: white; 
+  padding: 10px 24px; 
+  cursor: pointer; 
+}
+
+.btns-edit button:not(:last-child) {
+  border-bottom: none; 
+}
+
+
+.btns-edit button:hover {
+  background-color: rgb(40, 140, 215);
+}
+
+.btns-delete{
+  display: table;
+  margin: 0 auto;
+  float:left;
+}
+
+.btns-delete button{
+  background-color: rgb(0, 64, 128); 
+  border: 1px solid rgb(0, 0, 160); 
+  color: white; 
+  padding: 10px 24px; 
+  cursor: pointer; 
+}
+
+.btns-delete button:not(:last-child) {
+  border-bottom: none; 
+}
+
+.btns-delete button:hover {
+  background-color: rgb(40, 140, 215);
 }
 
 .btn-return button {
@@ -288,14 +357,12 @@ img.img-responsive{
   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);
 }

src/main/resources/messages/messages_es.properties

@@ -1,4 +1,8 @@
 welcome=Bienvenido a
+new=Nueva 
+deleteOffer=Eliminar Oferta
+cancel=Cancelar
+deleteOfferMessage=Confirme que quiere eliminar su oferta
 listOffers=Ver Ofertas
 foodOffers=Ofertas por plato especifico
 foodOffer=Oferta por plato especifico

src/main/webapp/WEB-INF/jsp/foodOffers/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="petclinic" tagdir="/WEB-INF/tags" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <petclinic:layout pageName="foodOffers">
-    <h2>
+    <h2 style="text-align:center;padding:5px">
-        <c:if test="${foodOffer['new']}">New </c:if> FoodOffer
+        <c:if test="${foodOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="foodOffer"/>
     </h2>
     <form:form modelAttribute="foodOffer" class="form-horizontal" id="add-foodOffer-form">
         <div class="form-group has-feedback">
@@ -22,15 +23,21 @@
         </div>
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
+            	<div class="btn-mod">
 	                <c:choose>
 	                    <c:when test="${foodOffer['new']}">
-                        <button class="btn btn-default" type="submit">Crear oferta</button>
+	                        <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 oferta</button>
 	                    </c:when>
 	                    <c:otherwise>
-                        <button class="btn btn-default" type="submit">Modificar</button>
+	                        <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>
+	                        Modificar</button>
 	                    </c:otherwise>
 	                </c:choose>
                 </div>
             </div>
+        </div>
     </form:form>
 </petclinic:layout>

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

@@ -29,7 +29,7 @@
         </tr>
         <tr>
             <th><fmt:message key="discount"/></th>
-            <td><c:out value="${foodOffer.discount}"/></td>
+            <td><c:out value="${foodOffer.discount}"/> </td>
         </tr>
 
         <tr>
@@ -39,20 +39,28 @@
         </thead>
     </table>
     
+    <div class="btn-menu">
 	    <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>
 
+		<div class="btns-edit">
 		    <spring:url value="{foodOfferId}/edit" var="editUrl">
 		    <spring:param name="foodOfferId" value="${foodOffer.id}"/>
 		    </spring:url>
-    <a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Editar oferta</a>
+		    <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 oferta</button>
 	    
 		    <spring:url value="{foodOfferId}/disable" var="editUrl">
 		    <spring:param name="foodOfferId" value="${foodOffer.id}"/>
 		    </spring:url>
-    <a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Desactivar oferta</a>
+		    <button type="button" role="link" onclick="window.location='${fn:escapeXml(editUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+            <span class="glyphicon glyphicon glyphicon-trash" aria-hidden="true" style="padding: 5px"> </span>
+	        Desactivar oferta</button>
+	    </div>
+    </div>
 	
 </cheapy:layout>

src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.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="petclinic" tagdir="/WEB-INF/tags" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <petclinic:layout pageName="NumOffers">
-    <h2>
+    <h2 style="text-align:center;padding:5px">
-        <c:if test="${nuOffer['new']}">New </c:if> NuOffer
+        <c:if test="${nuOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="nuOffer"/>
     </h2>
     <form:form modelAttribute="nuOffer" class="form-horizontal" id="add-nuOffer-form">
         <div class="form-group has-feedback">
@@ -28,15 +29,21 @@
             </div>
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
+            	<div class="btn-mod">
 	                <c:choose>
 	                    <c:when test="${nuOffer['new']}">
-                        <button class="btn btn-default" type="submit">Crear oferta</button>
+	                        <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 oferta</button>
 	                    </c:when>
 	                    <c:otherwise>
-                        <button class="btn btn-default" type="submit">Modificar</button>
+	                        <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>
+	                        Modificar</button>
 	                    </c:otherwise>
 	                </c:choose>
                 </div>
             </div>
+        </div>
     </form:form>
 </petclinic:layout>

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

@@ -50,20 +50,28 @@
         </tr>
     </table>
     
+    <div class="btn-menu">
 	    <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>
 
+		<div class="btns-edit">
 		    <spring:url value="{nuOfferId}/edit" var="editUrl">
 		    <spring:param name="nuOfferId" value="${nuOffer.id}"/>
 		    </spring:url>
-    <a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Editar oferta</a>
+		    <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 oferta</button>
 	    
 		    <spring:url value="{nuOfferId}/disable" var="editUrl">
 		    <spring:param name="nuOfferId" value="${nuOffer.id}"/>
 		    </spring:url>
-    <a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Desactivar oferta</a>
+		    <button type="button" role="link" onclick="window.location='${fn:escapeXml(editUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+            <span class="glyphicon glyphicon glyphicon-trash" aria-hidden="true" style="padding: 5px"> </span>
+	        Desactivar oferta</button>
+	    </div>
+    </div>
 
 </cheapy:layout>

src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.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="petclinic" tagdir="/WEB-INF/tags" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <petclinic:layout pageName="speedOffers">
-    <h2>
+    <h2 style="text-align:center;padding:5px">
-        <c:if test="${speedOffer['new']}">New </c:if> SpeedOffer
+        <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">
         <div class="form-group has-feedback">
@@ -26,15 +27,21 @@
         </div>
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
+            	<div class="btn-mod">
 	                <c:choose>
 	                    <c:when test="${speedOffer['new']}">
-                        <button class="btn btn-default" type="submit">Crear oferta</button>
+	                        <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 oferta</button>
 	                    </c:when>
 	                    <c:otherwise>
-                        <button class="btn btn-default" type="submit">Modificar</button>
+	                        <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>
+	                        Modificar</button>
 	                    </c:otherwise>
 	                </c:choose>
                 </div>
             </div>
+        </div>
     </form:form>
 </petclinic:layout>

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

@@ -50,20 +50,29 @@
         </tr>
     </table>
     
+    <div class="btn-menu">
 	    <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>
 
+		<div class="btns-edit">
 		    <spring:url value="{speedOfferId}/edit" var="editUrl">
 		    <spring:param name="speedOfferId" value="${speedOffer.id}"/>
 		    </spring:url>
-    <a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Editar oferta</a>
+		    <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 oferta</button>
 	    
 		   <spring:url value="{speedOfferId}/disable" var="editUrl">
 		    <spring:param name="speedOfferId" value="${speedOffer.id}"/>
 		    </spring:url>
-    <a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Desactivar oferta</a>
+		    <button type="button" role="link" onclick="window.location='${fn:escapeXml(editUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+            <span class="glyphicon glyphicon glyphicon-trash" aria-hidden="true" style="padding: 5px"> </span>
+	        Desactivar oferta</button>
+	    </div>
+    </div>
+
 
 </cheapy:layout>

src/main/webapp/WEB-INF/jsp/timeOffers/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="petclinic" tagdir="/WEB-INF/tags" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <petclinic:layout pageName="TimeOffers">
-    <h2>
+    <h2 style="text-align:center;padding:5px">
-        <c:if test="${timeOffer['new']}">New </c:if> TimeOffer
+        <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">
         <div class="form-group has-feedback">
@@ -25,15 +26,21 @@
             </div>
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
+            	<div class="btn-mod">
 	                <c:choose>
 	                    <c:when test="${timeOffer['new']}">
-                        <button class="btn btn-default" type="submit">Add Offer</button>
+	                        <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 oferta</button>
 	                    </c:when>
 	                    <c:otherwise>
-                        <button class="btn btn-default" type="submit">Update Offer</button>
+	                        <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>
+	                        Modificar</button>
 	                    </c:otherwise>
 	                </c:choose>
                 </div>
             </div>
+        </div>
     </form:form>
 </petclinic:layout>

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

@@ -32,20 +32,30 @@
         </thead>
     </table>
 
-    <spring:url value="{timeOfferId}/edit" var="editUrl">
+	<div class="btn-menu">
-    <spring:param name="timeOfferId" value="${timeOffer.id}"/>
-    </spring:url>
-    <a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Editar oferta</a>
-    
-    <spring:url value="{timeOfferId}/disable" var="editUrl">
-    <spring:param name="timeOfferId" value="${timeOffer.id}"/>
-    </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>
 
+		<div class="btns-edit">
+		    <spring:url value="{timeOfferId}/edit" var="editUrl">
+		    <spring:param name="timeOfferId" value="${timeOffer.id}"/>
+		    </spring:url>
+		    <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 oferta</button>
+	    
+		   	<spring:url value="{timeOfferId}/disable" var="editUrl">
+		    <spring:param name="timeOfferId" value="${timeOffer.id}"/>
+		    </spring:url>
+		    <button type="button" role="link" onclick="window.location='${fn:escapeXml(editUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+            <span class="glyphicon glyphicon glyphicon-trash" aria-hidden="true" style="padding: 5px"> </span>
+	        Desactivar oferta</button>
+	    </div>
+    </div>
+    
+
+  
 </cheapy:layout>