From tchemit@users.forge.codelutin.com Sat Nov 26 12:02:53 2011
From: tchemit@users.forge.codelutin.com
To: echobase-commits@list.forge.codelutin.com
Subject: [Echobase-commits] r133 -
	trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData
Date: Sat, 26 Nov 2011 12:02:53 +0100
Message-ID: <20111126110253.DAC3F15A51@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4600717215067824205=="

--===============4600717215067824205==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: tchemit
Date: 2011-11-26 12:02:53 +0100 (Sat, 26 Nov 2011)
New Revision: 133

Url: http://forge.codelutin.com/repositories/revision/echobase/133

Log:
fix import data

Modified:
   trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.jsp
   trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importResult.jsp

Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureF=
iles.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.j=
sp	2011-11-26 10:50:09 UTC (rev 132)
+++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureFiles.j=
sp	2011-11-26 11:02:53 UTC (rev 133)
@@ -45,7 +45,7 @@
       <s:text name=3D"echobase.legend.import.configuration.files"/>
     </legend>
=20
-    <s:hidden key=3D"voyageId" label=3D''/>
+    <s:hidden key=3D"missionId" label=3D''/>
=20
     <s:file name=3D"acoustic"
             key=3D"echobase.label.import.accoustique"/>

Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importResu=
lt.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importResult.jsp=
	2011-11-26 10:50:09 UTC (rev 132)
+++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/importResult.jsp=
	2011-11-26 11:02:53 UTC (rev 133)
@@ -26,13 +26,25 @@
=20
 <title><s:text name=3D"echobase.title.importResult"/></title>
=20
+<fieldset>
+  <legend>
+    <s:text name=3D"echobase.legend.import.configuration.mission.resume"/>
+  </legend>
+  <s:label value=3D"%{model.mission.missionName}"
+           key=3D'echobase.common.missionName'/>
+
+  <s:label value=3D"%{model.mission.missionAbstract}"
+           key=3D'echobase.common.missionAbstract'/>
+</fieldset>
+<br/>
 <s:iterator value=3D"importResult" var=3D"entry">
   <s:set var=3D"inputFile" value=3D"%{#entry.key}"/>
   <s:set var=3D"result" value=3D"%{#entry.value}"/>
   <fieldset>
     <legend>
       <s:text name=3D"echobase.legend.importFileResult">
-        <s:param><strong><s:property value=3D"%{#inputFile.label}"/></strong=
></s:param>
+        <s:param><strong><s:property
+          value=3D"%{#inputFile.label}"/></strong></s:param>
       </s:text>
     </legend>
=20


--===============4600717215067824205==--