Changeset 140 for ether_megapoli
- Timestamp:
- 08/25/11 14:48:51 (13 years ago)
- Location:
- ether_megapoli/trunk
- Files:
-
- 5 added
- 7 deleted
- 22 edited
-
common/implementation/com/medias/Nombre.java (modified) (8 diffs)
-
persistence/implementation/com/medias/objects/Langue.hbm.xml (modified) (2 diffs)
-
persistence/implementation/com/medias/objects/Localisation.hbm.xml (modified) (3 diffs)
-
persistence/implementation/com/medias/objects/Mesure.hbm.xml (modified) (3 diffs)
-
persistence/implementation/com/medias/objects/Valeur.hbm.xml (modified) (1 diff)
-
service/implementation/com/medias (added)
-
service/test/com/medias (added)
-
service/test/com/medias/Test.java (added)
-
service/test/kerropi1.jpg (deleted)
-
service/test/test_ImageIcon.jpg (deleted)
-
service/test/test_JPlotLayout.jpg (deleted)
-
service/test/test_SBExample1.jpg (deleted)
-
service/test/test_SBExample2.jpg (deleted)
-
service/test/test_SBExample3.jpg (deleted)
-
service/test/test_TimeSeriesFrame.jpg (deleted)
-
web/WEB-INF/lib/medias/netcdf-4.0.jar (added)
-
web/WEB-INF/megapoli.properties (modified) (1 diff)
-
web/WEB-INF/megapoli.properties.template (added)
-
web/WEB-INF/struts-config.xml (modified) (11 diffs)
-
web/WEB-INF/tlds/listlib.tld (modified) (1 diff)
-
web/WEB-INF/tlds/struts-bean.tld (modified) (1 diff)
-
web/WEB-INF/tlds/struts-html.tld (modified) (1 diff)
-
web/WEB-INF/tlds/struts-logic.tld (modified) (1 diff)
-
web/WEB-INF/tlds/struts-nested.tld (modified) (1 diff)
-
web/WEB-INF/tlds/struts-tiles.tld (modified) (1 diff)
-
web/WEB-INF/tlds/validator-rules.xml (modified) (3 diffs)
-
web/WEB-INF/validation.xml (modified) (2 diffs)
-
web/WEB-INF/validator-rules.xml (modified) (2 diffs)
-
web/WEB-INF/xml/metadata.xsd (modified) (1 diff)
-
web/WEB-INF/xml/uploadFiles.xsl (modified) (5 diffs)
-
web/WEB-INF/xml/uploadTree.xsl (modified) (4 diffs)
-
web/resources/css/medias_new.css (modified) (11 diffs)
-
web/resources/css/megapoli.css (modified) (2 diffs)
-
web/resources/js/maj.js (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/common/implementation/com/medias/Nombre.java
r89 r140 1 package com.medias;/*1 /* 2 2 * Created on 16 févr. 2005 3 3 */ 4 package com.medias; 4 5 5 6 /** … … 12 13 /** 13 14 * Vérifie qu'une donnée est un entier. 14 * @param nb com.medias.Nombre à vérifier.15 * @param nb Nombre à vérifier. 15 16 * @return Vrai si la donnée est un entier. 16 17 */ … … 26 27 /** 27 28 * Vérifie qu'une donnée est un entier long. 28 * @param nb com.medias.Nombre à vérifier.29 * @param nb Nombre à vérifier. 29 30 * @return Vrai si la donnée est un entier long. 30 31 */ … … 40 41 /** 41 42 * Verifie qu'une donnée est un double. 42 * @param nb com.medias.Nombre à vérifier.43 * @param nb Nombre à vérifier. 43 44 * @return Vrai si la donnée est un double. 44 45 */ … … 54 55 /** 55 56 * Verifie qu'un double est dans un intervalle. 56 * @param nb com.medias.Nombre à vérifier.57 * @param nb Nombre à vérifier. 57 58 * @param min Borne inférieure de l'intervalle. 58 59 * @param max Borne supérieure de l'intervalle. … … 131 132 if (val.floatValue() == 0) 132 133 return new Integer(0); 133 return new Integer((int)((val.doubleValue() + 0.0005) * 10000.0)); 134 // return new Integer((int)((val.doubleValue() + 0.0005) * 10000.0)); 135 return new Integer((int)Math.round((val.doubleValue() + 0.0005) * 10000.0)); 134 136 } 135 137 … … 157 159 if (val.floatValue() == 0) 158 160 return new Integer(0); 159 return new Integer((int) ((val.doubleValue() + 0.05) * 100.0));161 return new Integer((int)Math.round((val.doubleValue() + 0.05) * 100.0)); 160 162 } 161 163 … … 185 187 * Ne conserve que n chiffres aprÚs la virgule pour le double val. 186 188 * @param val Double à convertir. 187 * @param n com.medias.Nombre de chiffres aprÚs la virgule189 * @param n Nombre de chiffres aprÚs la virgule 188 190 * @return Double avec n chiffres aprÚs la virgule. 189 191 */ -
ether_megapoli/trunk/persistence/implementation/com/medias/objects/Langue.hbm.xml
r89 r140 4 4 <!-- Generated 5 f?vr. 2007 11:07:12 by Hibernate Tools 3.2.0.b9 --> 5 5 <hibernate-mapping> 6 <class name=" com.medias.database.objects.Langue" table="langue" schema="public">6 <class name="org.medias.megapoli.model.database.objects.Langue" table="langue" schema="public"> 7 7 <comment>Table contenant les langages des commentaires</comment> 8 8 <id name="langueId" type="string"> … … 21 21 </column> 22 22 </key> 23 <one-to-many class=" com.medias.database.objects.Commentaire" />23 <one-to-many class="org.medias.megapoli.model.database.objects.Commentaire" /> 24 24 </set> 25 25 </class> -
ether_megapoli/trunk/persistence/implementation/com/medias/objects/Localisation.hbm.xml
r89 r140 4 4 <!-- Generated 5 f?vr. 2007 11:07:12 by Hibernate Tools 3.2.0.b9 --> 5 5 <hibernate-mapping> 6 <class name=" com.medias.database.objects.Localisation" table="localisation" schema="public">6 <class name="org.medias.megapoli.model.database.objects.Localisation" table="localisation" schema="public"> 7 7 <comment>Table indiquant les localisations des mesures</comment> 8 8 <id name="localisationId" type="int"> … … 12 12 </generator> 13 13 </id> 14 <many-to-one name="flagByAltitudeFlag" class=" com.medias.database.objects.Flag" fetch="select">14 <many-to-one name="flagByAltitudeFlag" class="org.medias.megapoli.model.database.objects.Flag" fetch="select"> 15 15 <column name="altitude_flag"> 16 16 <comment>lien vers la table flag (contrainte sur l'altitude)</comment> 17 17 </column> 18 18 </many-to-one> 19 <many-to-one name="flagByLatlonFlag" class=" com.medias.database.objects.Flag" fetch="select">19 <many-to-one name="flagByLatlonFlag" class="org.medias.megapoli.model.database.objects.Flag" fetch="select"> 20 20 <column name="latlon_flag"> 21 21 <comment>lien vers la table flag (contrainte sur la latitude/longitude)</comment> … … 48 48 </column> 49 49 </key> 50 <one-to-many class=" com.medias.database.objects.Mesure" />50 <one-to-many class="org.medias.megapoli.model.database.objects.Mesure" /> 51 51 </set> 52 52 </class> -
ether_megapoli/trunk/persistence/implementation/com/medias/objects/Mesure.hbm.xml
r89 r140 4 4 <!-- Generated 5 f?vr. 2007 11:07:12 by Hibernate Tools 3.2.0.b9 --> 5 5 <hibernate-mapping> 6 <class name=" com.medias.database.objects.Mesure" table="mesure" schema="public">6 <class name="org.medias.megapoli.model.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=" com.medias.database.objects.Localisation" fetch="select">14 <many-to-one name="localisation" class="org.medias.megapoli.model.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=" com.medias.database.objects.Plateforme" fetch="select">19 <many-to-one name="plateforme" class="org.medias.megapoli.model.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=" com.medias.database.objects.Fichier" fetch="select">24 <many-to-one name="fichier" class="org.medias.megapoli.model.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=" com.medias.database.objects.Sequence" fetch="select">29 <many-to-one name="sequence" class="org.medias.megapoli.model.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=" com.medias.database.objects.DeltaMesure" fetch="select">34 <many-to-one name="deltaMesure" class="org.medias.megapoli.model.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=" com.medias.database.objects.Valeur" />50 <one-to-many class="org.medias.megapoli.model.database.objects.Valeur" /> 51 51 </set> 52 52 </class> -
ether_megapoli/trunk/persistence/implementation/com/medias/objects/Valeur.hbm.xml
r89 r140 47 47 </column> 48 48 </property> 49 <property name="valeurLod" type="java.lang.Double"> 50 <column name="valeur_lod" precision="8" scale="0"> 51 <comment>limit of detection</comment> 52 </column> 53 </property> 49 54 </class> 50 55 </hibernate-mapping> -
ether_megapoli/trunk/web/WEB-INF/megapoli.properties
r89 r140 13 13 mail.webmaster=vmipsl@ipsl.jussieu.fr 14 14 url.upload=http://localhost:8080/megapoli/InitLogon.do 15 url.extractcgi=http://medias3.mediasfrance.org/megapoli_data/cgi-bin/megapoli_extract.cgi 15 16 16 17 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -
ether_megapoli/trunk/web/WEB-INF/struts-config.xml
r89 r140 1 <? com.medias.xml version="1.0" encoding="ISO-8859-1" ?>1 <?xml version="1.0" encoding="UTF-8" ?> 2 2 3 3 <!DOCTYPE struts-config PUBLIC … … 23 23 </form-bean> 24 24 <form-bean 25 name="accessForm" 26 type="org.medias.megapoli.struts.forms.AccessForm"> 27 </form-bean> 28 <form-bean 25 29 name="deleteForm" 26 30 type="org.medias.megapoli.struts.forms.DeleteForm"> … … 47 51 </form-bean> 48 52 <form-bean 53 name="jeuxForm" 54 type="org.medias.megapoli.struts.forms.JeuxForm"> 55 </form-bean> 56 <form-bean 57 name="fichiersForm" 58 type="org.medias.megapoli.struts.forms.FichiersForm"> 59 </form-bean> 60 <form-bean 49 61 name="parametreForm" 50 62 type="org.medias.megapoli.struts.forms.ParametreForm"> … … 61 73 name="prepareTreeForm" 62 74 type="org.medias.megapoli.struts.forms.PrepareTreeForm"> 75 </form-bean> 76 <form-bean 77 name="datasForm" 78 type="org.medias.megapoli.struts.forms.DatasForm"> 63 79 </form-bean> 64 80 </form-beans> … … 109 125 type="org.medias.megapoli.struts.actions.InitLogonAction" 110 126 name="logonForm" 111 validate="false" 112 input="/data/data.jsp">127 validate="false"> 128 <!-- input="/data/data.jsp"> --> 113 129 <forward name="success" path="/data/logon.jsp"/> 114 130 </action> … … 165 181 validate="true" 166 182 input="/data/logonAccess.jsp"> 167 <forward name="cancel" path="/data/ access/listFiles.jsp"/>183 <forward name="cancel" path="/data/data.jsp"/> 168 184 <!-- <forward name="input" path="/data/logonAccess.jsp"/> --> 169 <forward name="access" path="/data/access/listFiles.jsp"/> 185 <forward name="access" path="/DataAccess.do"/> 186 <forward name="download" path="/JeuxAccess.do"/> 170 187 <forward name="login" path="/InitLogonAccess.do"/> 171 188 </action> 189 <action 190 path="/NewContact" 191 type="org.medias.megapoli.struts.actions.NewContactAction" 192 name="metadataForm"/> 193 <action 194 path="/RemoveContact" 195 type="org.medias.megapoli.struts.actions.RemoveContactAction" 196 name="metadataForm"/> 197 <action 198 path="/NewPlat" 199 type="org.medias.megapoli.struts.actions.NewPlatAction" 200 name="metadataForm"/> 201 <action 202 path="/RemovePlat" 203 type="org.medias.megapoli.struts.actions.RemovePlatAction" 204 name="metadataForm"/> 205 <action 206 path="/NewCapt" 207 type="org.medias.megapoli.struts.actions.NewCaptAction" 208 name="metadataForm"/> 209 <action 210 path="/RemoveCapt" 211 type="org.medias.megapoli.struts.actions.RemoveCaptAction" 212 name="metadataForm"/> 213 <action 214 path="/NewParam" 215 type="org.medias.megapoli.struts.actions.NewParamAction" 216 name="metadataForm"/> 217 <action 218 path="/RemoveParam" 219 type="org.medias.megapoli.struts.actions.RemoveParamAction" 220 name="metadataForm"/> 172 221 <action 173 222 path="/NewSet" … … 253 302 </action> 254 303 <action 304 path="/JeuxAccess" 305 type="org.medias.megapoli.struts.actions.JeuxAccessAction" 306 name="jeuxForm"> 307 <forward name="success" path="/data/access/jeux.jsp"/> 308 </action> 309 <action 310 path="/FichiersAccess" 311 type="org.medias.megapoli.struts.actions.FichiersAccessAction" 312 name="fichiersForm"> 313 <forward name="success" path="/data/access/files.jsp"/> 314 </action> 315 <action 255 316 path="/PlateformesAccess" 256 317 type="org.medias.megapoli.struts.actions.PlateformesAccessAction" … … 259 320 </action> 260 321 <action 322 path="/DataAccess" 323 type="org.medias.megapoli.struts.actions.DataAccessAction" 324 name="datasForm" 325 validate="false"> 326 <forward name="success" path="/data/access/extract.jsp"/> 327 </action> 328 <action 329 path="/DataSubmit" 330 type="org.medias.megapoli.struts.actions.DataSubmitAction" 331 input="/data/access/extract.jsp" 332 name="datasForm" 333 validate="true"> 334 <forward name="cancel" path="/data/access/access.jsp"/> 335 <forward name="reset" path="/data/access/extract.jsp"/> 336 <forward name="success" path="/data/access/extract2.jsp"/> 337 </action> 338 <action 339 path="/DataExtract" 340 type="org.medias.megapoli.struts.actions.DataExtractAction" 341 input="/data/access/extract2.jsp" 342 name="datasForm"> 343 <forward name="cancel" path="/data/access/extract.jsp"/> 344 <forward name="success" path="/data/access/extract3.jsp"/> 345 </action> 346 <action 261 347 path="/DescParametre" 262 348 type="org.medias.megapoli.struts.actions.DescParametreAction" … … 279 365 path="/ZipGame" 280 366 type="org.medias.megapoli.struts.actions.ZipGameAction"> 281 <forward name="success" path="/SendFileToClient.do"/>282 367 </action> 283 368 <action … … 293 378 <!-- ================================ Message Resources Definitions --> 294 379 <message-resources parameter="ApplicationResources" null="false"/> 380 295 381 296 382 <!-- ========================================== Plugins Definitions --> … … 299 385 </plug-in> 300 386 387 301 388 </struts-config> -
ether_megapoli/trunk/web/WEB-INF/tlds/listlib.tld
r89 r140 1 <? com.medias.xml version="1.0" encoding="ISO-8859-1" ?>1 <?xml version="1.0" encoding="ISO-8859-1" ?> 2 2 <!DOCTYPE taglib 3 3 PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" -
ether_megapoli/trunk/web/WEB-INF/tlds/struts-bean.tld
r89 r140 378 378 </tag> 379 379 </taglib> 380 381 382 -
ether_megapoli/trunk/web/WEB-INF/tlds/struts-html.tld
r89 r140 1 <? com.medias.xml version="1.0" encoding="UTF-8"?>1 <?xml version="1.0" encoding="UTF-8"?> 2 2 3 3 -
ether_megapoli/trunk/web/WEB-INF/tlds/struts-logic.tld
r89 r140 1 <? com.medias.xml version="1.0" encoding="UTF-8"?>1 <?xml version="1.0" encoding="UTF-8"?> 2 2 3 3 -
ether_megapoli/trunk/web/WEB-INF/tlds/struts-nested.tld
r89 r140 1 <? com.medias.xml version="1.0" encoding="UTF-8"?>1 <?xml version="1.0" encoding="UTF-8"?> 2 2 3 3 -
ether_megapoli/trunk/web/WEB-INF/tlds/struts-tiles.tld
r89 r140 1 <? com.medias.xml version="1.0" encoding="UTF-8"?>1 <?xml version="1.0" encoding="UTF-8"?> 2 2 3 3 -
ether_megapoli/trunk/web/WEB-INF/tlds/validator-rules.xml
r89 r140 3 3 "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd"> 4 4 <!-- 5 $Header: /home/cvs/jakarta-struts/conf/share/validator-rules. com.medias.xml,v 1.52 2004/07/25 12:00:20 niallp Exp $5 $Header: /home/cvs/jakarta-struts/conf/share/validator-rules.xml,v 1.52 2004/07/25 12:00:20 niallp Exp $ 6 6 $Revision: 1.52 $ 7 7 $Date: 2004/07/25 12:00:20 $ … … 9 9 This file contains the default Struts Validator pluggable validator 10 10 definitions. It should be placed somewhere under /WEB-INF and 11 referenced in the struts-config. com.medias.xml under the plug-in element11 referenced in the struts-config.xml under the plug-in element 12 12 for the ValidatorPlugIn. 13 13 14 14 <plug-in className="org.apache.struts.validator.ValidatorPlugIn"> 15 <set-property property="pathnames" value="/WEB-INF/validator-rules. com.medias.xml,16 /WEB-INF/validation. com.medias.xml"/>15 <set-property property="pathnames" value="/WEB-INF/validator-rules.xml, 16 /WEB-INF/validation.xml"/> 17 17 </plug-in> 18 18 … … 39 39 errors.range={0} is not in the range {1} through {2}. 40 40 errors.creditcard={0} is an invalid credit card number. 41 errors.email={0} is an invalid e- com.medias.mail address.41 errors.email={0} is an invalid e-mail address. 42 42 43 43 Note: Starting in Struts 1.2.0 the default javascript definitions have -
ether_megapoli/trunk/web/WEB-INF/validation.xml
r89 r140 1 <? com.medias.xml version="1.0" encoding="ISO-8859-1" ?>1 <?xml version="1.0" encoding="UTF-8" ?> 2 2 3 3 <!DOCTYPE form-validation PUBLIC … … 75 75 </field> 76 76 77 < field77 <!-- field 78 78 property="metadata.desc.organisme" 79 79 depends="required"> 80 80 <arg0 key="errors.upload.metadata.desc.org"/> 81 </field >82 <!-- <field81 </field--> 82 <!-- field 83 83 property="metadata" 84 84 depends="required"> 85 85 <arg0 key="errors.upload.metadata.desc.tech"/> 86 </field >-->86 </field--> 87 87 88 88 </form> -
ether_megapoli/trunk/web/WEB-INF/validator-rules.xml
r89 r140 6 6 This file contains the default Struts Validator pluggable validator 7 7 definitions. It should be placed somewhere under /WEB-INF and 8 referenced in the struts-config. com.medias.xml under the plug-in element8 referenced in the struts-config.xml under the plug-in element 9 9 for the ValidatorPlugIn. 10 10 11 11 <plug-in className="org.apache.struts.validator.ValidatorPlugIn"> 12 <set-property property="pathnames" value="/WEB-INF/validator-rules. com.medias.xml,13 /WEB-INF/validation. com.medias.xml"/>12 <set-property property="pathnames" value="/WEB-INF/validator-rules.xml, 13 /WEB-INF/validation.xml"/> 14 14 </plug-in> 15 15 … … 36 36 errors.range={0} is not in the range {1} through {2}. 37 37 errors.creditcard={0} is an invalid credit card number. 38 errors.email={0} is an invalid e- com.medias.mail address.38 errors.email={0} is an invalid e-mail address. 39 39 40 40 --> -
ether_megapoli/trunk/web/WEB-INF/xml/metadata.xsd
r89 r140 1 <? com.medias.xml version="1.0" encoding="utf-8"?>1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" blockDefault="#all"> 3 3 -
ether_megapoli/trunk/web/WEB-INF/xml/uploadFiles.xsl
r89 r140 1 <? com.medias.xml version='1.0' encoding='ISO-8859-1'?>1 <?xml version='1.0' encoding='UTF-8'?> 2 2 3 3 <!-- Feuille de style permettant de générer la vue d'affichage de la liste de fichiers … … 11 11 <!-- Début : on cherche le jeu désigné par le path "target" --> 12 12 <xsl:template match="/hierarchie"> 13 <xsl:text><![CDATA[< ![CDATA[<%@ page import="org.medias.utils.Context"%>14 <%@ page import=" org.medias.megapoli.model.com.medias.xml.hierarchie.Hierarchie"%>15 16 <%@ page language="java" %>13 <xsl:text><![CDATA[<%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%> 14 <%@ page import="com.medias.xml.hierarchie.Hierarchie"%> 15 16 <%@ page language="java" contentType="text/html; charset=UTF-8"%> 17 17 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%> 18 18 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html"%> … … 20 20 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%> 21 21 22 <div id="level1">]]> ]]></xsl:text>22 <div id="level1">]]></xsl:text> 23 23 <xsl:apply-templates select="level[@name=substring-before($target,'/')]"> 24 24 <xsl:with-param name="new_path" select="substring-after($target,'/')"/> … … 41 41 <xsl:text><![CDATA[ 42 42 <html:form action="/ConfirmDeletion"> 43 <html:img page="/images/utils/text.png" alt="file"/> ]]></xsl:text> 43 <html:img page="/images/utils/text.png" alt="file"/> 44 <bean:define id="pathFile" value="${categ}/${jeu}/]]></xsl:text> 45 <xsl:value-of select="@name"/> 46 <xsl:text><![CDATA["/> 47 <html:link titleKey="data.access.downloading" page="/SendFileToClient.do" paramId="path" paramName="pathFile">]]></xsl:text> 44 48 <xsl:value-of select="@name"/> 45 49 <xsl:text><![CDATA[ 46 50 </html:link> 47 51 <bean:define id="modify" value="false"/> 48 52 <logic:iterate id="jeu" name="SES_USER" property="jeux" scope="session"> … … 61 65 <xsl:value-of select="concat($target,'/',@name)"/> 62 66 <xsl:text><![CDATA["/> 63 <html:image page="/images/utils/delete.png" alt="delete" />67 <html:image page="/images/utils/delete.png" alt="delete" titleKey="data.upload.metadata.deleteFile"/> 64 68 </logic:equal> 65 69 </html:form>]]></xsl:text> -
ether_megapoli/trunk/web/WEB-INF/xml/uploadTree.xsl
r89 r140 1 <? com.medias.xml version='1.0' encoding='ISO-8859-1'?>1 <?xml version='1.0' encoding='UTF-8'?> 2 2 3 3 <!-- Feuille de style permettant de générer la vue d'affichage de l'arborescence à partir du 4 fichier hierarchie. com.medias.xml, qui décrit la structure de l'arborescence à obtenir -->4 fichier hierarchie.xml, qui décrit la structure de l'arborescence à obtenir --> 5 5 6 6 <xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'> … … 10 10 <!-- On commence par écrire l'en-tête de la jsp --> 11 11 <xsl:template match="/hierarchie"> 12 <xsl:text><![CDATA[< ![CDATA[<%@ page import="org.medias.utils.Context"%>13 <%@ page import=" org.medias.megapoli.model.com.medias.xml.hierarchie.Hierarchie"%>14 15 <%@ page language="java" %>12 <xsl:text><![CDATA[<%@ page import="com.medias.Context" contentType="text/html; charset=UTF-8"%> 13 <%@ page import="com.medias.xml.hierarchie.Hierarchie"%> 14 15 <%@ page language="java" contentType="text/html; charset=UTF-8"%> 16 16 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%> 17 17 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html"%> … … 19 19 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%> 20 20 21 ]]> ]]></xsl:text>21 ]]></xsl:text> 22 22 <xsl:apply-templates select="*"/> 23 23 <xsl:text><![CDATA[<br><br>]]></xsl:text> … … 64 64 <xsl:value-of select="concat($parent,'/',@name)"/> 65 65 <xsl:text><![CDATA["/> 66 <html:image page="/images/utils/delete.png" alt="delete" />66 <html:image page="/images/utils/delete.png" alt="delete" titleKey="data.upload.metadata.deleteJeu"/> 67 67 </logic:equal> 68 68 </html:form>]]></xsl:text> -
ether_megapoli/trunk/web/resources/css/medias_new.css
r89 r140 4 4 5 5 h1, h2, h3 { 6 font-family: Arial, Verdana, Tahoma,Helvetica, sans-serif;6 font-family: Helvetica, sans-serif; 7 7 } 8 8 … … 31 31 32 32 body { 33 font-family: Tahoma, Verdana, Helvetica, Arial, sans-serif;33 font-family:Helvetica, sans-serif; 34 34 color:#000000; 35 35 margin: 0; … … 40 40 #container { 41 41 position:relative; 42 width:90%;43 margin:0; 44 margin-left:5%; 42 /*width:90%; 43 margin:0; 44 margin-left:5%;*/ 45 45 padding:0; 46 46 border:#FFFFFF solid 0.2em; … … 55 55 #pageHeader { 56 56 position:relative; 57 height:4em;58 57 margin:0; 59 58 padding:0; … … 80 79 81 80 #pageHeader h2 { 82 font-size:2 0px;81 font-size:23px; 83 82 color:#ffffff; 84 text-align: right;83 text-align:center; 85 84 margin:0; 86 85 padding:0.5em; … … 128 127 margin-right:0.75em; 129 128 margin-left:0.75em; 130 height:1.4em;129 vertical-align: middle; 131 130 } 132 131 … … 213 212 } 214 213 214 .texte ul { 215 list-style: none outside none; 216 } 217 218 .texte ul li { 219 background: url(../images/utils/bullet_arrow.gif) no-repeat scroll 0 50% transparent; 220 display: inline; 221 padding: 0 0 0 10px; 222 } 223 215 224 #nav a { 216 225 color:#ffffff; … … 227 236 right:0; 228 237 margin:0.75em; 229 margin-right:0.75em;238 /* margin-right:0.75em; 230 239 margin-left:0.75em; 231 height:1em; 232 } 233 234 # blabla{240 height:1em;*/ 241 } 242 243 #corpsPage { 235 244 position:relative; 236 245 top:-1em; … … 248 257 text-transform:uppercase; 249 258 color:#04155D; 250 padding:0.5em ;259 padding:0.5em 0.5em 0; 251 260 _margin:0.5em; 252 261 } … … 254 263 #txt { 255 264 position:relative; 256 padding: 1em;265 padding:0 1em 1em; 257 266 color:#000000; 258 267 text-align:justify; … … 274 283 font-size: 12px; 275 284 /*float:left;*/ 276 }277 278 #copyright {279 position:relative;280 text-align:left;281 285 color:#ffffff; 282 286 padding:0.5em; 283 float:left; 284 } 285 286 #datestamp { 287 position:relative; 288 float:right; 289 text-align:right; 290 font-style:italic; 291 color:#ffffff; 292 padding:0.5em; 293 } 287 } -
ether_megapoli/trunk/web/resources/css/megapoli.css
r89 r140 10 10 11 11 #txt .legende { 12 text-align:center;13 12 font-style:italic; 14 13 color:#6178BC; … … 133 132 text-align:right; 134 133 } 134 135 .titleBox { 136 font-size: 15px; 137 color: blue; 138 } 139 140 .titleType { 141 font-size: 11px; 142 font-weight: bold; 143 color:#806159; 144 } 145 146 .smallButton { 147 font-size: 8px; 148 width: 15px; 149 } -
ether_megapoli/trunk/web/resources/js/maj.js
r89 r140 186 186 '<option value="C2H4 (Ethylene)">C2H4 (Ethylene)</option>'+ 187 187 '<option value="C2H6 (Ethane)">C2H6 (Ethane)</option>'+ 188 '<option value="C3H6 (Propylene) ">C3H6 (Propylene)</option>'+188 '<option value="C3H6 (Propylene)">C3H6 (Propylene)</option>'+ 189 189 '<option value="C3H8 (Propane)">C3H8 (Propane)</option>'+ 190 190 '<option value="i-C4H10 (Iso-butane)">i-C4H10 (Iso-butane)</option>'+ … … 265 265 } 266 266 } 267 268 function selectElem(checked,idNb) { 269 var str = document.getElementById(idNb).innerHTML; 270 var nbElems = parseInt(str.substring(1,str.indexOf(")"))); 271 if (checked) 272 nbElems++; 273 else 274 nbElems--; 275 document.getElementById(idNb).innerHTML = "("+nbElems+")"; 276 if (nbElems == 0) { 277 document.getElementById(idNb).style.visibility = "hidden"; 278 document.getElementById(idNb).style.display = "none"; 279 } else { 280 document.getElementById(idNb).style.visibility = "visible"; 281 document.getElementById(idNb).style.display = ""; 282 } 283 } 284 285 function affPlat(typePlat) { 286 var div = document.getElementById("listPlateformes"); 287 var tables = div.getElementsByTagName("table"); 288 var plus = document.getElementById("plusPlat_"+typePlat); 289 for (var numsel = 0; numsel < tables.length ; numsel++) { 290 var idTable = tables[numsel].id; 291 if (idTable.substring(0,idTable.lastIndexOf("_")) == "plat_"+typePlat) { 292 // On appuie sur + : on déploie l'arborescence 293 if (plus.value == "+") { 294 tables[numsel].style.visibility = "visible"; 295 tables[numsel].style.display = ""; 296 } 297 // On appuie sur - : on replie l'arborescence 298 else { 299 tables[numsel].style.visibility = "hidden"; 300 tables[numsel].style.display = "none"; 301 } 302 } 303 } 304 if (plus.value == "+") plus.value = "-"; 305 else plus.value = "+"; 306 } 307 308 function affJeu(catJeu) { 309 var div = document.getElementById("listJeux"); 310 var tables = div.getElementsByTagName("table"); 311 var plus = document.getElementById("plusJeu_"+catJeu); 312 for (var numsel = 0; numsel < tables.length ; numsel++) { 313 var idTable = tables[numsel].id; 314 315 if (idTable.substring(0,idTable.lastIndexOf("_")) == "jeu_"+catJeu) { 316 // On appuie sur + : on déploie l'arborescence 317 if (plus.value == "+") { 318 tables[numsel].style.visibility = "visible"; 319 tables[numsel].style.display = ""; 320 } 321 // On appuie sur - : on replie l'arborescence 322 else { 323 tables[numsel].style.visibility = "hidden"; 324 tables[numsel].style.display = "none"; 325 } 326 } 327 } 328 if (plus.value == "+") plus.value = "-"; 329 else plus.value = "+"; 330 } 331 332 function affCapt(typeCapt) { 333 var div = document.getElementById("listCapteurs"); 334 var tables = div.getElementsByTagName("table"); 335 var plus = document.getElementById("plusCapt_"+typeCapt); 336 for (var numsel = 0; numsel < tables.length ; numsel++) { 337 var idTable = tables[numsel].id; 338 if (idTable.substring(0,idTable.lastIndexOf("_")) == "capt_"+typeCapt) { 339 // On appuie sur + : on déploie l'arborescence 340 if (plus.value == "+") { 341 tables[numsel].style.visibility = "visible"; 342 tables[numsel].style.display = ""; 343 } 344 // On appuie sur - : on replie l'arborescence 345 else { 346 tables[numsel].style.visibility = "hidden"; 347 tables[numsel].style.display = "none"; 348 } 349 } 350 } 351 if (plus.value == "+") plus.value = "-"; 352 else plus.value = "+"; 353 } 354 355 function affParam(idCat1,idCat2,idCat3,idCat4,level,signe) { 356 var strCatParam = idCat1+"-"+idCat2+"-"+idCat3+"-"+idCat4; 357 var plus = document.getElementById("plusParam_"+strCatParam); 358 if (signe == "+") plus.value = "-"; 359 else plus.value = "+"; 360 level++; 361 var div = document.getElementById("listParametres"); 362 var divCats = div.getElementsByTagName("div"); 363 var tables = div.getElementsByTagName("table"); 364 var debCat = strCatParam; 365 if (level == 4) debCat = idCat1+"-"+idCat2+"-"+idCat3; 366 else if (level == 3) debCat = idCat1+"-"+idCat2; 367 else if (level == 2) debCat = idCat1; 368 // Ouverture/Fermeture des catégories 369 for (var numsel = 0; numsel < divCats.length ; numsel++) { 370 var idDiv = divCats[numsel].id; 371 if (idDiv != "catParam_"+strCatParam && idDiv.search("catParam_"+debCat) != -1) { 372 // On appuie sur + : on déploie l'arborescence 373 if (signe == "+") { 374 if (level == 4 || 375 (level == 3 && idDiv.search("-0") != -1) || 376 (level == 2 && idDiv.search("-0-0") != -1)) { 377 divCats[numsel].style.visibility = "visible"; 378 divCats[numsel].style.display = ""; 379 } 380 } 381 // On appuie sur - : on replie l'arborescence 382 else { 383 divCats[numsel].style.visibility = "hidden"; 384 divCats[numsel].style.display = "none"; 385 var plus2 = document.getElementById("plusParam_"+idDiv.substring(idDiv.indexOf("_")+1)); 386 plus2.value = "+"; 387 } 388 } 389 } 390 // Ouverture/Fermeture des paramÚtres 391 for (var numtab = 0; numtab < tables.length ; numtab++) { 392 var idTable = tables[numtab].id; 393 if (idTable.search("param_"+debCat) != -1) { 394 // On appuie sur + : on déploie l'arborescence 395 if (signe == "+") { 396 if (level > 4 || 397 (level == 4 && idTable.search("-0") != -1) || 398 (level == 3 && idTable.search("-0-0") != -1) || 399 (level == 2 && idTable.search("-0-0-0") != -1)) { 400 tables[numtab].style.visibility = "visible"; 401 tables[numtab].style.display = ""; 402 } 403 } 404 // On appuie sur - : on replie l'arborescence 405 else { 406 tables[numtab].style.visibility = "hidden"; 407 tables[numtab].style.display = "none"; 408 } 409 } 410 } 411 } 412 413 function resetExtractForm() { 414 selAll(false,'selectCapts','nbCaptsTxt'); 415 selAll(false,'selectPlats','nbPlatsTxt'); 416 selAll(false,'selectJeux','nbJeuxTxt'); 417 selAll(false,'selectParams','nbParamsTxt'); 418 // var inputs = document.getElementsByTagName('input'); 419 // for (var num = 0; num < inputs.length ; num++) { 420 // if (inputs[num].type == "checkbox") { 421 // inputs[num].checked = false; 422 // } 423 // } 424 } 425 426 function selAll(check,selId,idNb) { 427 var checkboxes = document.getElementsByName(selId); 428 // Si case cochée, on sélectionne tout 429 if (check) { 430 for (var numsel = 0; numsel < checkboxes.length ; numsel++) { 431 checkboxes[numsel].checked = true; 432 } 433 document.getElementById(idNb).innerHTML = "("+checkboxes.length+")"; 434 document.getElementById(idNb).style.visibility = "visible"; 435 document.getElementById(idNb).style.display = ""; 436 } 437 // Si case décochée, on désélectionne tout et on cache le (0) 438 else { 439 for (var numsel = 0; numsel < checkboxes.length ; numsel++) { 440 checkboxes[numsel].checked = false; 441 } 442 document.getElementById(idNb).innerHTML = "(0)"; 443 document.getElementById(idNb).style.visibility = "hidden"; 444 document.getElementById(idNb).style.display = "none"; 445 } 446 }
Note: See TracChangeset
for help on using the changeset viewer.
