Index: /ether_megapoli/trunk/web/data/access/access.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/access.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/access.jsp	(revision 161)
@@ -1,4 +1,3 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -22,8 +21,8 @@
 
 	<tiles:put name="body" type="string">
-		<bean:message key="data.access.intro"/>
+		<bean:message key="data.access.intro3"/>
 		<bean:define id="access" value="access"/>
 		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;
-		<html:link page="/data/access/jeux.jsp" paramName="access" paramId="source">
+		<html:link page="/JeuxAccess.do">
 			<bean:message key="data.access.jeux"/>
 		</html:link>
@@ -43,4 +42,9 @@
 			<bean:message key="data.access.plat"/>
 		</html:link>
+		<%--br>
+		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;
+		<html:link page="/DataAccess.do">
+			<bean:message key="data.access.extract"/>
+		</html:link--%>
 	</tiles:put>
 </tiles:insert>
Index: /ether_megapoli/trunk/web/data/access/capt.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/capt.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/capt.jsp	(revision 161)
@@ -2,6 +2,4 @@
 <%@ page import="com.medias.Calcul"%>
 <%@ page import="java.util.ArrayList"%>
-<%@ page import="com.medias.Calcul" %>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -34,7 +32,7 @@
 		</div>
 		
-		<div class="submit">
+		<%--div class="submit">
 			<html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link>
-		</div>
+		</div--%>
 		
 		<nested:root name="capteursForm">
@@ -52,35 +50,45 @@
 				</logic:notEqual>
 			</th></tr>
-				<bean:define id="nomTypePrec" value=""/>
-				<nested:iterate property="capteurs" indexId="captId">
-					<nested:nest property="typeCapteur">
-						<nested:define id="nomType" property="typeCapteurNom"/>
-					</nested:nest>
-					<tr><td>
-						<nested:notEqual name="nomType" value="${nomTypePrec}">
-							<div id="messages"><bean:write name="nomType"/>&nbsp;:</div>
-						</nested:notEqual>
-						<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(captId.intValue())%>"/>
-						<logic:equal name="parite" value="pair"><bean:define id="idP" value="pair"/></logic:equal>
-						<logic:equal name="parite" value="impair"><bean:define id="idP" value="impair"/></logic:equal>
-						<table class="${idP}">
-							<tr>
-								<td style="width:155px;" nowrap>
-									-
-									<nested:define id="id" property="capteurId"/>
-									<html:link page="/DescCapteur.do" titleKey="data.access.capt4" paramName="id" paramId="idCapt">
-										<nested:notEqual property="capteurNumserie" value="UNKNOWN">
-											<nested:write property="capteurModele"/>&nbsp;&nbsp;&nbsp;(<bean:message key="data.access.capt.nums"/>&nbsp;:&nbsp;<nested:write property="capteurNumserie"/>)
+			<bean:define id="nomTypePrec" value=""/>
+			<nested:iterate property="capteurs" indexId="captId">
+				<nested:nest property="typeCapteur">
+					<nested:define id="nomType" property="typeCapteurNom"/>
+				</nested:nest>
+				<tr><td>
+					<nested:notEqual name="nomType" value="${nomTypePrec}">
+						<div id="messages"><bean:write name="nomType"/>&nbsp;:</div>
+					</nested:notEqual>
+					<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(captId.intValue())%>"/>
+					<logic:equal name="parite" value="pair"><bean:define id="idP" value="pair"/></logic:equal>
+					<logic:equal name="parite" value="impair"><bean:define id="idP" value="impair"/></logic:equal>
+					<table class="${idP}" style="margin-left: 20px">
+						<tr>
+							<td nowrap>
+								<nested:define id="id" property="capteurId"/>
+								<html:link page="/DescCapteur.do" titleKey="data.access.capt4" paramName="id" paramId="idCapt">
+									<nested:notEqual property="capteurModele" value="UNKNOWN">
+										<nested:write property="capteurModele"/>
+										<nested:notEqual property="fabriquant.fabriquantNom" value="UNKNOWN">
+											- <nested:write property="fabriquant.fabriquantNom"/>
 										</nested:notEqual>
-										<nested:equal property="capteurNumserie" value="UNKNOWN">
-											<nested:write property="capteurModele"/>
+									</nested:notEqual>
+									<nested:equal property="capteurModele" value="UNKNOWN">
+										<nested:notEqual property="fabriquant.fabriquantNom" value="UNKNOWN">
+											<nested:write property="fabriquant.fabriquantNom"/>
+										</nested:notEqual>
+										<nested:equal property="fabriquant.fabriquantNom" value="UNKNOWN">
+											Unknown
 										</nested:equal>
-									</html:link>
-								</td>
-							</tr>
-						</table>
-						<bean:define id="nomTypePrec" value="${nomType}"/>
-					</td></tr>
-				</nested:iterate>
+									</nested:equal>
+									<nested:notEqual property="capteurNumserie" value="UNKNOWN">
+										(<bean:message key="data.access.capt.nums"/>&nbsp;:&nbsp;<nested:write property="capteurNumserie"/>)
+									</nested:notEqual>
+								</html:link>
+							</td>
+						</tr>
+					</table>
+					<bean:define id="nomTypePrec" value="${nomType}"/>
+				</td></tr>
+			</nested:iterate>
 		</table>
 		</nested:root>
@@ -88,11 +96,11 @@
 		<div class="hdp" align="right">
 			<html:link page="/data/access/capt.jsp" anchor="top" titleKey="app.hdp">
-				<html:img page="/resources/images/utils/hdp1.png"/>
+				<html:img page="/images/utils/hdp1.png"/>
 			</html:link>
 		</div>
 			
-		<div class="submit">
+		<%--div class="submit">
 			<html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link>
-		</div>
+		</div--%>
 	</tiles:put>
 </tiles:insert>
Index: /ether_megapoli/trunk/web/data/access/desc_capt.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/desc_capt.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/desc_capt.jsp	(revision 161)
@@ -1,4 +1,3 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -22,5 +21,17 @@
 	<tiles:put name="bodytitle" type="string">
 		<nested:nest property="capteur">
-			<bean:message key="data.access.capt1"/> : <nested:write property="capteurModele"/>
+			<bean:message key="data.access.capt1"/> :
+			<nested:nest property="typeCapteur">
+				<nested:write property="typeCapteurNom"/>
+			</nested:nest>
+			<nested:notEqual property="capteurModele" value="UNKNOWN">
+				- <nested:write property="capteurModele"/>
+			</nested:notEqual>
+			<nested:notEqual property="fabriquant.fabriquantNom" value="UNKNOWN">
+				- <nested:write property="fabriquant.fabriquantNom"/>
+			</nested:notEqual>
+			<nested:notEqual property="capteurNumserie" value="UNKNOWN">
+				(<bean:message key="data.access.capt.nums"/>&nbsp;:&nbsp;<nested:write property="capteurNumserie"/>)
+			</nested:notEqual>
 		</nested:nest>
 	</tiles:put>
@@ -54,5 +65,5 @@
 		<table>
 			<nested:nest property="capteur">
-			<tr><th/>
+			<tr><th>
 				<nested:nest property="typeCapteur">
 					<bean:message key="data.upload.metadata.capteur.type"/> : <nested:write property="typeCapteurNom"/>
@@ -97,5 +108,4 @@
 				<tr>
 					<td>
-						-&nbsp;
 						<nested:define id="id" property="plateformeId"/>
 						<html:link page="/DescPlateforme.do" titleKey="data.access.plat4" paramName="id" paramId="idPlat">
@@ -119,8 +129,7 @@
 				<tr>
 					<td>
-						-&nbsp;
 						<nested:define id="id" property="parametreId"/>
 						<html:link page="/DescParametre.do" titleKey="data.access.param4" paramName="id" paramId="idParam">
-							<nested:write property="parametreNom"/>
+							<nested:write property="parametreNom"/> (<nested:write property="parametreCode"/>)
 						</html:link>
 					</td>
@@ -141,9 +150,33 @@
 				<tr>
 					<td>
-						-&nbsp;
 						<nested:define id="id" property="jeuId"/>
 						<html:link page="/MetadataInfo.do" titleKey="data.access.metadata.link" paramName="id" paramId="idJeu">
 							<nested:write property="jeuNom"/>
 						</html:link>
+						<bean:define id="download" value="download"/>
+						<nested:notEqual property="nbFichiers" value="0">
+							(<logic:notPresent name="SES_USER" scope="session">
+								<html:link page="/InitLogonAccess.do" paramName="download" paramId="source">
+									<nested:write property="nbFichiers"/>
+									<nested:equal property="nbFichiers" value="1">
+										<bean:message key="data.access.metadata.file" arg0=""/>
+									</nested:equal>
+									<nested:notEqual name="nbFichiers" value="1">
+										<bean:message key="data.access.metadata.file" arg0="s"/>
+									</nested:notEqual>
+								</html:link>
+							</logic:notPresent>
+							<logic:present name="SES_USER" scope="session">
+								<nested:link page="/FichiersAccess.do" titleKey="data.access.download.file" paramId="idJeu" paramProperty="jeuId">
+									<nested:write property="nbFichiers"/>
+									<nested:equal property="nbFichiers" value="1">
+										<bean:message key="data.access.metadata.file" arg0=""/>
+									</nested:equal>
+									<nested:notEqual name="nbFichiers" value="1">
+										<bean:message key="data.access.metadata.file" arg0="s"/>
+									</nested:notEqual>
+								</nested:link>
+							</logic:present>)
+						</nested:notEqual>
 					</td>
 				</tr>
@@ -152,9 +185,9 @@
 		<div class="hdp" align="right">
 			<html:link page="/data/access/desc_capt.jsp" anchor="top" titleKey="app.hdp">
-				<html:img page="/resources/images/utils/hdp1.png"/>
+				<html:img page="/images/utils/hdp1.png"/>
 			</html:link>
 		</div>
 		<div class="submit">
-			<html:link page="/CapteursAccess.do"><bean:message key="app.access.capt.back"/></html:link>
+			<html:link page="/CapteursAccess.do"><bean:message key="data.access.capt"/></html:link>
 		</div>
 	</tiles:put>
Index: /ether_megapoli/trunk/web/data/access/desc_param.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/desc_param.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/desc_param.jsp	(revision 161)
@@ -1,4 +1,3 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -55,7 +54,7 @@
 			<nested:nest property="parametre">
 			<tr>
-				<th/><bean:message key="data.upload.metadata.param.abrev"/> :</th>
-				<th/><nested:write property="parametreCode"/></th>
-				<th/>&nbsp;</th>
+				<th><bean:message key="data.upload.metadata.param.abrev"/> :</th>
+				<th><nested:write property="parametreCode"/></th>
+				<th>&nbsp;</th>
 			</tr>
 			<nested:nest property="unite">
@@ -98,5 +97,4 @@
 				<tr>
 					<td>
-						-&nbsp;
 						<nested:define id="id" property="capteurId"/>
 						<html:link page="/DescCapteur.do" titleKey="data.access.capt4" paramName="id" paramId="idCapt">
@@ -106,4 +104,7 @@
 							<nested:notEqual property="capteurModele" value="UNKNOWN">
 								- <nested:write property="capteurModele"/>
+							</nested:notEqual>
+							<nested:notEqual property="fabriquant.fabriquantNom" value="UNKNOWN">
+								- <nested:write property="fabriquant.fabriquantNom"/>
 							</nested:notEqual>
 							<nested:notEqual property="capteurNumserie" value="UNKNOWN">
@@ -126,5 +127,4 @@
 				<tr>
 					<td>
-						-&nbsp;
 						<nested:define id="id" property="plateformeId"/>
 						<html:link page="/DescPlateforme.do" titleKey="data.access.plat4" paramName="id" paramId="idPlat">
@@ -148,9 +148,33 @@
 				<tr>
 					<td>
-						-&nbsp;
 						<nested:define id="id" property="jeuId"/>
 						<html:link page="/MetadataInfo.do" titleKey="data.access.metadata.link" paramName="id" paramId="idJeu">
 							<nested:write property="jeuNom"/>
 						</html:link>
+						<bean:define id="download" value="download"/>
+						<nested:notEqual property="nbFichiers" value="0">
+							(<logic:notPresent name="SES_USER" scope="session">
+								<html:link page="/InitLogonAccess.do" paramName="download" paramId="source">
+									<nested:write property="nbFichiers"/>
+									<nested:equal property="nbFichiers" value="1">
+										<bean:message key="data.access.metadata.file" arg0=""/>
+									</nested:equal>
+									<nested:notEqual name="nbFichiers" value="1">
+										<bean:message key="data.access.metadata.file" arg0="s"/>
+									</nested:notEqual>
+								</html:link>
+							</logic:notPresent>
+							<logic:present name="SES_USER" scope="session">
+								<nested:link page="/FichiersAccess.do" titleKey="data.access.download.file" paramId="idJeu" paramProperty="jeuId">
+									<nested:write property="nbFichiers"/>
+									<nested:equal property="nbFichiers" value="1">
+										<bean:message key="data.access.metadata.file" arg0=""/>
+									</nested:equal>
+									<nested:notEqual name="nbFichiers" value="1">
+										<bean:message key="data.access.metadata.file" arg0="s"/>
+									</nested:notEqual>
+								</nested:link>
+							</logic:present>)
+						</nested:notEqual>
 					</td>
 				</tr>
@@ -159,9 +183,9 @@
 		<div class="hdp" align="right">
 			<html:link page="/data/access/desc_param.jsp" anchor="top" titleKey="app.hdp">
-				<html:img page="/resources/images/utils/hdp1.png"/>
+				<html:img page="/images/utils/hdp1.png"/>
 			</html:link>
 		</div>
 		<div class="submit">
-			<html:link page="/ParametresAccess.do"><bean:message key="app.access.param.back"/></html:link>
+			<html:link page="/ParametresAccess.do"><bean:message key="data.access.param"/></html:link>
 		</div>
 	</tiles:put>
Index: /ether_megapoli/trunk/web/data/access/desc_plat.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/desc_plat.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/desc_plat.jsp	(revision 161)
@@ -1,4 +1,3 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -54,5 +53,5 @@
 		<table>
 			<nested:nest property="plateforme">
-			<tr><th/>
+			<tr><th>
 				<nested:nest property="typePlateforme">
 					<bean:message key="data.access.metadata.plat.type"/> : <nested:write property="typePlateformeNom"/>
@@ -159,5 +158,4 @@
 				<tr>
 					<td>
-						-&nbsp;
 						<nested:define id="id" property="capteurId"/>
 						<html:link page="/DescCapteur.do" titleKey="data.access.capt4" paramName="id" paramId="idCapt">
@@ -168,4 +166,7 @@
 								- <nested:write property="capteurModele"/>
 							</nested:notEqual>
+							<nested:notEqual property="fabriquant.fabriquantNom" value="UNKNOWN">
+								- <nested:write property="fabriquant.fabriquantNom"/>
+							</nested:notEqual>
 							<nested:notEqual property="capteurNumserie" value="UNKNOWN">
 								(<bean:message key="data.access.capt.nums"/>&nbsp;:&nbsp;<nested:write property="capteurNumserie"/>)
@@ -187,8 +188,7 @@
 				<tr>
 					<td>
-						-&nbsp;
 						<nested:define id="id" property="parametreId"/>
 						<html:link page="/DescParametre.do" titleKey="data.access.param4" paramName="id" paramId="idParam">
-							<nested:write property="parametreNom"/>
+							<nested:write property="parametreNom"/> (<nested:write property="parametreCode"/>)
 						</html:link>
 					</td>
@@ -209,9 +209,33 @@
 				<tr>
 					<td>
-						-&nbsp;
 						<nested:define id="id" property="jeuId"/>
 						<html:link page="/MetadataInfo.do" titleKey="data.access.metadata.link" paramName="id" paramId="idJeu">
 							<nested:write property="jeuNom"/>
 						</html:link>
