diff --git a/frontend/themes/soportet.iv1.2/styles.css b/frontend/themes/soportet.iv1.2/styles.css index e3e0024..bb6a98c 100644 --- a/frontend/themes/soportet.iv1.2/styles.css +++ b/frontend/themes/soportet.iv1.2/styles.css @@ -1 +1,6 @@ @import url('./main-layout.css'); + +.vaadin-grid::part(selected-row-cell) { + background-color: #A02142 !important; + color: white !important; +} diff --git a/src/main/bundles/prod.bundle b/src/main/bundles/prod.bundle index ef65b49..f18251a 100644 Binary files a/src/main/bundles/prod.bundle and b/src/main/bundles/prod.bundle differ diff --git a/src/main/java/mx/gob/jumapacelaya/views/MainLayout.java b/src/main/java/mx/gob/jumapacelaya/views/MainLayout.java index 68efeea..031182c 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/MainLayout.java +++ b/src/main/java/mx/gob/jumapacelaya/views/MainLayout.java @@ -32,7 +32,7 @@ public class MainLayout extends AppLayout { public MainLayout(SecurityService securityService) { this.securityService = securityService; - this.getStyle().set("background-image", "url('images/bckgnd.png')"); + this.getStyle().set("background-image", "url('images/LOGO_1024x768.jpg')"); setPrimarySection(Section.DRAWER); addDrawerContent(); addHeaderContent(); @@ -71,13 +71,13 @@ public class MainLayout extends AppLayout { headerLayout.setAlignItems(FlexComponent.Alignment.CENTER); - Image imgLogo = new Image("images/1027x160.png", "Logo"); + Image imgLogo = new Image("images/LOGO_900x160.png", "Logo"); imgLogo.setWidth("260px"); headerLayout.add(imgLogo); Scroller scroller = new Scroller(createNavigation()); - scroller.getStyle().set("background-image", "url('images/textureblue.jpg')"); + scroller.getStyle().set("background-color", "#A02142"); addToDrawer(headerLayout, scroller, createFooter()); } diff --git a/src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java b/src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java index c5f0e6e..b665d8c 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/crearnuevoticket/CrearnuevoTicketView.java @@ -71,6 +71,7 @@ public class CrearnuevoTicketView extends VerticalLayout { //Configuracion del Boton Button createButton = new Button("Enviar ticket", event -> handleCreateButton(user, tipoTickets, asunto, descripcion)); createButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY, ButtonVariant.LUMO_LARGE); + createButton.getStyle().set("background-color", "#691B31"); uploadFile.addSucceededListener(event -> { handleFileUpload(event.getFileName()); diff --git a/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java b/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java index 6b6bd49..71b14c4 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/login/LoginView.java @@ -38,7 +38,7 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver { mainLayout.setMargin(false); // Configuración de la imagen - Image logo = new Image("images/1024x768.png", "Logo JUMAPA ISO"); + Image logo = new Image("images/LOGO_1024x768.jpg", "Logo JUMAPA ISO"); logo.addClassName("login-logo"); // Configuración de i18n para el formulario de login @@ -62,10 +62,11 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver { login.setAction("login"); login.setForgotPasswordButtonVisible(false); login.setI18n(i18n); + login.getElement().getStyle().set("background-color", "#A02142"); // Crear un contenedor para el formulario VerticalLayout loginFormContainer = new VerticalLayout(); - Image imageLogin = new Image("images/NVO_JUMAPA.png", "Login"); + Image imageLogin = new Image("images/LOGO_24'27.png", "Login"); imageLogin.setWidth("300px"); loginFormContainer.add(imageLogin); loginFormContainer.add(login); diff --git a/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java b/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java index fb3d3b5..d44ffd2 100644 --- a/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java +++ b/src/main/java/mx/gob/jumapacelaya/views/tickets/AllTicketsView.java @@ -1,5 +1,6 @@ package mx.gob.jumapacelaya.views.tickets; +import com.vaadin.flow.component.dependency.CssImport; import com.vaadin.flow.component.grid.Grid; import com.vaadin.flow.component.grid.GridVariant; import com.vaadin.flow.component.html.Span; @@ -21,6 +22,7 @@ import java.util.List; @Route(value="tickets", layout = MainLayout.class) @AnonymousAllowed @PageTitle("Todos los tickets") +@CssImport("./themes/sistema-mantenimiento/styles.css") public class AllTicketsView extends VerticalLayout { private final RedmineClient redmineClient; @@ -57,9 +59,9 @@ public class AllTicketsView extends VerticalLayout { grid.addColumn(ticket -> ticket.tiempoEst(ticket.getTrackerId())).setHeader("Tiempo estimado de atencion").setAutoWidth(false); grid.addColumn(Ticket::getDescription).setHeader("Descripcion").setWidth("25em"); - grid.addThemeVariants(GridVariant.LUMO_WRAP_CELL_CONTENT); grid.getStyle().set("opacity", "0.8"); + grid.addClassName("vaadin-grid::part(selected-row-cell)"); //Ajustar tamaño del Grid y Layout diff --git a/src/main/resources/META-INF/resources/images/1024x768.png b/src/main/resources/META-INF/resources/images/1024x768.png deleted file mode 100644 index d529146..0000000 Binary files a/src/main/resources/META-INF/resources/images/1024x768.png and /dev/null differ diff --git a/src/main/resources/META-INF/resources/images/1027x160.png b/src/main/resources/META-INF/resources/images/1027x160.png deleted file mode 100644 index 3a88986..0000000 Binary files a/src/main/resources/META-INF/resources/images/1027x160.png and /dev/null differ diff --git a/src/main/resources/META-INF/resources/images/900x160.png b/src/main/resources/META-INF/resources/images/900x160.png deleted file mode 100644 index 83e5196..0000000 Binary files a/src/main/resources/META-INF/resources/images/900x160.png and /dev/null differ diff --git a/src/main/resources/META-INF/resources/images/960x960.png b/src/main/resources/META-INF/resources/images/960x960.png deleted file mode 100644 index 301c090..0000000 Binary files a/src/main/resources/META-INF/resources/images/960x960.png and /dev/null differ diff --git a/src/main/resources/META-INF/resources/images/LOGO.40ANIV.png b/src/main/resources/META-INF/resources/images/LOGO.40ANIV.png deleted file mode 100644 index 9febf55..0000000 Binary files a/src/main/resources/META-INF/resources/images/LOGO.40ANIV.png and /dev/null differ diff --git a/src/main/resources/META-INF/resources/images/LOGO_1024X768.jpg b/src/main/resources/META-INF/resources/images/LOGO_1024X768.jpg new file mode 100644 index 0000000..7e63a9b Binary files /dev/null and b/src/main/resources/META-INF/resources/images/LOGO_1024X768.jpg differ diff --git a/src/main/resources/META-INF/resources/images/LOGO_24'27.png b/src/main/resources/META-INF/resources/images/LOGO_24'27.png new file mode 100644 index 0000000..055f9e8 Binary files /dev/null and b/src/main/resources/META-INF/resources/images/LOGO_24'27.png differ diff --git a/src/main/resources/META-INF/resources/images/LOGO_900X160.png b/src/main/resources/META-INF/resources/images/LOGO_900X160.png new file mode 100644 index 0000000..0451ce5 Binary files /dev/null and b/src/main/resources/META-INF/resources/images/LOGO_900X160.png differ diff --git a/src/main/resources/META-INF/resources/images/LOGO_FondoAPP1.jpg b/src/main/resources/META-INF/resources/images/LOGO_FondoAPP1.jpg new file mode 100644 index 0000000..b220cdf Binary files /dev/null and b/src/main/resources/META-INF/resources/images/LOGO_FondoAPP1.jpg differ diff --git a/src/main/resources/META-INF/resources/images/NVO_JUMAPA.png b/src/main/resources/META-INF/resources/images/NVO_JUMAPA.png deleted file mode 100644 index 0851f25..0000000 Binary files a/src/main/resources/META-INF/resources/images/NVO_JUMAPA.png and /dev/null differ diff --git a/src/main/resources/META-INF/resources/images/bckgnd.png b/src/main/resources/META-INF/resources/images/bckgnd.png deleted file mode 100644 index 8b523af..0000000 Binary files a/src/main/resources/META-INF/resources/images/bckgnd.png and /dev/null differ diff --git a/src/main/resources/META-INF/resources/images/textureblue.jpg b/src/main/resources/META-INF/resources/images/textureblue.jpg deleted file mode 100644 index 78ab70d..0000000 Binary files a/src/main/resources/META-INF/resources/images/textureblue.jpg and /dev/null differ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1b3a594..7ab369f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -18,13 +18,13 @@ spring.ldap.password=Dr3na%134$4guA ########PRODUCTIVO################################# -#redmine.url=https://proyman.jumapacelaya.gob.mx/ -#redmine.api_key=65b37a803babb6ba27f0f4fa3e562575d5ae63b3 +redmine.url=https://proyman.jumapacelaya.gob.mx/ +redmine.api_key=65b37a803babb6ba27f0f4fa3e562575d5ae63b3 ########LOCAL###################################### -redmine.url=http://localhost:10083 -redmine.api_key=69b347fdfbf01bb60a10ea6daa92eb86acd10e3b +#redmine.url=http://localhost:10083 +#redmine.api_key=69b347fdfbf01bb60a10ea6daa92eb86acd10e3b ###CONFIGURACION DEL TAMANO MAXIMO PERMITIDO PARA ARCHIVOS###