From 100876a7f4eb169512e8a19437a0952406ab546d Mon Sep 17 00:00:00 2001
From: ginquin <ginojesus.quintana@alumnos.uva.es>
Date: Mon, 18 Mar 2019 01:31:58 +0100
Subject: [PATCH] =?UTF-8?q?modificado=20banner.zul=20para=20cerrar=20sesi?=
=?UTF-8?q?=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/webapp/WEB-INF/zk-label.properties | 4 ++++
src/main/webapp/WEB-INF/zk-label_en.properties | 4 ++++
src/main/webapp/WEB-INF/zk-label_es.properties | 4 ++++
src/main/webapp/css/banner.zul | 11 +++++++----
src/main/webapp/css/style.css | 3 +--
5 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/WEB-INF/zk-label.properties b/src/main/webapp/WEB-INF/zk-label.properties
index 073f4b8..0c4a067 100644
--- a/src/main/webapp/WEB-INF/zk-label.properties
+++ b/src/main/webapp/WEB-INF/zk-label.properties
@@ -1,3 +1,7 @@
+#banner.zul
+banner.logout=Cerrar sesión
+banner.hello=Hola
+
#login.zul
s1=Bienvenido a la aplicación SmellsWisdom
s2=Aplicación para consultar y ampliar los conocimientos sobre la detección de Design Smell.
diff --git a/src/main/webapp/WEB-INF/zk-label_en.properties b/src/main/webapp/WEB-INF/zk-label_en.properties
index 6f2584f..b9b686f 100644
--- a/src/main/webapp/WEB-INF/zk-label_en.properties
+++ b/src/main/webapp/WEB-INF/zk-label_en.properties
@@ -1,3 +1,7 @@
+#banner.zul
+banner.logout=Logout
+banner.hello=Hello
+
#login.zul
s1=Welcome to SmellsWisdom App.
s2=Main page to query and extend the current knowledge on Design Smell Detection.
diff --git a/src/main/webapp/WEB-INF/zk-label_es.properties b/src/main/webapp/WEB-INF/zk-label_es.properties
index 7d4a534..13ac456 100644
--- a/src/main/webapp/WEB-INF/zk-label_es.properties
+++ b/src/main/webapp/WEB-INF/zk-label_es.properties
@@ -1,3 +1,7 @@
+#banner.zul
+banner.logout=Cerrar sesión
+banner.hello=Hola
+
#login.zul
s1=Bienvenido a la aplicación SmellsWisdom
s2=Aplicación para consultar y ampliar los conocimientos sobre la detección de Design Smell.
diff --git a/src/main/webapp/css/banner.zul b/src/main/webapp/css/banner.zul
index 15c633f..b850f1f 100644
--- a/src/main/webapp/css/banner.zul
+++ b/src/main/webapp/css/banner.zul
@@ -1,11 +1,14 @@
<div hflex="1" vflex="1" sclass="banner">
<hbox hflex="1" vflex="1" align="center">
- <div width="100%">
+ <div hflex="1">
<label value="SMELLSWISDOM" sclass="banner-head" />
</div>
- <hbox hflex="min" pack="end" >
- <label value="${sessionScope.userCredential.name}" if="${sec:isAllGranted('ROLE_USER')}"/>
- <label id="logout" value="Logout" if="${sec:isAllGranted('ROLE_USER')}" sclass="logout"/>
+ <hbox hflex="2" pack="end" align="center" >
+ <label value="${labels.banner.hello} ${execution.userPrincipal.name}!"
+ if="${sec:isAllGranted('ROLE_USER')}" sclass="head2"/>
+ <button id="logout" type="button" label="${labels.banner.logout}"
+ if="${sec:isAllGranted('ROLE_USER')}"
+ href="/j_spring_security_logout" sclass="logout"/>
</hbox>
</hbox>
</div>
\ No newline at end of file
diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css
index ddbcf41..c16e56b 100644
--- a/src/main/webapp/css/style.css
+++ b/src/main/webapp/css/style.css
@@ -13,6 +13,7 @@
.banner .logout {
text-decoration: underline;
cursor: pointer;
+ font-size: medium;
}
.footer {
@@ -27,12 +28,10 @@
.head1 {
font-size: large;
- width: 100%;
}
.head2 {
font-size: medium;
- width: 100%;
}
.row-title .z-label {
--
GitLab