+						<bean:define id="download" value="download"/>
+						<nested:notEqual property="nbFichiers" value="0">
+							(<logic:notPresent name="SES_USER" scope="session">
+								<html:link page="/InitLogonAccess.do" paramName="download" paramId="source">
+									<nested:write property="nbFichiers"/>
+									<nested:equal property="nbFichiers" value="1">
+										<bean:message key="data.access.metadata.file" arg0=""/>
+									</nested:equal>
+									<nested:notEqual name="nbFichiers" value="1">
+										<bean:message key="data.access.metadata.file" arg0="s"/>
+									</nested:notEqual>
+								</html:link>
+							</logic:notPresent>
+							<logic:present name="SES_USER" scope="session">
+								<nested:link page="/FichiersAccess.do" titleKey="data.access.download.file" paramId="idJeu" paramProperty="jeuId">
+									<nested:write property="nbFichiers"/>
+									<nested:equal property="nbFichiers" value="1">
+										<bean:message key="data.access.metadata.file" arg0=""/>
+									</nested:equal>
+									<nested:notEqual name="nbFichiers" value="1">
+										<bean:message key="data.access.metadata.file" arg0="s"/>
+									</nested:notEqual>
+								</nested:link>
+							</logic:present>)
+						</nested:notEqual>
 					</td>
 				</tr>
@@ -220,9 +244,9 @@
 		<div class="hdp" align="right">
 			<html:link page="/data/access/desc_plat.jsp" anchor="top" titleKey="app.hdp">
-				<html:img page="/resources/images/utils/hdp1.png"/>
+				<html:img page="/images/utils/hdp1.png"/>
 			</html:link>
 		</div>
 		<div class="submit">
-			<html:link page="/PlateformesAccess.do"><bean:message key="app.access.plat.back"/></html:link>
+			<html:link page="/PlateformesAccess.do"><bean:message key="data.access.plat"/></html:link>
 		</div>
 	</tiles:put>
