Changeset 529
- Timestamp:
- 06/28/12 17:44:26 (12 years ago)
- Location:
- tapas
- Files:
-
- 62 added
- 24 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
tapas/common/implementation/com/ether/DateHelper.java
r524 r529 164 164 public static final String ENGLISH_DATE_PATTERN = "yyyy-MM-dd HH:mm"; 165 165 public static final String ENGLISH_DATE_LONG_PATTERN = "yyyy-MM-dd HH:mm:ss"; 166 public static final String DATE_UTC = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; 166 167 167 168 public static final String ORDERED_FORMAT_PLUS_GMT = "yyyy-MM-dd HH:mm:ss.SSSS Z"; -
tapas/domain/interface/com/ether/ClimatoReference.java
r444 r529 7 7 public enum ClimatoReference 8 8 { 9 ECMWF, 9 10 TROPICAL, 10 11 MEDIUM_LATITUDE_SUMMER, -
tapas/domain/interface/com/ether/FileFormat.java
r419 r529 9 9 ASCII, 10 10 FITS, 11 NETCDF 11 NETCDF, 12 VO 12 13 } -
tapas/domain/interface/com/ether/tapas/Los.java
r466 r529 2 2 3 3 import org.jetbrains.annotations.NotNull; 4 import org.jetbrains.annotations.Nullable; 4 5 5 6 /** … … 9 10 public class Los 10 11 { 11 @N otNull12 @Nullable 12 13 public String getRaJ2000() 13 14 { … … 15 16 } 16 17 17 public void setRaJ2000( @N otNullfinal String raJ2000 )18 public void setRaJ2000( @Nullable final String raJ2000 ) 18 19 { 19 20 _raJ2000 = raJ2000; 20 21 } 21 22 22 @N otNull23 @Nullable 23 24 public String getDecJ2000() 24 25 { … … 26 27 } 27 28 28 public void setDecJ2000( @N otNullfinal String decJ2000 )29 public void setDecJ2000( @Nullable final String decJ2000 ) 29 30 { 30 31 _decJ2000 = decJ2000; 31 32 } 32 33 33 @N otNull34 @Nullable 34 35 public String getZenithAngle() 35 36 { … … 37 38 } 38 39 39 public void setZenithAngle( @N otNullfinal String zenithAngle )40 public void setZenithAngle( @Nullable final String zenithAngle ) 40 41 { 41 42 _zenithAngle = zenithAngle; 42 43 } 43 44 44 @N otNull45 @Nullable 45 46 private String _raJ2000; 46 @N otNull47 @Nullable 47 48 private String _decJ2000; 48 @N otNull49 @Nullable 49 50 private String _zenithAngle; 50 51 } -
tapas/service/implementation/com/ether/TapasServiceImpl.java
r524 r529 3 3 import com.ether.dao.ObservatoryDAO; 4 4 import com.ether.dao.TapasRequestDAO; 5 import com.ether.tapas.Los; 5 6 import com.ether.tapas.Observatory; 6 7 import com.ether.tapas.Request; … … 80 81 final Element format = new Element( "format" ); 81 82 //final Attribute validF = new Attribute( "valid", iRequest.getPreference().getFormat().getFirstValue() ); 82 final Attribute validF = new Attribute( "valid", " ASCII,FITS,NETCDF" );83 final Attribute validF = new Attribute( "valid", "VO,ASCII,FITS,NETCDF" ); 83 84 format.setAttribute( validF ); 84 85 format.setText( iRequest.getPreference().getFormat().getSecondValue() ); … … 127 128 128 129 // OBSERVATORIES 129 130 130 final Element observation = new Element( "observation" ); 131 131 … … 133 133 final Element mdate = new Element( "date" ); 134 134 final Calendar calendar = Calendar.getInstance(); 135 135 136 calendar.setTimeInMillis( Long.valueOf( iRequest.getObservation().getDate() ) ); 136 mdate.setText( DateHelper.formatDate( calendar.getTime(), DateHelper.ENGLISH_DATE_LONG_PATTERN ) ); 137 final String dateFormatFinal=DateHelper.formatDate( calendar.getTime(), DateHelper.DATE_UTC ); 138 139 mdate.setText( dateFormatFinal ); 140 137 141 // mdate.setText( iRequest.getObservation().getDate() ); 138 139 142 observation.addContent( mdate ); 140 143 … … 188 191 observation.addContent( los ); 189 192 190 final Element ra_j2000 = new Element( "ra_j2000" ); 191 ra_j2000.setText( iRequest.getObservation().getLos().getRaJ2000() ); 192 los.addContent( ra_j2000 ); 193 194 final Element dec_j2000 = new Element( "dec_j2000" ); 195 dec_j2000.setText( iRequest.getObservation().getLos().getDecJ2000() ); 196 los.addContent( dec_j2000 ); 197 198 final Element zenith_angle = new Element( "zenith_angle" ); 199 200 Attribute a1 = new Attribute( "min", "0" ); 201 Attribute a2 = new Attribute( "max", "90" ); 202 203 zenith_angle.setAttribute( a1 ); 204 zenith_angle.setAttribute( a2 ); 205 206 zenith_angle.setText( iRequest.getObservation().getLos().getZenithAngle() ); 207 208 los.addContent( zenith_angle ); 193 Los temp = iRequest.getObservation().getLos(); 194 if ( !temp.getRaJ2000().equals( "" )) { 195 final Element ra_j2000 = new Element( "ra_j2000" ); 196 ra_j2000.setText( iRequest.getObservation().getLos().getRaJ2000() ); 197 los.addContent( ra_j2000 ); 198 } 199 200 if ( !temp.getDecJ2000().equals( "" )) { 201 final Element dec_j2000 = new Element( "dec_j2000" ); 202 dec_j2000.setText( iRequest.getObservation().getLos().getDecJ2000() ); 203 los.addContent( dec_j2000 ); 204 } 205 206 207 if ( !temp.getZenithAngle().equals("") ) { 208 final Element zenith_angle = new Element( "zenith_angle" ); 209 210 Attribute a1 = new Attribute( "min", "0" ); 211 Attribute a2 = new Attribute( "max", "90" ); 212 213 zenith_angle.setAttribute( a1 ); 214 zenith_angle.setAttribute( a2 ); 215 zenith_angle.setText( temp.getZenithAngle() ); 216 217 los.addContent( zenith_angle ); 218 } 209 219 210 220 … … 281 291 shortName = obs.getShortName(); 282 292 283 fileArletty = dataPath + "/" + createFileName( iRequest.getObservation().getDate(), "arletty", shortName ); 284 fileECMWF = dataPath + "/" + createFileName( iRequest.getObservation().getDate(), "ecmwf", shortName ); 293 294 fileArletty = dataPath + "/" + createFileName( dateFormatFinal , "arletty", shortName ); 295 fileECMWF = dataPath + "/" + createFileName( dateFormatFinal, "ecmwf", shortName ); 285 296 286 297 final Element arlettyFile = new Element( "arletty_file" ); … … 456 467 } 457 468 458 int iheure = cal.get( Calendar.HOUR_OF_DAY ) + 2;469 int iheure = cal.get( Calendar.HOUR_OF_DAY );// + 2; 459 470 460 471 if( iheure < 3 ) ind = "00"; -
tapas/web/init.jsp
r490 r529 20 20 <div id="errors"><spring:message code="${errors}"/></div> 21 21 </c:if> 22 <div class="containerLabel3"> 23 <fieldset class="cfs3"> 24 25 WHAT TAPAS CAN DO FOR YOU : 26 27 <ul type=circle> 28 <li>Make use of the <a href="http://ether.ipsl.jussieu.fr">ETHER</a> facility to interpolate within the ECMWF (European Centre for Medium-Range Weather Forecasts) the pressure, temperature, and constituent profile at the location of your observing site and within 6 hours from the date of your observations. 29 <br> 30 <li>Compute the atmospheric transmittance from the top of the atmosphere down to the observatory, based on the HITRAN (high-resolution transmission molecular absorption database) molecular database and the LBLTRM (Line-By-Line Radiative Transfer Model) radiative transfer code. 31 <br> 32 <li>Provide separate transmittances associated with H2O, O2, O3, CO2, and Rayleigh scattering. 33 <br> 34 <li>Allow disentangling atmospheric features from other absorptions in your astronomical spectra. 35 36 </ul> 37 38 <br> 39 40 <table cellpadding=4 cellspacing=6 align="center"> 41 42 <tr> 43 <td><a target="_blank" href="http://www.cnes.fr"><img border="1" width=70 src="resources/images/logo_cnes.png"></a></td> 44 <td><a target="_blank" href="http://www.latmos.ipsl.fr"><img border="1" width=100 src="resources/images/logo_latmos.png"></a></td> 45 <td><a target="_blank" href="http://www.ipsl.fr"><img width=100 src="resources/images/logo_ipsl.png"></a></td> 46 <td><a target="_blank" href="http://www.cnrs.fr"><img border="1" width=70 src="resources/images/logo_cnrs.jpg"></a></td> 47 </tr> 22 48 23 49 50 51 </table> 52 53 </fieldset> 54 </div> 24 55 25 56 </tiles:put> -
tapas/web/project/formTapas.jsp
r511 r529 25 25 <ether:htmlJs jsFile="tools/controls"/> 26 26 <ether:htmlJs jsFile="classesForJQuery/Tab"/> 27 <ether:htmlJs jsFile="tools/googleStats"/> 27 28 </tiles:put> 29 28 30 29 31 <tiles:put name="title" type="string"><spring:message code="app.title"/> - <spring:message code="title.form"/></tiles:put> … … 55 57 tapasTexts["<%=InstrumentalFunction.NONE%>"] = "<spring:message code="text.NONE"/>"; 56 58 tapasTexts["<%=InstrumentalFunction.GAUSSIAN%>"] = "<spring:message code="label.instrumentalFunction.GAUSSIAN"/>"; 59 tapasTexts["<%=ClimatoReference.ECMWF%>"] = "ARLETTY"; 57 60 tapasTexts["<%=ClimatoReference.TROPICAL%>"] = "<spring:message code="label.climatoReference.TROPICAL"/>"; 58 61 tapasTexts["<%=ClimatoReference.MEDIUM_LATITUDE_SUMMER%>"] = "<spring:message code="label.climatoReference.MEDIUM_LATITUDE_SUMMER"/>"; … … 104 107 tapasTexts["label.title.add"] = "<spring:message code="label.title.add"/>"; 105 108 tapasTexts["label.title.del"] = "<spring:message code="label.title.del"/>"; 109 tapasTexts["label.or"] = "<spring:message code="label.or"/>"; 106 110 107 111 var interfaceTapas = new InterfaceTapas( ${jSonFileFormats}, ${jSonYesNos}, ${jSonObservatories}, ${jSonSpectralUnits}, ${jSonInstrumentalFunctions}, ${jSonClimatoReferences} ); -
tapas/web/project/formTapas_script.jsp
r524 r529 106 106 currentDate = new Date(); 107 107 108 108 109 $( "#" + inputDateId ).val( this.calendarConverter.format( currentDate ) ); 109 110 $( "#" + inputDateId ).addClass( "calendar" ); … … 113 114 114 115 // CREATES ******************************************************** 115 createTime: function( containerCalendar, texte, inputDateId, currentTime, isTrToCreate )116 createTime: function( containerCalendar, texte, inputDateId, currentTime, isTrToCreate, text2 ) 116 117 { 117 118 if( isTrToCreate ) 118 119 { 120 119 121 // Create input for date text 120 122 var tr = $( document.createElement( "tr" ) ); 121 123 var td1 = $( document.createElement( "td" ) ); 122 124 var td2 = $( document.createElement( "td" ) ); 125 var td3 = $( document.createElement( "td" ) ); 123 126 var inputDate = $( document.createElement( "input" ) ); 124 127 inputDate.attr( {id:inputDateId, size:"10"} ); … … 126 129 td1.html( texte ); 127 130 td1.attr( { class:"containerLabel" } ); 128 129 131 tr.append( td1 ); 130 132 131 132 td2.attr( {colspan:3} ); 133 td2.attr( {colspan:1} ); 133 134 td2.append( inputDate ); 134 135 tr.append( td2 ); 136 137 td3.html( text2 ); 138 td3.attr( { class:"containerLabel2" } ); 139 tr.append( td3 ); 140 135 141 containerCalendar.append( tr ); 136 142 } … … 153 159 154 160 155 createTr: function( texte, inputId, container, textesup )161 createTr: function( texte, inputId, container, textesup, event, champ, ctnb ) 156 162 { 157 163 var tr = $( document.createElement( "tr" ) ); … … 161 167 var input = $( document.createElement( "input" ) ); 162 168 163 input.attr( {id: inputId, class:"containerText", size:11} ); 169 input.attr( {id: inputId, class:"containerText"+ctnb, size:11} ); 170 171 172 if (event.length > 0) input.bind( event, [this, champ], this.angleChoice ); 164 173 165 174 td1.html( texte ); … … 176 185 177 186 }, 187 188 189 createTrTxt: function( texte, container ) 190 { 191 var tr = $( document.createElement( "tr" ) ); 192 var td1 = $( document.createElement( "td" ) ); 193 194 td1.html( texte ); 195 td1.attr( {class:"containerLabelT", colspan:4} ); 196 197 tr.append( td1 ); 198 container.append( tr ); 199 200 }, 201 202 178 203 179 204 createTr2Input: function( texte1, texte2, inputId1, inputId2, container, textesup ) … … 323 348 { 324 349 var numCurrent = this.numRequest; 350 325 351 var z = 1; 326 352 … … 343 369 document.getElementById( "all_" + i ).id = "all_" + z; 344 370 $( "#tab_request" + i ).html( "Request " + z ); 371 //$( "#tab_request" + i ).html( "toto"); 345 372 $( "#tab_request" + i ).attr( {name:z} ); 346 373 $( "#tab_request" + i ).attr( {id:"tab_request" + z} ); … … 360 387 this.selectClimatoReferencesList[z] = this.selectClimatoReferencesList[i]; 361 388 this.selectClimatoReferencesList[i] = null; 389 // le $ n'intervient qu en html. $() remplace le document.element 362 390 $( "#ide_" + i ).attr( {id:"ide_" + z} ); 363 391 $( "#iza_" + i ).attr( {id:"iza_" + z} ); 364 392 $( "#irp_" + i ).attr( {id:"irp_" + z} ); 365 393 $( "#isr_" + i ).attr( {id:"isr_" + z} ); 394 $( "#ira_" + i ).attr( {id:"ira_" + z} ); 366 395 // $( "#select_iformat_" + i ).attr( {id:"select_iformat_" + z} ); 367 396 this.selectFileFormatsList[z] = this.selectFileFormatsList[i]; … … 385 414 // Supression du calendrier puis re-création en insérant l'ancienne date 386 415 var oldDate = this.calendarConverter.parse( $( "#iobservation_date_" + i ).val() ); 416 //var oldDate = $( "#iobservation_date_" + i ).val(); 417 387 418 AnyTime.noPicker( "iobservation_date_" + i ); 419 //this.createCalendar( $( "#tabObservation_" + z ), tapasTexts["label.datemesure"], "iobservation_date_" + z, oldDate, false ); 420 421 $( "#iobservation_date_" + i ).attr( {id:"iobservation_date_" + z} ); 388 422 this.createCalendar( $( "#tabObservation_" + z ), tapasTexts["label.datemesure"], "iobservation_date_" + z, oldDate, false ); 389 $( "#iobservation_date_" + i ).attr( {id:"iobservation_date_" + z});423 //this.createCalendar( $( "#tabObservation_" + z ), tapasTexts["label.datemesure"], "iobservation_date_" + z, false, false ); 390 424 391 425 // Idem pour les heures !!! 392 426 // TODO : voir si besoin de parser les heures ou non 393 427 // var oldTime = this.timeConverter.parse( $( "#ira_" + i ).val() ); 394 var oldTime = $( "#ira_" + i ).val();428 /*var oldTime = $( "#ira_" + i ).val(); 395 429 AnyTime.noPicker( "ira_" + i ); 396 this.createTime( $( "#tabObservation_" + z ), tapasTexts["label.ira"], "ira_" + z, oldTime, false );397 $( "#ira_" + i ).attr( {id:"ira_" + z} ); 430 this.createTime( $( "#tabObservation_" + z ), tapasTexts["label.ira"], "ira_" + z, oldTime, false,"j2000" ); 431 $( "#ira_" + i ).attr( {id:"ira_" + z} );*/ 398 432 } 399 433 } … … 554 588 555 589 556 //this.createTr( tapasTexts["label.ira"], "ira", tabObservation ); 557 this.createTime( tabObservation, tapasTexts["label.ira"], "ira_" + this.nbRequest, false, true ); 558 this.createTr( tapasTexts["label.ide"], "ide_" + this.nbRequest, tabObservation, "hh:mm:ss.ms [-90,90] °" ); 559 this.createTr( tapasTexts["label.iza"], "iza_" + this.nbRequest, tabObservation, "[0,90] °" ); 560 561 this.createTr( tapasTexts["label.resolution"], "irp_" + this.nbRequest, tabObservation, "" ); 562 this.createTr( tapasTexts["label.ratio"], "isr_" + this.nbRequest, tabObservation, "" ); 563 564 590 this.createTr( tapasTexts["label.resolution"], "irp_" + this.nbRequest, tabObservation, "", "", "","" ); 591 this.createTr( tapasTexts["label.ratio"], "isr_" + this.nbRequest, tabObservation, "", "","","" ); 592 593 594 this.createTr( tapasTexts["label.ira"], "ira_" + this.nbRequest,tabObservation,"hh:mm:ss (J2000)","keypress","ra","2" ); 595 //this.createTime( tabObservation, tapasTexts["label.ira"], "ira_" + this.nbRequest, false, true,"hh:mm:ss (J2000)" ); 596 this.createTr( tapasTexts["label.ide"], "ide_" + this.nbRequest, tabObservation, "deg:':''","keypress","de","2" ); 597 this.createTrTxt( tapasTexts["label.or"], tabObservation ); 598 this.createTr( tapasTexts["label.iza"], "iza_" + this.nbRequest, tabObservation, "[0,90] °","keypress","za","2" ); 599 600 601 this.initRequestFields(); 565 602 //jQuery.proxy permet d'envoyer le contexte this courant 566 603 … … 611 648 // Los 612 649 var los = new Object(); 613 los.raJ2000 = $( "#ira_" + i ).val(); 614 los.decJ2000 = $( "#ide_" + i ).val(); 615 los.zenithAngle = $( "#iza_" + i ).val(); 650 651 //if ($( "#iza_" + i ).val().toString() != null) 652 los.zenithAngle = $( "#iza_" + i ).val(); 653 //else { 654 los.raJ2000 = $( "#ira_" + i ).val(); 655 los.decJ2000 = $( "#ide_" + i ).val(); 656 //} 657 658 659 //los.raJ2000 = "22:22:22";//$( "#ira_" + i ).val(); 660 //los.decJ2000 = "22:22:22";//$( "#ide_" + i ).val(); 661 //los.zenithAngle = "12";//$( "#iza_" + i ).val("12"); 662 616 663 617 664 // Instrument … … 638 685 var observation = new Object(); 639 686 observation.date = this.calendarConverter.parse( $( "#iobservation_date_" + i ).val() ).getTime(); 687 688 640 689 observation.observatory = observatory; 641 690 … … 673 722 674 723 var chaine = tapasTexts["text.erreur.saisie"] + " " + i + "<br>"; 724 var testOk1=false; 725 var testOk2=false; 726 var testOk3=false; 675 727 var testOk = isSup( this.selectObservatoriesList[i].getValue(), 0 ); 676 728 if( !testOk ) … … 697 749 } 698 750 699 testOk = isDeg( $( "#ide_" + i ).val() );751 /*testOk = isDeg( $( "#ide_" + i ).val() ); 700 752 if( !testOk ) 701 753 { … … 703 755 this.divE.show(); 704 756 return false; 705 } 706 707 testOk = isValidNum( $( "#iza_" + i ).val() ); 757 } */ 758 759 760 testOk = isBetween( $( "#iza_" + i ).val(), 0, 90 ); 761 testOk1 = isValidNum( $( "#iza_" + i ).val()); 762 testOk2 = isDeg( $( "#ide_" + i ).val()); 763 testOk3 = isHourDeg( $( "#ira_" + i ).val()); 764 if( !((testOk && testOk1) || (testOk2 && testOk3)) ) 765 { 766 if ( !(testOk && testOk1) ) 767 this.divE.html( chaine + "LOS : " + tapasTexts["text.badvalue"] ); 768 else 769 this.divE.html( chaine + tapasTexts["label.iza"] + " : " + tapasTexts["text.badvalue"] ); 770 this.divE.show(); 771 return false; 772 } 773 774 /*testOk = isBetween( $( "#iza_" + i ).val(), 0, 90 ); 708 775 if( !testOk ) 709 776 { … … 711 778 this.divE.show(); 712 779 return false; 713 } 714 715 testOk = isBetween( $( "#iza_" + i ).val(), 0, 90 ); 716 if( !testOk ) 717 { 718 this.divE.html( chaine + tapasTexts["label.iza"] + " : " + tapasTexts["text.badvalue"] ); 719 this.divE.show(); 720 return false; 721 } 780 } */ 722 781 723 782 testOk = isValidNum( $( "#irp_" + i ).val() ); … … 768 827 else 769 828 this.addRequestButton.enable(); 829 }, 830 831 832 angleChoice: function(params) 833 { 834 var context = params.data[0]; 835 var champ = params.data[1]; 836 //alert(context.nbRequest); 837 var indice = context.nbRequest; 838 if (champ == "za") { 839 //$( "#iza_"+indice ).val($( "#iza_"+indice ).val().replace(/^\s+|\s+$/g,"")); 840 //alert($( "#iza_"+indice ).val($( "#iza_"+indice ).val().replace(/^\s+|\s+$/g,"")).length); 841 //if ($( "#iza_"+indice ).val($( "#iza_"+indice ).val().replace(/^\s+|\s+$/g,"")).length >0 ) { 842 $( "#ira_"+indice ).val(""); 843 $( "#ide_"+indice ).val(""); 844 //} 845 } 846 else { 847 $( "#iza_"+indice ).val(""); 848 } 849 850 851 }, 852 853 854 855 /*this.createTrList( tapasTexts["label.format"], "iformat_" + this.nbRequest, this.nbRequest, tabPreference, 'format' ); 856 this.createTrList( tapasTexts["label.era"], "irextinction_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' ); 857 this.createTrList( tapasTexts["label.eh2o"], "ih2oe_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' ); 858 this.createTrList( tapasTexts["label.eo3"], "io3e_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' ); 859 this.createTrList( tapasTexts["label.eo2"], "io2e_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' ); 860 this.createTrList( tapasTexts["label.eco2"], "ico2e_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' ); 861 862 this.createTrList( tapasTexts["label.observatory"], "iobservatory_" + this.nbRequest, this.nbRequest, tabObservation, 'observatories' ); 863 this.createCalendar( tabObservation, tapasTexts["label.datemesure"], "iobservation_date_" + this.nbRequest, false, true ); 864 865 //unite 866 this.createTrList( tapasTexts["label.spectralUnit"], "ispectral_choice_" + this.nbRequest, this.nbRequest, tabObservation, 'spectralUnit' ); 867 this.createTr2Input( tapasTexts["label.spectralRange"], tapasTexts["label.to"], "iminspectral_ranger_" + this.nbRequest, "imaxspectral_ranger_" + this.nbRequest, tabObservation, "[350,2500] nm" ); 868 869 //fonction instrumentale 870 this.createTrList( tapasTexts["label.ifunction"], "ifunction_" + this.nbRequest, this.nbRequest, tabObservation, "ilsf" ); 871 //reference climato 872 //this.createTrList( tapasTexts["label.climato"], "icr", tabAtmosphere, "climatoReference" ); 873 this.createTrList( tapasTexts["label.climato"], "icr_" + this.nbRequest, this.nbRequest, tabObservation, "climatoReference" ); 874 875 876 this.createTr( tapasTexts["label.ira"], "ira_" + this.nbRequest,tabObservation,"hh:mm:ss (J2000)","keypress","ra","2" ); 877 //this.createTime( tabObservation, tapasTexts["label.ira"], "ira_" + this.nbRequest, false, true,"hh:mm:ss (J2000)" ); 878 this.createTr( tapasTexts["label.ide"], "ide_" + this.nbRequest, tabObservation, "deg:':''","keypress","de","2" ); 879 this.createTrTxt( "or", tabObservation ); 880 this.createTr( tapasTexts["label.iza"], "iza_" + this.nbRequest, tabObservation, "[0,90] °","keypress","za","2" ); 881 882 this.createTr( tapasTexts["label.resolution"], "irp_" + this.nbRequest, tabObservation, "", "", "","" ); 883 this.createTr( tapasTexts["label.ratio"], "isr_" + this.nbRequest, tabObservation, "", "","","" ); 884 */ 885 886 887 initRequestFields: function() 888 { 889 if (this.nbRequest > 1 && this.nbRequest <=9) { 890 var indice = this.nbRequest; 891 var indice0 = indice - 1; 892 893 this.selectObservatoriesList[indice].select(this.selectObservatoriesList[indice-1].getValue(),false); 894 $( "#iobservation_date_" + indice ).val( $( "#iobservation_date_" + indice0).val() ); 895 this.selectSpectralUnitsList[indice].select(this.selectSpectralUnitsList[indice-1].getValue(),false); 896 897 898 this.selectInstrumentalFunctionsList[indice].select(this.selectInstrumentalFunctionsList[indice-1].getValue(),false); 899 this.selectClimatoReferencesList[indice].select(this.selectClimatoReferencesList[indice-1].getValue(),false); 900 901 this.selectFileFormatsList[indice].select(this.selectFileFormatsList[indice-1].getValue(),false); 902 this.select_irextinctionList[indice].select(this.select_irextinctionList[indice-1].getValue(),false); 903 this.select_ih2oeList[indice].select(this.select_ih2oeList[indice-1].getValue(),false); 904 this.select_io3eList[indice].select(this.select_io3eList[indice-1].getValue(),false); 905 this.select_io2eList[indice].select(this.select_io2eList[indice-1].getValue(),false); 906 this.select_ico2eList[indice].select(this.select_ico2eList[indice-1].getValue(),false); 907 908 $( "#iminspectral_ranger_" + indice ).val($( "#iminspectral_ranger_" + indice0 ).val() ); 909 $( "#imaxspectral_ranger_" + indice ).val($( "#imaxspectral_ranger_" + indice0 ).val() ); 910 911 $( "#irp_" + indice ).val($( "#irp_" + indice0 ).val() ); 912 $( "#isr_" + indice ).val($( "#isr_" + indice0 ).val() ); 913 $( "#ira_" + indice ).val($( "#ira_" + indice0 ).val() ); 914 $( "#ide_" + indice ).val($( "#ide_" + indice0 ).val() ); 915 $( "#iza_" + indice ).val($( "#iza_" + indice0 ).val() ); 916 917 918 919 // $( "#iobservatory_date_" + indice ).val( $( "#iobservatory_date_" + indice0 ).val() ); 920 // $( "#iobservatory_date_" + indice ).val( this.calendarConverter.format( currentDate ) ); 921 922 //$( "#iobservatory_date_" + indice ).val( this.calendarConverter.format( this.calendarConverter.parse( $( "#iobservation_date_" + indice0 ).val() ).getTime() ) ); 923 // this.selectSpectralUnitsList[z] = this.selectSpectralUnitsList[i]; 924 /*this.selectSpectralUnitsList[i] = null; 925 $( "#iminspectral_ranger_" + i ).attr( {id:"iminspectral_ranger_" + z} ); 926 $( "#imaxspectral_ranger_" + i ).attr( {id:"imaxspectral_ranger_" + z} );*/ 927 928 //$( "#irp_"+indice ).val($( "#irp_"+(indice-1)).val() ); 929 930 } 770 931 } 771 932 -
tapas/web/resources/css/TwitterLogin/front.css
r481 r529 39 39 *background: transparent url("images/signin-nav-bg-hover-ie.png") no-repeat 0 0; 40 40 *padding: 4px 12px 6px; 41 color: # bfafd6;41 color: #ff7c25; 42 42 } 43 43 … … 62 62 -moz-border-radius-topleft: 4px; 63 63 -moz-border-radius-topright: 4px; 64 background: white!important;64 background: #ff7c25 !important; 65 65 color: black !important; 66 66 outline: none; … … 77 77 a.signin.menu-open span { 78 78 background-image: url("images/toggle_up_dark.png"); 79 color: black ;79 color: black ; 80 80 } 81 81 … … 86 86 -webkit-border-bottom-right-radius: 4px; 87 87 display: none; 88 background-color: # bfafd6;88 background-color: #ff7c25; 89 89 position: absolute; 90 90 width: 210px; … … 97 97 margin-top: 5px; 98 98 margin-right: 0px; 99 *margin-right: -1px;100 color: #574176;99 margin-right: -1px; 100 color: black; 101 101 font-size: 11px; 102 102 } … … 106 106 -moz-border-radius: 4px; 107 107 -webkit-border-radius: 4px; 108 border: 1px solid # 574176;108 border: 1px solid #d45400; 109 109 font-size: 13px; 110 110 margin: 0 0 5px; … … 145 145 -moz-border-radius: 4px; 146 146 -webkit-border-radius: 4px; 147 background: # 574176url('images/bg-btn-blue.png') repeat-x scroll 0 0;148 border: 1px solid # 574176;149 color: #fff ;147 background: #d45400 url('images/bg-btn-blue.png') repeat-x scroll 0 0; 148 border: 1px solid #d45400; 149 color: #ffffff; 150 150 //text-shadow: 0 -1px 0 #39d; 151 151 padding: 4px 10px 5px; … … 163 163 background-position: 0 -5px; 164 164 cursor: pointer; 165 color: # bfafd6;165 color: #d45400; 166 166 } 167 167 … … 188 188 -webkit-border-radius: 4px; 189 189 border-radius: 4px; 190 background-color: # 574176;190 background-color: #d45400; 191 191 color: white; 192 192 text-align: left; -
tapas/web/resources/css/button.css
r490 r529 139 139 /* RED BUTTON */ 140 140 button.red_button { 141 background-color: # 574176;141 background-color: #d45400; 142 142 height: 40px; 143 143 float: right; … … 147 147 148 148 .red_button_text { 149 color: white; 149 color: black; 150 font-size: 11px; 151 font-weight: bold; 152 } 153 154 .red_button_text:hover { 155 color : #d45400; 150 156 font-size: 11px; 151 157 font-weight: bold; … … 153 159 154 160 button.red_button:hover { 155 background-color: #bfafd6; 161 background-color: #ff7c25; 162 156 163 } -
tapas/web/resources/css/mainEther.css
r504 r529 23 23 24 24 a { 25 color: #574176; 26 text-decoration: none; 25 text-decoration:none; 26 color: black; 27 text-align:center; 28 //line-height: 35px; 27 29 } 28 30 29 31 a:hover { 30 text-decoration: none; 31 color: #bfafd6; 32 text-decoration:none; 33 color: black; 34 text-align:center; 35 //line-height: 35px; 32 36 } 33 37 34 38 a:visited { 35 text-decoration: none; 36 color: #bfafd6; 39 text-decoration:none; 40 color: black; 41 text-align:center; 42 line-height: 35px; 37 43 } 38 44 … … 42 48 } 43 49 44 li {50 /*li { 45 51 list-style-type: none; 46 52 } … … 48 54 li:hover { 49 55 color: #ADEAEA; 56 } */ 57 58 a.li { 59 color:white; 50 60 } 61 51 62 52 63 .navStyle { -
tapas/web/resources/css/tapas.css
r515 r529 25 25 .tab_class { 26 26 float: right; 27 background: #BFAFD6; 28 color: #574176; 27 background: #ff7c25; 28 //color: #d45400; 29 color: white; 29 30 margin-left: 11px; 30 31 margin-right: -10px; … … 40 41 41 42 .tab_class.activated { 42 background: # 574176;43 color: #BFAFD6;43 background: #d45400; 44 color: black; 44 45 45 46 } … … 50 51 51 52 .cfs1 { 52 border: 2px solid white;53 border: 2px solid black; 53 54 -moz-border-radius: 8px; 54 55 -webkit-border-radius: 8px; … … 62 63 63 64 .cfs2 { 64 border: 2px solid white;65 border: 2px solid black; 65 66 -moz-border-radius: 8px; 66 67 -webkit-border-radius: 8px; 67 68 border-radius: 8px; 68 padding-right: 30px;69 /*padding-right: 9px; 69 70 padding-bottom: 30px; 70 margin-right: 0px; 71 margin-left: -65px; 72 padding-left: 20px 73 } 74 75 71 margin-right: 0px;*/ 72 margin-left: -67px; 73 /*padding-left: 20px;*/ 74 width : 249px; 75 76 } 77 78 .cfs3 { 79 border: 2px solid black; 80 -moz-border-radius: 8px; 81 -webkit-border-radius: 8px; 82 border-radius: 8px; 83 padding-right: 45px; 84 padding-left: 30px; 85 margin-left: 18px; 86 margin-top: 11px; 87 padding-bottom: 30px; 88 width:900px; 89 } 76 90 77 91 .containerForm { … … 135 149 .containerText { 136 150 font-size: 12px; 137 color: #574176; 138 / / float : left; 139 / / margin-top : 10 px; 151 color: #999999; 140 152 padding-left: 0px; 141 / / width : 100 px; 153 background-color: white; 154 155 156 } 157 158 .containerText2 { 159 font-size: 12px; 160 color: white; 161 padding-left: 0px; 162 background-color: #cccccc; 163 font-weight:bold; 164 142 165 143 166 } … … 145 168 .containerLabel { 146 169 font-size: 12px; 147 color: white;170 color: black; 148 171 font-weight: bold; 149 172 / / margin-bottom : 10 px; … … 152 175 } 153 176 177 .containerLabelT { 178 font-size: 12px; 179 color: black; 180 font-weight: bold; 181 / / margin-bottom : 10 px; 182 padding-left: 20px; 183 text-align: center; 184 } 185 154 186 .containerLabel2 { 155 187 font-size: 12px; 156 color: white;188 color: black; 157 189 font-weight: bold; 158 190 / / margin-bottom : 10 px; … … 162 194 .containerLabel3 { 163 195 font-size: 12px; 164 color: white;196 color: black; 165 197 font-weight: bold; 166 198 text-align: center; 199 } 200 201 .containerLabel3 { 202 font-size: 12px; 203 color: black; 204 font-weight: bold; 205 text-align: justify; 167 206 } 168 207 … … 180 219 .containerTitle { 181 220 font-size: 16px; 182 color: # 574176;221 color: #d45400; 183 222 font-weight: bold; 184 223 float: left; … … 193 232 margin-bottom: 10px; 194 233 margin-right: 20px; 195 padding-left: 30px;234 //padding-left: 30px; 196 235 width: 120px; 197 236 top: -22px; … … 219 258 position: relative; 220 259 width: 330px; 221 height: 33px;260 height: 40px; 222 261 color: #04155D; 223 262 top: 4px; … … 238 277 position: relative; 239 278 height: 2px; 240 border-bottom: 10px solid white;279 border-bottom: 10px solid black; 241 280 z-index: 1; 242 281 left: -10px; 243 282 width: 810px; 244 283 } 284 245 285 246 286 .containerTitleContent { … … 250 290 -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); 251 291 box-shadow: 0 0 4px rgba(0, 0, 0, 0.3); 252 background: -moz-linear-gradient(# 574176, #574176) repeat scroll 0 0 transparent;253 background: -ms-linear-gradient(# 574176, #574176) repeat scroll 0 0 transparent; /*For IE10*/254 background: -webkit-linear-gradient(# 574176, #574176) repeat scroll 0 0 transparent; /*For IE10*/255 filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '# 574176', endColorstr = 'white'); /*For IE7-8-9*/292 background: -moz-linear-gradient(#d45400, #d45400) repeat scroll 0 0 transparent; 293 background: -ms-linear-gradient(#d45400, #d45400) repeat scroll 0 0 transparent; /*For IE10*/ 294 background: -webkit-linear-gradient(#d45400, #d45400) repeat scroll 0 0 transparent; /*For IE10*/ 295 filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#d45400', endColorstr = 'black'); /*For IE7-8-9*/ 256 296 float: left; 257 297 position: relative; 258 298 width: 141px; 259 299 height: 26px; 260 color: white;300 color: black; 261 301 font-weight: bold; 262 302 padding-left: 10px; 263 303 padding-top: 4px; 264 top: 23px;304 top: 18px; 265 305 margin-right: 600px; 266 306 text-decoration: underline; … … 269 309 270 310 .containerField { 271 color: white;311 color: black; 272 312 font-weight: bold; 273 313 font-size: 14px; … … 277 317 -moz-border-radius-topright: 0; 278 318 -webkit-border-radius: 0; /*#E8EFF3*//* #618EAC*/ 279 background: -moz-linear-gradient(# 574176, #bfafd6);280 background: -webkit-linear-gradient(# 574176, #bfafd6);281 background: -ms-linear-gradient( white, #C03000) repeat scroll 0 0 transparent; /*For IE10*/282 filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = ' white', endColorstr = '#574176'); /*For IE7-8-9*/319 background: -moz-linear-gradient(#d45400, #ff7c25); 320 background: -webkit-linear-gradient(#d45400, #ff7c25); 321 background: -ms-linear-gradient(#d45400, #ff7c25) repeat scroll 0 0 transparent; /*For IE10*/ 322 filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#333333', endColorstr = '#d45400'); /*For IE7-8-9*/ 283 323 min-height: 400px; 284 324 text-align: justify; … … 290 330 291 331 .containerBottom { 292 background: # 574176;293 background: -moz-linear-gradient(left center, white, #574176); /*background: -webkit-linear-gradient(white, #574176);*/294 background: -ms-linear-gradient( white, #574176) repeat scroll 0 0 transparent; /*For IE10*/295 filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = ' white', endColorstr = '#574176'); /*For IE7-8-9*/332 background: #d45400; 333 background: -moz-linear-gradient(left center, #FF7C25, #d45400); /*background: -webkit-linear-gradient(#333333, #d45400);*/ 334 background: -ms-linear-gradient(#333333, #d45400) repeat scroll 0 0 transparent; /*For IE10*/ 335 filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#333333', endColorstr = '#d45400'); /*For IE7-8-9*/ 296 336 color: #FFFFFF; 297 337 height: 26px; … … 303 343 304 344 .containerBottom a { 305 color: white;345 color: black; 306 346 } 307 347 308 348 .containerErrors, #errors { 309 background: white;349 background: black; 310 350 -moz-border-radius: 4px 4px 4px 4px; 311 351 -webkit-border-radius: 4px 4px 4px 4px; 312 border: 1px solid # 574176;313 color: # 574176;352 border: 1px solid #d45400; 353 color: #d45400; 314 354 padding: 10px; 315 355 margin: 10px; … … 331 371 font-weight: bold; 332 372 float: left; 333 background: white;373 background: black; 334 374 } 335 375 Spectral unit : must be selected … … 346 386 margin-left: 30px; 347 387 padding-left: 30px ; 348 background: white;*/388 background: #333333;*/ 349 389 } 350 390 351 391 /*.errorsForm { 352 392 -moz-border-radius: 8px 8px 8px 8px; 353 border: 2px solid white;393 border: 2px solid #333333; 354 394 //margin-left: 648px; 355 395 margin-right: 1500; … … 368 408 -moz-border-radius: 4px 4px 4px 4px; 369 409 -webkit-border-radius: 4px 4px 4px 4px; 370 border: 1px solid # 574176;371 color: # 574176;410 border: 1px solid #d45400; 411 color: #d45400; 372 412 padding: 10px; 373 413 margin: 10px; … … 480 520 background-image: url(../../resources/icons/transparent_loading.gif); 481 521 height: 37px; 482 width:37px; 483 margin-left:510px; 484 margin-top:-70px; 522 margin-left: 21px; 523 margin-top: -169px; 485 524 position: absolute; 486 525 width: 36px; 487 526 } 488 527 -
tapas/web/resources/js/apycom.com-5-red/index.html
r387 r529 14 14 padding:0; 15 15 } 16 html { background: #333333; }16 html { background:black; } 17 17 body { 18 18 margin:40px auto; -
tapas/web/resources/js/apycom.com-5-red/menu.css
r480 r529 132 132 133 133 div#menu ul.menu>li:hover>a span { 134 color: # bfafd6;134 color: #ff7c25; 135 135 } 136 136 div#menu li { } … … 169 169 div#menu ul ul a:hover { 170 170 background:none; 171 background-color: # 574176;171 background-color: #d45400; 172 172 } 173 173 div#menu ul ul a:hover span { 174 174 background:none; 175 color: # bfafd6;175 color: #ff7c25; 176 176 } 177 177 div#menu ul ul a.parent { … … 185 185 background: url(images/submenu-pointer.png) no-repeat right bottom; 186 186 _background: url(images/submenu-pointer-hover.gif) no-repeat right bottom; 187 background-color: # 574176;187 background-color: #d45400; 188 188 } 189 189 div#menu ul ul a.parent:hover span { -
tapas/web/resources/js/tools/controls.js
r504 r529 8 8 function isEmpty( string ) 9 9 { 10 11 10 return (string.trim() == ''); 12 11 } … … 45 44 } 46 45 46 47 48 49 function isHourDeg( val ) 50 { 51 //return (/^(([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9]))$/.test(val)); 52 if( !(/^([0-2]?[0-9]):([0-5]+[0-9]+):([0-5]+[0-9]+)*$/.test( val )) || isEmpty( val.toString() ) ) 53 return false; 54 else 55 { 56 var tab = val.split( ":" ) 57 58 if( tab[0] > 24 ) 59 return false 60 else 61 return true; 62 } 63 64 //return (/^(([0-9]*[0-9]+):([0-9]+[0-9]+):([0-9]+[0-9]+))$/.test(val)); 65 } 66 67 47 68 function isDeg( val ) 48 69 { 49 70 //return (/^(([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9]))$/.test(val)); 50 if( !(/^(([\+-])?[0-9]?[0-9]):([0-9]+[0-9]+):([0-9]+[0-9]+)(\.)?([0-9]*[0-9]*[0-9]*)*$/.test( val )) || isEmpty( val ) )71 if( !(/^(([\+-])?[0-9]?[0-9]):([0-9]+[0-9]+):([0-9]+[0-9]+)(\.)?([0-9]*[0-9]*[0-9]*)*$/.test( val )) || isEmpty( val.toString() ) ) 51 72 return false; 52 73 else … … 91 112 function isValidRange( val1, val2, unit ) 92 113 { 93 /*alert("val1 : "+val1);94 alert("val2 : "+val2);95 alert("unit : "+unit);*/96 114 97 115 if( 'NM_VACUUM' == unit || 'NM_STANDARD' == unit ) -
tapas/web/resources/js/tools/googleStats.js
r524 r529 1 /** 2 * Created by IntelliJ IDEA. 3 * User: rboipsl 4 * Date: 18/04/12 * 5 * Time: 11:26 6 */ 1 <!-- code stats google --> 2 var _gaq = _gaq || []; 3 _gaq.push(['_setAccount', 'UA-22348943-4']); 4 _gaq.push(['_trackPageview']); 7 5 8 function isEmpty( string ) 9 { 6 (function() { 7 var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; 8 ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; 9 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); 10 })(); 10 11 11 return (string.trim() == '');12 }13 14 15 function isMail( email )16 {17 return (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test( email ));18 }19 20 21 function isInt( number, champ, texte )22 {23 if( !(/^[0-9]+$/.test( number )) )24 {25 alert( champ + ' : ' + texte );26 return false;27 }28 else29 {30 return true;31 }32 }33 34 35 function isFloat( number )36 {37 //if (!(/^[0-9]+(\.[0-9]+)?$/.test(number))) {38 return (/^([\+-])?([0-9])*(\.?[0-9]*)?$/.test( number ));39 }40 41 42 function isIP( ip )43 {44 return (/^(([0-2]*[0-9]+[0-9]+)\.([0-2]*[0-9]+[0-9]+)\.([0-2]*[0-9]+[0-9]+)\.([0-2]*[0-9]+[0-9]+))$/.test( ip ));45 }46 47 function isDeg( val )48 {49 //return (/^(([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9]))$/.test(val));50 if( !(/^(([\+-])?[0-9]?[0-9]):([0-9]+[0-9]+):([0-9]+[0-9]+)(\.)?([0-9]*[0-9]*[0-9]*)*$/.test( val )) || isEmpty( val ) )51 return false;52 else53 {54 var tab = val.split( ":" )55 56 if( 90 < tab[0] )57 return false58 else59 return true;60 }61 62 //return (/^(([0-9]*[0-9]+):([0-9]+[0-9]+):([0-9]+[0-9]+))$/.test(val));63 }64 65 function isURL( string )66 {67 return (/^(((ht|f)tp(s?))\:\/\/)([0-9a-zA-Z\-]+\.)+[a-zA-Z]{2,6}(\:[0-9]+)?(\/\S*)?$/.test( string.toLowerCase() ));68 }69 70 function isValidNum( number )71 {72 return ( !isEmpty( number ) && isFloat( number ) );73 }74 75 function isSup( number, limit )76 {77 return ( number >= limit );78 }79 80 function isDiff( val, badvalue )81 {82 return ( val != badvalue );83 }84 85 function isBetween( number, limitinf, limitsup)86 {87 return ( number >= limitinf && number <= limitsup );88 }89 90 91 function isValidRange( val1, val2, unit )92 {93 /*alert("val1 : "+val1);94 alert("val2 : "+val2);95 alert("unit : "+unit);*/96 97 if( 'NM_VACUUM' == unit || 'NM_STANDARD' == unit )98 {99 if( isFloat( val1 ) && isFloat( val2 ) && 350 <= parseFloat( val1 ) && 2500 >= parseFloat( val2 ) && parseFloat( val1 ) <= parseFloat( val2 ) ) return true;100 else return false;101 }102 else return 'Unit unknown';103 104 } -
tapas/web/resources/templates/templateEther.jsp
r481 r529 16 16 <link rel="shortcut icon" type="image/x-icon" href="resources/images/logo_tapas.gif"/> 17 17 18 <ether:htmlCss cssFile="apycom.com- 4-blue-violet/menu"/>18 <ether:htmlCss cssFile="apycom.com-8-orange-red/menu"/> 19 19 <ether:htmlCss cssFile="jquery-ui-1.8.16.custom/jquery-ui-1.8.16.custom"/> 20 20 <ether:htmlCss cssFile="button"/> … … 34 34 <ether:htmlJs jsFile="TwitterLogin/javascripts/jquery.tipsy"/> 35 35 <ether:htmlJs jsFile="library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min"/> 36 <ether:htmlJs jsFile="apycom.com-4-blue-violet/menu"/> 37 36 <ether:htmlJs jsFile="apycom.com-8-orange-rued/menu"/> 38 37 <jsp:include page="templateEther_script.jsp"/> 39 38 … … 41 40 <tiles:insert attribute="insertJsOrJsp"/> 42 41 </HEAD> 42 43 43 44 44 45 <BODY> … … 51 52 <%-- ****************** TITLE & TOOLS ****************** --%> 52 53 <div id="title_tools" class="containerTapas"> 53 <div id="title" class="containerTitle"> <spring:message code="app.fulltitle"/></div>54 <div id="title" class="containerTitle"> <spring:message code="app.fulltitle"/></div> 54 55 55 56 <div id="tools" align="right"> … … 65 66 66 67 <%-- ****************** NAV ****************** --%> 67 < div id="nav" class="containerNav"><tiles:insert attribute="nav"/></div>68 <!--<div id="nav" class="containerNav"><tiles:insert attribute="nav"/></div>--> 68 69 69 70 <%-- ****************** MENU ****************** --%> 70 71 <div id="menu" class="containerMenu"> 72 71 73 <ul class="menu"> 74 <li><a href="http://ether.ipsl.jussieu.fr" class="parent" target="_blank"><img width=50 height="50" src="resources/images/logo_ether.jpg"></a></li> 75 72 76 <li><a href="project?methodName=home" class="parent"><span><spring:message code="title.home"/></span></a> 73 77 … … 78 82 </li> 79 83 <li><a href="#"><span><spring:message code="title.legals"/></span></a></li> 84 80 85 </ul> 81 86 </div> -
tapas/web/src/messages_en.properties
r508 r529 5 5 6 6 7 label.ira= Right LOS ascension8 label.ide=LOS declension7 label.ira=LOS Right Ascension 8 label.ide=LOS Declination 9 9 label.iza=Zenithal angle 10 10 label.spectralUnit=Spectral unit 11 11 label.spectralRange=Spectral range 12 12 label.to=to 13 label.or=or 13 14 label.observatory=Observatory 14 15 label.preferences=Preferences … … 16 17 label.resolution=Resolution power 17 18 label.ratio=Sampling ratio 18 label.climato= Climatologic reference19 label.climato=Atmospheric Model 19 20 label.datemesure=Date measurement 20 21 -
tapas/web/src/messages_fr.properties
r508 r529 5 5 6 6 7 label.ira= Ascension LOS droite8 label.ide= Déclinaision LOS7 label.ira=LOS Ascension Droite 8 label.ide=LOS Déclinaison 9 9 label.iza=Angle zénithal 10 10 label.spectralUnit=Unité spectrale 11 11 label.spectralRange=Intervalle spectral 12 12 label.to= à 13 label.or=ou 13 14 label.ifunction=Fonction instrumentale 14 15 label.resolution=Résolution 15 16 label.ratio=Taux d'échantillonnage 16 label.climato= Climatologie17 label.climato=ModÚle atmosphérique 17 18 label.datemesure=Date de mesure 18 19
Note: See TracChangeset
for help on using the changeset viewer.