From bf2245b556952bf3556fa5de20483bbebf0221b6 Mon Sep 17 00:00:00 2001
From: nayelivilchismariscal <nayelivilchismariscal@192.168.1.81>
Date: Mon, 13 May 2024 17:20:54 -0700
Subject: [PATCH] Logout de todas las ventanas

---
 Inventario-war/web/ProductoLista.xhtml        | 35 +++++++++-------
 .../web/UbicacionAlmacenLista.xhtml           | 40 ++++++++++--------
 Inventario-war/web/categoriaLista.xhtml       | 32 ++++++++-------
 Inventario-war/web/marcaLista.xhtml           | 41 +++++++++++--------
 Inventario-war/web/proveedorLista.xhtml       | 36 ++++++++--------
 Inventario-war/web/rolLista.xhtml             | 39 ++++++++++--------
 Inventario-war/web/usuariosLista.xhtml        | 39 +++++++++---------
 7 files changed, 145 insertions(+), 117 deletions(-)

diff --git a/Inventario-war/web/ProductoLista.xhtml b/Inventario-war/web/ProductoLista.xhtml
index a005e58..66fce5a 100644
--- a/Inventario-war/web/ProductoLista.xhtml
+++ b/Inventario-war/web/ProductoLista.xhtml
@@ -16,16 +16,17 @@
             <ui:define name="left" >
 
 
-                <h:form >
-                    <p:menu style="border-color: gray; margin: 1px; width: 163px; height: 600px;">
-
-                        <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false" icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />
-                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white " styleClass="botonMenu"/>
-                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />
-                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white" styleClass="botonMenu" />
-                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray" styleClass="botonMenu"/>
-                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white" styleClass="botonMenu" />
-                    </p:menu>
+                                 <h:form >
+                   <p:menu style="border-color: gray; width: 163px; height: 630px;">
+
+                         <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false"  icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray; height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu" />                   
+                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />          
+                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="rolLista.xhtml" value="Rol" ajax="false" icon="pi pi-sitemap" iconPos="left" style="background-color: lightgray ;height: 80px;" styleClass="botonMenu" />
+                     </p:menu>
                 </h:form>
             </ui:define>
 
@@ -44,15 +45,19 @@
                             <f:facet name="header">
                                 <div class="flex justify-content-end" style="height: 30px;" >
                                     <div>
-                                        <p:commandButton ajax="true" oncomplete="PF('dlg').show();"  actionListener="#{demoBeanProductos.prepararNuevo()}" update=":dialog" value="Nuevo" icon="pi pi-plus" />
+                                        
+                                        <p:commandButton ajax="true" oncomplete="PF('dlg').show();" actionListener="#{demoBeanMarca.prepararnuevo()}" 
+                                                         update=":dialog" value="Nuevo" icon="pi pi-plus" />
 
-                                        <i class="pi pi-search" style="margin-left: 800px; margin-top: -15px;"></i>
-                                        <p:inputText id="globalFilter" onkeyup="PF('productos').filter()" style="width:300px; margin-left: 10px; margin-top: -6px; float: right;"
-                                                     placeholder="Buscar productos" />
+                                        <i class="pi pi-search" style="margin-left: 690px; margin-top: 10px;"></i>
+                                        <p:inputText id="globalFilter" onkeyup="PF('categorias').filter()" placeholder="Buscar producto" 
+                                                     style="width:250px; margin-right:  120px; float: right; margin-top: -1px;" />
 
+                                        <p:commandButton value="Logout" ajax="false" icon="pi pi-sign-out" action="#{login.logout()}" style="background-color: #036FAB;   width: 100px; float: right; margin-top: -40px " />
                                     </div>
                                 </div>
-                            </f:facet>
+                                
+                               </f:facet>
                             <p:column styleClass="columnaOpc">
                                 <f:facet name="header">
                                     <h:outputText value="Id" style="font-weight: bolder;" />
diff --git a/Inventario-war/web/UbicacionAlmacenLista.xhtml b/Inventario-war/web/UbicacionAlmacenLista.xhtml
index aca7263..3d12b0b 100644
--- a/Inventario-war/web/UbicacionAlmacenLista.xhtml
+++ b/Inventario-war/web/UbicacionAlmacenLista.xhtml
@@ -15,17 +15,17 @@
             </ui:define>
    <ui:define name="left" >  
              
