diff --git a/src/main/webapp/WEB-INF/zk-label.properties b/src/main/webapp/WEB-INF/zk-label.properties index 073f4b8c1bdff741449827f7677562b6a01b50a3..0c4a0677dbdd07d0338c3cf8d14bf33ca357db26 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 6f2584fc5caf093fc1c2ed246f6395dc6ab482c7..b9b686f4971e3902615a1ba2b0095b4d0d08c00b 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 7d4a53468e7fb538378829a742dfa5dee69f1776..13ac456222221aa80c0a73745115f75f60d956b1 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 15c633fea277028450f30662c251cab4c7a24c45..b850f1f3ba97e407e96391c08946af24a964c87e 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 ddbcf414c8098f7fc7566687408d02f52c03c2fb..c16e56b794b5b4aec0e932fc12974db25d1128fa 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 {