Index: /ether_megapoli/trunk/web/data/access/extract.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/extract.jsp	(revision 161)
+++ /ether_megapoli/trunk/web/data/access/extract.jsp	(revision 161)
@@ -0,0 +1,426 @@
+<%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
+<%@ page import="com.medias.Calcul"%>
+<%@ page import="java.util.ArrayList"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested"%>
+
+<tiles:insert page="/resources/templates/template.jsp" flush="true">
+
+	<bean:define type="java.lang.String" id="relativePath" value="<%=Context.getRelativePath(request)%>"/>
+	<bean:define type="java.lang.String" id="contextPath" value="<%=request.getContextPath()%>"/>
+	<tiles:put name="nav" value='<%=relativePath+"/navDatas.jsp"%>'/>
+
+	<tiles:put name="title" type="string">
+		<bean:message key="app.title"/> - <bean:message key="data.access.extract"/>
+	</tiles:put>
+
+	<tiles:put name="bodytitle" type="string">
+		<bean:message key="data.access.extract"/>
+	</tiles:put>
+
+	<tiles:put name="body" type="string">
+		<%--bean:message key="errors.access.failed.sel"/><br/--%>
+		<span class="legende" style="font-size: 12px"><bean:message key="app.mandatory2"/></span><br/>
+		<div id="errors" style="font-size: 12px">
+			<div><html:errors property="latMax"/></div>
+			<div><html:errors property="lonMax"/></div>
+			<div><html:errors property="dateFin"/></div>
+		</div>
+		<div id="messages">
+			<html:messages id="mess" property="<%=org.apache.struts.action.ActionMessages.GLOBAL_MESSAGE%>" message="true">
+				<bean:write name="mess"/>
+			</html:messages>
+		</div>
+
+		<html:form action="/DataSubmit">
+
+		<nested:root name="datasForm">
+		<table border="2" width="750px">
+			<tr><td width="250px" rowspan="2" valign="top">
+				<table bgcolor="#E6E6FA" width="100%">
+					<tr>
+						<th class="titleBox">
+							<input type="checkbox" onclick="selAll(this.checked,'selectPlats','nbPlatsTxt')" title="<bean:message key="data.access.selall"/>"/>
+							<bean:message key="data.access.plat"/> <span id="nbPlatsTxt" style="visibility: hidden;display: none">(<bean:write name="datasForm" property="nbSelectedPlats"/>)</span>
+						</th>
+					</tr>
+					<%--tr>
+						<th width="30px"><bean:message key="data.access.metadata.plat.type2"/></th>
+						<td><input type="checkbox" name="selTypePlat" onclick="selectTypePlat('${contextPath}',this.value,this.checked)" value="fix"><bean:message key="data.access.plat.fixe2"/>&nbsp;&nbsp;
+						<input type="checkbox" name="selTypePlat" onclick="selectTypePlat('${contextPath}',this.value,this.checked)" value="mob"><bean:message key="data.access.plat.mobile2"/></td>
+					</tr--%>
+					<tr>
+						<%--th width="30px" valign="top"><bean:message key="data.upload.metadata.plat.nom"/></th--%>
+						<td>
+							<%--html:select name="datasForm" property="selectPlats" multiple="true" size="3">
+								<nested:iterate property="plateformes" indexId="platId">
+									<nested:define id="idP" property="plateformeId"/>
+									<option value="${idP}" id="plat_${platId}"><nested:write property="plateformeNom"/></option>
+								</nested:iterate>
+							</html:select--%>
+							<div style="height: 150px; overflow: auto" id="listPlateformes">
+							<bean:define id="nomTypePlatPrec" value=""/>
+							<nested:iterate property="plateformes" indexId="platId">
+								<nested:nest property="typePlateforme">
+									<nested:define id="idTypePlat" property="typePlateformeId"/>
+									<nested:notEqual property="typePlateformeNom" value="${nomTypePlatPrec}">
+										<div class="titleType">
+											<input type="button" value="+" class="smallButton" onclick="affPlat(${idTypePlat})" id="plusPlat_${idTypePlat}"/>
+											<nested:equal property="typePlateformeNom" value="FIXED">
+												<bean:message key="data.access.plat.fixe2"/>
+											</nested:equal>
+											<nested:equal property="typePlateformeNom" value="MOBILE">
+												<bean:message key="data.access.plat.mobile2"/>
+											</nested:equal>
+										</div>
+									</nested:notEqual>
+									<nested:define id="nomTypePlatPrec" property="typePlateformeNom" type="java.lang.String"/>
+								</nested:nest>
+								<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(platId.intValue())%>"/>
+								<logic:equal name="parite" value="pair"><bean:define id="classPlat" value="pair"/></logic:equal>
+								<logic:equal name="parite" value="impair"><bean:define id="classPlat" value="impair"/></logic:equal>
+								<nested:define id="idP" property="plateformeId"/>
+								<table class="${classPlat}" id="plat_${idTypePlat}_${platId}" style="visibility: hidden; display: none;">
+									<tr>
+										<td nowrap style="font-size: 11px">
+											<html:multibox property="selectPlats" value="${idP}" onchange="selectElem(this.checked,'nbPlatsTxt')"/>
+											<html:link page="/DescPlateforme.do" titleKey="data.access.plat4" paramName="idP" paramId="idPlat">
+												<nested:write property="plateformeNom"/>
+											</html:link>
+										</td>
+									</tr>
+								</table>
+							</nested:iterate>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</td><td width="250px" rowspan="2" valign="top">
+				<table bgcolor="#E6E6FA" width="100%">
+					<tr>
+						<th class="titleBox">
+							<input type="checkbox" onclick="selAll(this.checked,'selectJeux','nbJeuxTxt')" title="<bean:message key="data.access.selall"/>"/>
+							<bean:message key="data.access.jeux"/> <span id="nbJeuxTxt" style="visibility: hidden;display: none">(<bean:write name="datasForm" property="nbSelectedJeux"/>)</span>
+						</th>
+					</tr>
+					<tr>
+						<td>
+							<div style="height: 150px; overflow: auto" id="listJeux">
+							<bean:define id="nomCatJeuPrec" value=""/>
+							<nested:iterate property="jeux" indexId="jId">
+								<nested:nest property="categorie">
+									<nested:define id="idCatJeu" property="categorieId"/>
+									<nested:notEqual property="categorieNom" value="${nomCatJeuPrec}">
+										<div class="titleType">
+											<input type="button" value="+" class="smallButton" onclick="affJeu(${idCatJeu})" id="plusJeu_${idCatJeu}"/>
+											<nested:equal property="categorieNom" value="AVION">
+												<bean:message key="data.categ1"/>
+											</nested:equal>
+											<nested:equal property="categorieNom" value="SURF_FIXE">
+												<bean:message key="data.categ2"/>
+											</nested:equal>
+											<nested:equal property="categorieNom" value="SURF_MOBILE">
+												<bean:message key="data.categ3"/>
+											</nested:equal>
+										</div>
+									</nested:notEqual>
+									<nested:define id="nomCatJeuPrec" property="categorieNom" type="java.lang.String"/>
+								</nested:nest>
+								<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(jId.intValue())%>"/>
+								<logic:equal name="parite" value="pair"><bean:define id="classJeu" value="pair"/></logic:equal>
+								<logic:equal name="parite" value="impair"><bean:define id="classJeu" value="impair"/></logic:equal>
+								<nested:define id="idJ" property="jeuId"/>
+								<table class="${classJeu}" id="jeu_${idCatJeu}_${jId}" style="visibility: hidden; display: none;">
+									<tr>
+										<td nowrap style="font-size: 11px">
+											<html:multibox property="selectJeux" value="${idJ}" onchange="selectElem(this.checked,'nbJeuxTxt')"/>
+											<html:link page="/MetadataInfo.do" paramName="idJ" paramId="idJeu" titleKey="data.access.metadata.link">
+												<nested:write property="jeuNom"/>
+											</html:link>
+										</td>
+									</tr>
+								</table>
+							</nested:iterate>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</td><td width="250px" valign="top">
+				<table width="100%">
+					<tr>
+						<th class="titleBox" colspan="3"><bean:message key="data.access.period"/> (<bean:message key="data.access.period.format"/>)</th>
+					</tr>
+					<tr>
+						<td width="50px" class="titleType"><bean:message key="data.access.period.beg"/> *</td>
+						<td width="100px">
+							<html:text property="dateDeb" size="10" maxlength="10" readonly="true" styleId="idDate1"/>
+						</td>
+						<td valign="middle">
+							<html:img page="/images/utils/calendar.gif" alt="cal" onclick="scwShowHide(scwID('idDate1'),event);"/>
+					    </td>
+					</tr>
+					<tr>
+						<td class="titleType"><bean:message key="data.access.period.end"/> *</td>
+						<td><html:text property="dateFin" size="10" maxlength="10" readonly="true" styleId="idDate2"/></td>
+						<td valign="middle">
+							<html:img page="/images/utils/calendar.gif" alt="cal" onclick="scwShowHide(scwID('idDate2'),event);"/>
+					    </td>
+					</tr>
+				</table>
+			</td></tr>
+			<tr><td valign="top">
+				<table width="100%">
+					<tr>
+						<th class="titleBox" colspan="2"><bean:message key="data.access.loc"/> (<bean:message key="data.access.loc.format"/>)</th>
+					</tr>
+					<tr>
+						<td class="titleType"><bean:message key="data.access.plat.lat"/> *</td>
+						<td class="titleType" nowrap><bean:message key="data.access.loc.inter"/> <html:text property="latMin" size="5"/> <bean:message key="data.access.loc.inter2"/> <html:text property="latMax" size="5"/></td>
+					</tr>
+					<tr>
+						<td class="titleType"><bean:message key="data.access.plat.lon"/> *</td>
+						<td class="titleType" nowrap><bean:message key="data.access.loc.inter"/> <html:text property="lonMin" size="5"/> <bean:message key="data.access.loc.inter2"/> <html:text property="lonMax" size="5"/></td>
+					</tr>
+				</table>
+			</td></tr>
+			<tr><td width="500px" colspan="2" valign="top">
+				<table bgcolor="#E6E6FA" width="100%">
+					<tr>
+						<th class="titleBox">
+							<input type="checkbox" onclick="selAll(this.checked,'selectParams','nbParamsTxt')" title="<bean:message key="data.access.selall"/>"/>
+							<bean:message key="data.access.param"/> <span id="nbParamsTxt" style="visibility: hidden;display: none">(<bean:write name="datasForm" property="nbSelectedParams"/>)</span>
+						</th>
+					</tr>
+					<tr>
+						<td>
+							<div style="height: 200px; overflow: auto" id="listParametres">
+							<bean:define id="nomCat1Prec" value=""/>
+							<bean:define id="nomCat2Prec" value=""/>
+							<bean:define id="nomCat3Prec" value=""/>
+							<bean:define id="nomCat4Prec" value=""/>
+							<bean:define id="idCat1" value="0"/>
+							<bean:define id="idCat2" value="0"/>
+							<bean:define id="idCat3" value="0"/>
+							<bean:define id="idCat4" value="0"/>
+							<nested:iterate property="parametres" indexId="paramId">
+								<nested:nest property="categorieParam">
+									<nested:notEqual property="cat1" value="${nomCat1Prec}">
+										<bean:define id="idCat1" value="<%=Calcul.inc(idCat1)%>"/>
+										<bean:define id="paramLevel" value="${idCat1}-0-0-0"/>
+										<div class="titleType">
+											<input type="button" value="-" class="smallButton" onclick="affParam(${idCat1},0,0,0,1,this.value)" id="plusParam_${paramLevel}"/>
+											<nested:write property="cat1"/>
+										</div>
+										<nested:notEmpty property="cat2">
+											<nested:notEqual property="cat2" value="${nomCat2Prec}">
+												<bean:define id="idCat2" value="<%=Calcul.inc(idCat2)%>"/>
+												<bean:define id="paramLevel" value="${idCat1}-${idCat2}-0-0"/>
+												<div class="titleType" style="margin-left: 15px" id="catParam_${paramLevel}">
+													<input type="button" value="+" class="smallButton" onclick="affParam(${idCat1},${idCat2},0,0,2,this.value)" id="plusParam_${paramLevel}"/>
+													<nested:write property="cat2"/>
+												</div>
+												<nested:notEmpty property="cat3">
+													<nested:notEqual property="cat3" value="${nomCat3Prec}">
+														<bean:define id="idCat3" value="<%=Calcul.inc(idCat3)%>"/>
+														<bean:define id="paramLevel" value="${idCat1}-${idCat2}-${idCat3}-0"/>
+														<div class="titleType" style="margin-left: 30px; visibility: hidden; display: none;" id="catParam_${paramLevel}">
+															<input type="button" value="+" class="smallButton" onclick="affParam(${idCat1},${idCat2},${idCat3},0,3,this.value)" id="plusParam_${paramLevel}"/>
+															<nested:write property="cat3"/>
+														</div>
+														<nested:notEmpty property="cat4">
+															<nested:notEqual property="cat4" value="${nomCat4Prec}">
+																<bean:define id="idCat4" value="<%=Calcul.inc(idCat4)%>"/>
+																<bean:define id="paramLevel" value="${idCat1}-${idCat2}-${idCat3}-${idCat4}"/>
+																<div class="titleType" style="margin-left: 45px; visibility: hidden; display: none;" id="catParam_${paramLevel}">
+																	<input type="button" value="+" class="smallButton" onclick="affParam(${idCat1},${idCat2},${idCat3},${idCat4},4,this.value)" id="plusParam_${paramLevel}"/>
+																	<nested:write property="cat4"/>
+																</div>
+															</nested:notEqual>
+														</nested:notEmpty>
+													</nested:notEqual>
+												</nested:notEmpty>
+											</nested:notEqual>
+										</nested:notEmpty>
+									</nested:notEqual>
+									<nested:equal property="cat1" value="${nomCat1Prec}">
+										<nested:notEmpty property="cat2">
+											<nested:notEqual property="cat2" value="${nomCat2Prec}">
+												<bean:define id="idCat2" value="<%=Calcul.inc(idCat2)%>"/>
+												<bean:define id="paramLevel" value="${idCat1}-${idCat2}-0-0"/>
+												<div class="titleType" style="margin-left: 15px" id="catParam_${paramLevel}">
+													<input type="button" value="+" class="smallButton" onclick="affParam(${idCat1},${idCat2},0,0,2,this.value)" id="plusParam_${paramLevel}"/>
+													<nested:write property="cat2"/>
+												</div>
+												<nested:notEmpty property="cat3">
+													<nested:notEqual property="cat3" value="${nomCat3Prec}">
+														<bean:define id="idCat3" value="<%=Calcul.inc(idCat3)%>"/>
+														<bean:define id="paramLevel" value="${idCat1}-${idCat2}-${idCat3}-0"/>
+														<div class="titleType" style="margin-left: 30px; visibility: hidden; display: none;" id="catParam_${paramLevel}">
+															<input type="button" value="+" class="smallButton" onclick="affParam(${idCat1},${idCat2},${idCat3},0,3,this.value)" id="plusParam_${paramLevel}"/>
+															<nested:write property="cat3"/>
+														</div>
+														<nested:notEmpty property="cat4">
+															<nested:notEqual property="cat4" value="${nomCat4Prec}">
+																<bean:define id="idCat4" value="<%=Calcul.inc(idCat4)%>"/>
+																<bean:define id="paramLevel" value="${idCat1}-${idCat2}-${idCat3}-${idCat4}"/>
+																<div class="titleType" style="margin-left: 45px; visibility: hidden; display: none;" id="catParam_${paramLevel}">
+																	<input type="button" value="+" class="smallButton" onclick="affParam(${idCat1},${idCat2},${idCat3},${idCat4},4,this.value)" id="plusParam_${paramLevel}"/>
+																	<nested:write property="cat4"/>
+																</div>
+															</nested:notEqual>
+														</nested:notEmpty>
+													</nested:notEqual>
+												</nested:notEmpty>
+											</nested:notEqual>
+											<nested:equal property="cat2" value="${nomCat2Prec}">
+												<nested:notEmpty property="cat3">
+													<nested:notEqual property="cat3" value="${nomCat3Prec}">
+														<bean:define id="idCat3" value="<%=Calcul.inc(idCat3)%>"/>
+														<bean:define id="paramLevel" value="${idCat1}-${idCat2}-${idCat3}-0"/>
+														<div class="titleType" style="margin-left: 30px; visibility: hidden; display: none;" id="catParam_${paramLevel}">
+															<input type="button" value="+" class="smallButton" onclick="affParam(${idCat1},${idCat2},${idCat3},0,3,this.value)" id="plusParam_${paramLevel}"/>
+															<nested:write property="cat3"/>
+														</div>
+														<nested:notEmpty property="cat4">
+															<nested:notEqual property="cat4" value="${nomCat4Prec}">
+																<bean:define id="idCat4" value="<%=Calcul.inc(idCat4)%>"/>
+																<bean:define id="paramLevel" value="${idCat1}-${idCat2}-${idCat3}-${idCat4}"/>
+																<div class="titleType" style="margin-left: 45px; visibility: hidden; display: none;" id="catParam_${paramLevel}">
+																	<input type="button" value="+" class="smallButton" onclick="affParam(${idCat1},${idCat2},${idCat3},${idCat4},4,this.value)" id="plusParam_${paramLevel}"/>
+																	<nested:write property="cat4"/>
+																</div>
+															</nested:notEqual>
+														</nested:notEmpty>
+													</nested:notEqual>
+													<nested:equal property="cat3" value="${nomCat3Prec}">
+														<nested:notEmpty property="cat4">
+															<nested:notEqual property="cat4" value="${nomCat4Prec}">
+																<bean:define id="idCat4" value="<%=Calcul.inc(idCat4)%>"/>
+																<bean:define id="paramLevel" value="${idCat1}-${idCat2}-${idCat3}-${idCat4}"/>
+																<div class="titleType" style="margin-left: 45px; visibility: hidden; display: none;" id="catParam_${paramLevel}">
+																	<input type="button" value="+" class="smallButton" onclick="affParam(${idCat1},${idCat2},${idCat3},${idCat4},4,this.value)" id="plusParam_${paramLevel}"/>
+																	<nested:write property="cat4"/>
+																</div>
+															</nested:notEqual>
+														</nested:notEmpty>
+													</nested:equal>
+												</nested:notEmpty>
+											</nested:equal>
+										</nested:notEmpty>
+									</nested:equal>
+									<nested:define id="nomCat1Prec" property="cat1" type="java.lang.String"/>
+									<nested:define id="nomCat2Prec" property="cat2" type="java.lang.String"/>
+									<nested:define id="nomCat3Prec" property="cat3" type="java.lang.String"/>
+									<nested:define id="nomCat4Prec" property="cat4" type="java.lang.String"/>
+								</nested:nest>
+								<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(paramId.intValue())%>"/>
+								<logic:equal name="parite" value="pair"><bean:define id="classParam" value="pair"/></logic:equal>
+								<logic:equal name="parite" value="impair"><bean:define id="classParam" value="impair"/></logic:equal>
+								<nested:define id="idPar" property="parametreId"/>
+								<logic:match name="paramLevel" value="-0-0-0">
+									<bean:define id="decal" value="0"/>
+								</logic:match>
+								<logic:notMatch name="paramLevel" value="-0-0-0">
+									<logic:match name="paramLevel" value="-0-0">
+										<bean:define id="decal" value="15"/>
+									</logic:match>
+									<logic:notMatch name="paramLevel" value="-0-0">
+										<logic:match name="paramLevel" value="-0">
+											<bean:define id="decal" value="30"/>
+										</logic:match>
+										<logic:notMatch name="paramLevel" value="-0">
+											<bean:define id="decal" value="45"/>
+										</logic:notMatch>
+									</logic:notMatch>
+								</logic:notMatch>
+								<table class="${classParam}" id="param_${paramLevel}_${paramId}" style="visibility: hidden; display: none; margin-left: ${decal}px">
+									<tr>
+										<td nowrap style="font-size: 11px">
+											<html:multibox property="selectParams" value="${idPar}" onchange="selectElem(this.checked,'nbParamsTxt')"/>
+											<html:link page="/DescParametre.do" titleKey="data.access.param4" paramName="idPar" paramId="idParam">
+												<nested:write property="parametreNom"/> (<nested:write property="parametreCode"/>)
+											</html:link>
+										</td>
+									</tr>
+								</table>
+							</nested:iterate>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</td><td width="250px" valign="top">
+				<table bgcolor="#E6E6FA" width="100%">
+					<tr>
+						<th class="titleBox">
+							<input type="checkbox" onclick="selAll(this.checked,'selectCapts','nbCaptsTxt')" title="<bean:message key="data.access.selall"/>"/>
+							<bean:message key="data.access.capt"/> <span id="nbCaptsTxt" style="visibility: hidden;display: none">(<bean:write name="datasForm" property="nbSelectedCapts"/>)</span>
+						</th>
+					</tr>
+					<tr>
+						<td>
+							<div style="height: 200px; overflow: auto" id="listCapteurs">
+							<bean:define id="nomTypeCaptPrec" value=""/>
+							<nested:iterate property="capteurs" indexId="captId">
+								<nested:nest property="typeCapteur">
+									<nested:define id="idTypeCapt" property="typeCapteurId"/>
+									<nested:notEqual property="typeCapteurNom" value="${nomTypeCaptPrec}">
+										<div class="titleType"><input type="button" value="+" class="smallButton" onclick="affCapt(${idTypeCapt})" id="plusCapt_${idTypeCapt}"/>&nbsp;<nested:write property="typeCapteurNom"/></div>
+									</nested:notEqual>
+									<nested:define id="nomTypeCaptPrec" property="typeCapteurNom" type="java.lang.String"/>
+								</nested:nest>
+								<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(captId.intValue())%>"/>
+								<logic:equal name="parite" value="pair"><bean:define id="classCapt" value="pair"/></logic:equal>
+								<logic:equal name="parite" value="impair"><bean:define id="classCapt" value="impair"/></logic:equal>
+								<nested:define id="idC" property="capteurId"/>
+								<table class="${classCapt}" id="capt_${idTypeCapt}_${captId}" style="visibility: hidden; display: none;">
+									<tr>
+										<td nowrap style="font-size: 11px">
+											<html:multibox property="selectCapts" value="${idC}" onchange="selectElem(this.checked,'nbCaptsTxt')"/>
+											<html:link page="/DescCapteur.do" titleKey="data.access.capt4" paramName="idC" paramId="idCapt">
+												<nested:equal property="capteurModele" value="UNKNOWN">
+													<nested:notEqual property="fabriquant.fabriquantNom" value="UNKNOWN">
+														<nested:write property="fabriquant.fabriquantNom"/>
+													</nested:notEqual>
+													<nested:equal property="fabriquant.fabriquantNom" value="UNKNOWN">
+														Unknown
+													</nested:equal>
+												</nested:equal>
+												<nested:notEqual property="capteurModele" value="UNKNOWN">
+													<nested:write property="capteurModele"/>
+													<nested:notEqual property="fabriquant.fabriquantNom" value="UNKNOWN">
+														- <nested:write property="fabriquant.fabriquantNom"/>
+													</nested:notEqual>
+												</nested:notEqual>
+											</html:link>
+										</td>
+									</tr>
+								</table>
+							</nested:iterate>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</td></tr>
+		</table>
+		<table width="750px">
+			<tr><td class="legende" align="left" style="font-size: 10px">
+				* <bean:message key="app.mandatory"/>
+			</td><td align="right">
+				<%--html:cancel><bean:message key="app.cancel"/></html:cancel--%>
+				<html:reset onclick="resetExtractForm()"><bean:message key="app.reset"/></html:reset>
+				<html:submit><bean:message key="app.submit"/></html:submit>
+			</td></tr>
+		</table>
+		<%--div class="hdp" align="right">
+			<html:link page="/data/access/extract.jsp" anchor="top" titleKey="app.hdp">
+				<html:img page="/images/utils/hdp1.png"/>
+			</html:link>
+		</div--%>
+		</nested:root>
+		</html:form>
+	</tiles:put>
+</tiles:insert>
Index: /ether_megapoli/trunk/web/data/access/extract2.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/extract2.jsp	(revision 161)
+++ /ether_megapoli/trunk/web/data/access/extract2.jsp	(revision 161)
@@ -0,0 +1,302 @@
+<%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
+<%@ page import="com.medias.Calcul"%>
+<%@ page import="java.util.ArrayList"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested"%>
+
+<tiles:insert page="/resources/templates/template.jsp" flush="true">
+
+	<bean:define type="java.lang.String" id="relativePath" value="<%=Context.getRelativePath(request)%>"/>
+	<bean:define type="java.lang.String" id="contextPath" value="<%=request.getContextPath()%>"/>
+	<tiles:put name="nav" value='<%=relativePath+"/navDatas.jsp"%>'/>
+
+	<tiles:put name="title" type="string">
+		<bean:message key="app.title"/> - <bean:message key="data.access.extract2"/>
+	</tiles:put>
+
+	<tiles:put name="bodytitle" type="string">
+		<bean:message key="data.access.extract2"/>
+	</tiles:put>
+
+	<tiles:put name="body" type="string">
+		
+		<div id="errors"><html:errors/></div>
+		<div id="messages">
+			<html:messages id="mess" property="<%= org.apache.struts.action.ActionMessages.GLOBAL_MESSAGE %>" message="true">
+				<bean:write name="mess"/>
+			</html:messages>
+		</div>
+
+		<html:form action="/DataExtract">
+	
+		<nested:root name="datasForm">
+		<table border="2" width="750px">
+			<tr><td width="250px" rowspan="2" valign="top">
+				<table width="100%">
+					<tr>
+						<th class="titleBox">
+							<bean:message key="data.access.plat"/> (<span id="nbPlatsTxt"><bean:write name="datasForm" property="nbSelectedPlats"/></span>)
+						</th>
+					</tr>
+					<tr>
+						<td>
+							<div style="height: 150px; overflow: auto" id="listPlateformes">
+							<bean:define id="typePPrec" value=""/>
+							<nested:iterate property="plateformes">
+								<nested:define id="idP" property="plateformeId"/>
+								<nested:define id="nomP" property="plateformeNom"/>
+								<nested:define id="typeP" property="typePlateforme.typePlateformeNom"/>
+								<logic:notEmpty name="datasForm" property="selectPlats">
+									<logic:iterate name="datasForm" property="selectPlats" id="selPlat" indexId="platId">
+										<logic:equal name="selPlat" value="${idP}">
+											<logic:notEqual name="typeP" value="${typePPrec}">
+												<div class="titleType">
+													<logic:equal name="typeP" value="FIXED">
+														<bean:message key="data.access.plat.fixe2"/>
+													</logic:equal>
+													<logic:equal name="typeP" value="MOBILE">
+														<bean:message key="data.access.plat.mobile2"/>
+													</logic:equal>
+												</div>
+											</logic:notEqual>
+											<bean:define id="typePPrec" name="typeP" type="java.lang.String"/>
+											<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(platId.intValue())%>"/>
+											<logic:equal name="parite" value="pair"><bean:define id="classPlat" value="pair"/></logic:equal>
+											<logic:equal name="parite" value="impair"><bean:define id="classPlat" value="impair"/></logic:equal>
+											<table class="${classPlat}">
+												<tr>
+													<td nowrap style="font-size: 11px">
+														<html:link page="/DescPlateforme.do" titleKey="data.access.plat4" paramName="idP" paramId="idPlat">
+															<bean:write name="nomP"/>
+														</html:link>
+													</td>
+												</tr>
+											</table>										
+										</logic:equal>
+									</logic:iterate>
+								</logic:notEmpty>
+							</nested:iterate>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</td><td width="250px" rowspan="2" valign="top">
+				<table width="100%">
+					<tr>
+						<th class="titleBox"><bean:message key="data.access.jeux"/> (<span id="nbJeuxTxt"><bean:write name="datasForm" property="nbSelectedJeux"/></span>)</th>
+					</tr>
+					<tr>
+						<td>
+							<div style="height: 150px; overflow: auto" id="listJeux">
+							<bean:define id="catJPrec" value=""/>
+							<nested:iterate property="jeux">
+								<nested:define id="idJ" property="jeuId"/>
+								<nested:define id="nomJ" property="jeuNom"/>
+								<nested:define id="catJ" property="categorie.categorieNom"/>
+								<logic:notEmpty name="datasForm" property="selectJeux">
+									<logic:iterate name="datasForm" property="selectJeux" id="selJeu" indexId="jId">
+										<logic:equal name="selJeu" value="${idJ}">
+											<logic:notEqual name="catJ" value="${catJPrec}">
+												<div class="titleType">
+													<logic:equal name="catJ" value="AVION">
+														<bean:message key="data.categ1"/>
+													</logic:equal>
+													<logic:equal name="catJ" value="SURF_FIXE">
+														<bean:message key="data.categ2"/>
+													</logic:equal>
+													<logic:equal name="catJ" value="SURF_MOBILE">
+														<bean:message key="data.categ3"/>
+													</logic:equal>
+												</div>
+											</logic:notEqual>
+											<bean:define id="catJPrec" name="catJ" type="java.lang.String"/>
+											<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(jId.intValue())%>"/>
+											<logic:equal name="parite" value="pair"><bean:define id="classJeu" value="pair"/></logic:equal>
+											<logic:equal name="parite" value="impair"><bean:define id="classJeu" value="impair"/></logic:equal>
+											<table class="${classJeu}">
+												<tr>
+													<td nowrap style="font-size: 11px">
+														<html:link page="/MetadataInfo.do" paramName="idJ" paramId="idJeu" titleKey="data.access.metadata.link">
+															<bean:write name="nomJ"/>
+														</html:link>
+													</td>
+												</tr>
+											</table>
+										</logic:equal>
+									</logic:iterate>
+								</logic:notEmpty>
+							</nested:iterate>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</td><td width="250px" valign="top">
+				<table width="100%">
+					<tr>
+						<th class="titleBox" colspan="2"><bean:message key="data.access.period"/></th>
+					</tr>
+					<tr>
+						<td class="titleType"><bean:message key="data.access.period.beg"/></td>
+						<td><bean:write name="datasForm" property="dateDeb"/></td>
+					</tr>
+					<tr>
+						<td class="titleType"><bean:message key="data.access.period.end"/></td>
+						<td><bean:write name="datasForm" property="dateFin"/></td>
+					</tr>
+				</table>
+			</td></tr>
+			<tr><td valign="top">
+				<table width="100%">
+					<tr>
+						<th class="titleBox" colspan="2"><bean:message key="data.access.loc"/></th>
+					</tr>
+					<tr>
+						<td class="titleType"><bean:message key="data.access.plat.lat"/></td>
+						<td nowrap><bean:message key="data.access.loc.inter"/> <bean:write name="datasForm" property="latMin"/><bean:message key="unit.deg"/> <bean:message key="data.access.loc.inter2"/> <bean:write name="datasForm" property="latMax"/><bean:message key="unit.deg"/></td>
+					</tr>
+					<tr>
+						<td class="titleType"><bean:message key="data.access.plat.lon"/></td>
+						<td nowrap><bean:message key="data.access.loc.inter"/> <bean:write name="datasForm" property="lonMin"/><bean:message key="unit.deg"/> <bean:message key="data.access.loc.inter2"/> <bean:write name="datasForm" property="lonMax"/><bean:message key="unit.deg"/></td>
+					</tr>
+				</table>
+			</td></tr>
+			<tr><td width="500px" colspan="2" valign="top">
+				<table width="100%">
+					<tr>
+						<th class="titleBox"><bean:message key="data.access.param"/> (<span id="nbParamsTxt"><bean:write name="datasForm" property="nbSelectedParams"/></span>)</th>
+					</tr>
+					<tr>
+						<td>
+							<div style="height: 150px; overflow: auto" id="listParametres">
+							<bean:define id="catParPrec" value=""/>
+							<nested:iterate property="parametres">
+								<nested:define id="idPar" property="parametreId"/>
+								<nested:define id="nomPar" property="parametreNom"/>
+								<nested:define id="codePar" property="parametreCode"/>
+								<nested:define id="catPar" property="categorieParam.categorieParamNom"/>
+								<logic:notEmpty name="datasForm" property="selectParams">
+									<logic:iterate name="datasForm" property="selectParams" id="selParam" indexId="paramId">
+										<logic:equal name="selParam" value="${idPar}">
+											<logic:notEqual name="catPar" value="${catParPrec}">
+												<div class="titleType"><bean:write name="catPar"/></div>
+											</logic:notEqual>
+											<bean:define id="catParPrec" name="catPar" type="java.lang.String"/>
+											<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(paramId.intValue())%>"/>
+											<logic:equal name="parite" value="pair"><bean:define id="classParam" value="pair"/></logic:equal>
+											<logic:equal name="parite" value="impair"><bean:define id="classParam" value="impair"/></logic:equal>
+											<table class="${classParam}">
+												<tr>
+													<td nowrap style="font-size: 11px">
+														<html:link page="/DescParametre.do" titleKey="data.access.param4" paramName="idPar" paramId="idParam">
+															<bean:write name="nomPar"/> (<bean:write name="codePar"/>)
+														</html:link>
+													</td>
+												</tr>
+											</table>										
+										</logic:equal>
+									</logic:iterate>
+								</logic:notEmpty>
+							</nested:iterate>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</td><td width="250px" valign="top">
+				<table width="100%">
+					<tr>
+						<th class="titleBox"><bean:message key="data.access.capt"/> (<span id="nbCaptsTxt"><bean:write name="datasForm" property="nbSelectedCapts"/></span>)</th>
+					</tr>
+					<tr>
+						<td>
+							<div style="height: 150px; overflow: auto" id="listCapteurs">
+							<bean:define id="typeCPrec" value=""/>
+							<nested:iterate property="capteurs">
+								<nested:define id="idC" property="capteurId"/>
+								<nested:define id="modeleC" property="capteurModele"/>
+								<nested:define id="typeC" property="typeCapteur.typeCapteurNom"/>
+								<logic:notEmpty name="datasForm" property="selectCapts">
+									<logic:iterate name="datasForm" property="selectCapts" id="selCapt" indexId="captId">
+										<logic:equal name="selCapt" value="${idC}">
+											<logic:notEqual name="typeC" value="${typeCPrec}">
+												<div class="titleType"><bean:write name="typeC"/></div>
+											</logic:notEqual>
+											<bean:define id="typeCPrec" name="typeC" type="java.lang.String"/>
+											<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(captId.intValue())%>"/>
+											<logic:equal name="parite" value="pair"><bean:define id="classCapt" value="pair"/></logic:equal>
+											<logic:equal name="parite" value="impair"><bean:define id="classCapt" value="impair"/></logic:equal>
+											<table class="${classCapt}">
+												<tr>
+													<td nowrap style="font-size: 11px">
+														<html:link page="/DescCapteur.do" titleKey="data.access.capt4" paramName="idC" paramId="idCapt">
+															<bean:write name="modeleC"/>
+														</html:link>
+													</td>
+												</tr>
+											</table>										
+										</logic:equal>
+									</logic:iterate>
+								</logic:notEmpty>
+							</nested:iterate>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</td></tr>
+			<tr><th align="left" class="titleBox">
+				<bean:define id="nbVals" name="datasForm" property="nbValeurs"/>
+				<logic:equal name="nbVals" value="0">
+					<bean:define id="colorNb" value="red"/>
+				</logic:equal>
+				<logic:notEqual name="nbVals" value="0">
+					<bean:define id="colorNb" value="green"/>
+				</logic:notEqual>
+				<font color="${colorNb}"><bean:write name="nbVals" format="#,##0"/></font>
+				<logic:equal name="nbVals" value="1">
+					<bean:message key="data.access.nbval" arg0=""/>
+				</logic:equal>
+				<logic:notEqual name="nbVals" value="1">
+					<bean:message key="data.access.nbval" arg0="s"/>
+				</logic:notEqual>
+			</th><th class="titleBox">
+				<bean:message key="data.access.output"/>
+				<html:select property="output">
+					<html:option value="NASA-AMES">NASA-Ames 1001</html:option>
+					<html:option value="NETCDF">NetCDF</html:option>
+				</html:select>
+			</th><th class="titleBox">
+				<bean:message key="data.access.compression"/>
+				<html:select property="compression">
+					<html:option value="None"></html:option>
+					<html:option value="zip"></html:option>
+					<html:option value="tgz"></html:option>
+				</html:select>
+			</th></tr>
+		</table>
+<script type="text/javascript">
+	var extractDatasConfirm = '<bean:message key="data.access.extract.confirm" arg0="${nbVals}"/>';
+</script>
+		<table width="750px">
+			<tr><td align="right" style="color: red">
+				<html:cancel><bean:message key="app.cancel"/></html:cancel>
+				<logic:equal name="nbVals" value="0">
+					<bean:message key="errors.access.novalues"/>
+				</logic:equal>
+				<logic:notEqual name="nbVals" value="0">
+					<%--bean:message key="app.provisoire"/--%>
+					<html:submit onclick="return confirm(extractDatasConfirm)"><bean:message key="app.submit"/></html:submit>
+				</logic:notEqual>
+			</td></tr>
+		</table>
+		<%--div class="hdp" align="right">
+			<html:link page="/data/access/extract2.jsp" anchor="top" titleKey="app.hdp">
+				<html:img page="/images/utils/hdp1.png"/>
+			</html:link>
+		</div--%>
+		</nested:root>
+		</html:form>
+	</tiles:put>
+</tiles:insert>
Index: /ether_megapoli/trunk/web/data/access/extract3.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/extract3.jsp	(revision 161)
+++ /ether_megapoli/trunk/web/data/access/extract3.jsp	(revision 161)
@@ -0,0 +1,33 @@
+<%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested"%>
+
+<tiles:insert page="/templates/template2.jsp" flush="true">
+
+	<bean:define type="java.lang.String" id="relativePath" value="<%=Context.getRelativePath(request)%>"/>
+	<bean:define type="java.lang.String" id="contextPath" value="<%=request.getContextPath()%>"/>
+	<tiles:put name="nav" value='<%=relativePath+"/navDatas.jsp"%>'/>
+
+	<tiles:put name="title" type="string">
+		<bean:message key="app.title"/> - <bean:message key="data.access.extract3"/>
+	</tiles:put>
+
+	<tiles:put name="bodytitle" type="string">
+		<bean:message key="data.access.extract3"/>
+	</tiles:put>
+
+	<tiles:put name="body" type="string">
+		
+		<div id="errors"><html:errors/></div>
+		<div id="messages">
+			<html:messages id="mess" property="<%= org.apache.struts.action.ActionMessages.GLOBAL_MESSAGE %>" message="true">
+				<bean:write name="mess"/>
+			</html:messages>
+		</div>
+		<bean:message key="data.access.extract.process"/>
+	</tiles:put>
+</tiles:insert>
Index: /ether_megapoli/trunk/web/data/access/files.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/files.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/files.jsp	(revision 161)
@@ -1,4 +1,3 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -33,7 +32,7 @@
 		</div>
 		