-             
-             <h:form >
-                    <p:menu style="border-color: gray; margin: 1px; width: 163px; height: 600px;">
-
-                        <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false"  icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />
-                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white " styleClass="botonMenu"/>
-                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />                   
-                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white" styleClass="botonMenu" />          
-                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray" styleClass="botonMenu"/>
-                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white" styleClass="botonMenu" />
-                    </p:menu>
+                         <h:form >
+                   <p:menu style="border-color: gray; width: 163px; height: 630px;">
+
+                         <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false"  icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray; height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu" />                   
+                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />          
+                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="rolLista.xhtml" value="Rol" ajax="false" icon="pi pi-sitemap" iconPos="left" style="background-color: lightgray ;height: 80px;" styleClass="botonMenu" />
+                     </p:menu>
                 </h:form>
             </ui:define>
 
@@ -46,18 +46,22 @@
                                      globalFilterFunction="#{demoBeanUbicacionalmacen.globalFilterFunction}" 
                                      scrollable="true" scrollHeight="480" >
 
-                              <f:facet name="header">
+                            <f:facet name="header">
                                 <div class="flex justify-content-end" style="height: 30px;" >
                                     <div>
-                                        <p:commandButton ajax="true" oncomplete="PF('dlg').show();" actionListener="#{demoBeanUbicacionalmacen.prepararNuevo()}" update=":dialog" value="Nuevo" icon="pi pi-plus" />
-                                       
-                                       <i class="pi pi-search" style="margin-left: 800px; margin-top: -15px;"></i>
-                                       <p:inputText id="globalFilter" onkeyup="PF('almacen').filter()" style="width:300px; margin-left: 10px; margin-top: -6px; float: right;"
-                                                     placeholder="Buscar ubicacion" />
                                         
+                                        <p:commandButton ajax="true" oncomplete="PF('dlg').show();" actionListener="#{demoBeanMarca.prepararnuevo()}" 
+                                                         update=":dialog" value="Nuevo" icon="pi pi-plus" />
+
+                                        <i class="pi pi-search" style="margin-left: 690px; margin-top: 10px;"></i>
+                                        <p:inputText id="globalFilter" onkeyup="PF('categorias').filter()" placeholder="Buscar ubicación" 
+                                                     style="width:250px; margin-right:  120px; float: right; margin-top: -1px;" />
+
+                                        <p:commandButton value="Logout" ajax="false" icon="pi pi-sign-out" action="#{login.logout()}" style="background-color: #036FAB;   width: 100px; float: right; margin-top: -40px " />
                                     </div>
                                 </div>
-                              </f:facet>
+                                
+                               </f:facet>
                             <p:column styleClass="columnaOpc" >
                                 <f:facet name="header">
                                     <h:outputText value="Id"/>
diff --git a/Inventario-war/web/categoriaLista.xhtml b/Inventario-war/web/categoriaLista.xhtml
index a58cad0..1729a0a 100644
--- a/Inventario-war/web/categoriaLista.xhtml
+++ b/Inventario-war/web/categoriaLista.xhtml
@@ -18,16 +18,17 @@
          <ui:define name="left" >  
              
              
-                  <h:form >
-               <p:menu style="border-color: gray; margin: 1px; width: 163px; height: 600px;">
-
-                        <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false"  icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />
-                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white " styleClass="botonMenu"/>
-                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />                   
-                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white" styleClass="botonMenu" />          
-                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray" styleClass="botonMenu"/>
-                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white" styleClass="botonMenu" />
-                    </p:menu>
+                                 <h:form >
+                   <p:menu style="border-color: gray; width: 163px; height: 630px;">
+
+                         <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false"  icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray; height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu" />                   
+                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />          
+                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="rolLista.xhtml" value="Rol" ajax="false" icon="pi pi-sitemap" iconPos="left" style="background-color: lightgray ;height: 80px;" styleClass="botonMenu" />
+                     </p:menu>
                 </h:form>
             </ui:define>
 
@@ -45,18 +46,21 @@
                                      globalFilterFunction="#{demoBeanCategoria.globalFilterFunction}" 
                                      scrollable="true" scrollHeight="480" >
 
