Author: tchemit Date: 2012-03-10 01:55:19 +0100 (Sat, 10 Mar 2012) New Revision: 347 Url: http://forge.codelutin.com/repositories/revision/echobase/347 Log: add create mission to selection import type page Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-03-10 00:54:19 UTC (rev 346) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-03-10 00:55:19 UTC (rev 347) @@ -20,6 +20,7 @@ echobase.error.export.sqlQuery.forbidden.update.word=Export query contains a forbidden word 'UPDATE' echobase.error.invalid.sql=Invalid request \: %s echobase.error.login.unknown=Unkwon login +echobase.action.createNewMission=Create a new mission echobase.error.mission.name.already.exist=Mission name already exists echobase.error.no.embeddedApplication.configurationFound= echobase.error.no.embeddedApplication.exportFileFound= 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-03-10 00:54:19 UTC (rev 346) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-10 00:55:19 UTC (rev 347) @@ -17,6 +17,7 @@ echobase.action.generateSqlQuery=Générer la requète echobase.action.import=Importer echobase.action.importTable=Importer +echobase.action.createNewMission=Créer une nouvelle mission echobase.action.locale.english=Anglais echobase.action.locale.french=Français echobase.action.login=Connection Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonData.jsp 2012-03-10 00:54:19 UTC (rev 346) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonData.jsp 2012-03-10 00:55:19 UTC (rev 347) @@ -62,7 +62,7 @@ </legend> <s:select key="model.missionId" required="true" - label='%{getText("echobase.common.mission")} (*)' + label='%{getText("echobase.common.mission")}' list="missions" headerKey="" headerValue=""/> <br/> @@ -103,10 +103,6 @@ </fieldset> <br/> - (*) <s:a namespace="/importData" action="createMission" method="input"> - <s:text name="echobase.information.create.mission"/> -</s:a> - <br/> <s:submit action="ConfigureCommonData-modeAll" key='echobase.action.import'/> </s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp 2012-03-10 00:54:19 UTC (rev 346) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp 2012-03-10 00:55:19 UTC (rev 347) @@ -31,7 +31,7 @@ function updateMode(newValue) { // change the action target $('#selectImportType_configure').attr('name', - 'action:configure-' + newValue + '!input'); + 'action:configure-' + newValue + '!input'); } jQuery(document).ready(function () { @@ -55,8 +55,16 @@ </fieldset> - <br/> - <s:submit action="selectImportType" key='echobase.action.configureImport'/> + <ul class="toolbar floatRight"> + <li> + <s:submit action="createMission" key='echobase.action.createNewMission' + method="input" theme="simple"/> + </li> + <li> + <s:submit action="selectImportType" key='echobase.action.configureImport' + theme="simple"/> + </li> + </ul> </s:form> \ No newline at end of file