-		<div class="submit">
-			<html:link page="/JeuxAccess.do"><bean:message key="app.access.back"/></html:link>
-		</div>
+		<%--div class="submit">
+			<html:link page="/JeuxAccess.do"><bean:message key="data.access.jeux"/></html:link>
+		</div--%>
 		
 		<table>
@@ -49,14 +48,14 @@
 			</th></tr>
 			<tr><td>
-			<%--logic:present name="SES_USER"--%>
+			<%--logic:present name="SES_USER" scope="session"--%>
 				<html:link titleKey="data.access.downloading" page="/ZipGame.do" paramId="path" paramName="path">
-					<html:img page="/resources/images/utils/text.png" alt="file"/>
+					<html:img page="/images/utils/text.png" alt="file"/>
 					<bean:message arg0="${nomJeu}" key="data.access.files.dowload.zip"/>
 				</html:link>
 			<%--/logic:present>
-			<logic:notPresent name="SES_USER">
-				<html:link titleKey="data.access.downloading.logon" page="/InitLogonAccess.do" name="paramsName" scope="page">
-					<html:img page="/resources/images/utils/text.png" alt="file"/>
-					<bean:message arg0="${nomJeu}" key="data.access.files.dowload.com.medias.zip"/>
+			<logic:notPresent name="SES_USER" scope="session">
+				<html:link titleKey="data.access.downloading.logon" page="/InitLogonAccess.do" paramName="access" paramId="source">
+					<html:img page="/images/utils/text.png" alt="file"/>
+					<bean:message arg0="${nomJeu}" key="data.access.files.dowload.zip"/>
 				</html:link>
 			</logic:notPresent--%>
@@ -65,5 +64,5 @@
 			<nested:iterate property="fichiers" indexId="fId">
 			<tr><td>
-				<html:img page="/resources/images/utils/text.png" alt="file"/>
+				<html:img page="/images/utils/text.png" alt="file"/>
 				<nested:define id="file" property="fichierNom"/>
 				<bean:define id="pathFile" value="${path}/${file}"/>
@@ -77,9 +76,9 @@
 		<div class="hdp" align="right">
 			<html:link page="/data/access/files.jsp" anchor="top" titleKey="app.hdp">
-				<html:img page="/resources/images/utils/hdp1.png"/>
+				<html:img page="/images/utils/hdp1.png"/>
 			</html:link>
 		</div>
 		<div class="submit">
-			<html:link page="/JeuxAccess.do"><bean:message key="app.access.back"/></html:link>
+			<html:link page="/JeuxAccess.do"><bean:message key="data.access.jeux"/></html:link>
 		</div>
 		
Index: /ether_megapoli/trunk/web/data/access/jeux.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/jeux.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/jeux.jsp	(revision 161)
@@ -1,5 +1,5 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
+<%@ page import="com.medias.Calcul"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html"%>
@@ -30,9 +30,10 @@
 		</div>
 		
-		<div class="submit">
+		<%--div class="submit">
 			<html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link>
-		</div>
+		</div --%>
 		
 		<%--jsp:include page="arborescence.jsp"/--%>
+		<bean:define id="download" value="download"/>
 		<nested:root name="jeuxForm">
 		<table>
@@ -48,129 +49,189 @@
 			</th></tr>
 			<tr><td>
-				<html:img page="/resources/images/utils/folder.png" alt="folder"/>
+				<html:img page="/images/utils/folder.png" alt="folder"/>
 				<bean:message key="data.categ1"/>
 			</td></tr>
+			<tr><td>
+			<table style="margin-left:30px">
 			<nested:iterate property="jeux" indexId="jId">
-			<tr><td>
 				<nested:nest property="categorie">
 					<nested:define id="catNom" property="categorieNom"/>
 				</nested:nest>
 				<nested:equal name="catNom" value="AVION">
-					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-
-					<nested:link page="/MetadataInfo.do" paramProperty="jeuId" paramId="idJeu" titleKey="data.access.metadata.link">
-						<nested:write property="jeuNom"/>
-					</nested:link>
-					&rArr;
-					<nested:size id="nbFiles" property="fichiers"/>
-					<logic:greaterThan name="nbFiles" value="0">
-						<%--html:link page="/PrepareFileListAccess.do" titleKey="data.access.download.file" paramId="setPath" paramName="path"--%>
-						<nested:link page="/FichiersAccess.do" titleKey="data.access.download.file" paramId="idJeu" paramProperty="jeuId">
-							<html:img page="/resources/images/utils/text.png" altKey="data.access.download.file"/>
-							<i><bean:write name="nbFiles"/>
-							<logic:equal name="nbFiles" value="1">
-								<bean:message key="data.access.metadata.file" arg0=""/>
-							</logic:equal>
-							<logic:notEqual name="nbFiles" value="1"> 	
-								<bean:message key="data.access.metadata.file" arg0="s"/>
-							</logic:notEqual>
-							<%--logic:equal name="dateD" value="<%=dateF%>">
-								<bean:message arg0="<%=dateD%>" key="data.access.metadata.file.sameDate"/>
-							</logic:equal>
-							<logic:notEqual name="dateD" value="<%=dateF%>">
-								<bean:message arg0="<%=dateD%>" arg1="<%=dateF%>" key="data.access.metadata.file.differentDate"/>
-							</logic:notEqual--%></i>
+					<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(jId.intValue())%>"/>
+					<logic:equal name="parite" value="pair"><bean:define id="idP" value="pair"/></logic:equal>
+					<logic:equal name="parite" value="impair"><bean:define id="idP" value="impair"/></logic:equal>
+					<tr class="${idP}"><td width="300px">
+						<nested:link page="/MetadataInfo.do" paramProperty="jeuId" paramId="idJeu" titleKey="data.access.metadata.link">
+							<nested:write property="jeuNom"/>
 						</nested:link>
-					</logic:greaterThan>
-					<logic:equal name="nbFiles" value="0">
-						<bean:message key="data.access.files.zero"/>
-					</logic:equal>
+					</td><td width="160px" align="right">
+						<nested:size id="nbFiles" property="fichiers"/>
+						<logic:greaterThan name="nbFiles" value="0">
+							<%--html:link page="/PrepareFileListAccess.do" titleKey="data.access.download.file" paramId="setPath" paramName="path"--%>
+							<logic:notPresent name="SES_USER" scope="session">
+								<html:link page="/InitLogonAccess.do" paramName="download" paramId="source">
+									<%-- html:img page="/images/utils/text.png" altKey="data.access.download.file"/--%>
+									<i><bean:write name="nbFiles"/>
+									<logic:equal name="nbFiles" value="1">
+										<bean:message key="data.access.metadata.file" arg0=""/>
+									</logic:equal>
+									<logic:notEqual name="nbFiles" value="1"> 	
+										<bean:message key="data.access.metadata.file" arg0="s"/>
+									</logic:notEqual></i>
+								</html:link>
+							</logic:notPresent>
+							<logic:present name="SES_USER" scope="session">
+								<nested:link page="/FichiersAccess.do" titleKey="data.access.download.file" paramId="idJeu" paramProperty="jeuId">
+									<%-- html:img page="/images/utils/text.png" altKey="data.access.download.file"/--%>
+									<i><bean:write name="nbFiles"/>
+									<logic:equal name="nbFiles" value="1">
+										<bean:message key="data.access.metadata.file" arg0=""/>
+									</logic:equal>
+									<logic:notEqual name="nbFiles" value="1"> 	
+										<bean:message key="data.access.metadata.file" arg0="s"/>
+									</logic:notEqual>
+									<%--logic:equal name="dateD" value="<%=dateF%>">
+										<bean:message arg0="<%=dateD%>" key="data.access.metadata.file.sameDate"/>
+									</logic:equal>
+									<logic:notEqual name="dateD" value="<%=dateF%>">
+										<bean:message arg0="<%=dateD%>" arg1="<%=dateF%>" key="data.access.metadata.file.differentDate"/>
+									</logic:notEqual--%></i>
+								</nested:link>
+							</logic:present>
+						</logic:greaterThan>
+						<logic:equal name="nbFiles" value="0">
+							<bean:message key="data.access.files.zero"/>
+						</logic:equal>					
+					</td>
+					</tr>
 				</nested:equal>
-			</td></tr>
 			</nested:iterate>
+			</table>
+			</td></tr>
 			<tr><td>&nbsp;</td></tr>
 			<tr><td>
-				<html:img page="/resources/images/utils/folder.png" alt="folder"/>
+				<html:img page="/images/utils/folder.png" alt="folder"/>
 				<bean:message key="data.categ2"/>
 			</td></tr>
