From d1909ec7e12d00ba29f8598a6b018c5bc11b3946 Mon Sep 17 00:00:00 2001
From: David <davsotpon@alum.us.es>
Date: Sat, 10 Apr 2021 15:40:27 +0200
Subject: [PATCH] Cambios en las nuevas vistas y arreglo de algunos errores

---
 src/main/less/cheapy.less                     | 32 +++++++++++++++++++
 .../resources/messages/messages_es.properties | 17 +++++++++-
 .../WEB-INF/jsp/clients/clientDisable.jsp     |  2 +-
 .../webapp/WEB-INF/jsp/clients/clientShow.jsp | 24 +++++++-------
 .../WEB-INF/jsp/clients/clientsList.jsp       |  4 +--
 .../WEB-INF/jsp/usuarios/usuariosDisable.jsp  |  2 +-
 .../WEB-INF/jsp/usuarios/usuariosList.jsp     | 10 +++---
 .../WEB-INF/jsp/usuarios/usuariosShow.jsp     |  8 ++---
 src/main/webapp/WEB-INF/jsp/welcome.jsp       | 14 ++++----
 9 files changed, 81 insertions(+), 32 deletions(-)

diff --git a/src/main/less/cheapy.less b/src/main/less/cheapy.less
index cbda84c10..b62ff8533 100644
--- a/src/main/less/cheapy.less
+++ b/src/main/less/cheapy.less
@@ -522,6 +522,38 @@ text-align: center;
   background-color: rgb(204, 128, 51);
 }
 
+#clientTable th{
+	width: 30%;
+	text-align: center;
+}
+
+#clientTable td{
+	vertical-align:middle;
+text-align: center;
+}
+
+#reviewTable th{
+	width: 30%;
+	text-align: center;
+}
+
+#reviewTable td{
+	vertical-align:middle;
+text-align: center;
+}
+
+#usuarioTable th{
+	width: 20%;
+	text-align: center;
+	vertical-align:middle;
+}
+
+#usuarioTable td{
+	width:20%;
+	vertical-align:middle;
+text-align: center;
+}
+
 #vacio {
 	text-align:center;
 	font-size: 120%;
diff --git a/src/main/resources/messages/messages_es.properties b/src/main/resources/messages/messages_es.properties
index 4f1fa0a1d..d1e5854d1 100644
--- a/src/main/resources/messages/messages_es.properties
+++ b/src/main/resources/messages/messages_es.properties
@@ -48,10 +48,25 @@ createSpeedOffers= Crear ofertas por rapidez comiendo
 createTimeOffers= Crear ofertas por franja horaria
 init= Inicio del intervalo
 finishOffer= Fin del intervalo
-name= Nombre del restaurante
+name= Nombre del bar/restaurante
 status= Estado de oferta
 myOffers= Ver mis Ofertas
 typeMismatch=Debe ser del formato correcto
 typeMismatch.java.lang.Integer=Debe ser un número
 typeMismatch.java.time.LocalDateTime=Debe ser una fecha válida
 typeMismatch.java.time.LocalTime=Debe ser una hora válida
+clientShow= Información del bar/restaurante
+client= Cliente
+clients= Clientes
+email=Dirección de correo electrónico
+addressClient= Dirección del bar/restaurante
+addressUser= Dirección del usuario
+telephone= Número de teléfono
+descriptionClient= Descripción del bar/restaurante
+foodClient= Tipo de comida
+enabled= ¿Está activo el usuario?
+users=Usuarios
+nameUser=Nombre
+surname= Apellidos
+dni= DNI
+usuario=Usuario
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/clients/clientDisable.jsp b/src/main/webapp/WEB-INF/jsp/clients/clientDisable.jsp
index 5961d075c..2e824727e 100644
--- a/src/main/webapp/WEB-INF/jsp/clients/clientDisable.jsp
+++ b/src/main/webapp/WEB-INF/jsp/clients/clientDisable.jsp
@@ -9,7 +9,7 @@
 <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">
             
diff --git a/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp b/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp
index 66ff86179..e83809451 100644
--- a/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp
+++ b/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp
@@ -16,34 +16,34 @@
     <table class="table table-striped" id="clientTable">
     	<thead>
         <tr>
-            <th><fmt:message key="clientInit"/></th>
-            <td><c:out value="${client.init}"/></td>
+            <th><fmt:message key="init"/></th>
+            <td><c:out value="${client.init}h"/></td>
         </tr>
         <tr>
-            <th><fmt:message key="clientFinish"/></th>
-            <td><c:out value="${client.finish}"/></td>
+            <th><fmt:message key="finishOffer"/></th>
+            <td><c:out value="${client.finish}h"/></td>
         </tr>
 		<tr>
-            <th><fmt:message key="nameClient"/></th>
+            <th><fmt:message key="name"/></th>
             <td><c:out value="${client.name}"/></td>
         </tr>
         <tr>
-            <th><fmt:message key="emailClient"/></th>
-            <td><c:out value="${client.email}%"/> </td>
+            <th><fmt:message key="email"/></th>
+            <td><c:out value="${client.email}"/> </td>
         </tr>
         
         <tr>
             <th><fmt:message key="addressClient"/></th>
