Author: tchemit Date: 2012-01-04 23:47:10 +0100 (Wed, 04 Jan 2012) New Revision: 236 Url: http://forge.codelutin.com/repositories/revision/echobase/236 Log: fix action mappings + remove old directories Removed: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/ Modified: trunk/echobase-ui/src/main/resources/config/struts-importDb.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/result.jsp Modified: trunk/echobase-ui/src/main/resources/config/struts-importDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-01-04 22:46:32 UTC (rev 235) +++ trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-01-04 22:47:10 UTC (rev 236) @@ -37,7 +37,7 @@ <result name="input">/WEB-INF/jsp/importDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/importDb</param> - <param name="actionName">doImport</param> + <param name="actionName">import</param> </result> </action> 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 2012-01-04 22:46:32 UTC (rev 235) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-04 22:47:10 UTC (rev 236) @@ -141,7 +141,7 @@ echobase.title.importDb.configuration=Configuration d'un import de base de données echobase.title.importDbProgress=Import de données en cours echobase.title.importDbResult=Résultats de l'import de données -echobase.title.importHistorical=Import de données historiques +echobase.title.importDb=Import de données historiques echobase.title.importTable=Importer une table echobase.title.login=Connexion echobase.title.modification.detail=Détail de la modification Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-01-04 22:46:32 UTC (rev 235) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-01-04 22:47:10 UTC (rev 236) @@ -38,8 +38,7 @@ </fieldset> <br/> - <s:submit action="configureExport" - value='%{getText("echobase.action.export")}'/> + <s:submit action="configure" value='%{getText("echobase.action.export")}'/> <div>(*) Il s'agit du nom de l'archive, l'extension <strong>.zip</strong> sera automatiquement rajoutée.</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progress.jsp 2012-01-04 22:46:32 UTC (rev 235) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progress.jsp 2012-01-04 22:47:10 UTC (rev 236) @@ -25,7 +25,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<s:url id="url" action="doImport" namespace="/importData"/> +<s:url id="url" action="import" namespace="/importData"/> <meta http-equiv="refresh" content="1;url=${url}"/> <title><s:text name="echobase.title.importDataProgress"/></title> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-01-04 22:46:32 UTC (rev 235) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-01-04 22:47:10 UTC (rev 236) @@ -24,7 +24,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importHistorical"/></title> +<title><s:text name="echobase.title.importDb"/></title> <s:form namespace="/importDb" method="POST" enctype="multipart/form-data"> @@ -38,7 +38,7 @@ </fieldset> <br/> - <s:submit action="configureImport" + <s:submit action="configure" value='%{getText("echobase.action.import")}'/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/result.jsp 2012-01-04 22:46:32 UTC (rev 235) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/result.jsp 2012-01-04 22:47:10 UTC (rev 236) @@ -35,5 +35,3 @@ la sauvegarde importée. </div> -<div>TODO</div> -