+			<tr><td>
+			<table style="margin-left:30px">
 			<nested:iterate property="jeux" indexId="jId">
-			<tr><td>
 				<nested:nest property="categorie">
 					<nested:define id="catNom" property="categorieNom"/>
 				</nested:nest>
 				<nested:equal name="catNom" value="SURF_FIXE">
-					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-
-					<nested:link page="/MetadataInfo.do" paramProperty="jeuId" paramId="idJeu" titleKey="data.access.metadata.link">
-						<nested:write property="jeuNom"/>
-					</nested:link>
-					&rArr;
-					<nested:size id="nbFiles" property="fichiers"/>
-					<logic:greaterThan name="nbFiles" value="0">
-						<%--html:link page="/PrepareFileListAccess.do" titleKey="data.access.download.file" paramId="setPath" paramName="path"--%>
-						<nested:link page="/FichiersAccess.do" titleKey="data.access.download.file" paramId="idJeu" paramProperty="jeuId">
-							<html:img page="/resources/images/utils/text.png" altKey="data.access.download.file"/>
-							<i><bean:write name="nbFiles"/>
-							<logic:equal name="nbFiles" value="1">
-								<bean:message key="data.access.metadata.file" arg0=""/>
-							</logic:equal>
-							<logic:notEqual name="nbFiles" value="1">
-								<bean:message key="data.access.metadata.file" arg0="s"/>
-							</logic:notEqual>
-							<%--logic:equal name="dateD" value="<%=dateF%>">
-								<bean:message arg0="<%=dateD%>" key="data.access.metadata.file.sameDate"/>
-							</logic:equal>
-							<logic:notEqual name="dateD" value="<%=dateF%>">
-								<bean:message arg0="<%=dateD%>" arg1="<%=dateF%>" key="data.access.metadata.file.differentDate"/>
-							</logic:notEqual--%></i>
+					<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(jId.intValue())%>"/>
+					<logic:equal name="parite" value="pair"><bean:define id="idP" value="pair"/></logic:equal>
+					<logic:equal name="parite" value="impair"><bean:define id="idP" value="impair"/></logic:equal>
+					<tr class="${idP}"><td width="300px">
+						<nested:link page="/MetadataInfo.do" paramProperty="jeuId" paramId="idJeu" titleKey="data.access.metadata.link">
+							<nested:write property="jeuNom"/>
 						</nested:link>
-					</logic:greaterThan>
-					<logic:equal name="nbFiles" value="0">
-						<bean:message key="data.access.files.zero"/>
-					</logic:equal>
+					</td><td width="160px" align="right">
+						<nested:size id="nbFiles" property="fichiers"/>
+						<logic:greaterThan name="nbFiles" value="0">
+							<%--html:link page="/PrepareFileListAccess.do" titleKey="data.access.download.file" paramId="setPath" paramName="path"--%>
+							<logic:notPresent name="SES_USER" scope="session">
+								<html:link page="/InitLogonAccess.do" paramName="download" paramId="source">
+									<%-- html:img page="/images/utils/text.png" altKey="data.access.download.file"/--%>
+									<i><bean:write name="nbFiles"/>
+									<logic:equal name="nbFiles" value="1">
+										<bean:message key="data.access.metadata.file" arg0=""/>
+									</logic:equal>
+									<logic:notEqual name="nbFiles" value="1"> 	
+										<bean:message key="data.access.metadata.file" arg0="s"/>
+									</logic:notEqual></i>
+								</html:link>
+							</logic:notPresent>
+							<logic:present name="SES_USER" scope="session">
+								<nested:link page="/FichiersAccess.do" titleKey="data.access.download.file" paramId="idJeu" paramProperty="jeuId">
+									<%-- html:img page="/images/utils/text.png" altKey="data.access.download.file"/--%>
+									<i><bean:write name="nbFiles"/>
+									<logic:equal name="nbFiles" value="1">
+										<bean:message key="data.access.metadata.file" arg0=""/>
+									</logic:equal>
+									<logic:notEqual name="nbFiles" value="1">
+										<bean:message key="data.access.metadata.file" arg0="s"/>
+									</logic:notEqual>
+									<%--logic:equal name="dateD" value="<%=dateF%>">
+										<bean:message arg0="<%=dateD%>" key="data.access.metadata.file.sameDate"/>
+									</logic:equal>
+									<logic:notEqual name="dateD" value="<%=dateF%>">
+										<bean:message arg0="<%=dateD%>" arg1="<%=dateF%>" key="data.access.metadata.file.differentDate"/>
+									</logic:notEqual--%></i>
+								</nested:link>
+							</logic:present>
+						</logic:greaterThan>
+						<logic:equal name="nbFiles" value="0">
+							<bean:message key="data.access.files.zero"/>
+						</logic:equal>
+					</td></tr>
 				</nested:equal>
-			</td></tr>
 			</nested:iterate>
+			</table>
+			</td></tr>
 			<tr><td>&nbsp;</td></tr>
 			<tr><td>
-				<html:img page="/resources/images/utils/folder.png" alt="folder"/>
+				<html:img page="/images/utils/folder.png" alt="folder"/>
 				<bean:message key="data.categ3"/>
 			</td></tr>
+			<tr><td>
+			<table style="margin-left:30px">
 			<nested:iterate property="jeux" indexId="jId">
-			<tr><td>
 				<nested:nest property="categorie">
 					<nested:define id="catNom" property="categorieNom"/>
 				</nested:nest>
 				<nested:equal name="catNom" value="SURF_MOBILE">
-					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-
-					<nested:link page="/MetadataInfo.do" paramProperty="jeuId" paramId="idJeu" titleKey="data.access.metadata.link">
-						<nested:write property="jeuNom"/>
-					</nested:link>
-					&rArr;
-					<nested:size id="nbFiles" property="fichiers"/>
-					<logic:greaterThan name="nbFiles" value="0">
-						<%--html:link page="/PrepareFileListAccess.do" titleKey="data.access.download.file" paramId="setPath" paramName="path"--%>
-						<nested:link page="/FichiersAccess.do" titleKey="data.access.download.file" paramId="idJeu" paramProperty="jeuId">
-							<html:img page="/resources/images/utils/text.png" altKey="data.access.download.file"/>
-							&nbsp;<i><bean:write name="nbFiles"/>
-							<logic:equal name="nbFiles" value="1">
-								<bean:message key="data.access.metadata.file" arg0=""/>
-							</logic:equal>
-							<logic:notEqual name="nbFiles" value="1"> 	
-								<bean:message key="data.access.metadata.file" arg0="s"/>
-							</logic:notEqual>
-							<%--logic:equal name="dateD" value="<%=dateF%>">
-								<bean:message arg0="<%=dateD%>" key="data.access.metadata.file.sameDate"/>
-							</logic:equal>
-							<logic:notEqual name="dateD" value="<%=dateF%>">
-								<bean:message arg0="<%=dateD%>" arg1="<%=dateF%>" key="data.access.metadata.file.differentDate"/>
-							</logic:notEqual--%></i>
+					<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(jId.intValue())%>"/>
+					<logic:equal name="parite" value="pair"><bean:define id="idP" value="pair"/></logic:equal>
+					<logic:equal name="parite" value="impair"><bean:define id="idP" value="impair"/></logic:equal>
+					<tr class="${idP}"><td width="300px">
+						<nested:link page="/MetadataInfo.do" paramProperty="jeuId" paramId="idJeu" titleKey="data.access.metadata.link">
+							<nested:write property="jeuNom"/>
 						</nested:link>
-					</logic:greaterThan>
-					<logic:equal name="nbFiles" value="0">
-						<bean:message key="data.access.files.zero"/>
-					</logic:equal>
+					</td><td width="160px" align="right">
+						<nested:size id="nbFiles" property="fichiers"/>
+						<logic:greaterThan name="nbFiles" value="0">
+							<%--html:link page="/PrepareFileListAccess.do" titleKey="data.access.download.file" paramId="setPath" paramName="path"--%>
+							<logic:notPresent name="SES_USER" scope="session">
+								<html:link page="/InitLogonAccess.do" paramName="download" paramId="source">
+									<%--html:img page="/images/utils/text.png" altKey="data.access.download.file"/--%>
+									<i><bean:write name="nbFiles"/>
+									<logic:equal name="nbFiles" value="1">
+										<bean:message key="data.access.metadata.file" arg0=""/>
+									</logic:equal>
+									<logic:notEqual name="nbFiles" value="1"> 	
+										<bean:message key="data.access.metadata.file" arg0="s"/>
+									</logic:notEqual></i>
+								</html:link>
+							</logic:notPresent>
+							<logic:present name="SES_USER" scope="session">
+								<nested:link page="/FichiersAccess.do" titleKey="data.access.download.file" paramId="idJeu" paramProperty="jeuId">
+									<%-- html:img page="/images/utils/text.png" altKey="data.access.download.file"/--%>
+									<i><bean:write name="nbFiles"/>
+									<logic:equal name="nbFiles" value="1">
+										<bean:message key="data.access.metadata.file" arg0=""/>
+									</logic:equal>
+									<logic:notEqual name="nbFiles" value="1"> 	
+										<bean:message key="data.access.metadata.file" arg0="s"/>
+									</logic:notEqual>
+									<%--logic:equal name="dateD" value="<%=dateF%>">
+										<bean:message arg0="<%=dateD%>" key="data.access.metadata.file.sameDate"/>
+									</logic:equal>
+									<logic:notEqual name="dateD" value="<%=dateF%>">
+										<bean:message arg0="<%=dateD%>" arg1="<%=dateF%>" key="data.access.metadata.file.differentDate"/>
+									</logic:notEqual--%></i>
+								</nested:link>
+							</logic:present>
+						</logic:greaterThan>
+						<logic:equal name="nbFiles" value="0">
+							<bean:message key="data.access.files.zero"/>
+						</logic:equal>
+					</td></tr>
 				</nested:equal>
-			</td></tr>
 			</nested:iterate>
-			<tr><td>&nbsp;</td></tr>
+			</table>
+			</td></tr>
 		</table>
 		</nested:root>
@@ -178,10 +239,10 @@
 		<div class="hdp" align="right">
 			<html:link page="/data/access/jeux.jsp" anchor="top" titleKey="app.hdp">
-				<html:img page="/resources/images/utils/hdp1.png"/>
+				<html:img page="/images/utils/hdp1.png"/>
 			</html:link>
 		</div>
-		<div class="submit">
+		<%--div class="submit">
 			<html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link>
-		</div>
+		</div--%>
 		
 	</tiles:put>
Index: /ether_megapoli/trunk/web/data/access/listFiles.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/listFiles.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/listFiles.jsp	(revision 161)
@@ -1,4 +1,3 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -26,10 +25,10 @@
 		<%-- Place here the content of your page --%>
 		&nbsp;
-		<div class="submit">
-			<html:link page="/PrepareTreeAccess.do"><bean:message key="app.access.back"/></html:link>
-		</div>
+		<%--div class="submit">
+			<html:link page="/PrepareTreeAccess.do"><bean:message key="data.access.jeux"/></html:link>
+		</div--%>
 		<jsp:include page="files.jsp"/>
 		<div class="submit">
-			<html:link page="/PrepareTreeAccess.do"><bean:message key="app.access.back"/></html:link>
+			<html:link page="/PrepareTreeAccess.do"><bean:message key="data.access.jeux"/></html:link>
 		</div>
 		<br><br>
Index: /ether_megapoli/trunk/web/data/access/metadataInfo.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/metadataInfo.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/metadataInfo.jsp	(revision 161)
@@ -1,8 +1,6 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
 <%@ page import="com.medias.Calcul"%>
-<%@ page import="org.medias.megapoli.model.xml.metadata.ExactTime"%>
-<%@ page import="org.medias.megapoli.model.xml.metadata.Metadata"%>
-<%@ page import="com.medias.Calcul" %>
-<%@ page import="com.medias.Context" %>
+<%@ page import="com.medias.xml.metadata.ExactTime"%>
+<%@ page import="com.medias.xml.metadata.Metadata"%>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -21,4 +19,5 @@
 		<bean:message key="app.title"/> - <bean:message key="data.upload.metadata"/>
 	</tiles:put>
+<bean:define id="download" value="download"/>
 <nested:root name="metadataForm">
 	<tiles:put name="bodytitle" type="string">
@@ -38,7 +37,7 @@
 			<nested:nest property="metadata">	
 			
-				<div class="submit">
-					<html:link page="/JeuxAccess.do"><bean:message key="app.access.jeu.back"/></html:link>
-				</div>
+				<%--div class="submit">
+					<html:link page="/JeuxAccess.do"><bean:message key="data.access.jeux"/></html:link>
+				</div--%>
 				<div id="level2">
 					<hr/>
@@ -72,5 +71,5 @@
 					<div class="hdp">
 						<html:link page="/data/access/metadataInfo.jsp" anchor="top" titleKey="app.hdp">
-							<html:img page="/resources/images/utils/hdp1.png"/>
+							<html:img page="/images/utils/hdp1.png"/>
 						</html:link>
 					</div>
@@ -156,7 +155,14 @@
 											<bean:write name="b_nbfichiers"/>
 											<logic:notEqual name="b_nbfichiers" value="0">
-												(<nested:link page="/FichiersAccess.do" titleKey="data.access.download.file" paramId="idJeu" paramProperty="jeuId">
-													<bean:message key="data.access.metadata.fichierslink"/>
-												</nested:link>)
+												(<logic:notPresent name="SES_USER" scope="session">
+													<html:link page="/InitLogonAccess.do" paramName="download" paramId="source">
+														<bean:message key="data.access.metadata.fichierslink"/>
+													</html:link>
+												</logic:notPresent>
+												<logic:present name="SES_USER" scope="session">
+													<nested:link page="/FichiersAccess.do" titleKey="data.access.download.file" paramId="idJeu" paramProperty="jeuId">
+														<bean:message key="data.access.metadata.fichierslink"/>
+													</nested:link>
+												</logic:present>)
 											</logic:notEqual>
 										</td>
@@ -289,5 +295,5 @@
 					<div class="hdp">
 						<html:link page="/data/access/metadataInfo.jsp" anchor="top" titleKey="app.hdp">
-							<html:img page="/resources/images/utils/hdp1.png"/>
+							<html:img page="/images/utils/hdp1.png"/>
 						</html:link>
 					</div>
@@ -309,5 +315,4 @@
 												<tr>
 													<td style="width:155px;" nowrap>
-														-&nbsp;
 														<nested:define id="idPl" property="idPlateforme"/>
 														<bean:define id="id" value="${idPl}_${nomJeu}"/>
@@ -358,5 +363,5 @@
 							<div class="hdp">
 								<html:link page="/data/access/metadataInfo.jsp" anchor="top" titleKey="app.hdp">
-									<html:img page="/resources/images/utils/hdp1.png"/>
+									<html:img page="/images/utils/hdp1.png"/>
 								</html:link>
 							</div>
@@ -374,9 +379,8 @@
 												<tr>
 													<td style="width:155px;" nowrap>
-														-&nbsp;
 														<nested:define id="idPr" property="idParametre"/>
 														<bean:define id="id" value="${idPr}_${nomJeu}"/>
 														<html:link page="/DescParametre.do" titleKey="data.access.param4" paramName="id" paramId="idParam">
-															<nested:write property="nom"/>
+															<nested:write property="nom"/> (<nested:write property="abrev"/>)
 														</html:link>
 													</td>
@@ -403,5 +407,5 @@
 							<div class="hdp">
 								<html:link page="/data/access/metadataInfo.jsp" anchor="top" titleKey="app.hdp">
-									<html:img page="/resources/images/utils/hdp1.png"/>
+									<html:img page="/images/utils/hdp1.png"/>
 								</html:link>
 							</div>
@@ -419,5 +423,4 @@
 												<tr>
 													<td style="width:155px;" nowrap>
-														-&nbsp;
 														<nested:define id="idC" property="idCapteur"/>
 														<bean:define id="id" value="${idC}_${nomJeu}"/>
@@ -426,4 +429,7 @@
 															<nested:notEqual property="modele" value="UNKNOWN">
 																- <nested:write property="modele"/>
+															</nested:notEqual>
+															<nested:notEqual property="fabriquant" value="UNKNOWN">
+																- <nested:write property="fabriquant"/>
 															</nested:notEqual>
 															<nested:notEqual property="num" value="UNKNOWN">
@@ -468,5 +474,5 @@
 					<div class="hdp">
 						<html:link page="/data/upload/metadata.jsp" anchor="top" titleKey="app.hdp">