-            <td><c:out value="${client.address}%"/> </td>
+            <td><c:out value="${client.address}"/> </td>
         </tr><tr>
-            <th><fmt:message key="telephoneClient"/></th>
-            <td><c:out value="${client.telephone}%"/> </td>
+            <th><fmt:message key="telephone"/></th>
+            <td><c:out value="${client.telephone}"/> </td>
         </tr><tr>
             <th><fmt:message key="descriptionClient"/></th>
-            <td><c:out value="${client.description}%"/> </td>
+            <td><c:out value="${client.description}"/> </td>
         </tr><tr>
             <th><fmt:message key="foodClient"/></th>
-            <td><c:out value="${client.food}%"/> </td>
+            <td><c:out value="${client.food}"/> </td>
         </tr>
         
         
diff --git a/src/main/webapp/WEB-INF/jsp/clients/clientsList.jsp b/src/main/webapp/WEB-INF/jsp/clients/clientsList.jsp
index 464b7a0ec..abb1bc295 100644
--- a/src/main/webapp/WEB-INF/jsp/clients/clientsList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/clients/clientsList.jsp
@@ -18,8 +18,8 @@
         <thead>
         <tr>
 
-        	<th><fmt:message key="nameClient"/></th>
-        	<th><fmt:message key="username"/></th>
+        	<th><fmt:message key="name"/></th>
+        	<th><fmt:message key="user"/></th>
         	<th><fmt:message key="enabled"/></th>   
             <th> </th>
         </tr>
diff --git a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosDisable.jsp b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosDisable.jsp
index a728c3f55..6c04207c7 100644
--- a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosDisable.jsp
+++ b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosDisable.jsp
@@ -9,7 +9,7 @@
 <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">
 
diff --git a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosList.jsp b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosList.jsp
index 297978c7e..e1c56b62e 100644
--- a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosList.jsp
@@ -8,18 +8,18 @@
 <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="usuarios"/></h2>
+    <h2 style="text-align:center;padding:5px"><fmt:message key="users"/></h2>
     
 	<c:if test="${empty usuarioLs }">
-		<p id="vacio" >No hay ningun 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">
         <thead>
         <tr>
-        	<th><fmt:message key="nombre"/></th>
-        	<th><fmt:message key="apellidos"/></th>
-        	<th><fmt:message key="username"/></th>
+        	<th><fmt:message key="nameUser"/></th>
+        	<th><fmt:message key="surname"/></th>
+        	<th><fmt:message key="user"/></th>
         	<th><fmt:message key="enabled"/></th>   
             <th> </th>
         </tr>
diff --git a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosShow.jsp b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosShow.jsp
index 2feff3623..c9201d00c 100644
--- a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosShow.jsp
+++ b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosShow.jsp
@@ -14,11 +14,11 @@
     <table class="table table-striped" id="usuarioTable">
     	<thead>
         <tr>
-            <th><fmt:message key="nombre"/></th>
+            <th><fmt:message key="nameUser"/></th>
             <td><c:out value="${usuario.nombre}"/></td>
         </tr>
         <tr>
-            <th><fmt:message key="apellidos"/></th>
+            <th><fmt:message key="surname"/></th>
             <td><c:out value="${usuario.apellidos}"/></td>
         </tr>
 		<tr>
@@ -26,11 +26,11 @@
             <td><c:out value="${usuario.dni}"/></td>
         </tr>
         <tr>
-            <th><fmt:message key="direccion"/></th>
+            <th><fmt:message key="addressUser"/></th>
             <td><c:out value="${usuario.direccion}"/> </td>
         </tr>
         <tr>
-            <th><fmt:message key="telefono"/></th>
+            <th><fmt:message key="telephone"/></th>
             <td><c:out value="${usuario.telefono}"/></td>
         </tr>
         <tr>
diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp
index e5a956229..0ebaa7377 100644
--- a/src/main/webapp/WEB-INF/jsp/welcome.jsp
+++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp
@@ -35,7 +35,7 @@
                       <fmt:message key="createOffers"/> </button>
                   </div>
                 <div class="btn-home">
-                    <button type="button" role="link" onclick="window.location='/clients/show'" style="font-family: 'Lobster'; font-size: 20px;margin:5px;">
+                    <button type="button" role="link" onclick="window.location='/clients/show'" style="font-family: 'Lobster'; font-size: 20px;margin:5px;" class="btn-block">
                     <span class="glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
                     <fmt:message key="clientShow"/> </button>
                 </div>           
@@ -43,11 +43,13 @@
               </sec:authorize>
             </div>
 	        <sec:authorize access="hasAnyAuthority('usuario')">
-	        <div class="btn-home">
-                <button type="button" role="link" onclick="window.location='/usuarios/show'" style="font-family: 'Lobster'; font-size: 20px;margin:5px;">
-                <span class="glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
-                <fmt:message key="showUsuario"/> </button>
-            </div>
+		    <div class="btn-home-max">
+		        <div class="btn-home">
+	                <button type="button" role="link" onclick="window.location='/usuarios/show'" style="font-family: 'Lobster'; font-size: 20px;margin:5px;">
+	                <span class="glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
+	                <fmt:message key="showUsuario"/> </button>
+	            </div>
+	        </div>
 	        </sec:authorize>
 
         </div>