-                            <f:facet name="header">
+                           <f:facet name="header">
                                 <div class="flex justify-content-end" style="height: 30px;" >
                                     <div>
+                                        
                                         <p:commandButton ajax="true" oncomplete="PF('dlg').show();" actionListener="#{demoBeanCategoria.prepararnuevo()}" 
                                                          update=":dialog" value="Nuevo" icon="pi pi-plus" />
 
-                                        <i class="pi pi-search" style="margin-left: 765px; margin-top: 10px;"></i>
+                                        <i class="pi pi-search" style="margin-left: 690px; margin-top: 10px;"></i>
                                         <p:inputText id="globalFilter" onkeyup="PF('categorias').filter()" placeholder="Buscar categoria" 
-                                                     style="width:300px; margin-left: 10px; float: right; margin-top: -40px;" />
+                                                     style="width:250px; margin-right:  120px; float: right; margin-top: -1px;" />
 
+                                        <p:commandButton value="Logout" ajax="false" icon="pi pi-sign-out" action="#{login.logout()}" style="background-color: #036FAB;   width: 100px; float: right; margin-top: -40px " />
                                     </div>
                                 </div>
+                                
                                </f:facet>
 
                             <p:column styleClass="columnaId">
@@ -105,7 +109,7 @@
                             <h:panelGrid id="grid" columns="3" style="width: 100%">
 
                             
-                            <p:outputLabel value="Nombre:" for="nombre" />
+                             <p:outputLabel value="Nombre:" for="nombre" style=" font-weight:bolder" />
                             <p:inputText id="nombre" value="#{demoBeanCategoria.categoria.nombre}" title="Nombre" required="true" requiredMessage="Falta el campo Nombre." styleClass="formulario-elemento" />
                            <p:message for="nombre"/>  
                           </h:panelGrid>
diff --git a/Inventario-war/web/marcaLista.xhtml b/Inventario-war/web/marcaLista.xhtml
index dad03f6..11eb8b1 100644
--- a/Inventario-war/web/marcaLista.xhtml
+++ b/Inventario-war/web/marcaLista.xhtml
@@ -20,15 +20,17 @@
              
              
                   <h:form >
-               <p:menu style="border-color: gray; margin: 1px; width: 163px; height: 600px;">
-
-                        <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false"  icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />
-                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white " styleClass="botonMenu"/>
-                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />                   
-                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white" styleClass="botonMenu" />          
-                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray" styleClass="botonMenu"/>
-                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white" styleClass="botonMenu" />
-                    </p:menu>
+   
+                   <p:menu style="border-color: gray; width: 163px; height: 630px;">
+
+                         <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false"  icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray; height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu" />                   
+                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />          
+                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="rolLista.xhtml" value="Rol" ajax="false" icon="pi pi-sitemap" iconPos="left" style="background-color: lightgray ;height: 80px;" styleClass="botonMenu" />
+                     </p:menu>
                 </h:form>
             </ui:define>
 
@@ -49,15 +51,18 @@
                             <f:facet name="header">
                                 <div class="flex justify-content-end" style="height: 30px;" >
                                     <div>
+                                        
                                         <p:commandButton ajax="true" oncomplete="PF('dlg').show();" actionListener="#{demoBeanMarca.prepararnuevo()}" 
                                                          update=":dialog" value="Nuevo" icon="pi pi-plus" />
 
-                                        <i class="pi pi-search" style="margin-left: 765px; margin-top: 10px;"></i>
-                                        <p:inputText id="globalFilter" onkeyup="PF('categorias').filter()" placeholder="Buscar categoria" 
-                                                     style="width:300px; margin-left: 10px; float: right; margin-top: -40px;" />
+                                        <i class="pi pi-search" style="margin-left: 690px; margin-top: 10px;"></i>
+                                        <p:inputText id="globalFilter" onkeyup="PF('categorias').filter()" placeholder="Buscar marca" 
+                                                     style="width:250px; margin-right:  120px; float: right; margin-top: -1px;" />
 
+                                        <p:commandButton value="Logout" ajax="false" icon="pi pi-sign-out" action="#{login.logout()}" style="background-color: #036FAB;   width: 100px; float: right; margin-top: -40px " />
                                     </div>
                                 </div>