-							<html:img page="/resources/images/utils/hdp1.png"/>
+							<html:img page="/images/utils/hdp1.png"/>
 						</html:link>
 					</div>
@@ -520,13 +526,26 @@
 								</table>
 								<nested:greaterThan name="b_nbFiles" value="0">
-									<nested:link page="/FichiersAccess.do" titleKey="data.access.download.file" paramId="idJeu" paramProperty="jeuId">
-										<bean:write name="b_nbFiles"/>
-										<nested:equal name="b_nbFiles" value="1">
-											<bean:message arg0="" key="data.access.metadata.file"/>&nbsp;
-										</nested:equal>
-										<nested:greaterThan name="b_nbFiles" value="1">
-											<bean:message arg0="s" key="data.access.metadata.file"/>&nbsp;
-										</nested:greaterThan>
-									</nested:link>
+									<logic:notPresent name="SES_USER" scope="session">
+										<html:link page="/InitLogonAccess.do" paramName="download" paramId="source">
+											<bean:write name="b_nbFiles"/>
+											<nested:equal name="b_nbFiles" value="1">
+												<bean:message arg0="" key="data.access.metadata.file2"/>&nbsp;
+											</nested:equal>
+											<nested:greaterThan name="b_nbFiles" value="1">
+												<bean:message arg0="s" key="data.access.metadata.file2"/>&nbsp;
+											</nested:greaterThan>
+										</html:link>
+									</logic:notPresent>
+									<logic:present name="SES_USER" scope="session">
+										<nested:link page="/FichiersAccess.do" titleKey="data.access.download.file" paramId="idJeu" paramProperty="jeuId">
+											<bean:write name="b_nbFiles"/>
+											<nested:equal name="b_nbFiles" value="1">
+												<bean:message arg0="" key="data.access.metadata.file2"/>&nbsp;
+											</nested:equal>
+											<nested:greaterThan name="b_nbFiles" value="1">
+												<bean:message arg0="s" key="data.access.metadata.file2"/>&nbsp;
+											</nested:greaterThan>
+										</nested:link>
+									</logic:present>
 									<nested:notEqual name="b_dateD" value="${b_dateF}">
 										<bean:message arg0="${b_dateD}" arg1="${b_dateF}" key="data.access.metadata.file.differentDate"/>&nbsp;
@@ -543,5 +562,5 @@
 						<div class="hdp">
 							<html:link page="/data/access/metadataInfo.jsp" anchor="top" titleKey="app.hdp">
-								<html:img page="/resources/images/utils/hdp1.png"/>
+								<html:img page="/images/utils/hdp1.png"/>
 							</html:link>
 						</div>
@@ -549,5 +568,5 @@
 				</div>
 				<div class="submit">
-					<html:link page="/JeuxAccess.do"><bean:message key="app.access.jeu.back"/></html:link>
+					<html:link page="/JeuxAccess.do"><bean:message key="data.access.jeux"/></html:link>
 				</div>
 			</nested:nest>
Index: /ether_megapoli/trunk/web/data/access/nav.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/nav.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/nav.jsp	(revision 161)
@@ -5,5 +5,7 @@
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
 <!-- barre dÃ©crivant la position de la page dans l'arborescence du site -->
-<html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&gt;
-<html:link page="/data/data.jsp"><bean:message key="data"/></html:link>&gt;
-<html:link page="/data/access/access.jsp"><bean:message key="data.access"/>&gt;</html:link>
+<ul>
+<li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></li>
+<%--li><html:link page="/data/data.jsp"><bean:message key="data"/></html:link></li--%>
+<li><html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link></li>
+</ul>
Index: /ether_megapoli/trunk/web/data/access/navCapt.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/navCapt.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/navCapt.jsp	(revision 161)
@@ -5,7 +5,9 @@
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
 <!-- barre dÃ©crivant la position de la page dans l'arborescence du site -->
-<html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&gt;
-<html:link page="/data/data.jsp"><bean:message key="data"/></html:link>&gt;
-<html:link page="/data/access/access.jsp"><bean:message key="data.access"/>&gt;</html:link>
-<html:link page="/CapteursAccess.do"><bean:message key="data.access.capt"/>&gt;</html:link>
-<html:link page="/data/access/desc_capt.jsp"><bean:message key="data.access.capt4"/>&gt;</html:link>
+<ul>
+<li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></li>
+<%--li><html:link page="/data/data.jsp"><bean:message key="data"/></html:link></li--%>
+<li><html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link></li>
+<li><html:link page="/CapteursAccess.do"><bean:message key="data.access.capt"/></html:link></li>
+<li><html:link page="/data/access/desc_capt.jsp"><bean:message key="data.access.capt4"/></html:link></li>
+</ul>
Index: /ether_megapoli/trunk/web/data/access/navCapts.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/navCapts.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/navCapts.jsp	(revision 161)
@@ -5,6 +5,8 @@
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
 <!-- barre dÃ©crivant la position de la page dans l'arborescence du site -->
-<html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&gt;
-<html:link page="/data/data.jsp"><bean:message key="data"/></html:link>&gt;
-<html:link page="/data/access/access.jsp"><bean:message key="data.access"/>&gt;</html:link>
-<html:link page="/data/access/capt.jsp"><bean:message key="data.access.capt"/>&gt;</html:link>
+<ul>
+<li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></li>
+<%--li><html:link page="/data/data.jsp"><bean:message key="data"/></html:link></li--%>
+<li><html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link></li>
+<li><html:link page="/data/access/capt.jsp"><bean:message key="data.access.capt"/></html:link></li>
+</ul>
Index: /ether_megapoli/trunk/web/data/access/navDatas.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/navDatas.jsp	(revision 161)
+++ /ether_megapoli/trunk/web/data/access/navDatas.jsp	(revision 161)
@@ -0,0 +1,11 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean"%>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
+<!-- barre dÃ©crivant la position de la page dans l'arborescence du site -->
+<ul>
+<li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></li>
+<%--li><html:link page="/data/data.jsp"><bean:message key="data"/></html:link></li--%>
+<li><html:link page="/data/access/extract.jsp"><bean:message key="data.access.extract"/></html:link></li>
+</ul>
Index: /ether_megapoli/trunk/web/data/access/navFiles.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/navFiles.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/navFiles.jsp	(revision 161)
@@ -5,7 +5,9 @@
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
 <!-- barre dÃ©crivant la position de la page dans l'arborescence du site -->
-<html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&gt;
-<html:link page="/data/data.jsp"><bean:message key="data"/></html:link>&gt;
-<html:link page="/data/access/access.jsp"><bean:message key="data.access"/>&gt;</html:link>
-<html:link page="/data/access/jeux.jsp"><bean:message key="data.access.jeux"/>&gt;</html:link>
-<html:link page="/data/access/files.jsp"><bean:message key="data.access.files"/>&gt;</html:link>
+<ul>
+<li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></li>
+<%--li><html:link page="/data/data.jsp"><bean:message key="data"/></html:link></li--%>
+<li><html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link></li>
+<li><html:link page="/data/access/jeux.jsp"><bean:message key="data.access.jeux"/></html:link></li>
+<li><html:link page="/data/access/files.jsp"><bean:message key="data.access.files"/></html:link></li>
+</ul>
Index: /ether_megapoli/trunk/web/data/access/navJeux.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/navJeux.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/navJeux.jsp	(revision 161)
@@ -5,6 +5,8 @@
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
 <!-- barre dÃ©crivant la position de la page dans l'arborescence du site -->
-<html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&gt;
-<html:link page="/data/data.jsp"><bean:message key="data"/></html:link>&gt;
-<html:link page="/data/access/access.jsp"><bean:message key="data.access"/>&gt;</html:link>
-<html:link page="/data/access/jeux.jsp"><bean:message key="data.access.jeux"/>&gt;</html:link>
+<ul>
+<li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></li>
+<%--li><html:link page="/data/data.jsp"><bean:message key="data"/></html:link></li--%>
+<li><html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link></li>
+<li><html:link page="/data/access/jeux.jsp"><bean:message key="data.access.jeux"/></html:link></li>
+</ul>
Index: /ether_megapoli/trunk/web/data/access/navParam.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/navParam.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/navParam.jsp	(revision 161)
@@ -5,7 +5,9 @@
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
 <!-- barre dÃ©crivant la position de la page dans l'arborescence du site -->
-<html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&gt;
-<html:link page="/data/data.jsp"><bean:message key="data"/></html:link>&gt;
-<html:link page="/data/access/access.jsp"><bean:message key="data.access"/>&gt;</html:link>
-<html:link page="/ParametresAccess.do"><bean:message key="data.access.param"/>&gt;</html:link>
-<html:link page="/data/access/desc_param.jsp"><bean:message key="data.access.param4"/>&gt;</html:link>
+<ul>
+<li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></li>
+<%--li><html:link page="/data/data.jsp"><bean:message key="data"/></html:link></li--%>
+<li><html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link></li>
+<li><html:link page="/ParametresAccess.do"><bean:message key="data.access.param"/></html:link></li>
+<li><html:link page="/data/access/desc_param.jsp"><bean:message key="data.access.param4"/></html:link></li>
+</ul>
Index: /ether_megapoli/trunk/web/data/access/navParams.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/navParams.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/navParams.jsp	(revision 161)
@@ -5,6 +5,8 @@
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
 <!-- barre dÃ©crivant la position de la page dans l'arborescence du site -->
-<html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&gt;
-<html:link page="/data/data.jsp"><bean:message key="data"/></html:link>&gt;
-<html:link page="/data/access/access.jsp"><bean:message key="data.access"/>&gt;</html:link>
-<html:link page="/data/access/param.jsp"><bean:message key="data.access.param"/>&gt;</html:link>
+<ul>
+<li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></li>
+<%--li><html:link page="/data/data.jsp"><bean:message key="data"/></html:link></li--%>
+<li><html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link></li>
+<li><html:link page="/data/access/param.jsp"><bean:message key="data.access.param"/></html:link></li>
+</ul>
Index: /ether_megapoli/trunk/web/data/access/navPlat.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/navPlat.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/navPlat.jsp	(revision 161)
@@ -5,7 +5,9 @@
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
 <!-- barre dÃ©crivant la position de la page dans l'arborescence du site -->
-<html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&gt;
-<html:link page="/data/data.jsp"><bean:message key="data"/></html:link>&gt;
-<html:link page="/data/access/access.jsp"><bean:message key="data.access"/>&gt;</html:link>
-<html:link page="/PlateformesAccess.do"><bean:message key="data.access.plat"/>&gt;</html:link>
-<html:link page="/data/access/desc_plat.jsp"><bean:message key="data.access.plat4"/>&gt;</html:link>
+<ul>
+<li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></li>
+<%--li><html:link page="/data/data.jsp"><bean:message key="data"/></html:link></li--%>
+<li><html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link></li>
+<li><html:link page="/PlateformesAccess.do"><bean:message key="data.access.plat"/></html:link></li>
+<li><html:link page="/data/access/desc_plat.jsp"><bean:message key="data.access.plat4"/></html:link></li>
+</ul>
Index: /ether_megapoli/trunk/web/data/access/navPlats.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/navPlats.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/navPlats.jsp	(revision 161)
@@ -5,6 +5,8 @@
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
 <!-- barre dÃ©crivant la position de la page dans l'arborescence du site -->
-<html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&gt;
-<html:link page="/data/data.jsp"><bean:message key="data"/></html:link>&gt;
-<html:link page="/data/access/access.jsp"><bean:message key="data.access"/>&gt;</html:link>
-<html:link page="/data/access/plat.jsp"><bean:message key="data.access.plat"/>&gt;</html:link>
+<ul>
+<li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></li>
+<%--li><html:link page="/data/data.jsp"><bean:message key="data"/></html:link></li--%>
+<li><html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link></li>
+<li><html:link page="/data/access/plat.jsp"><bean:message key="data.access.plat"/></html:link></li>
+</ul>
Index: /ether_megapoli/trunk/web/data/access/param.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/param.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/param.jsp	(revision 161)
@@ -2,6 +2,4 @@
 <%@ page import="com.medias.Calcul"%>
 <%@ page import="java.util.ArrayList"%>
-<%@ page import="com.medias.Calcul" %>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -34,7 +32,7 @@
 		</div>
 		
-		<div class="submit">
+		<%--div class="submit">
 			<html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link>
-		</div>
+		</div--%>
 		
 		<nested:root name="parametresForm">
@@ -52,13 +50,20 @@
 				</logic:notEqual>
 			</th></tr>
-			<tr><td>
-				<nested:iterate property="parametres" indexId="paramId">
+
+			<bean:define id="nomCatPrec" value=""/>
+			<nested:iterate property="parametres" indexId="paramId">
+				<nested:nest property="categorieParam">
+					<nested:define id="nomCat" property="categorieParamNom"/>
+				</nested:nest>
+				<tr><td>
+					<nested:notEqual name="nomCat" value="${nomCatPrec}">
+						<div id="messages"><bean:write name="nomCat"/>&nbsp;:</div>
+					</nested:notEqual>
 					<bean:define type="java.lang.String" id="parite" value="<%=Calcul.getParite(paramId.intValue())%>"/>
 					<logic:equal name="parite" value="pair"><bean:define id="idP" value="pair"/></logic:equal>
 					<logic:equal name="parite" value="impair"><bean:define id="idP" value="impair"/></logic:equal>
-						<table class="${idP}">
+					<table class="${idP}" style="margin-left: 20px">
 						<tr>
-							<td style="width:155px;" rowspan="2" nowrap>
-								-&nbsp;
+							<td style="width:155px;" nowrap>
 								<nested:define id="id" property="parametreId"/>
 								<html:link page="/DescParametre.do" titleKey="data.access.param4" paramName="id" paramId="idParam">
@@ -68,19 +73,19 @@
 						</tr>
 					</table>
-				</nested:iterate>
-			</td></tr>
-			<tr><td>&nbsp;</td></tr>
+					<bean:define id="nomCatPrec" value="${nomCat}"/>
+				</td></tr>
+			</nested:iterate>
 		</table>
 
 		<div class="hdp" align="right">
 			<html:link page="/data/access/param.jsp" anchor="top" titleKey="app.hdp">
-				<html:img page="/resources/images/utils/hdp1.png"/>
+				<html:img page="/images/utils/hdp1.png"/>
 			</html:link>
 		</div>
 		</nested:root>
 
-		<div class="submit">
+		<%--div class="submit">
 			<html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link>
-		</div>
+		</div--%>
 		
 	</tiles:put>
Index: /ether_megapoli/trunk/web/data/access/plat.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/access/plat.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/access/plat.jsp	(revision 161)
@@ -2,6 +2,4 @@
 <%@ page import="com.medias.Calcul"%>
 <%@ page import="java.util.ArrayList"%>
-<%@ page import="com.medias.Context" %>
-<%@ page import="com.medias.Calcul" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -34,7 +32,7 @@
 		</div>
 		
-		<div class="submit">
+		<%--div class="submit">
 			<html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link>
-		</div>
+		</div--%>
 		
 		<nested:root name="plateformesForm">
@@ -67,8 +65,7 @@
 						<logic:equal name="parite" value="pair"><bean:define id="idP" value="pair"/></logic:equal>
 						<logic:equal name="parite" value="impair"><bean:define id="idP" value="impair"/></logic:equal>
-						<table class="${idP}">
+						<table class="${idP}" style="margin-left: 20px">
 							<tr>
 								<td style="width:155px;" nowrap>
-									-&nbsp;
 									<nested:define id="id" property="plateformeId"/>
 									<html:link page="/DescPlateforme.do" titleKey="data.access.plat4" paramName="id" paramId="idPlat">
@@ -96,8 +93,7 @@
 						<logic:equal name="parite" value="pair"><bean:define id="idP" value="pair"/></logic:equal>
 						<logic:equal name="parite" value="impair"><bean:define id="idP" value="impair"/></logic:equal>
-						<table class="${idP}">
+						<table class="${idP}" style="margin-left: 20px">
 							<tr>
 								<td style="width:155px;" rowspan="2" nowrap>
-									-&nbsp;
 									<nested:define id="id" property="plateformeId"/>
 									<html:link page="/DescPlateforme.do" titleKey="data.access.plat4" paramName="id" paramId="idPlat">
@@ -118,12 +114,12 @@
 		<div class="hdp" align="right">
 			<html:link page="/data/access/plat.jsp" anchor="top" titleKey="app.hdp">
