Author: sletellier Date: 2011-11-04 10:21:14 +0100 (Fri, 04 Nov 2011) New Revision: 7 Url: http://forge.codelutin.com/repositories/revision/echobase/7 Log: - Rename all ecobase to ecHobase - Creating import pages - Creating user administration page - Add missing traductions Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/ImportProgress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/ImportResult.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/imports.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/users.jsp Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/resources/struts.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2011-11-04 08:43:34 UTC (rev 6) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2011-11-04 09:21:14 UTC (rev 7) @@ -40,8 +40,8 @@ <!-- login action --> <action name="login" class="fr.ifremer.echobase.ui.actions.LoginAction" method="doLogin"> - <result name="input">/WEB-INF/jsp/login.jsp</result> - <result name="error">/WEB-INF/jsp/login.jsp</result> + <result name="input">/WEB-INF/jsp/user/login.jsp</result> + <result name="error">/WEB-INF/jsp/user/login.jsp</result> <result name="redirect" type="redirect">${redirectAction}</result> <!--<interceptor-ref name="internalTransaction"/>--> <interceptor-ref name="paramsPrepareParamsStack"/> 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-04 08:43:34 UTC (rev 6) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-04 09:21:14 UTC (rev 7) @@ -1,10 +1,23 @@ echobase.action.locale.english=Anglais echobase.action.locale.french=Français +echobase.action.login=Connection echobase.action.logout=Déconnection +echobase.common.admin=Administrateur +echobase.common.email=Email +echobase.common.password=Mot de passe echobase.label.language=Language echobase.label.locale.english=Anglais echobase.label.locale.french=Français -echobase.label.user.login=Login -ecobase.label.login=Connection -ecobase.label.welcome=Bienvenue -ecobase.title.login=Connection +echobase.label.login=Connection +echobase.label.welcome=Bienvenue +echobase.menu.export=Exports +echobase.menu.import=Imports +echobase.menu.logs=Logs +echobase.menu.users=Utilisateurs +echobase.msg.warnImportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir acceder au résultats de l'import. +echobase.title.import=Imports +echobase.title.importProgress=Import en cours +echobase.title.importResult=Résultats de l'import +echobase.title.login=Connection +echobase.title.users=Adminitration des utilisateurs +echobase.user.gridTitle=Liste des utilisateurs Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2011-11-04 08:43:34 UTC (rev 6) +++ trunk/echobase-ui/src/main/resources/struts.xml 2011-11-04 09:21:14 UTC (rev 7) @@ -57,15 +57,15 @@ <interceptor name="paramRemover" class="com.opensymphony.xwork2.interceptor.ParameterRemoverInterceptor"/> - <!-- to manage the Ecobase topia transaction inside an action --> + <!-- to manage the echobase topia transaction inside an action --> <interceptor name="topiaTransaction" class="fr.ifremer.echobase.ui.interceptors.EchoBaseTransactionInterceptorImpl"/> - <!-- to inject the ecobase session inside an action --> + <!-- to inject the echobase session inside an action --> <interceptor name="injectEchoBaseSession" class="fr.ifremer.echobase.ui.interceptors.EchoBaseSessionInterceptor"/> - <!-- to clean some properties from the ecobase session --> + <!-- to clean some properties from the echobase session --> <interceptor name="cleanEchoBaseSession" class="fr.ifremer.echobase.ui.interceptors.CleanEchoBaseSessionInterceptor"/> @@ -81,7 +81,7 @@ <param name="redirectAction">/home</param> </interceptor> - <interceptor name="checkEcobaseSession" + <interceptor name="checkEchobaseSession" class="fr.ifremer.echobase.ui.interceptors.CheckInUserSessionInterceptor"/> </interceptors> @@ -95,7 +95,7 @@ <interceptors> - <!-- ecobase basic authenticated stack --> + <!-- echobase basic authenticated stack --> <interceptor-stack name="echoBaseBasicStack"> <interceptor-ref name="injectEchoBaseSession"/> <!--<interceptor-ref name="checkEchoBaseDatabaseSelected"/>--> @@ -103,7 +103,7 @@ <interceptor-ref name="basicStack"/> </interceptor-stack> - <!-- ecobase stack with params--> + <!-- echobase stack with params--> <interceptor-stack name="echoBaseParamsPrepareParamsStack"> <interceptor-ref name="injectEchoBaseSession"/> <!--<interceptor-ref name="checkEchoBaseDatabaseSelected"/>--> @@ -121,7 +121,7 @@ <interceptor-stack name="loginAndActionContext"> <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> - <interceptor-ref name="checkEcobaseSession"> + <interceptor-ref name="checkEchobaseSession"> <param name="parameters">actionContext</param> <param name="redirectAction">/missingActionContext</param> </interceptor-ref> 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-04 08:43:34 UTC (rev 6) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2011-11-04 09:21:14 UTC (rev 7) @@ -23,9 +23,9 @@ --%> <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<%--<s:set var="userIsAdmin" value="%{#session.ecobaseSession.ecobaseUser.admin}"/>--%> -<title><s:text name="ecobase.label.welcome"/></title> +<%--<s:set var="userIsAdmin" value="%{#session.echobaseSession.echobaseUser.admin}"/>--%> +<title><s:text name="echobase.label.welcome"/></title> -<h2><s:text name="ecobase.label.welcome"/></h2> +<h2><s:text name="echobase.label.welcome"/></h2> <hr/> \ No newline at end of file Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/ImportProgress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/ImportProgress.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/ImportProgress.jsp 2011-11-04 09:21:14 UTC (rev 7) @@ -0,0 +1,33 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<title><s:text name="echobase.title.importProgress"/></title> + +<sj:progressbar value="%{EchoBaseActionContext.progression}"/> + +<%-- TODO letellier 20111104 : Add warn icon --%> +<p><s:text name="echobase.msg.warnImportInProgress"/></p> \ No newline at end of file Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/ImportResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/ImportResult.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/ImportResult.jsp 2011-11-04 09:21:14 UTC (rev 7) @@ -0,0 +1,29 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<title><s:text name="echobase.title.importResult"/></title> + +<%-- TODO letellier 20111104 : Add import results --%> \ No newline at end of file Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/imports.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/imports.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/import/imports.jsp 2011-11-04 09:21:14 UTC (rev 7) @@ -0,0 +1,43 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<title><s:text name="echobase.title.import"/></title> + +<s:form id="importForm" action="importFiles" namespace="/import" method="POST" enctype="multipart/form-data"> + + <%-- TODO letellier 20111104 : Allow to select existing campagne --%> + + <s:file name="accoustique" key="echobase.importFile.accoustique"/> + <s:file name="pecherie" key="echobase.importFile.pecherie"/> + <s:file name="lectureAgeGen" key="echobase.importFile.lectureAgeGen"/> + <s:file name="events" key="echobase.importFile.events"/> + <s:file name="typeEchoSpecies" key="echobase.importFile.typeEchoSpecies"/> + + <s:textarea name="comment" key="echobase.common.comment"/> + + <s:submit id="addFilesSubmit" + value="%{saveText}"/> +</s:form> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2011-11-04 08:43:34 UTC (rev 6) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2011-11-04 09:21:14 UTC (rev 7) @@ -27,7 +27,7 @@ <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>Ecobase - <s:text name="ecobase.label.login"/></title> + <title>Echobase - <s:text name="echobase.label.login"/></title> <link rel="stylesheet" type="text/css" href="<s:url value='/css/screen.css' />"/> <link rel="icon" type="image/png" @@ -41,7 +41,7 @@ <div class='displayBlock'> <div class='floatLeft'> - <s:a action="home" namespace="/">Ecobase</s:a> + <s:a action="home" namespace="/">Echobase</s:a> </div> <div id='headerRight'> <%@ include file="/WEB-INF/includes/i18n.jsp" %> @@ -52,13 +52,13 @@ <%-- content --%> -<h2><s:text name="ecobase.title.login"/></h2> +<h2><s:text name="echobase.title.login"/></h2> <s:form method="POST" namespace="/user"> <s:hidden key="redirectAction" label=""/> - <s:textfield name="login" key="ecobase.common.login" required="true"/> - <s:password name="password" key="ecobase.common.password" required="true"/> - <s:submit action="login" key="ecobase.action.login" align="right"/> + <s:textfield name="email" key="echobase.common.email" required="true"/> + <s:password name="password" key="echobase.common.password" required="true"/> + <s:submit action="login" key="echobase.action.login" align="right"/> </s:form> <br/> Added: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/users.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/users.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/users.jsp 2011-11-04 09:21:14 UTC (rev 7) @@ -0,0 +1,99 @@ +<%-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> + +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> + +<title><s:text name="echobase.title.users"/></title> + +<h2><s:text name="echobase.title.users"/></h2> + +<hr/> + +<s:url id="usersListUrl" namespace="/users" action="list"/> +<s:url id="saveUrl" action="saveUser" /> + +<sjg:grid id="usersList" + caption='%{getText("echobase.user.gridTitle")}' + dataType="json" + href="%{usersListUrl}" + pager="true" + navigator="true" + navigatorAddOptions="{ + height:280, + reloadAfterSubmit:true, + afterSubmit:function(response, postdata) { + return isError(response.responseText); + } + }" + navigatorEdit="true" + navigatorEditOptions="{ + height:280, + reloadAfterSubmit:true, + afterSubmit:function(response, postdata) { + return isError(response.responseText); + } + }" + navigatorDelete="true" + navigatorDeleteOptions="{ + height:280, + reloadAfterSubmit:true, + afterSubmit:function(response, postdata) { + return isError(response.responseText); + } + }" + gridModel="gridModel" + rowList="10,100,1000" + rowNum="10" + editurl="%{saveUrl}" + editinline="false" + rownumbers="true" + multiselect="false" + autowidth="true" + viewrecords="true"> + + <sjg:gridColumn name="id" + key="true" + hidden="true"/> + + <sjg:gridColumn name="email" + title='%{getText("echobase.common.email")}' + sortable="true" + editable="true" + edittype="text"/> + + <sjg:gridColumn name="password" + title='%{getText("echobase.common.password")}' + editable="true" + edittype="password" + hidden="true"/> + + <sjg:gridColumn name="admin" + title='%{getText("echobase.common.admin")}' + sortable="true" + editable="true" + edittype="checkbox"/> + +</sjg:grid> \ No newline at end of file