+                                
                                </f:facet>
 
                             <p:column styleClass="columnaId">
@@ -99,7 +104,7 @@
                     
                
                 <!-- CREAR/EDITAR -->
-                    <p:dialog id="dialog" widgetVar="dlg" width="700" height="250" modal="true" appendTo="@(body)" >
+                    <p:dialog id="dialog" widgetVar="dlg" width="700" height="260" modal="true" appendTo="@(body)" >
 
                         <h:form >
                             <p:growl id="growl" for="categoriaMsj" showDetail="true" />
@@ -113,12 +118,14 @@
                             <h:panelGrid id="grid" columns="3" style="width: 100%">
 
                             
-                            <p:outputLabel value="Nombre:" for="nombre" />
+                             <p:outputLabel value="Nombre:" for="nombre" style=" font-weight:bolder" />
                             <p:inputText id="nombre" value="#{demoBeanMarca.marca.nombre}" title="Nombre" required="true" requiredMessage="Falta el campo Nombre." styleClass="formulario-elemento" />
                            <p:message for="nombre"/>  
-                           
-                             <p:outputLabel style="font-weight:bolder;" value="Proveedor:" for="proveedorId" />
-                            <p:selectOneMenu id="proveedorId" value="#{demoBeanMarca.marca.proveedorId}" converter="selectOneMenuConverter"  > 
+                                   
+                             <p:outputLabel style="font-weight:bolder; left: 100px" value="Proveedor:" for="proveedorId"  />
+                            
+                             
+                             <p:selectOneMenu id="proveedorId" value="#{demoBeanMarca.marca.proveedorId}" converter="selectOneMenuConverter"  > 
                             <f:selectItems value="#{demoBeanProveedor.all}" var="item" itemLabel="#{item.nombre}" itemValue="#{item}" />
                             </p:selectOneMenu>
                           </h:panelGrid>
diff --git a/Inventario-war/web/proveedorLista.xhtml b/Inventario-war/web/proveedorLista.xhtml
index a49372f..e37cc18 100644
--- a/Inventario-war/web/proveedorLista.xhtml
+++ b/Inventario-war/web/proveedorLista.xhtml
@@ -15,16 +15,17 @@
             </ui:define>
 
             <ui:define name="left" >              
-                <h:form >
-                    <p:menu style="border-color: gray; margin: 1px; width: 163px; height: 600px;">
-
-                        <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false"  icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />
-                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white " styleClass="botonMenu"/>
-                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />                   
-                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white" styleClass="botonMenu" />          
-                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray" styleClass="botonMenu"/>
-                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white" styleClass="botonMenu" />
-                    </p:menu>
+                                 <h:form >
+                   <p:menu style="border-color: gray; width: 163px; height: 630px;">
+
+                         <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false"  icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray; height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu" />                   
+                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />          
+                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="rolLista.xhtml" value="Rol" ajax="false" icon="pi pi-sitemap" iconPos="left" style="background-color: lightgray ;height: 80px;" styleClass="botonMenu" />
+                     </p:menu>
                 </h:form>
             </ui:define>
 
@@ -39,19 +40,22 @@
                                      globalFilterFunction="#{demoBeanProveedor.globalFilterFunction}" 
                                      scrollable="true" scrollHeight="480" >
 
-                            <f:facet name="header">
+                          <f:facet name="header">
                                 <div class="flex justify-content-end" style="height: 30px;" >
                                     <div>
-                                        <p:commandButton ajax="true" oncomplete="PF('dlg').show();" actionListener="#{demoBeanProveedor.prepararNuevo()}" 
+                                        
+                                        <p:commandButton ajax="true" oncomplete="PF('dlg').show();" actionListener="#{demoBeanMarca.prepararnuevo()}" 
                                                          update=":dialog" value="Nuevo" icon="pi pi-plus" />
 