-				<html:img page="/resources/images/utils/hdp1.png"/>
+				<html:img page="/images/utils/hdp1.png"/>
 			</html:link>
 		</div>
 		</nested:root>
 
-		<div class="submit">
+		<%--div class="submit">
 			<html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link>
-		</div>
+		</div--%>
 	</tiles:put>
 </tiles:insert>
Index: /ether_megapoli/trunk/web/data/data.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/data.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/data.jsp	(revision 161)
@@ -1,4 +1,3 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -30,11 +29,24 @@
 			<li>
 <%--				<html:link page="/InitLogon.do" paramName="upload" paramId="source"><bean:message key="data.upload"/></html:link> --%>
-				<html:link page="/InitLogon.do" paramName="upload" paramId="source"><bean:message key="data.upload"/></html:link>
+				<logic:notPresent name="SES_USER" scope="session">
+					<html:link page="/InitLogon.do" paramName="upload" paramId="source"><bean:message key="data.upload"/></html:link>
+				</logic:notPresent>
+				<logic:present name="SES_USER" scope="session">
+					<html:link page="/PrepareTree.do"><bean:message key="data.upload"/></html:link>
+				</logic:present>
 				 : <bean:message key="data.upload.intro"/>
 			</li>
 			<li>
-<%--				<html:link page="/InitLogon.do" paramName="access" paramId="source"><bean:message key="data.access"/></html:link> --%>
-					<html:link page="/data/access/access.jsp" paramName="access" paramId="source"><bean:message key="data.access"/></html:link>
+				<html:link page="/data/access/access.jsp"><bean:message key="data.access"/></html:link>
 				 : <bean:message key="data.access.intro"/>
+			</li>
+			<li>
+				<logic:notPresent name="SES_USER" scope="session">
+					<html:link page="/InitLogonAccess.do" paramName="access" paramId="source"><bean:message key="data.access.extract"/></html:link>
+				</logic:notPresent>
+				<logic:present name="SES_USER" scope="session">
+					<html:link page="/DataAccess.do"><bean:message key="data.access.extract"/></html:link>
+				</logic:present>
+				 : <bean:message key="data.access.intro2"/>
 			</li>
 		</ul>
Index: /ether_megapoli/trunk/web/data/logon.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/logon.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/logon.jsp	(revision 161)
@@ -1,4 +1,3 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
Index: /ether_megapoli/trunk/web/data/logonAccess.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/logonAccess.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/logonAccess.jsp	(revision 161)
@@ -1,4 +1,3 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -38,11 +37,10 @@
 
 	<tiles:put name="bodytitle" type="string">
-	<logic:present name="SES_USER">
+	<%--logic:present name="SES_USER">
 		<bean:message key="data.download"/>
 	</logic:present>
-
-	<logic:notPresent name="SES_USER">
+	<logic:notPresent name="SES_USER"--%>
 		<bean:message key="data.authentification"/>
-	</logic:notPresent>
+	<%--/logic:notPresent--%>
 	</tiles:put>
 
@@ -63,13 +61,10 @@
 							<td><bean:message key="data.authentification.login"/> : </td>
 							<td><html:text property="login"/></td>
-<%--							<td>&nbsp;</td> --%>
 						</tr>
 						<tr>
 							<td><bean:message key="data.authentification.pwd"/> : </td>
 							<td><html:password property="pwd"/></td>
-<%--							<td>&nbsp;</td> --%>
 						</tr>
 						<tr>
-<%--							<td>&nbsp;</td> --%>
 							<td>&nbsp;</td>
 							<td align="right">
Index: /ether_megapoli/trunk/web/data/nav.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/nav.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/nav.jsp	(revision 161)
@@ -5,4 +5,6 @@
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
 <!-- barre dÃ©crivant la position de la page dans l'arborescence du site -->
-<html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&gt;
-<html:link page="/data/data.jsp"><bean:message key="data"/></html:link>&gt;
+<ul>
+<li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></li>
+<%--li><html:link page="/data/data.jsp"><bean:message key="data"/></html:link></li--%>
+</ul>
Index: /ether_megapoli/trunk/web/data/upload/arborescence.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/upload/arborescence.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/upload/arborescence.jsp	(revision 161)
@@ -1,6 +1,6 @@
-<%@ page import="com.medias.Context"%>
-<%@ page import="org.medias.megapoli.model.xml.hierarchie.Hierarchie"%>		
+<%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
+<%@ page import="com.medias.xml.hierarchie.Hierarchie"%>
 		
-<%@ page language="java" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html"%>
Index: /ether_megapoli/trunk/web/data/upload/deleteFile.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/upload/deleteFile.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/upload/deleteFile.jsp	(revision 161)
@@ -1,4 +1,3 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
Index: /ether_megapoli/trunk/web/data/upload/deleteSet.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/upload/deleteSet.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/upload/deleteSet.jsp	(revision 161)
@@ -1,4 +1,3 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
Index: /ether_megapoli/trunk/web/data/upload/files.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/upload/files.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/upload/files.jsp	(revision 161)
@@ -1,4 +1,4 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="org.medias.megapoli.model.xml.hierarchie.Hierarchie"%>		
+<%@ page import="com.medias.xml.hierarchie.Hierarchie"%>
 		
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
@@ -10,18 +10,18 @@
 
 <div id="level1">
-	<html:img page="/resources/images/utils/folder.png" alt="folder"/>&nbsp;<bean:message key="data.categ1"/>
+	<html:img page="/images/utils/folder.png" alt="folder"/>&nbsp;<bean:message key="data.categ1"/>
 	<div id="level2">
 		<%--html:form action="/ConfirmDeletion">
-			<html:img page="/resources/images/utils/folder.png" alt="folder"/>&nbsp;GRAZ
+			<html:img page="/images/utils/folder.png" alt="folder"/>&nbsp;GRAZ
 			<logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur">
 				&nbsp;
 				<html:hidden property="path" value="AVION/GRAZ"/>
-				<html:image page="/resources/images/utils/delete.png" alt="delete"/>
+				<html:image page="/images/utils/delete.png" alt="delete"/>
 			</logic:equal>
 		</html:form>
 		<div id="level2">
-			<bean:define id="path" value="<%=((Hierarchie)(application.getAttribute("APP_UPLOADTREE"))).getDataRoot()+"/"+"AVION/GRAZ/GRAZ_metadata.com.medias.xml"%>"/>
+			<bean:define id="path" value="<%=((Hierarchie)(application.getAttribute("APP_UPLOADTREE"))).getDataRoot()+"/"+"AVION/GRAZ/GRAZ_metadata.xml"%>"/>
 			<html:link page="/LoadMetadata.do" paramName="path" paramId="metadataUri" titleKey="data.upload.metadata.link">
-				<html:img page="/resources/images/utils/metadata.png" alt="metadata"/>&nbsp;GRAZ_metadata.com.medias.xml
+				<html:img page="/images/utils/metadata.png" alt="metadata"/>&nbsp;GRAZ_metadata.xml
 			</html:link>
 		</div>
@@ -29,5 +29,5 @@
 			<bean:define id="path" value="AVION/GRAZ"/>
 			<html:link page="/PrepareFileList.do" titleKey="data.upload.listFiles" paramId="setPath" paramName="path">
-				<html:img page="/resources/images/utils/text.png" altKey="data.upload.listFiles"/>
+				<html:img page="/images/utils/text.png" altKey="data.upload.listFiles"/>
 				&nbsp;
 				<bean:define id="nbFiles"  value="<%=""+((Hierarchie)(application.getAttribute("APP_UPLOADTREE"))).getNbFiles("AVION/GRAZ")%>"/>
@@ -50,5 +50,5 @@
 			<logic:equal name="modify" value="true">
 				<div id="level2">
-							<html:img page="/resources/images/utils/uploadText.png" alt="upload"/>&nbsp; <html:file property="newFile"/> &nbsp;
+							<html:img page="/images/utils/uploadText.png" alt="upload"/>&nbsp; <html:file property="newFile"/> &nbsp; 
 							<html:hidden property="path" value="AVION/GRAZ"/><html:submit/>
 				</div>
@@ -60,5 +60,5 @@
 		<div id="level2">
 			<html:link page="/InitNewSet.do" titleKey="data.upload.newSet" paramId="categorie" paramName="parent">
-				<html:img page="/resources/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
+				<html:img page="/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
 			</html:link>
 		</div>
@@ -66,10 +66,10 @@
 </div>
 <%--div id="level1">
-	<html:img page="/resources/images/utils/folder.png" alt="folder"/>&nbsp;BALLON
+	<html:img page="/images/utils/folder.png" alt="folder"/>&nbsp;BALLON
 	<logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur">
 		<bean:define id="parent" value="BALLON"/>
 		<div id="level2">
 			<html:link page="/InitNewSet.do" titleKey="data.upload.newSet" paramId="categorie" paramName="parent">
-				<html:img page="/resources/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
+				<html:img page="/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
 			</html:link>
 		</div>
@@ -77,10 +77,10 @@
 </div>
 <div id="level1">
-	<html:img page="/resources/images/utils/folder.png" alt="folder"/>&nbsp;PROFILEUR
+	<html:img page="/images/utils/folder.png" alt="folder"/>&nbsp;PROFILEUR
 	<logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur">
 		<bean:define id="parent" value="PROFILEUR"/>
 		<div id="level2">
 			<html:link page="/InitNewSet.do" titleKey="data.upload.newSet" paramId="categorie" paramName="parent">
-				<html:img page="/resources/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
+				<html:img page="/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
 			</html:link>
 		</div>
@@ -88,10 +88,10 @@
 </div>
 <div id="level1">
-	<html:img page="/resources/images/utils/folder.png" alt="folder"/>&nbsp;RADAR
+	<html:img page="/images/utils/folder.png" alt="folder"/>&nbsp;RADAR
 	<logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur">
 		<bean:define id="parent" value="RADAR"/>
 		<div id="level2">
 			<html:link page="/InitNewSet.do" titleKey="data.upload.newSet" paramId="categorie" paramName="parent">
-				<html:img page="/resources/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
+				<html:img page="/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
 			</html:link>
 		</div>
@@ -99,18 +99,18 @@
 </div>
 <div id="level1">
-	<html:img page="/resources/images/utils/folder.png" alt="folder"/>&nbsp;SATELLITE
+	<html:img page="/images/utils/folder.png" alt="folder"/>&nbsp;SATELLITE
 	<div id="level2">
 		<html:form action="/ConfirmDeletion">
-			<html:img page="/resources/images/utils/folder.png" alt="folder"/>&nbsp;VBZ
+			<html:img page="/images/utils/folder.png" alt="folder"/>&nbsp;VBZ
 			<logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur">
 				&nbsp;
 				<html:hidden property="path" value="SATELLITE/VBZ"/>
-				<html:image page="/resources/images/utils/delete.png" alt="delete"/>
+				<html:image page="/images/utils/delete.png" alt="delete"/>
 			</logic:equal>
 		</html:form>
 		<div id="level2">
-			<bean:define id="path" value="<%=((Hierarchie)(application.getAttribute("APP_UPLOADTREE"))).getDataRoot()+"/"+"SATELLITE/VBZ/VBZ_metadata.com.medias.xml"%>"/>
+			<bean:define id="path" value="<%=((Hierarchie)(application.getAttribute("APP_UPLOADTREE"))).getDataRoot()+"/"+"SATELLITE/VBZ/VBZ_metadata.xml"%>"/>
 			<html:link page="/LoadMetadata.do" paramName="path" paramId="metadataUri" titleKey="data.upload.metadata.link">
-				<html:img page="/resources/images/utils/metadata.png" alt="metadata"/>&nbsp;VBZ_metadata.com.medias.xml
+				<html:img page="/images/utils/metadata.png" alt="metadata"/>&nbsp;VBZ_metadata.xml
 			</html:link>
 		</div>
@@ -118,5 +118,5 @@
 			<bean:define id="path" value="SATELLITE/VBZ"/>
 			<html:link page="/PrepareFileList.do" titleKey="data.upload.listFiles" paramId="setPath" paramName="path">
-				<html:img page="/resources/images/utils/text.png" altKey="data.upload.listFiles"/>
+				<html:img page="/images/utils/text.png" altKey="data.upload.listFiles"/>
 				&nbsp;
 				<bean:define id="nbFiles"  value="<%=""+((Hierarchie)(application.getAttribute("APP_UPLOADTREE"))).getNbFiles("SATELLITE/VBZ")%>"/>
@@ -139,5 +139,5 @@
 			<logic:equal name="modify" value="true">
 				<div id="level2">
-							<html:img page="/resources/images/utils/uploadText.png" alt="upload"/>&nbsp; <html:file property="newFile"/> &nbsp;
+							<html:img page="/images/utils/uploadText.png" alt="upload"/>&nbsp; <html:file property="newFile"/> &nbsp; 
 							<html:hidden property="path" value="SATELLITE/VBZ"/><html:submit/>
 				</div>
@@ -149,5 +149,5 @@
 		<div id="level2">
 			<html:link page="/InitNewSet.do" titleKey="data.upload.newSet" paramId="categorie" paramName="parent">
-				<html:img page="/resources/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
+				<html:img page="/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
 			</html:link>
 		</div>
@@ -155,10 +155,10 @@
 </div--%>
 <div id="level1">
-	<html:img page="/resources/images/utils/folder.png" alt="folder"/>&nbsp;<bean:message key="data.categ2"/>
+	<html:img page="/images/utils/folder.png" alt="folder"/>&nbsp;<bean:message key="data.categ2"/>
 	<logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur">
 		<bean:define id="parent" value="SURF_FIXE"/>
 		<div id="level2">
 			<html:link page="/InitNewSet.do" titleKey="data.upload.newSet" paramId="categorie" paramName="parent">
-				<html:img page="/resources/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
+				<html:img page="/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
 			</html:link>
 		</div>
@@ -166,10 +166,10 @@
 </div>
 <div id="level1">
-	<html:img page="/resources/images/utils/folder.png" alt="folder"/>&nbsp;<bean:message key="data.categ3"/>
+	<html:img page="/images/utils/folder.png" alt="folder"/>&nbsp;<bean:message key="data.categ3"/>
 	<logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur">
 		<bean:define id="parent" value="SURF_MOBILE"/>
 		<div id="level2">
 			<html:link page="/InitNewSet.do" titleKey="data.upload.newSet" paramId="categorie" paramName="parent">
-				<html:img page="/resources/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
+				<html:img page="/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
 			</html:link>
 		</div>
Index: /ether_megapoli/trunk/web/data/upload/listFiles.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/upload/listFiles.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/upload/listFiles.jsp	(revision 161)
@@ -1,4 +1,3 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -19,6 +18,7 @@
 
 	<tiles:put name="bodytitle" type="string">
-		<bean:define id="set" name="jeu" scope="session"/>
-		<bean:message arg0='<%=""+set%>' key="data.upload.listFiles.title"/>
+		<bean:define id="categ" name="categ" scope="session"/>
+		<bean:define id="jeu" name="jeu" scope="session"/>
+		<bean:message arg0="${jeu}" key="data.upload.listFiles.title"/>
 	</tiles:put>
 
@@ -26,10 +26,10 @@
 		<%-- Place here the content of your page --%>
 		&nbsp;
-		<div class="submit">
-			<html:link page="/PrepareTree.do"><bean:message key="app.back"/></html:link>
-		</div>
+		<%--div class="submit">
+			<html:link page="/PrepareTree.do"><bean:message key="data.upload"/></html:link>
+		</div--%>
 		<jsp:include page="files.jsp"/>
 		<div class="submit">
-			<html:link page="/PrepareTree.do"><bean:message key="app.back"/></html:link>
+			<html:link page="/PrepareTree.do"><bean:message key="data.upload"/></html:link>
 		</div>
 		<br><br>
Index: /ether_megapoli/trunk/web/data/upload/metadata.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/upload/metadata.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/upload/metadata.jsp	(revision 161)
@@ -2,8 +2,6 @@
 <%@ page import="com.medias.Calcul"%>
 <%@ page import="java.util.ArrayList"%>
-<%@ page import="org.medias.megapoli.model.xml.metadata.ExactTime"%>
-<%@ page import="org.medias.megapoli.model.xml.metadata.Metadata"%>
-<%@ page import="com.medias.Context" %>
-<%@ page import="com.medias.Calcul" %>
+<%@ page import="com.medias.DateTime"%>
+<%@ page import="com.medias.xml.metadata.Metadata"%>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -90,5 +88,4 @@
 		</ul>
 		
