DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-25 00:25:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #110 from cheapy-ispp/025-cambiar-vistas-sprint2

Browse source 
Añadido estilo a los filtros y algunas tablas nuevas
This commit is contained in:
davsotpon 2021-04-13 21:49:13 +02:00 committed by GitHub
commit 9299088070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 239 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/main/less/cheapy.less
View file

@ -224,6 +224,28 @@ img.img-responsive{
width: 25%; width: 25%;
} }
.btn-filter{
background: rgb(40, 140, 215);
color: white;
}
.btn-filter:hover{
background: rgb(0, 64, 128);
color: white;
}
.btn-filter-active{
background: rgb(0, 64, 128);
color: white;
}
.btn-filter-max button {
padding:10px;
margin-bottom: 20px;
}
.btn-home { .btn-home {
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -307,6 +329,15 @@ img.img-responsive{
background-color: rgb(40, 140, 215); background-color: rgb(40, 140, 215);
} }
#offerTable th{
text-align: center;
}
#offerTable td{
vertical-align:middle;
text-align: center;
}
#foodOfferTable th { #foodOfferTable th {
width: 20%; width: 20%;
text-align: center; text-align: center;
@ -564,6 +595,12 @@ text-align: center;
color: rgb(29, 142, 226); color: rgb(29, 142, 226);
} }
input[type=text] {
width:80%;
}
.row-full{ .row-full{
width: 100vw; width: 100vw;
position: relative; position: relative;

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

@ -9,39 +9,43 @@
<cheapy:layout pageName="ofertas de plato especifico"> <cheapy:layout pageName="ofertas de plato especifico">
<spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl"> <div class="text-center">
<spring:param name="page" value="0"/> <div class="btn-filter-max">
</spring:url> <spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl">
<button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <spring:param name="page" value="0"/>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> </spring:url>
Ofertas de plato especifico</button>
<button type="button" role="link" class="btn-filter-active" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl"> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
<spring:param name="page" value="0"/> Ofertas de plato específico</button>
</spring:url>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <spring:param name="page" value="0"/>
Ofertas por número de comensales</button> </spring:url>
<button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
<spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl"> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
<spring:param name="page" value="0"/> Ofertas por número de comensales</button>
</spring:url>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl">
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <spring:param name="page" value="0"/>
Ofertas de velocidad</button> </spring:url>
<button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
<spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl"> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
<spring:param name="page" value="0"/> Ofertas de velocidad</button>
</spring:url>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl">
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <spring:param name="page" value="0"/>
Ofertas de franja horaria</button> </spring:url>
<button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
<span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas de franja horaria</button>
</div>
</div>
<h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2> <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2>
<c:if test="${empty foodOfferLs }"> <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<EFBFBD>fico activa.</p>
</c:if> </c:if>
<c:if test="${not empty foodOfferLs }"> <c:if test="${not empty foodOfferLs }">
<table id="foodOfferTable" class="table table-striped"> <table id="foodOfferTable" class="table table-striped">
@ -97,7 +101,7 @@
</spring:url> </spring:url>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <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> <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Pág. anterior</button> P<EFBFBD>g. anterior</button>
</c:if> </c:if>
<c:out value='${page}'></c:out> <c:out value='${page}'></c:out>
<c:if test="${fn:length(foodOfferLs) == 5}"> <c:if test="${fn:length(foodOfferLs) == 5}">
@ -106,7 +110,7 @@
</spring:url> </spring:url>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <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> <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Pág. siguiente</button> P<EFBFBD>g. siguiente</button>
</c:if> </c:if>
</c:if> </c:if>

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

@ -7,40 +7,42 @@
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'> <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
<cheapy:layout pageName="ofertas"> <cheapy:layout pageName="ofertas por numero de comensales">
<div class="text-center">
<spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl"> <div class="btn-filter-max">
<spring:param name="page" value="0"/> <spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl">
</spring:url> <spring:param name="page" value="0"/>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> </spring:url>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
Ofertas de plato especifico</button> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas de plato especifico</button>
<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
<spring:param name="page" value="0"/> <spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
</spring:url> <spring:param name="page" value="0"/>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> </spring:url>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" class="btn-filter-active" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
Ofertas por número de comensales</button> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas por número de comensales</button>
<spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl">
<spring:param name="page" value="0"/> <spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl">
</spring:url> <spring:param name="page" value="0"/>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> </spring:url>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
Ofertas de velocidad</button> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas de velocidad</button>
<spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl">
<spring:param name="page" value="0"/> <spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl">
</spring:url> <spring:param name="page" value="0"/>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> </spring:url>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
Ofertas de franja horaria</button> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas de franja horaria</button>
</div>
</div>
<h2 style="text-align:center;padding:5px"><fmt:message key="nuOffers"/></h2> <h2 style="text-align:center;padding:5px"><fmt:message key="nuOffers"/></h2>
<c:if test="${empty nuOfferLs }"> <c:if test="${empty nuOfferLs }">
<p id="vacio" >No hay ninguna oferta por número de comensales activa.</p> <p id="vacio" >No hay ninguna oferta por n<EFBFBD>mero de comensales activa.</p>
</c:if> </c:if>
<c:if test="${not empty nuOfferLs }"> <c:if test="${not empty nuOfferLs }">
<table id="nuOfferTable" class="table table-striped"> <table id="nuOfferTable" class="table table-striped">
@ -94,7 +96,7 @@
</spring:url> </spring:url>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <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> <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Pág. anterior</button> P<EFBFBD>g. anterior</button>
</c:if> </c:if>
<c:out value='${page}'></c:out> <c:out value='${page}'></c:out>
<c:if test="${fn:length(nuOfferLs) == 5}"> <c:if test="${fn:length(nuOfferLs) == 5}">
@ -103,7 +105,7 @@
</spring:url> </spring:url>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <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> <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Pág. siguiente</button> P<EFBFBD>g. siguiente</button>
</c:if> </c:if>
</c:if> </c:if>

94
src/main/webapp/WEB-INF/jsp/offers/offersList.jsp
View file

@ -9,51 +9,67 @@
<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'> <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
<cheapy:layout pageName="ofertas"> <cheapy:layout pageName="ofertas">
<div class="text-center">
<spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl"> <div class="btn-filter-max">
<spring:param name="page" value="0"/> <spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl">
</spring:url> <spring:param name="page" value="0"/>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> </spring:url>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Ofertas de plato especifico</button>
<button type="button" class="btn-filter" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl"> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
<spring:param name="page" value="0"/> Ofertas de plato específico</button>
</spring:url>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <spring:param name="page" value="0"/>
Ofertas por número de comensales</button> </spring:url>
<spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl"> <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
<spring:param name="page" value="0"/> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
</spring:url> Ofertas por número de comensales</button>
<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>
Ofertas de velocidad</button> <spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl">
<spring:param name="page" value="0"/>
<spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl"> </spring:url>
<spring:param name="page" value="0"/> <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
</spring:url> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> Ofertas de velocidad</button>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Ofertas de franja horaria</button> <spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl">
<spring:param name="page" value="0"/>
</spring:url>
<button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
<span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas de franja horaria</button>
</div>
</div>
<form class="example" action="/offersByName"> <form class="example" action="/offersByName">
<input type="text" name="name"> <h2 class="text-center" style="font-size: 100%" >Búsqueda por nombre del bar/restaurante: </h2>
<button type="submit"><i class="fa fa-search"></i></button> <div class="text-center">
<input type="text" placeholder="Búsqueda por nombre" name="name">
<button type="submit"><i class="fa fa-search"></i>
<span class="glyphicon glyphicon glyphicon-search" aria-hidden="true" style="padding: 5px"> </span>
</button>
</div>
</form> </form>
<form class="example" action="/offersByFood"> <form class="example" action="/offersByFood">
<input type="text" name="name"> <h2 class="text-center" style="font-size: 100%" >Búsqueda por comida: </h2>
<button type="submit"><i class="fa fa-search"></i></button> <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>
<span class="glyphicon glyphicon glyphicon-search" aria-hidden="true" style="padding: 5px"> </span>
</button>
</div>
</form> </form>
<h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2> <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2>
<c:if test="${empty foodOfferLs }"> <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>
<c:if test="${not empty foodOfferLs }"> <c:if test="${not empty foodOfferLs }">
@ -107,13 +123,13 @@
</table> </table>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <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> <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Ver más</button> Ver más</button>
</div> </div>
</c:if> </c:if>
<h2 style="text-align:center;padding:5px"><fmt:message key="nuOffers"/></h2> <h2 style="text-align:center;padding:5px"><fmt:message key="nuOffers"/></h2>
<c:if test="${empty nuOfferLs }"> <c:if test="${empty nuOfferLs }">
<p id="vacio" >No hay ninguna oferta por número de comensales activa.</p> <p id="vacio" >No hay ninguna oferta por n<EFBFBD>mero de comensales activa.</p>
</c:if> </c:if>
<c:if test="${not empty nuOfferLs }"> <c:if test="${not empty nuOfferLs }">
@ -165,7 +181,7 @@
</table> </table>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <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> <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Ver más</button> Ver más</button>
</div> </div>
</c:if> </c:if>
@ -226,7 +242,7 @@
<spring:url value="/offers/speedOfferList" var="speedOfferUrl"></spring:url> <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;"> <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> <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Ver más</button> Ver más</button>
</div> </div>
</c:if> </c:if>
@ -285,7 +301,7 @@
<spring:url value="/offers/timeOfferList" var="timeOfferUrl"></spring:url> <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;"> <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> <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Ver más</button> Ver más</button>
</div> </div>
</c:if> </c:if>

10
src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp
View file

@ -51,7 +51,15 @@
<c:out value="${localDateTimeFormat.format(datos.key.end)}"/> <c:out value="${localDateTimeFormat.format(datos.key.end)}"/>
</td> </td>
<td> <td>
<c:out value="${datos.key.status}"/> <c:if test="${datos.key.status == 'active'}">
<c:out value="Activa"/>
</c:if>
<c:if test="${datos.key.status == 'hidden'}">
<c:out value="Oculta"/>
</c:if>
<c:if test="${datos.key.status == 'inactive'}">
<c:out value="Inactiva"/>
</c:if>
</td> </td>
<td> <td>

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

@ -7,37 +7,38 @@
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'> <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
<cheapy:layout pageName="ofertas"> <cheapy:layout pageName="ofertas por rapidez">
<div class="text-center">
<spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl"> <div class="btn-filter-max">
<spring:param name="page" value="0"/> <spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl">
</spring:url> <spring:param name="page" value="0"/>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> </spring:url>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
Ofertas de plato especifico</button> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas de plato especifico</button>
<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
<spring:param name="page" value="0"/> <spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
</spring:url> <spring:param name="page" value="0"/>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> </spring:url>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
Ofertas por número de comensales</button> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas por número de comensales</button>
<spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl">
<spring:param name="page" value="0"/> <spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl">
</spring:url> <spring:param name="page" value="0"/>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> </spring:url>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" class="btn-filter-active" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
Ofertas de velocidad</button> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas de velocidad</button>
<spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl">
<spring:param name="page" value="0"/> <spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl">
</spring:url> <spring:param name="page" value="0"/>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> </spring:url>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
Ofertas de franja horaria</button> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas de franja horaria</button>
</div>
</div>
<h2 style="text-align:center;padding:5px"><fmt:message key="speedOffers"/></h2> <h2 style="text-align:center;padding:5px"><fmt:message key="speedOffers"/></h2>
<c:if test="${empty speedOfferLs }"> <c:if test="${empty speedOfferLs }">
<p id="vacio" >No hay ninguna oferta por tiempo empleado en comer activa.</p> <p id="vacio" >No hay ninguna oferta por tiempo empleado en comer activa.</p>
@ -95,7 +96,7 @@
</spring:url> </spring:url>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <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> <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Pág. anterior</button> P<EFBFBD>g. anterior</button>
</c:if> </c:if>
<c:out value='${page}'></c:out> <c:out value='${page}'></c:out>
<c:if test="${fn:length(speedOfferLs) == 5}"> <c:if test="${fn:length(speedOfferLs) == 5}">
@ -104,7 +105,7 @@
</spring:url> </spring:url>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <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> <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Pág. siguiente</button> P<EFBFBD>g. siguiente</button>
</c:if> </c:if>
</c:if> </c:if>
</cheapy:layout> </cheapy:layout>

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

@ -7,36 +7,38 @@
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'> <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
<cheapy:layout pageName="ofertas"> <cheapy:layout pageName="ofertas por intervalo de tiempo">
<div class="text-center">
<spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl"> <div class="btn-filter-max">
<spring:param name="page" value="0"/> <spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl">
</spring:url> <spring:param name="page" value="0"/>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> </spring:url>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
Ofertas de plato especifico</button> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas de plato especifico</button>
<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
<spring:param name="page" value="0"/> <spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
</spring:url> <spring:param name="page" value="0"/>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> </spring:url>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
Ofertas por número de comensales</button> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas por número de comensales</button>
<spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl">
<spring:param name="page" value="0"/> <spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl">
</spring:url> <spring:param name="page" value="0"/>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> </spring:url>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
Ofertas de velocidad</button> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas de velocidad</button>
<spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl">
<spring:param name="page" value="0"/> <spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl">
</spring:url> <spring:param name="page" value="0"/>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> </spring:url>
<span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" class="btn-filter-active" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
Ofertas de franja horaria</button> <span class="glyphicon glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
Ofertas de franja horaria</button>
</div>
</div>
<h2 style="text-align:center;padding:5px"><fmt:message key="timeOffers"/></h2> <h2 style="text-align:center;padding:5px"><fmt:message key="timeOffers"/></h2>
<c:if test="${empty timeOfferLs }"> <c:if test="${empty timeOfferLs }">
@ -94,7 +96,7 @@
</spring:url> </spring:url>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <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> <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Pág. anterior</button> P<EFBFBD>g. anterior</button>
</c:if> </c:if>
<c:out value='${page}'></c:out> <c:out value='${page}'></c:out>
<c:if test="${fn:length(timeOfferLs) == 5}"> <c:if test="${fn:length(timeOfferLs) == 5}">
@ -103,7 +105,7 @@
</spring:url> </spring:url>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;"> <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> <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
Pág. siguiente</button> P<EFBFBD>g. siguiente</button>
</c:if> </c:if>
</c:if> </c:if>