-                                        <i class="pi pi-search" style="margin-left: 765px; margin-top: 10px;"></i>
-                                        <p:inputText id="globalFilter" onkeyup="PF('proveedores').filter()" placeholder="Buscar proveedor" 
-                                                     style="width:300px; margin-left: 10px; float: right; margin-top: -40px;" />
+                                        <i class="pi pi-search" style="margin-left: 690px; margin-top: 10px;"></i>
+                                        <p:inputText id="globalFilter" onkeyup="PF('categorias').filter()" placeholder="Buscar proveedor" 
+                                                     style="width:250px; margin-right:  120px; float: right; margin-top: -1px;" />
 
+                                        <p:commandButton value="Logout" ajax="false" icon="pi pi-sign-out" action="#{login.logout()}" style="background-color: #036FAB;   width: 100px; float: right; margin-top: -40px " />
                                     </div>
                                 </div>
-                            </f:facet>
+                                
+                               </f:facet>
 
                             <p:column styleClass="columnaId">
                                 <f:facet name="header">
diff --git a/Inventario-war/web/rolLista.xhtml b/Inventario-war/web/rolLista.xhtml
index e5bccb2..63e2fb2 100644
--- a/Inventario-war/web/rolLista.xhtml
+++ b/Inventario-war/web/rolLista.xhtml
@@ -15,17 +15,17 @@
             </ui:define>
 
             <ui:define name="left">
-                <h:form>
-                  <p:menu style="border-color: gray; margin: 1px; width: 163px; height: 600px; "  >
+                                 <h:form >
+                   <p:menu style="border-color: gray; width: 163px; height: 630px;">
 
-                         <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false"  icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />
-                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white " styleClass="botonMenu"/>
-                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />                   
-                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white" styleClass="botonMenu" />          
-                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray" styleClass="botonMenu"/>
-                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white" styleClass="botonMenu" />
-                        <p:menuitem action="rolLista.xhtml" value="Rol" ajax="false" icon="pi pi-sitemap" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />
-                     </p:menu>  
+                         <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false"  icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray; height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu" />                   
+                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />          
+                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="rolLista.xhtml" value="Rol" ajax="false" icon="pi pi-sitemap" iconPos="left" style="background-color: lightgray ;height: 80px;" styleClass="botonMenu" />
+                     </p:menu>
                 </h:form>
                 
             </ui:define>
@@ -41,19 +41,22 @@
                                      globalFilterFunction="#{demoBeanRol.globalFilterFunction}" 
                                      scrollable="true" scrollHeight="480" >
                             
-                            <f:facet name="header">
+                         <f:facet name="header">
                                 <div class="flex justify-content-end" style="height: 30px;" >
                                     <div>
-                                        <p:commandButton  ajax="true" oncomplete="PF('dlg').show();" actionListener="#{demoBeanRol.prepararNuevo()}"  
-                                                          update=":dialog" value="Nuevo" icon="pi pi-plus" />
-                        
-                                       <i class="pi pi-search" style="margin-left: 765px; margin-top: 10px;"></i>
-                                       <p:inputText id="globalFilter" onkeyup="PF('rol').filter()" placeholder="Buscar rol" 
-                                                    style="width:300px; margin-left: 10px; float: right; margin-top: -40px;"/>
                                         
+                                        <p:commandButton ajax="true" oncomplete="PF('dlg').show();" actionListener="#{demoBeanMarca.prepararnuevo()}" 
+                                                         update=":dialog" value="Nuevo" icon="pi pi-plus" />
+
+                                        <i class="pi pi-search" style="margin-left: 690px; margin-top: 10px;"></i>
+                                        <p:inputText id="globalFilter" onkeyup="PF('categorias').filter()" placeholder="Buscar rol" 
+                                                     style="width:250px; margin-right:  120px; float: right; margin-top: -1px;" />
+
+                                        <p:commandButton value="Logout" ajax="false" icon="pi pi-sign-out" action="#{login.logout()}" style="background-color: #036FAB;   width: 100px; float: right; margin-top: -40px " />
                                     </div>
                                 </div>
-                              </f:facet>
+                                
+                               </f:facet>
                             
                             <p:column styleClass="columnaId2">
                                 <f:facet name="header">
diff --git a/Inventario-war/web/usuariosLista.xhtml b/Inventario-war/web/usuariosLista.xhtml
index d6320f5..bf758fa 100644
--- a/Inventario-war/web/usuariosLista.xhtml
+++ b/Inventario-war/web/usuariosLista.xhtml
@@ -11,23 +11,21 @@
         <ui:composition template="./template/principal.xhtml">
 
             <ui:define name="top">