-		
 		<html:form action="/UpdateMetadata" method="POST" enctype="multipart/form-data">
 			<nested:nest property="metadata">	
@@ -122,8 +119,10 @@
 									<td><bean:message key="data.upload.metadata.presentation.def"/> : </td>
 									<td>
-										<logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur">
+										<%--logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur"--%>
+										<logic:equal name="SES_RIGHTS" scope="session" value="write">
 											<nested:textarea cols="50" property="def"/>
 										</logic:equal>
-										<logic:notEqual name="SES_USER" property="roles" scope="session" value="coordinateur">
+										<%--logic:notEqual name="SES_USER" property="roles" scope="session" value="coordinateur"--%>
+										<logic:notEqual name="SES_RIGHTS" scope="session" value="write">
 											<nested:write property="def"/>
 										</logic:notEqual>
@@ -325,5 +324,5 @@
 					<div class="hdp">
 						<html:link page="/data/upload/metadata.jsp" anchor="top" titleKey="app.hdp">
-							<html:img page="/resources/images/utils/hdp1.png"/>
+							<html:img page="/images/utils/hdp1.png"/>
 						</html:link>
 					</div>
@@ -416,5 +415,5 @@
 										<logic:notEqual name="SES_RIGHTS" scope="session" value="write">
 											<nested:write property="repartition"/>
-										</logic:notEqual>			
+										</logic:notEqual>
 									</td>
 								</tr>
@@ -425,5 +424,5 @@
 					<div class="hdp">
 						<html:link page="/data/upload/metadata.jsp" anchor="top" titleKey="app.hdp">
-							<html:img page="/resources/images/utils/hdp1.png"/>
+							<html:img page="/images/utils/hdp1.png"/>
 						</html:link>
 					</div>
@@ -492,5 +491,10 @@
 													</logic:equal>
 													<logic:notEqual name="SES_RIGHTS" scope="session" value="write">
-														<nested:write property="nom"/>
+														<nested:equal property="nom" value="-">
+															<nested:write property="nomOth"/>
+														</nested:equal>
+														<nested:notEqual property="nom" value="-">
+															<nested:write property="nom"/>
+														</nested:notEqual>
 													</logic:notEqual>		
 												</td>
@@ -514,5 +518,5 @@
 														<logic:equal name="SES_RIGHTS" scope="session" value="write">
 															<tr><td colspan="2">
-																<html:img page="/resources/images/utils/uploadText.png" alt="upload"/>&nbsp;<nested:file property="newFile"/><html:submit property="mess" indexed="true"><bean:message key="app.deposer"/></html:submit>
+																<html:img page="/images/utils/uploadText.png" alt="upload"/>&nbsp;<nested:file property="newFile"/><html:submit property="mess" indexed="true"><bean:message key="app.deposer"/></html:submit>
 															</td></tr>
 														</logic:equal>
@@ -526,6 +530,6 @@
 																<logic:equal name="SES_RIGHTS" scope="session" value="write">
 																	<bean:define id="idPlatImg" value="${platId}_${imgId}"/>
-																	<html:link page="/UpdateMetadata.do" paramName="idPlatImg" paramId="idPI">
-																		<html:img page="/resources/images/utils/delete.png" altKey="data.upload.metadata.deletePict"/>
+																	<html:link page="/UpdateMetadata.do" paramName="idPlatImg" paramId="idPI" titleKey="data.upload.metadata.deletePict">
+																		<html:img page="/images/utils/delete.png" altKey="data.upload.metadata.deletePict"/>
 																	</html:link>
 																</logic:equal>
@@ -642,5 +646,5 @@
 							<div class="hdp">
 								<html:link page="/data/upload/metadata.jsp" anchor="top" titleKey="app.hdp">
-									<html:img page="/resources/images/utils/hdp1.png"/>
+									<html:img page="/images/utils/hdp1.png"/>
 								</html:link>
 							</div>
@@ -746,5 +750,10 @@
 													</logic:equal>
 													<logic:notEqual name="SES_RIGHTS" scope="session" value="write">
-														<nested:write property="type"/>
+														<nested:equal property="type" value="-">
+															<nested:write property="typeOth"/>
+														</nested:equal>
+														<nested:notEqual property="type" value="-">
+															<nested:write property="type"/>
+														</nested:notEqual>
 													</logic:notEqual>
 												</td>
@@ -859,5 +868,5 @@
 							<div class="hdp">
 								<html:link page="/data/upload/metadata.jsp" anchor="top" titleKey="app.hdp">
-									<html:img page="/resources/images/utils/hdp1.png"/>
+									<html:img page="/images/utils/hdp1.png"/>
 								</html:link>
 							</div>
@@ -904,6 +913,10 @@
 													</logic:equal>
 													<logic:notEqual name="SES_RIGHTS" scope="session" value="write">
-														<nested:write property="categ"/>
-														<%--nested:write property="abrev"/--%>
+														<nested:equal property="categorie" value="-">
+															<nested:write property="categOth"/>
+														</nested:equal>
+														<nested:notEqual property="categorie" value="-">
+															<nested:write property="categorie"/>
+														</nested:notEqual>
 													</logic:notEqual>
 												</td>
@@ -1036,5 +1049,5 @@
 																<option value="C2H4 (Ethylene)" <%=(paramNom.equals("C2H4 (Ethylene)")?"selected":"")%>>C2H4 (Ethylene)</option>
 																<option value="C2H6 (Ethane)" <%=(paramNom.equals("C2H6 (Ethane)")?"selected":"")%>>C2H6 (Ethane)</option>
-																<option value="C3H6 (Propylene) " <%=(paramNom.equals("C3H6 (Propylene) ")?"selected":"")%>>C3H6 (Propylene) </option>
+																<option value="C3H6 (Propylene)" <%=(paramNom.equals("C3H6 (Propylene)")?"selected":"")%>>C3H6 (Propylene)</option>
 																<option value="C3H8 (Propane)" <%=(paramNom.equals("C3H8 (Propane)")?"selected":"")%>>C3H8 (Propane)</option>
 																<option value="i-C4H10 (Iso-butane)" <%=(paramNom.equals("i-C4H10 (Iso-butane)")?"selected":"")%>>i-C4H10 (Iso-butane)</option>
@@ -1121,5 +1134,10 @@
 													</logic:equal>
 													<logic:notEqual name="SES_RIGHTS" scope="session" value="write">
-														<nested:write property="nom"/>
+														<nested:equal property="nom" value="-">
+															<nested:write property="nomOth"/>
+														</nested:equal>
+														<nested:notEqual property="nom" value="-">
+															<nested:write property="nom"/>
+														</nested:notEqual>
 													</logic:notEqual>
 												</td>
@@ -1160,5 +1178,10 @@
 													</logic:equal>
 													<logic:notEqual name="SES_RIGHTS" scope="session" value="write">
-														<nested:write property="unite"/>
+														<nested:equal property="unite" value="-">
+															<nested:write property="uniteOth"/>
+														</nested:equal>
+														<nested:notEqual property="unite" value="-">
+															<nested:write property="unite"/>
+														</nested:notEqual>
 													</logic:notEqual>		
 												</td>
@@ -1244,5 +1267,5 @@
 							<div class="hdp">
 								<html:link page="/data/upload/metadata.jsp" anchor="top" titleKey="app.hdp">
-									<html:img page="/resources/images/utils/hdp1.png"/>
+									<html:img page="/images/utils/hdp1.png"/>
 								</html:link>
 							</div>
@@ -1323,5 +1346,5 @@
 													<td>
 														<logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur">
-															<nested:text property="date"/><i>(<%=ExactTime.date_format%>)</i>
+															<nested:text property="date"/><i>(<%=DateTime.formatDateStandard%>)</i>
 														</logic:equal>
 														<logic:notEqual name="SES_USER" property="roles" scope="session" value="coordinateur">
@@ -1334,5 +1357,5 @@
 													<td>
 														<logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur">
-															<nested:text property="heure"/><i>(<%=ExactTime.heure_format%>)</i>
+															<nested:text property="heure"/><i>(<%=DateTime.formatHeureStandard%>)</i>
 														</logic:equal>
 														<logic:notEqual name="SES_USER" property="roles" scope="session" value="coordinateur">
@@ -1354,5 +1377,5 @@
 													<td>
 														<logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur">
-															<nested:text property="date"/><i>(<%=ExactTime.date_format%>)</i>
+															<nested:text property="date"/><i>(<%=DateTime.formatDateStandard%>)</i>
 														</logic:equal>
 														<logic:notEqual name="SES_USER" property="roles" scope="session" value="coordinateur">
@@ -1365,5 +1388,5 @@
 													<td>
 														<logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur">
-															<nested:text property="heure"/><i>(<%=ExactTime.heure_format%>)</i>
+															<nested:text property="heure"/><i>(<%=DateTime.formatHeureStandard%>)</i>
 														</logic:equal>
 														<logic:notEqual name="SES_USER" property="roles" scope="session" value="coordinateur">
@@ -1405,5 +1428,5 @@
 					<div class="hdp">
 						<html:link page="/data/upload/metadata.jsp" anchor="top" titleKey="app.hdp">
-							<html:img page="/resources/images/utils/hdp1.png"/>
+							<html:img page="/images/utils/hdp1.png"/>
 						</html:link>
 					</div>
Index: /ether_megapoli/trunk/web/data/upload/nav.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/upload/nav.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/upload/nav.jsp	(revision 161)
@@ -5,5 +5,7 @@
 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%>
 <!-- barre dÃ©crivant la position de la page dans l'arborescence du site -->
-<html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&gt;
-<html:link page="/data/data.jsp"><bean:message key="data"/></html:link>&gt;
-<html:link page="/data/upload/upload.jsp"><bean:message key="data.upload"/></html:link>&gt;
+<ul>
+<li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></li>
+<%--li><html:link page="/data/data.jsp"><bean:message key="data"/></html:link></li--%>
+<li><html:link page="/data/upload/upload.jsp"><bean:message key="data.upload"/></html:link></li>
+</ul>
Index: /ether_megapoli/trunk/web/data/upload/newSet.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/upload/newSet.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/upload/newSet.jsp	(revision 161)
@@ -1,5 +1,3 @@
-<%@ page language="java" import="org.medias.utils.*" %>
-<%@ page import="com.medias.Context" %>
-<%@ page import="com.medias.Calcul" %>
+<%@ page language="java" import="com.medias.*" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html"%>
@@ -116,5 +114,5 @@
 											<tr>
 												<td><nested:radio property="role" value="tech"><bean:message key="data.upload.metadata.description.tech"/></nested:radio></td>
-												<td><html:image alt="delete" indexed="true" page="/resources/images/utils/delete.png" property="mess" value="deletePers" titleKey="data.upload.metadata.deletePers"/></td>
+												<td><html:image alt="delete" indexed="true" page="/images/utils/delete.png" property="mess" value="deletePers" titleKey="data.upload.metadata.deletePers"/></td>
 											</tr>
 										</table>
Index: /ether_megapoli/trunk/web/data/upload/newSetMails.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/upload/newSetMails.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/upload/newSetMails.jsp	(revision 161)
@@ -1,5 +1,3 @@
-<%@ page language="java" import="org.medias.utils.*" %>
-<%@ page import="com.medias.Context" %>
-<%@ page import="com.medias.Calcul" %>
+<%@ page language="java" import="com.medias.*" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html"%>
@@ -53,5 +51,5 @@
 					</tr>
 					<tr>
-						<td colspan="2"><nested:textarea cols="100" rows="10" property="content"/></td>
+						<td colspan="2"><nested:textarea cols="100" rows="20" property="content"/></td>
 					</tr>
 					<tr>
Index: /ether_megapoli/trunk/web/data/upload/upload.jsp
===================================================================
--- /ether_megapoli/trunk/web/data/upload/upload.jsp	(revision 160)
+++ /ether_megapoli/trunk/web/data/upload/upload.jsp	(revision 161)
@@ -1,5 +1,4 @@
 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%>
-<%@ page import="org.medias.megapoli.model.xml.hierarchie.Hierarchie"%>
-<%@ page import="com.medias.Context" %>
+<%@ page import="com.medias.xml.hierarchie.Hierarchie"%>
 <%@ page language="java" contentType="text/html; charset=UTF-8"%>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>
@@ -26,7 +25,6 @@
 	
 		<bean:message key="data.upload.accueil"/>
-		<br><br>
+		<br>
 		<bean:message key="data.upload.howto" arg0="${webmaster}"/>		
-		<br><br>
 		<hr/>
 		
@@ -43,5 +41,5 @@
 		<nested:iterate property="categories" indexId="categorieId">
 			<div id="level1">
-	        	<html:img page="/resources/images/utils/folder.png" alt="folder"/>
+	        	<html:img page="/images/utils/folder.png" alt="folder"/>
 	        	<%--nested:write property="nomCategorie"/--%>
 	        	<bean:define id="numCateg" value='<%=""+(((Integer)categorieId).intValue()+1)%>'/>
@@ -55,9 +53,9 @@
 		        	<div id="level2">
 		                <html:form action="/ConfirmDeletion">
-		                	<html:img page="/resources/images/utils/folder.png" alt="folder"/>&nbsp;<nested:write property="nomJeu"/>
+		                	<html:img page="/images/utils/folder.png" alt="folder"/>&nbsp;<nested:write property="nomJeu"/>
 		                    <logic:equal name="SES_USER" property="roles" scope="session" value="coordinateur">
 		                    	&nbsp;
 		                        <html:hidden value="${cheminJeu}" property="path"/>
-		                        	<html:image page="/resources/images/utils/delete.png" alt="delete"/>
+		                        	<html:image page="/images/utils/delete.png" alt="delete" titleKey="data.upload.metadata.deleteJeu"/>
 		                        </logic:equal>
 		                </html:form>
@@ -66,5 +64,5 @@
 		                	<bean:define id="path" value='<%="" + ((Hierarchie)(application.getAttribute ("APP_UPLOADTREE"))).getDataRoot () + "/" + (String)cheminJeu + "/" + (String)fichierMetadonnee%>'/>
 		                    <html:link page="/LoadMetadata.do" paramName="path" paramId="metadataUri" titleKey="data.upload.metadata.link">
-		                       	<html:img page="/resources/images/utils/metadata.png" alt="metadata"/>&nbsp;
+		                       	<html:img page="/images/utils/metadata.png" alt="metadata"/>&nbsp;
 		                        	<bean:message key="data.upload.metadata"/>
 		                    </html:link>
@@ -85,5 +83,5 @@
 		                    <logic:greaterThan name="nbFiles" value="0">
 		                    	<html:link page="/PrepareFileList.do" titleKey="data.upload.listFiles" paramId="setPath" paramName="cheminJeu">
-		                        	<html:img page="/resources/images/utils/text.png" altKey="data.upload.listFiles"/>
+		                        	<html:img page="/images/utils/text.png" altKey="data.upload.listFiles"/>
 		                                                &nbsp;
 		                        	<logic:equal name="nbFiles" value="1">
@@ -120,5 +118,5 @@
 		                    <logic:equal name="modify" value="true">
 		                    	<div id="level2">
-		                        	<html:img page="/resources/images/utils/uploadText.png" alt="upload"/>&nbsp; <html:file property="newFile"/> &nbsp;
+		                        	<html:img page="/images/utils/uploadText.png" alt="upload"/>&nbsp; <html:file property="newFile"/> &nbsp;
 		                            <html:hidden property="path" value="${cheminJeu}"/><html:submit><bean:message key="app.deposer"/></html:submit>
 		                        </div>
@@ -133,5 +131,5 @@
 					<div id="level2">
 						<html:link page="/InitNewSet.do" titleKey="data.upload.newSet" paramId="categorie" paramName="parent">
-							<html:img page="/resources/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
+							<html:img page="/images/utils/newFolder.png" alt="new set"/>&nbsp;<bean:message key="data.upload.newSet"/>
 						</html:link>
 					</div>
@@ -145,5 +143,5 @@
 		<div class="hdp" align="right">
 			<html:link page="/data/upload/upload.jsp" anchor="top" titleKey="app.hdp">
-				<html:img page="/resources/images/utils/hdp1.png"/>
+				<html:img page="/images/utils/hdp1.png"/>
 			</html:link>
 		</div>
