Author: sletellier Date: 2011-11-03 17:52:22 +0100 (Thu, 03 Nov 2011) New Revision: 5 Url: http://forge.codelutin.com/repositories/revision/echobase/5 Log: Comment not implemented code Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java 2011-11-03 16:20:03 UTC (rev 4) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java 2011-11-03 16:52:22 UTC (rev 5) @@ -47,5 +47,4 @@ return user.isAdmin(); } - } Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-03 16:20:03 UTC (rev 4) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-03 16:52:22 UTC (rev 5) @@ -1,10 +1,10 @@ +echobase.action.locale.english=Anglais +echobase.action.locale.french=Français +echobase.action.logout=Déconnection echobase.label.language=Language echobase.label.locale.english=Anglais -echobase.action.locale.english=Anglais echobase.label.locale.french=Français -echobase.action.locale.french=Français +echobase.label.user.login=Login +ecobase.label.login=Connection ecobase.label.welcome=Bienvenue -ecobase.label.login=Connection ecobase.title.login=Connection -echobase.label.user.login=Login -echobase.action.logout=Déconnection \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2011-11-03 16:20:03 UTC (rev 4) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2011-11-03 16:52:22 UTC (rev 5) @@ -32,9 +32,9 @@ <div id='headerRight'> <div> <s:text name="echobase.label.user.login"> - <s:param> - <s:property value="#session.echoBaseSession.echoBaseUser.login"/> - </s:param> + <%--<s:param>--%> + <%--<s:property value="#session.echoBaseSession.echoBaseUser.login"/>--%> + <%--</s:param>--%> </s:text> <ul> <li> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2011-11-03 16:20:03 UTC (rev 4) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2011-11-03 16:52:22 UTC (rev 5) @@ -23,7 +23,7 @@ --%> <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<s:set var="userIsAdmin" value="%{#session.ecobaseSession.ecobaseUser.admin}"/> +<%--<s:set var="userIsAdmin" value="%{#session.ecobaseSession.ecobaseUser.admin}"/>--%> <title><s:text name="ecobase.label.welcome"/></title> <h2><s:text name="ecobase.label.welcome"/></h2>