-                <h:form>
-                  <p:commandButton ajax="false" icon="pi pi-sign-out" action="#{login.logout()}" style="background-color: #036FAB;   width: 30px; " />
-                </h:form>
+               
                 <center><H2> U S U A R I O S </H2></center>
             </ui:define>
 
             <ui:define name="left">
                 <h:form >
-                    <p:menu style="border-color: gray; margin: 1px; width: 163px; height: 600px;">
+                         <p:menu style="border-color: gray; width: 163px; height: 630px;">
 
-                         <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false"  icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />
-                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white " styleClass="botonMenu"/>
-                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />                   
-                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white" styleClass="botonMenu" />          
-                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray" styleClass="botonMenu"/>
-                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white" styleClass="botonMenu" />
-                        <p:menuitem action="rolLista.xhtml" value="Rol" ajax="false" icon="pi pi-sitemap" iconPos="left" style="background-color: lightgray" styleClass="botonMenu" />
+                         <p:menuitem action="ProductoLista.xhtml" value="Productos" ajax="false"  icon="pi pi-shopping-bag" iconPos="left" style="background-color: lightgray; height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="proveedorLista.xhtml" value="Proveedores" ajax="false" icon="pi pi-id-card" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="marcaLista.xhtml" value="Marcas" ajax="false" icon="pi pi-tag" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu" />                   
+                        <p:menuitem action="categoriaLista.xhtml" value="Categorias" ajax="false" icon="pi pi-star" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />          
+                        <p:menuitem action="UbicacionAlmacenLista.xhtml" value="Almacen" ajax="false" icon="pi pi-map-marker" iconPos="left" style="background-color: lightgray ;height: 90px;" styleClass="botonMenu"/>
+                        <p:menuitem action="usuariosLista.xhtml" value="Usuarios" ajax="false" icon="pi pi-users" iconPos="left" style="background-color: white ;height: 90px;" styleClass="botonMenu" />
+                        <p:menuitem action="rolLista.xhtml" value="Rol" ajax="false" icon="pi pi-sitemap" iconPos="left" style="background-color: lightgray ;height: 80px;" styleClass="botonMenu" />
                      </p:menu>
                 </h:form>
             </ui:define>
@@ -43,19 +41,22 @@
                                      globalFilterFunction="#{demoBeanUsuarios.globalFilterFunction}" 
                                      scrollable="true" scrollHeight="480" >
                             
-                            <f:facet name="header">
+                         <f:facet name="header">
                                 <div class="flex justify-content-end" style="height: 30px;" >
                                     <div>
-                                       <p:commandButton ajax="true" oncomplete="PF('dlg').show();" actionListener="#{demoBeanUsuarios.prepararNuevo()}"
-                                                        update=":dialog" icon="pi pi-plus" value="Nuevo"/>
-                        
-                                       <i class="pi pi-search" style="margin-left: 765px; margin-top: 10px;"></i>
-                                       <p:inputText id="globalFilter" onkeyup="PF('usuario').filter()" style="width:300px; margin-left: 10px; margin-top: -40px; float: right;"
-                                                     placeholder="Buscar usuarios" />
                                         
+                                        <p:commandButton ajax="true" oncomplete="PF('dlg').show();" actionListener="#{demoBeanMarca.prepararnuevo()}" 
+                                                         update=":dialog" value="Nuevo" icon="pi pi-plus" />
+
+                                        <i class="pi pi-search" style="margin-left: 690px; margin-top: 10px;"></i>
+                                        <p:inputText id="globalFilter" onkeyup="PF('categorias').filter()" placeholder="Buscar usuario" 
+                                                     style="width:250px; margin-right:  120px; float: right; margin-top: -1px;" />
+
+                                        <p:commandButton value="Logout" ajax="false" icon="pi pi-sign-out" action="#{login.logout()}" style="background-color: #036FAB;   width: 100px; float: right; margin-top: -40px " />
                                     </div>
                                 </div>
-                              </f:facet>
+                                
+                               </f:facet>
                             
                             <p:column styleClass="columnaId2">
                                 <f:facet name="header">