Changeset 155
- Timestamp:
- 08/26/11 11:37:41 (13 years ago)
- Location:
- ether_megapoli/trunk
- Files:
-
- 2 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/common/implementation/log4j.xml
r123 r155 1 <? com.medias.xml version="1.0" encoding="UTF-8" ?>1 <?xml version="1.0" encoding="UTF-8" ?> 2 2 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> 3 3 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" threshold="all" debug="true"> -
ether_megapoli/trunk/persistence/implementation/com/medias/objects/Mesure.hbm.xml
r140 r155 4 4 <!-- Generated 5 f?vr. 2007 11:07:12 by Hibernate Tools 3.2.0.b9 --> 5 5 <hibernate-mapping> 6 <class name=" org.medias.megapoli.model.database.objects.Mesure" table="mesure" schema="public">6 <class name="com.medias.database.objects.Mesure" table="mesure" schema="public"> 7 7 <comment>Table contenant les mesures</comment> 8 8 <id name="mesureId" type="int"> … … 12 12 </generator> 13 13 </id> 14 <many-to-one name="localisation" class=" org.medias.megapoli.model.database.objects.Localisation" fetch="select">14 <many-to-one name="localisation" class="com.medias.database.objects.Localisation" fetch="select"> 15 15 <column name="localisation_id" not-null="true"> 16 16 <comment>lien vers la table localisation</comment> 17 17 </column> 18 18 </many-to-one> 19 <many-to-one name="plateforme" class=" org.medias.megapoli.model.database.objects.Plateforme" fetch="select">19 <many-to-one name="plateforme" class="com.medias.database.objects.Plateforme" fetch="select"> 20 20 <column name="plateforme_id" not-null="true"> 21 21 <comment>lien vers la table plateforme</comment> 22 22 </column> 23 23 </many-to-one> 24 <many-to-one name="fichier" class=" org.medias.megapoli.model.database.objects.Fichier" fetch="select">24 <many-to-one name="fichier" class="com.medias.database.objects.Fichier" fetch="select"> 25 25 <column name="fichier_id" not-null="true"> 26 26 <comment>lien vers la table fichier</comment> 27 27 </column> 28 28 </many-to-one> 29 <many-to-one name="sequence" class=" org.medias.megapoli.model.database.objects.Sequence" fetch="select">29 <many-to-one name="sequence" class="com.medias.database.objects.Sequence" fetch="select"> 30 30 <column name="sequence_id"> 31 31 <comment>lien vers la table sequence</comment> 32 32 </column> 33 33 </many-to-one> 34 <many-to-one name="deltaMesure" class=" org.medias.megapoli.model.database.objects.DeltaMesure" fetch="select">34 <many-to-one name="deltaMesure" class="com.medias.database.objects.DeltaMesure" fetch="select"> 35 35 <column name="delta_mesure_id"> 36 36 <comment>lien vers la table delta_mesure</comment> … … 48 48 </column> 49 49 </key> 50 <one-to-many class=" org.medias.megapoli.model.database.objects.Valeur" />50 <one-to-many class="com.medias.database.objects.Valeur" /> 51 51 </set> 52 52 </class> -
ether_megapoli/trunk/service/implementation/com/ether/MegapoliPlot.java
r133 r155 4 4 import org.jetbrains.annotations.NotNull; 5 5 import org.jetbrains.annotations.Nullable; 6 import org.medias.megapoli.utils.MegapoliInitialisation;6 import com.medias.megapoli.utils.MegapoliInitialisation; 7 7 8 8 /** -
ether_megapoli/trunk/service/implementation/com/ether/tutorial/src/tutorial/SBExample1.xml
r89 r155 1 <? com.medias.xml version="1.0" encoding="UTF-8"?>1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <java version="1.4.1_01" class="java.beans.XMLDecoder"> 3 3 <object class="gov.noaa.pmel.sgt.beans.PanelModel"> -
ether_megapoli/trunk/service/implementation/com/ether/tutorial/src/tutorial/SBExample2.xml
r89 r155 1 <? com.medias.xml version="1.0" encoding="UTF-8"?>1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <java version="1.4.1_01" class="java.beans.XMLDecoder"> 3 3 <object class="gov.noaa.pmel.sgt.beans.PanelModel"> -
ether_megapoli/trunk/service/implementation/com/ether/tutorial/src/tutorial/SBExample3.xml
r89 r155 1 <? com.medias.xml version="1.0" encoding="UTF-8"?>1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <java version="1.4.1_01" class="java.beans.XMLDecoder"> 3 3 <object class="gov.noaa.pmel.sgt.beans.PanelModel"> -
ether_megapoli/trunk/service/implementation/service-context.xml
r129 r155 1 <? com.medias.xml version="1.0" encoding="UTF-8"?>1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> 3 3 -
ether_megapoli/trunk/service/test/com/medias/Test.java
r140 r155 1 package org.medias.megapoli.utils;1 package com.medias.megapoli.utils; 2 2 3 3 import com.medias.DateTime; -
ether_megapoli/trunk/web/WEB-INF/servlet-context.xml
r89 r155 1 <? com.medias.xml version="1.0" encoding="UTF-8"?>1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <beans xmlns="http://www.springframework.org/schema/beans" 3 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop" -
ether_megapoli/trunk/web/WEB-INF/struts-config.xml
r140 r155 16 16 <form-bean 17 17 name="logonForm" 18 type=" org.medias.megapoli.struts.forms.LogonForm">18 type="com.medias.megapoli.struts.forms.LogonForm"> 19 19 </form-bean> 20 20 <form-bean 21 21 name="uploadForm" 22 type=" org.medias.megapoli.struts.forms.UploadForm">22 type="com.medias.megapoli.struts.forms.UploadForm"> 23 23 </form-bean> 24 24 <form-bean 25 25 name="accessForm" 26 type=" org.medias.megapoli.struts.forms.AccessForm">26 type="com.medias.megapoli.struts.forms.AccessForm"> 27 27 </form-bean> 28 28 <form-bean 29 29 name="deleteForm" 30 type=" org.medias.megapoli.struts.forms.DeleteForm">30 type="com.medias.megapoli.struts.forms.DeleteForm"> 31 31 </form-bean> 32 32 <form-bean 33 33 name="newSetForm" 34 type=" org.medias.megapoli.struts.forms.MetadataForm">34 type="com.medias.megapoli.struts.forms.MetadataForm"> 35 35 </form-bean> 36 36 <form-bean 37 37 name="metadataForm" 38 type=" org.medias.megapoli.struts.forms.MetadataForm">38 type="com.medias.megapoli.struts.forms.MetadataForm"> 39 39 </form-bean> 40 40 <form-bean 41 41 name="parametresForm" 42 type=" org.medias.megapoli.struts.forms.ParametresForm">42 type="com.medias.megapoli.struts.forms.ParametresForm"> 43 43 </form-bean> 44 44 <form-bean 45 45 name="capteursForm" 46 type=" org.medias.megapoli.struts.forms.CapteursForm">46 type="com.medias.megapoli.struts.forms.CapteursForm"> 47 47 </form-bean> 48 48 <form-bean 49 49 name="plateformesForm" 50 type=" org.medias.megapoli.struts.forms.PlateformesForm">50 type="com.medias.megapoli.struts.forms.PlateformesForm"> 51 51 </form-bean> 52 52 <form-bean 53 53 name="jeuxForm" 54 type=" org.medias.megapoli.struts.forms.JeuxForm">54 type="com.medias.megapoli.struts.forms.JeuxForm"> 55 55 </form-bean> 56 56 <form-bean 57 57 name="fichiersForm" 58 type=" org.medias.megapoli.struts.forms.FichiersForm">58 type="com.medias.megapoli.struts.forms.FichiersForm"> 59 59 </form-bean> 60 60 <form-bean 61 61 name="parametreForm" 62 type=" org.medias.megapoli.struts.forms.ParametreForm">62 type="com.medias.megapoli.struts.forms.ParametreForm"> 63 63 </form-bean> 64 64 <form-bean 65 65 name="capteurForm" 66 type=" org.medias.megapoli.struts.forms.CapteurForm">66 type="com.medias.megapoli.struts.forms.CapteurForm"> 67 67 </form-bean> 68 68 <form-bean 69 69 name="plateformeForm" 70 type=" org.medias.megapoli.struts.forms.PlateformeForm">70 type="com.medias.megapoli.struts.forms.PlateformeForm"> 71 71 </form-bean> 72 72 <form-bean 73 73 name="prepareTreeForm" 74 type=" org.medias.megapoli.struts.forms.PrepareTreeForm">74 type="com.medias.megapoli.struts.forms.PrepareTreeForm"> 75 75 </form-bean> 76 76 <form-bean 77 77 name="datasForm" 78 type=" org.medias.megapoli.struts.forms.DatasForm">78 type="com.medias.megapoli.struts.forms.DatasForm"> 79 79 </form-bean> 80 80 </form-beans> … … 90 90 <action 91 91 path="/ConfirmDeletion" 92 type=" org.medias.megapoli.struts.actions.ConfirmDeletionAction"92 type="com.medias.megapoli.struts.actions.ConfirmDeletionAction" 93 93 name="deleteForm"> 94 94 <forward name="set" path="/data/upload/deleteSet.jsp"/> … … 97 97 <action 98 98 path="/DeleteFile" 99 type=" org.medias.megapoli.struts.actions.DeleteFileAction"99 type="com.medias.megapoli.struts.actions.DeleteFileAction" 100 100 name="deleteForm"> 101 101 <forward name="success" path="/PrepareTree.do"/> … … 104 104 <action 105 105 path="/DeleteSet" 106 type=" org.medias.megapoli.struts.actions.DeleteSetAction"106 type="com.medias.megapoli.struts.actions.DeleteSetAction" 107 107 name="deleteForm"> 108 108 <forward name="success" path="/PrepareTree.do"/> … … 111 111 <action 112 112 path="/French" 113 type=" org.medias.megapoli.struts.actions.FrenchAction"113 type="com.medias.megapoli.struts.actions.FrenchAction" 114 114 scope="session"> 115 115 <forward name="success" path="/index.jsp"/> … … 117 117 <action 118 118 path="/English" 119 type=" org.medias.megapoli.struts.actions.EnglishAction"119 type="com.medias.megapoli.struts.actions.EnglishAction" 120 120 scope="session"> 121 121 <forward name="success" path="/index.jsp"/> … … 123 123 <action 124 124 path="/InitLogon" 125 type=" org.medias.megapoli.struts.actions.InitLogonAction"125 type="com.medias.megapoli.struts.actions.InitLogonAction" 126 126 name="logonForm" 127 127 validate="false"> … … 132 132 <action 133 133 path="/InitLogonAccess" 134 type=" org.medias.megapoli.struts.actions.InitLogonAction"134 type="com.medias.megapoli.struts.actions.InitLogonAction" 135 135 name="logonForm" 136 136 validate="false"> … … 141 141 <action 142 142 path="/InitNewSet" 143 type=" org.medias.megapoli.struts.actions.InitNewSetAction"143 type="com.medias.megapoli.struts.actions.InitNewSetAction" 144 144 name="newSetForm" 145 145 validate="false" … … 149 149 <action 150 150 path="/LoadMetadata" 151 type=" org.medias.megapoli.struts.actions.LoadMetadataAction"151 type="com.medias.megapoli.struts.actions.LoadMetadataAction" 152 152 name="metadataForm" 153 153 validate="false" … … 157 157 <action 158 158 path="/MetadataInfo" 159 type=" org.medias.megapoli.struts.actions.MetadataInfoAction"159 type="com.medias.megapoli.struts.actions.MetadataInfoAction" 160 160 name="metadataForm" 161 161 validate="false" … … 165 165 <action 166 166 path="/Logon" 167 type=" org.medias.megapoli.struts.actions.LogonAction"167 type="com.medias.megapoli.struts.actions.LogonAction" 168 168 name="logonForm" 169 169 validate="true" … … 177 177 <action 178 178 path="/LogonAccess" 179 type=" org.medias.megapoli.struts.actions.LogonAction"179 type="com.medias.megapoli.struts.actions.LogonAction" 180 180 name="logonForm" 181 181 validate="true" … … 189 189 <action 190 190 path="/NewContact" 191 type=" org.medias.megapoli.struts.actions.NewContactAction"191 type="com.medias.megapoli.struts.actions.NewContactAction" 192 192 name="metadataForm"/> 193 193 <action 194 194 path="/RemoveContact" 195 type=" org.medias.megapoli.struts.actions.RemoveContactAction"195 type="com.medias.megapoli.struts.actions.RemoveContactAction" 196 196 name="metadataForm"/> 197 197 <action 198 198 path="/NewPlat" 199 type=" org.medias.megapoli.struts.actions.NewPlatAction"199 type="com.medias.megapoli.struts.actions.NewPlatAction" 200 200 name="metadataForm"/> 201 201 <action 202 202 path="/RemovePlat" 203 type=" org.medias.megapoli.struts.actions.RemovePlatAction"203 type="com.medias.megapoli.struts.actions.RemovePlatAction" 204 204 name="metadataForm"/> 205 205 <action 206 206 path="/NewCapt" 207 type=" org.medias.megapoli.struts.actions.NewCaptAction"207 type="com.medias.megapoli.struts.actions.NewCaptAction" 208 208 name="metadataForm"/> 209 209 <action 210 210 path="/RemoveCapt" 211 type=" org.medias.megapoli.struts.actions.RemoveCaptAction"211 type="com.medias.megapoli.struts.actions.RemoveCaptAction" 212 212 name="metadataForm"/> 213 213 <action 214 214 path="/NewParam" 215 type=" org.medias.megapoli.struts.actions.NewParamAction"215 type="com.medias.megapoli.struts.actions.NewParamAction" 216 216 name="metadataForm"/> 217 217 <action 218 218 path="/RemoveParam" 219 type=" org.medias.megapoli.struts.actions.RemoveParamAction"219 type="com.medias.megapoli.struts.actions.RemoveParamAction" 220 220 name="metadataForm"/> 221 221 <action 222 222 path="/NewSet" 223 type=" org.medias.megapoli.struts.actions.NewSetAction"223 type="com.medias.megapoli.struts.actions.NewSetAction" 224 224 name="newSetForm" 225 225 validate="true" … … 232 232 <action 233 233 path="/NewSetMails" 234 type=" org.medias.megapoli.struts.actions.NewSetMailsAction"234 type="com.medias.megapoli.struts.actions.NewSetMailsAction" 235 235 name="newSetForm" 236 236 validate="true" … … 242 242 <action 243 243 path="/PrepareTree" 244 type=" org.medias.megapoli.struts.actions.PrepareTreeAction"244 type="com.medias.megapoli.struts.actions.PrepareTreeAction" 245 245 name="prepareTreeForm"> 246 246 <forward name="success" path="/data/upload/upload.jsp"/> … … 249 249 <action 250 250 path="/PrepareTreeAccess" 251 type=" org.medias.megapoli.struts.actions.PrepareTreeAccessAction">251 type="com.medias.megapoli.struts.actions.PrepareTreeAccessAction"> 252 252 <forward name="success" path="/data/access/jeux.jsp"/> 253 253 </action> 254 254 <action 255 255 path="/PrepareFileList" 256 type=" org.medias.megapoli.struts.actions.PrepareFileListAction">256 type="com.medias.megapoli.struts.actions.PrepareFileListAction"> 257 257 <forward name="success" path="/data/upload/listFiles.jsp"/> 258 258 </action> 259 259 <action 260 260 path="/PrepareFileListAccess" 261 type=" org.medias.megapoli.struts.actions.PrepareFileListAccessAction">261 type="com.medias.megapoli.struts.actions.PrepareFileListAccessAction"> 262 262 <forward name="success" path="/data/access/listFiles.jsp"/> 263 263 </action> 264 264 <action 265 265 path="/UpdateMetadata" 266 type=" org.medias.megapoli.struts.actions.UpdateMetadataAction"266 type="com.medias.megapoli.struts.actions.UpdateMetadataAction" 267 267 name="metadataForm" 268 268 validate="true" … … 276 276 <action 277 277 path="/Upload" 278 type=" org.medias.megapoli.struts.actions.UploadAction"278 type="com.medias.megapoli.struts.actions.UploadAction" 279 279 name="uploadForm" 280 280 validate="true" … … 285 285 <action 286 286 path="/SendFileToClient" 287 type=" org.medias.megapoli.struts.actions.SendFileToClientAction"287 type="com.medias.megapoli.struts.actions.SendFileToClientAction" 288 288 input="/data/access/listFiles.jsp"> 289 289 <!-- <forward name="success" path="/data/upload/listFiles.jsp"/> --> … … 291 291 <action 292 292 path="/ParametresAccess" 293 type=" org.medias.megapoli.struts.actions.ParametresAccessAction"293 type="com.medias.megapoli.struts.actions.ParametresAccessAction" 294 294 name="parametresForm"> 295 295 <forward name="success" path="/data/access/param.jsp"/> … … 297 297 <action 298 298 path="/CapteursAccess" 299 type=" org.medias.megapoli.struts.actions.CapteursAccessAction"299 type="com.medias.megapoli.struts.actions.CapteursAccessAction" 300 300 name="capteursForm"> 301 301 <forward name="success" path="/data/access/capt.jsp"/> … … 303 303 <action 304 304 path="/JeuxAccess" 305 type=" org.medias.megapoli.struts.actions.JeuxAccessAction"305 type="com.medias.megapoli.struts.actions.JeuxAccessAction" 306 306 name="jeuxForm"> 307 307 <forward name="success" path="/data/access/jeux.jsp"/> … … 309 309 <action 310 310 path="/FichiersAccess" 311 type=" org.medias.megapoli.struts.actions.FichiersAccessAction"311 type="com.medias.megapoli.struts.actions.FichiersAccessAction" 312 312 name="fichiersForm"> 313 313 <forward name="success" path="/data/access/files.jsp"/> … … 315 315 <action 316 316 path="/PlateformesAccess" 317 type=" org.medias.megapoli.struts.actions.PlateformesAccessAction"317 type="com.medias.megapoli.struts.actions.PlateformesAccessAction" 318 318 name="plateformesForm"> 319 319 <forward name="success" path="/data/access/plat.jsp"/> … … 321 321 <action 322 322 path="/DataAccess" 323 type=" org.medias.megapoli.struts.actions.DataAccessAction"323 type="com.medias.megapoli.struts.actions.DataAccessAction" 324 324 name="datasForm" 325 325 validate="false"> … … 328 328 <action 329 329 path="/DataSubmit" 330 type=" org.medias.megapoli.struts.actions.DataSubmitAction"330 type="com.medias.megapoli.struts.actions.DataSubmitAction" 331 331 input="/data/access/extract.jsp" 332 332 name="datasForm" … … 338 338 <action 339 339 path="/DataExtract" 340 type=" org.medias.megapoli.struts.actions.DataExtractAction"340 type="com.medias.megapoli.struts.actions.DataExtractAction" 341 341 input="/data/access/extract2.jsp" 342 342 name="datasForm"> … … 346 346 <action 347 347 path="/DescParametre" 348 type=" org.medias.megapoli.struts.actions.DescParametreAction"348 type="com.medias.megapoli.struts.actions.DescParametreAction" 349 349 name="parametreForm"> 350 350 <forward name="success" path="/data/access/desc_param.jsp"/> … … 352 352 <action 353 353 path="/DescCapteur" 354 type=" org.medias.megapoli.struts.actions.DescCapteurAction"354 type="com.medias.megapoli.struts.actions.DescCapteurAction" 355 355 name="capteurForm"> 356 356 <forward name="success" path="/data/access/desc_capt.jsp"/> … … 358 358 <action 359 359 path="/DescPlateforme" 360 type=" org.medias.megapoli.struts.actions.DescPlateformeAction"360 type="com.medias.megapoli.struts.actions.DescPlateformeAction" 361 361 name="plateformeForm"> 362 362 <forward name="success" path="/data/access/desc_plat.jsp"/> … … 364 364 <action 365 365 path="/ZipGame" 366 type=" org.medias.megapoli.struts.actions.ZipGameAction">366 type="com.medias.megapoli.struts.actions.ZipGameAction"> 367 367 </action> 368 368 <action 369 369 path="/Disconnect" 370 type=" org.medias.megapoli.struts.actions.DisconnectAction">370 type="com.medias.megapoli.struts.actions.DisconnectAction"> 371 371 <forward name="success" path="/index.jsp"/> 372 372 </action> -
ether_megapoli/trunk/web/resources/templates/modele.jsp
r89 r155 1 1 <%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%> 2 <%@ page import="com.medias.Context" %>3 2 <%@ page language="java" contentType="text/html; charset=UTF-8"%> 4 3 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%> -
ether_megapoli/trunk/web/resources/templates/template.jsp
r130 r155 19 19 <script src="<html:rewrite page='/resources/js/maj.js'/>"></script> 20 20 <script src="<html:rewrite page='/resources/js/medias/ajax.js'/>"></script> 21 <script src="<html:rewrite page='/resources/js/medias/scw.js'/>"></script> 21 22 <script type="text/javascript"> 22 23 <!-- 23 24 var popup; 24 25 25 26 function popupWindow (url, name, configuration) 26 27 { 27 28 popup = window.open (url, name, configuration); 28 29 } 29 30 30 31 function closePopupWindow () 31 32 { … … 40 41 41 42 <%-- VARIABLES A NE PAS TOUCHER !!! --%> 42 43 44 45 46 47 48 49 43 <bean:define type="java.lang.String" id="today" value="<%=Context.getSimpleDate()%>"/> 44 <bean:define type="java.lang.String" id="lastModified" value="<%=Context.getLastModified(request, application)%>"/> 45 <bean:define type="java.lang.String" id="racine" value="<%=Context.getWebroot(request)%>"/> 46 <bean:define type="java.lang.String" id="relativePageUri" value="<%=Context.getRelativePageURI(request)%>"/> 47 <bean:define type="java.lang.String" id="lang" value="<%=Context.getLangue(request)%>"/> 48 <bean:define type="java.lang.String" id="webmaster" value="<%=Context.getWebmaster(request)%>"/> 49 <bean:define type="java.lang.String" id="chemin" value="<%=request.getContextPath()%>"/> 50 50 51 <div id="container"> 51 52 <div id="pageHeader"> 52 53 <%-- le logo --%> 53 54 <%-- Internationalisation --%> 55 <logic:notEqual name="lang" value="en"> 56 <html:link page="/English.do" paramName="relativePageUri" paramId="requestUri"> 57 <html:img vspace="25" hspace="10" page="/resources/images/utils/gb.png" alt="gb"/> 58 </html:link> 59 </logic:notEqual> 60 <logic:equal name="lang" value="en"> 61 <html:link page="/French.do" paramName="relativePageUri" paramId="requestUri"> 62 <html:img vspace="25" hspace="10" page="/resources/images/utils/fr.png" alt="fr"/> 63 </html:link> 64 </logic:equal> 65 66 <%-- Le titre général du site --%> 67 <h2><u>M</u>egacities: <u>E</u>missions, urban, regional and <u>G</u>lobal <u>A</u>tmospheric <u>POL</u>lution and climate effects, and <u>I</u>ntegrated tools for assessment and mitigation</h2> 54 55 <%-- Le titre général du site --%> 56 <h2><%--<u>M</u>egacities: <u>E</u>missions, urban, regional and <u>G</u>lobal <u>A</u>tmospheric <u>POL</u>lution and climate effects, and <u>I</u>ntegrated tools for assessment and mitigation--%> 57 <bean:message key="app.fulltitle"/> 58 </h2> 68 59 </div> 69 60 70 61 71 <div id="pageMiddle"> 62 <div id="pageMiddle"> 72 63 <div id="pageMenu"> 73 64 <div id="util"> 74 65 75 66 <html:link page="/index.jsp"> 76 67 <html:img page="/resources/images/utils/home.jpg" titleKey="app.home" altKey="app.home"/> 77 68 </html:link> 78 69 79 70 <html:link href="mailto:${webmaster}?subject=[MEGAPOLI]"> 80 71 <html:img page="/resources/images/utils/enveloppe.jpg" titleKey="app.webmaster" altKey="app.webmaster"/> … … 82 73 83 74 <%--html:link page="/sitemap/sitemap.jsp"> 84 <html:img page="/ resources/images/utils/sitemap.png" titleKey="app.sitemap" altKey="app.sitemap"/>75 <html:img page="/images/utils/sitemap.png" titleKey="app.sitemap" altKey="app.sitemap"/> 85 76 </html:link--%> 86 87 <%-- le lien pour se déconnecter de l'application --%> 88 <logic:present name="SES_USER" scope="session"> 77 <%-- Internationalisation --%> 78 <logic:notEqual name="lang" value="en"> 79 <html:link page="/English.do" paramName="relativePageUri" paramId="requestUri" titleKey="app.en"> 80 <html:img page="/resources/images/utils/gb.png" alt="gb"/> 81 </html:link> 82 </logic:notEqual> 83 <logic:equal name="lang" value="en"> 84 <html:link page="/French.do" paramName="relativePageUri" paramId="requestUri" titleKey="app.fr"> 85 <html:img page="/resources/images/utils/fr.png" alt="fr"/> 86 </html:link> 87 </logic:equal> 88 89 <%-- le lien pour se déconnecter de l'application --%> 90 <%--logic:present name="SES_USER" scope="session"> 89 91 <html:link page="/Disconnect.do"> 90 <html:img page="/resources/images/utils/logout.gif" titleKey="app.disconnect" altKey="app.disconnect" onmouseover="this.src='${chemin}/ resources/images/utils/logout2.gif'" onmouseout="this.src='${chemin}/resources/images/utils/logout.gif'"/>91 </html:link> 92 </logic:present >93 </div> 94 92 <html:img page="/resources/images/utils/logout.gif" titleKey="app.disconnect" altKey="app.disconnect" onmouseover="this.src='${chemin}/images/utils/logout2.gif'" onmouseout="this.src='${chemin}/images/utils/logout.gif'"/> 93 </html:link> 94 </logic:present--%> 95 </div> 96 95 97 <div id="plan"> 96 98 <%-- le menu --%> … … 111 113 </ul> 112 114 </div--%> 113 115 114 116 <%--div id="menuItem"> 115 117 <html:link page="/projet/projet.jsp"> … … 121 123 </html:link></li> 122 124 <li><html:link href="mailto:${webmaster}?subject=[MEGAPOLI]"> 123 <html:img page="/ resources/images/utils/mailto.png" titleKey="app.webmaster" altKey="app.webmaster"/>125 <html:img page="/images/utils/mailto.png" titleKey="app.webmaster" altKey="app.webmaster"/> 124 126 </html:link></li> 125 127 <logic:present name="SES_USER" scope="session"> … … 134 136 135 137 <div id="menuItem"> 136 < html:link page="/data/data.jsp">138 <%--html:link page="/data/data.jsp"> 137 139 <h3> <bean:message key="data"/></h3> 138 </html:link >140 </html:link--%> 139 141 <bean:define id="upload" value="upload"/> 140 142 <bean:define id="access" value="access"/> 141 143 <ul> 142 <li> 144 <li><html:link page="/data/access/access.jsp" paramName="access" paramId="source"> 145 <bean:message key="data.access"/> 146 </html:link> 147 </li> 148 <li> > 149 <%--html:link page="/data/access/jeux.jsp" paramName="access" paramId="source"--%> 150 <html:link page="/JeuxAccess.do"> 151 <bean:message key="data.access.jeux"/> 152 </html:link> 153 </li> 154 <li> > 155 <html:link page="/ParametresAccess.do"> 156 <bean:message key="data.access.param"/> 157 </html:link> 158 </li> 159 <li> > 160 <html:link page="/CapteursAccess.do"> 161 <bean:message key="data.access.capt"/> 162 </html:link> 163 </li> 164 <li> > 165 <html:link page="/PlateformesAccess.do"> 166 <bean:message key="data.access.plat"/> 167 </html:link> 168 </li> 169 <li><br/> 170 <logic:notPresent name="SES_USER" scope="session"> 171 <html:link page="/InitLogonAccess.do" paramName="access" paramId="source"> 172 <bean:message key="data.access.extract"/> 173 </html:link> 174 </logic:notPresent> 175 <logic:present name="SES_USER" scope="session"> 176 <html:link page="/DataAccess.do"> 177 <bean:message key="data.access.extract"/> 178 </html:link> 179 </logic:present> 180 </li> 181 <li><br/> 143 182 <logic:notPresent name="SES_USER" scope="session"> 144 183 <html:link page="/InitLogon.do" paramName="upload" paramId="source"> … … 152 191 </logic:present> 153 192 </li> 154 <li><html:link page="/data/access/access.jsp" paramName="access" paramId="source">155 <bean:message key="data.access"/>156 </html:link>157 </li>158 <li> > 159 <%--html:link page="/data/access/jeux.jsp" paramName="access" paramId="source"--%>160 <html:link page="/JeuxAccess.do">161 <bean:message key="data.access.jeux"/>162 </html:link>163 </li>164 <li> > 165 <html:link page="/ParametresAccess.do">166 <bean:message key="data.access.param"/>167 </html:link>168 </li>169 <li> > 170 <html:link page="/CapteursAccess.do">171 <bean:message key="data.access.capt"/>172 </html:link>173 </li>174 <li> > 175 <html:link page="/PlateformesAccess.do">176 <bean:message key="data.access.plat"/>177 </html:link>178 </li>179 193 </ul> 180 194 </div> 181 195 <table width="100%"> 196 <tr><td align="center"> 197 <html:link href="http://megapoli.dmi.dk/" target="help" titleKey="app.linkmegapoli"> 198 <html:img page="/resources/images/megapoli/megapoli_small.jpg" altKey="app.home"/> 199 </html:link> 200 </td></tr> 201 </table> 182 202 <%--div id="menuItem"> 183 203 <html:link page="/partenaires/partenaires.jsp"> … … 193 213 </ul> 194 214 </div> 195 215 196 216 <div id="menuItem"> 197 217 <html:link page="/finance/finance.jsp"> … … 199 219 </html:link> 200 220 </div--%> 201 202 221 222 203 223 <%-- 204 224 <div id="menuItem> … … 210 230 </div> 211 231 <%-- Recherche : solution mnogosearch --%> 212 232 213 233 </div> 214 234 <%-- 215 <div id="recherche"> 235 <div id="recherche"> 216 236 <form method="get" action="/megapoli/cgi-bin/search.cgi"> 217 237 <bean:message key="app.search"/> : <INPUT TYPE="text" NAME="q" VALUE="" size="20"> 218 238 </form> 219 </div> 239 </div> 220 240 --%> 221 241 <div id="pageContent"> 222 242 <div id="nav"> 223 243 <%-- la barre de navigation --%> 224 <div class="texte" >244 <div class="texte" style="float: left;"> 225 245 <tiles:insert attribute="nav"/> 226 246 </div> 227 </div> 228 <div id="blabla"> 247 <div style="float: right; font-size: 13px"> 248 <logic:present name="SES_USER" scope="session"> 249 <table> 250 <tr><td height="40px" valign="middle" style="font-size: 13px; color: white"> 251 <bean:write name="SES_USER" property="prenom"/> <bean:write name="SES_USER" property="nom"/> 252 <logic:equal name="SES_USER" property="roles" value="coordinateur"> 253 (<bean:message key="app.admin"/>) 254 </logic:equal> 255 </td> 256 <td valign="top" width="40px"> 257 <html:link page="/Disconnect.do"> 258 <html:img page="/resources/images/utils/logout.gif" titleKey="app.disconnect" altKey="app.disconnect" onmouseover="this.src='${chemin}/images/utils/logout2.gif'" onmouseout="this.src='${chemin}/images/utils/logout.gif'" width="20px" height="20px" style="margin-top:7px"/> 259 </html:link> 260 </td> 261 </tr> 262 </table> 263 </logic:present> 264 </div> 265 </div> 266 <div id="corpsPage"> 229 267 <div id="title"> 230 268 <%-- le titre de la page --%> … … 237 275 </div> 238 276 </div> 239 </div> 277 </div> 240 278 241 279 242 280 <div id="pageFooter"> 243 <div id="copyright"> 244 © 2010 Sedoo / CNRS 281 <table width="100%" style="color:white;font-size: 12px"> 282 <tr><td align="left">© 2010-2011 <html:link href="http://www.sedoo.fr" target="help" titleKey="app.linksedoo">Sedoo</html:link> / CNRS 283 </td><td align="center"><bean:message key="app.infonavig"/> 284 </td><td align="right"><i><bean:message key="app.lastModified"/> : <bean:write name="lastModified"/></i> 285 </td></tr> 286 </table> 287 <%--div id="copyright"> 288 © 2010-2011 Sedoo / CNRS 245 289 </div> 246 290 <div id="datestamp"> 247 291 <bean:message key="app.lastModified"/> : <bean:write name="lastModified"/> 248 </div >292 </div--%> 249 293 </div> 250 294
Note: See TracChangeset
for help on using the changeset viewer.