- Timestamp:
- 04/01/14 16:56:38 (10 years ago)
- Location:
- tapas/web
- Files:
-
- 1 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
tapas/web/init_en.jsp
r767 r779 70 70 <br><br> 71 71 <u>Selection of atmospheric constituents:</u><br> 72 The user may select the transmission computation within the following list: 72 The user may select the transmission computation within the following list:<br> 73 73 - Rayleigh extinction, O2, Ozone, H2O. In the future, NO2 and NO3 from a climatology established from GOMOS /ENVISAT measurements may also be available. 74 74 75 The user may also select the option in which the transmissions are calculated separately for each constituent, for a better identification of observed lines. The total transmission is then the multiplication of all individual transmissions. It also may be useful to get the H2O transmission separately, because the quantity of H2O may be adjusted by a power law of the transmission, T X(H2O), where X is the adjusting factor. Such a formula must be applied, in principle only with the highest possible resolution, and after that the user may convolute by the spectrometer PSF spectral profile PSF.75 The user may also select the option in which the transmissions are calculated separately for each constituent, for a better identification of observed lines. The total transmission is then the multiplication of all individual transmissions. It also may be useful to get the H2O transmission separately, because the quantity of H2O may be adjusted by a power law of the transmission, T<SUP>x</SUP>(H2O), where X is the adjusting factor. Such a formula must be applied, in principle only with the highest possible resolution, and after that the user may convolute by the spectrometer ILSF spectral profile ILSF. However, for weak lines (say, less than 30% absorption at resolution 40,000), applying the formula T<SUP>x</SUP> to the convoluted spectrum gives a reasonable approximation. 76 76 <br> 77 77 <br> … … 113 113 114 114 <br><br> 115 <u>Acknowledgements</u><br>This work is being supported by CNES (Centre National des Etudes Spatiales) and CNRS (Centre National de la Recherche Scientifique).<br>TAPAS is a service maintained by ETHER data center. ETHER acknowledges for TAPAS the use of HITRAN data base and the LBLRTM radiative transfer code, the use of ECMWF data and the ETHER data center. 115 <u>Acknowledgements</u><br>This work is being supported by CNES (Centre National des Etudes Spatiales) and CNRS (Centre National de la Recherche Scientifique).<br>TAPAS is a service maintained by ETHER data center. ETHER acknowledges for TAPAS the use of HITRAN data base and the LBLRTM radiative transfer code, the use of ECMWF data and the ETHER data center. We acknowledge useful discussions with Iouli Gordon and Larry Rothman. 116 116 117 117 118 <br> 119 <table cellpadding=4 cellspacing=6 align="center" >118 <br><br> 119 <table cellpadding=4 cellspacing=6 align="center" bgcolor="white" width="700" height="60"> 120 120 121 121 <tr> 122 122 <td><a target="_blank" href="http://www.cnes.fr"><img border="1" width=70 src="resources/images/logo_cnes.png"></a></td> 123 <td><a target="_blank" href="http://www.cnrs.fr"><img border="1" width=70 src="resources/images/logo_cnrs.jpg"></a></td> 124 <td><a target="_blank" href="http://www.ipsl.fr"><img width=100 src="resources/images/logo_ipsl.png"></a></td> 123 125 <td><a target="_blank" href="http://www.latmos.ipsl.fr"><img border="1" width=100 src="resources/images/logo_latmos.png"></a></td> 124 <td><a target="_blank" href="http://www.ipsl.fr"><img width=100 src="resources/images/logo_ipsl.png"></a></td>125 <td><a target="_blank" href="http://www.cnrs.fr"><img border="1" width=70 src="resources/images/logo_cnrs.jpg"></a></td>126 126 <td><a target="_blank" href="http://gepi.obspm.fr"><img border="1" width=140 src="resources/images/logo_gepi.jpg"></a></td> 127 <td><a target="_blank" href="http://www.acri-st.fr"><img border="0" width=100 src="resources/images/logo_acri.jpg"></a></td> 127 128 </tr> 128 129 </table> -
tapas/web/init_fr.jsp
r767 r779 71 71 <br><br> 72 72 <u>Choix des composants atmosphériques:</u><br> 73 L'utilisateur peut sélectionner le calcul de la transmission par la liste suivante : 74 L'utilisateur peut également sélectionner l'option dont les transmissions sont calculées séparément pour chaque constituant, pour une meilleure identification des raies observées. La transmission totale est alors la multiplication de toutes les transmissions individuelles. Il peut également être utile pour obtenir la transmission H2O séparément, car la quantité de H2O peut être réglée par une loi de puissance de la transmission, T X (H2O), où X est le facteur d'ajustement. Une telle formule doit être appliquée en principe uniquement avec la résolution la plus élevée possible, et ensuite l'utilisateur peut convoluer par le spectromÚtre PSF profil spectral PSF.73 L'utilisateur peut sélectionner le calcul de la transmission par la liste suivante :<br>- Rayleigh extinction, O2, Ozone, H2O. à l'avenir, NO2 et NO3 d'une climatologie établie à partir des mesures GOMOS / ENVISAT peuvent également être disponibles. 74 L'utilisateur peut également sélectionner l'option dont les transmissions sont calculées séparément pour chaque constituant, pour une meilleure identification des raies observées. La transmission totale est alors la multiplication de toutes les transmissions individuelles. Il peut également être utile pour obtenir la transmission H2O séparément, car la quantité de H2O peut être réglée par une loi de puissance de la transmission, T<SUP>x</SUP> (H2O), où X est le facteur d'ajustement. Une telle formule doit être appliquée en principe uniquement avec la résolution la plus élevée possible, et ensuite l'utilisateur peut convoluer par le spectromÚtre ILSF spectrale ILSF de profil. Cependant, pour les lignes faibles (disons, moins de 30% d'absorption à une résolution de 40.000), en appliquant la formule T<SUP>x</SUP> au spectre donne une approximation raisonnable. 75 75 <br> 76 76 <br> … … 113 113 <br><br> 114 114 <u>Remerciements</u><br>Ce travail est soutenu par le CNES (Centre National des Etudes Spatiales) et le CNRS (Centre National de la Recherche Scientifique). 115 <br> TAPAS est un service géré par le centre de données Ether. Ether remercie pour TAPAS l'utilisation de la base de données HITRAN et le code de transfert radiatif LBLRTM, l'utilisation des données du ECMWF et le centre de données Ether. 115 <br> TAPAS est un service géré par le centre de données Ether. Ether remercie pour TAPAS l'utilisation de la base de données HITRAN et le code de transfert radiatif LBLRTM, l'utilisation des données du ECMWF et le centre de données Ether. Nous remercions Iouli Gordon et Larry Rothman pour nos discussions enrichissantes. 116 116 117 117 118 118 <br> 119 <table cellpadding=4 cellspacing=6 align="center" >119 <table cellpadding=4 cellspacing=6 align="center" bgcolor="white" width="700" height="60"> 120 120 121 121 <tr> 122 122 <td><a target="_blank" href="http://www.cnes.fr"><img border="1" width=70 src="resources/images/logo_cnes.png"></a></td> 123 <td><a target="_blank" href="http://www.cnrs.fr"><img border="1" width=70 src="resources/images/logo_cnrs.jpg"></a></td> 124 <td><a target="_blank" href="http://www.ipsl.fr"><img width=100 src="resources/images/logo_ipsl.png"></a></td> 123 125 <td><a target="_blank" href="http://www.latmos.ipsl.fr"><img border="1" width=100 src="resources/images/logo_latmos.png"></a></td> 124 <td><a target="_blank" href="http://www.ipsl.fr"><img width=100 src="resources/images/logo_ipsl.png"></a></td>125 <td><a target="_blank" href="http://www.cnrs.fr"><img border="1" width=70 src="resources/images/logo_cnrs.jpg"></a></td>126 126 <td><a target="_blank" href="http://gepi.obspm.fr"><img border="1" width=140 src="resources/images/logo_gepi.jpg"></a></td> 127 <td><a target="_blank" href="http://www.acri-st.fr"><img border="0" width=100 src="resources/images/logo_acri.jpg"></a></td> 127 128 </tr> 128 129 </table> -
tapas/web/project/formTapas.jsp
r767 r779 16 16 <ether:htmlCss cssFile="calendar/anytime"/> 17 17 <ether:htmlCss cssFile="jquery-ui-1.8.16.custom/jquery-ui-1.8.16.custom"/> 18 18 19 </tiles:put> 19 20 20 21 <tiles:put name="insertJsOrJsp" type="string"> 21 22 <ether:htmlJs jsFile="library/jquery.json-2.3"/> 23 <ether:htmlJs jsFile="library/js/jquery-ui-1.8.16.custom.min.js"/> 24 <!--<script src="js/library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min.js"></script>--> 22 25 <ether:htmlJs jsFile="classesForJQuery/Select"/> 23 26 <ether:htmlJs jsFile="classesForJQuery/Loading"/> … … 93 96 tapasTexts["label.eco2"] = "<spring:message code="label.eco2"/>"; 94 97 tapasTexts["label.eo3"] = "<spring:message code="label.eo3"/>"; 98 tapasTexts["label.ech4"] = "<spring:message code="label.ech4"/>"; 99 tapasTexts["label.en2o"] = "<spring:message code="label.en2o"/>"; 95 100 tapasTexts["text.select"] = "<spring:message code="text.select"/>"; 96 101 tapasTexts["text.toselect"] = "<spring:message code="text.toselect"/>"; -
tapas/web/project/formTapas_script.jsp
r767 r779 1 1 <script src="js/library/jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min.js"></script> 2 2 <script type="text/javascript"> 3 3 … … 22 22 this.select_io3eList = new Object(); 23 23 this.select_ico2eList = new Object(); 24 this.select_ich4eList = new Object(); 25 this.select_in2oeList = new Object(); 24 26 this.select_irextinctionList = new Object(); 25 27 this.select_ibervCList = new Object(); … … 188 190 if (event.length > 0) input.bind( event, [this, champ], this.angleChoice ); 189 191 190 td1.html( texte ); 192 191 193 td1.attr( {class:"containerLabel"} ); 192 194 … … 204 206 205 207 if (info && (inputId.match(re1) || inputId.match(re2))) { 206 var mt="-4px";207 var ml="";208 209 if (this.browser == "Firefox") {210 if (this.language == "en") ml="-252px";211 else ml="-244px";212 }213 else if (this.browser == "Chrome") {214 if (this.language == "en") ml="-227px";215 else ml="-223px";216 }217 208 218 209 var img = $( document.createElement( "img" ) ); … … 226 217 a.append(img); 227 218 div.append(a); 228 div.attr( "style","margin-left:"+ml+";margin-top:"+mt); 229 219 220 221 td1.append( a ); 222 td1.append( texte ); 230 223 tr.append( div ); 231 224 232 /*td2.attr( {colspan:3} );233 tr.append( td2 );234 tr.append( div );*/235 225 } 236 226 else if (info) { … … 242 232 img.bind("click",[inputId,450,100,this],this.onClickInfos); 243 233 a.append(img); 244 td3.append(a); 234 td1.append(a); 235 td1.append( texte ); 245 236 246 237 } … … 280 271 input2.attr( {id: inputId2,class:"containerText",size:11} ); 281 272 282 td1.html( texte1 ); 273 283 274 td3.html( texte2 ); 284 275 td5.html( textesup ); … … 290 281 img.bind("click",["spectral_range",450,100,this],this.onClickInfos); 291 282 a.append(img); 292 td5.append(a); 283 td1.append(a); 284 td1.append( texte1 ); 293 285 294 286 //img.onclick(this.onClickInfos("spectral_range",1200,440)); … … 318 310 var td1 = $( document.createElement( "td" ) ); 319 311 var td2 = $( document.createElement( "td" ) ); 312 var td3 = $( document.createElement( "td" ) ); 320 313 var input = $( document.createElement( "input" ) ); 321 var champ="" , ml="", mt="-4px";314 var champ=""; 322 315 323 316 var div = $( document.createElement( "div" ) ); 324 317 318 325 319 input.attr( {id: inputId} ); 326 320 327 td1.html( texte ); 328 td1.attr( {class:"containerLabel"} ); 329 tr.append( td1 ); 330 331 332 // alert(inputId); 321 // alert(inputId); 333 322 if( 'format' == type ) { 334 323 this.displaySelect( td2, inputId, index, this.jSonFileFormats, this.selectFileFormatsList, false, null ); 335 324 info = true; 336 325 champ = "iformat_"; 337 ml="-2px"; 338 mt="-4px"; 339 } 340 326 327 } 341 328 else 342 329 if( 'yesno' == type ) … … 350 337 else if( (/^(ico2e_[1-9]+)$/.test( inputId ) ) ) 351 338 this.displaySelect( td2, inputId, index, this.jSonYesNos, this.select_ico2eList, false, "yesNos" ); 339 else if( (/^(ich4e_[1-9]+)$/.test( inputId ) ) ) 340 this.displaySelect( td2, inputId, index, this.jSonYesNos, this.select_ich4eList, false, "yesNos" ); 341 else if( (/^(in2oe_[1-9]+)$/.test( inputId ) ) ) 342 this.displaySelect( td2, inputId, index, this.jSonYesNos, this.select_in2oeList, false, "yesNos" ); 352 343 else if( (/^(irextinction_[1-9]+)$/.test( inputId ) ) ) { 353 344 … … 355 346 info = true; 356 347 champ=inputId; 357 if (this.language == "en") ml="-11px";358 else ml="-13px";359 360 348 } 361 349 else if( (/^(ibervC_[1-9]+)$/.test( inputId ) ) ) { … … 363 351 info = true; 364 352 champ=inputId; 365 if (this.language == "en") ml="-11px";366 else ml="-13px";367 353 } 368 354 } 369 355 else if( 'observatories' == type ) { 370 this.displaySelect( td2, inputId, index, this.jSonObservatories, this.selectObservatoriesList, true, "observatories" ); 371 372 if (this.browser == "Firefox") { 373 if (this.language == "en") ml="-162px"; 374 else ml="-116px"; 375 } 376 else if (this.browser == "Chrome") { 377 if (this.language == "en") ml="-123px"; 378 else ml="-84px"; 379 } 356 357 this.displaySelect1( td2, inputId, index, this.jSonObservatories, this.selectObservatoriesList, true, "observatories" ); 358 //this.displaySelect( td2, inputId, index, this.jSonObservatories, this.selectObservatoriesList, true, "observatories" ); 380 359 381 360 champ="iobservatory_"; … … 386 365 387 366 champ = "ispectral_choice_"; 388 389 if (this.browser == "Firefox") {390 if (this.language == "en") ml="-162px";391 else ml="-116px";392 }393 else if (this.browser == "Chrome") {394 if (this.language == "en") ml="-123px";395 else ml="-84px";396 }397 398 367 } 399 368 else if( 'ilsf' == type ) { … … 401 370 info = true; 402 371 champ = "ifunction_"; 403 if (this.language == "en") ml="-192px";404 else ml="-172px";405 406 if (this.browser == "Firefox") {407 if (this.language == "en") ml="-192px";408 else ml="-172px";409 }410 else if (this.browser == "Chrome") {411 if (this.language == "en") ml="-149px";412 else ml="-134px";413 }414 415 372 } 416 373 else if( 'climatoReference' == type ) { … … 418 375 info = true; 419 376 champ = "icr_"; 420 421 if (this.browser == "Firefox") { 422 if (this.language == "en") ml="-170px"; 423 else ml="-162px"; 424 } 425 else if (this.browser == "Chrome") { 426 if (this.language == "en") ml="-127px"; 427 else ml="-124px"; 428 } 429 430 } 431 377 } 378 379 td1.attr( {class:"containerLabel"} ); 380 tr.append( td1 ); 432 381 433 382 … … 442 391 a.append(img); 443 392 div.append(a); 444 div.attr( "style","margin-left:"+ml+";margin-top:"+mt); 445 446 td2.attr( {colspan:3} ); 393 394 395 td2.attr( {colspan:5} ); 396 td1.append( a ); 397 td1.append( texte ); 398 447 399 tr.append( td2 ); 448 tr.append( div ); 400 449 401 } 450 402 else { 403 td1.append( texte ); 451 404 td2.attr( {colspan:3} ); 452 405 tr.append( td2 ); … … 760 713 //$( "#tab_request" + i ).html( "toto"); 761 714 $( "#tab_request" + i ).attr( {name:z} ); 762 $( "#tab_request" + i ).attr( {id:"tab_request" + z} ); this.angleChoice715 $( "#tab_request" + i ).attr( {id:"tab_request" + z} ); //this.angleChoice 763 716 $( "#tabObservation_" + i ).attr( {id:"tabObservation_" + z} ); 764 717 // $( "#select_iobservatory_" + i ).attr( {id:"select_iobservatory_" + z} ); … … 801 754 this.select_ico2eList[i] = null; 802 755 756 this.select_ich4eList[z] = this.select_ich4eList[i]; 757 this.select_ich4eList[i] = null; 758 759 this.select_in2oeList[z] = this.select_in2oeList[i]; 760 this.select_in2oeList[i] = null; 761 803 762 this.select_ibervCList[z] = this.select_ibervCList[i]; 804 763 this.select_ibervCList[i] = null; … … 895 854 }, 896 855 856 createAutoCompleteMenuForRegions: function() 857 { 858 859 $( "#select_iobservatory_"+this.nbRequest ).autocomplete( { 860 source: this.listObs, 861 appendTo: "#regionContent"+this.nbRequest, 862 minLength: 0, 863 autoFocus: true, 864 autoSelect: true, 865 select: jQuery.proxy( function( event, ui ) 866 { 867 this.regionLabel = ui.item.value; 868 }, this ) 869 } ).focus( function( event ) 870 { 871 $( this ).autocomplete( "search", "" ); 872 } ); 873 874 //$( "#regionTags" ).focus(); 875 }, 876 877 878 // OTHERS ******************************************************** 879 // General method to display select 880 displaySelect1: function( container, id, index, jsonList, selectList, nullValueIsNeeded, contentManage ) 881 { 882 //alert("ok"); 883 var iselect = $( document.createElement( "select" ) ); 884 var option = document.createElement("option"); 885 886 var paramSelect = new Object(); 887 paramSelect.id = "select_" + id; 888 paramSelect.parent = container; 889 890 var observatoryArray=new Array(); 891 this.listObs=new Array(); 892 893 894 //var bob =$('<div id="region" class="containerField"><div class="containerTitle"><div class="containerTitleText">Region</div><div class="containerTitleClose"><img src="img/close.png"></div></div><div class="containerRegion"><input id="regionTags" size="23"/></div><div id="regionContent"></div></div> '); 895 var bob =$('<div class="containerField"><input id="select_'+id+'" size="42"/></div><div id="regionContent'+this.nbRequest+'" class="regionContent"></div> '); 896 897 //alert('<div class=containerField><input id=select_'+id+' size=23/></div><div id=regionContent></div> '); 898 899 //var select = new Select( paramSelect ); 900 //iselect.options.add("1","1"); 901 //if( nullValueIsNeeded ) Select1 902 903 var option = new Option(); 904 option.text = "-- " + tapasTexts["text.select"] + " --"; 905 option.value = "-1"; 906 iselect.append( option ); 907 908 jQuery.each( jsonList, jQuery.proxy( function ( i, jsonElement ) 909 { 910 //ajouter fonction 911 912 /*var option = new Option(); 913 option.text = jsonElement.name; 914 option.value = jsonElement.id;*/ 915 //observatoryArray.push(jsonElement.name); 916 this.listObs.push(jsonElement.name); 917 //console.log(option.value+"-"+option.text); 918 //iselect.append(option); 919 920 921 }, this ) ); 922 //iselect.selectFirst( false ); 923 /*selectList[index] = select;*/ 924 //container.append(iselect); 925 container.append(bob); 926 selectList[index]="select_"+id; 927 928 }, 929 930 897 931 showErrors: function( result ) 898 932 { … … 967 1001 this.createTrList( tapasTexts["label.eo2"], "io2e_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' ); 968 1002 this.createTrList( tapasTexts["label.eco2"], "ico2e_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' ); 1003 this.createTrList( tapasTexts["label.ech4"], "ich4e_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' ); 1004 this.createTrList( tapasTexts["label.en2o"], "in2oe_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' ); 969 1005 this.createTrList( tapasTexts["label.berv"], "ibervC_" + this.nbRequest, this.nbRequest, tabPreference, 'yesno' ); 970 1006 … … 993 1029 this.createTr( tapasTexts["label.iza"], "iza_" + this.nbRequest, tabObservation, "[0,90] °","keypress","za","2",true ); 994 1030 1031 this.createAutoCompleteMenuForRegions(); 995 1032 996 1033 this.initRequestFields(); … … 1036 1073 preference.co2Extinction.secondValue = this.select_ico2eList[i].getValue(); 1037 1074 1075 preference.ch4Extinction = new Object(); 1076 preference.ch4Extinction.firstValue = this.select_ich4eList[i].getValuesInString(); 1077 preference.ch4Extinction.secondValue = this.select_ich4eList[i].getValue(); 1078 1079 preference.n2oExtinction = new Object(); 1080 preference.n2oExtinction.firstValue = this.select_in2oeList[i].getValuesInString(); 1081 preference.n2oExtinction.secondValue = this.select_in2oeList[i].getValue(); 1082 1038 1083 preference.bervCorrection = new Object(); 1039 1084 preference.bervCorrection.firstValue = this.select_ibervCList[i].getValuesInString(); … … 1043 1088 // OBSERVATION 1044 1089 var observatory = new Object(); 1045 observatory.id = this.selectObservatoriesList[i].getValue(); 1090 //observatory.id = "European Southern Obs R La Serena Cerro La Silla";//this.selectObservatoriesList[i].getValue(); 1091 //observatory.id = this.selectObservatoriesList[i].getValue(); 1092 //observatory.id = 2; 1093 observatory.name = $("#select_iobservatory_"+i).val(); 1046 1094 1047 1095 // Los … … 1124 1172 var testOk2=false; 1125 1173 var testOk3=false; 1126 var testOk = isSup( this.selectObservatoriesList[i].getValue(), 0 ); 1127 if( !testOk ) 1174 //var testOk = isSup( this.selectObservatoriesList[i].getValue(), 0 ); 1175 var testOk = isEmpty($( "#select_iobservatory_" + i ).val()) || this.listObs.indexOf($( "#select_iobservatory_" + i ).val())<0; 1176 //alert(testOk); 1177 if( testOk ) 1128 1178 { 1129 1179 this.divE.html( chaine + tapasTexts["label.observatory"] + " : " + tapasTexts["text.toselect"] ); … … 1305 1355 this.select_io2eList[indice].select(this.select_io2eList[indice-1].getValue(),false); 1306 1356 this.select_ico2eList[indice].select(this.select_ico2eList[indice-1].getValue(),false); 1357 this.select_ich4eList[indice].select(this.select_ich4eList[indice-1].getValue(),false); 1358 this.select_in2oeList[indice].select(this.select_in2oeList[indice-1].getValue(),false); 1307 1359 this.select_ibervCList[indice].select(this.select_ibervCList[indice-1].getValue(),false); 1308 1360 -
tapas/web/resources/css/tapas.css
r529 r779 58 58 padding-left: 30px; 59 59 margin-left: -10px; 60 padding-bottom: 30px;60 padding-bottom: 11px; 61 61 width:650px; 62 62 } … … 314 314 } 315 315 316 .containerFieldO { 317 font-size: 32px; 318 color: #999999; 319 padding-left: 0px; 320 font-weight: bold; 321 322 } 323 316 324 .containerCenter { 317 325 -moz-border-radius-topright: 0; … … 532 540 533 541 } 542 543 .regionContent ul { 544 height: 150px; 545 overflow-x: hidden; 546 overflow-y: auto; 547 } 548 549 .regionContent ul li a { 550 color: #778899; 551 text-align:left; 552 font-size:10px; 553 554 } -
tapas/web/resources/js/calendar/anytime.js
r409 r779 213 213 // ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'] 214 214 // Note that if the firstDOW option is passed to AnyTime.picker() (see 215 // AnyTime.picker()), this array should nonetheless begin with the 215 // AnyTime.picker()), this array should nonetheless begin with the 216 216 // desired abbreviation for Sunday. 217 217 // … … 279 279 // %: - the timezone offset, with a sign, in hours and minutes, in 280 280 // four-digit, 24-hour format with a colon delimiter (for example, 281 // +05:30). This is similar to the %z format used by Java. 281 // +05:30). This is similar to the %z format used by Java. 282 282 // To remember the difference between %: and %;, it might be helpful 283 283 // to remember that a colon (:) has a period (.) on the bottom and … … 286 286 // %: might be a longer string than %; (I know it's a stretch, but 287 287 // it's easier than looking it up every time)! 288 // 288 // 289 289 // %- - the timezone offset, with a sign, in hours and minutes, in 290 290 // three-or-four-digit, 24-hour format with no delimiter (for … … 296 296 // 297 297 // %@ - the timezone offset label. By default, this will be the 298 // string "UTC" followed by the offset, with a sign, in hours and 298 // string "UTC" followed by the offset, with a sign, in hours and 299 299 // minutes, in four-digit, 24-hour format with a colon delimiter 300 300 // (for example, UTC+05:30). However, if Any+Time(TM) has been … … 355 355 // utcParseOffsetCapture - if true, any parsed string is always treated as 356 356 // though it represents local time, and any offset specified by the string 357 // (or utcParseOffsetAssume) is captured for return by the 357 // (or utcParseOffsetAssume) is captured for return by the 358 358 // getUtcParseOffsetCaptured() method. If the %@ format specifier is 359 359 // used, the sub-index of any matched label is also captured for return … … 361 361 // AnyTime.picker can edit the time as specified (without conversion to 362 362 // local time) and then convert the edited time to a different time zone 363 // (as selected using the picker). 363 // (as selected using the picker). 364 364 //============================================================================= 365 365 … … 1031 1031 1032 1032 //------------------------------------------------------------------------- 1033 // AnyTime.Converter.setUtcFormatOffsetAlleged() sets the offset from 1033 // AnyTime.Converter.setUtcFormatOffsetAlleged() sets the offset from 1034 1034 // UTC, in minutes, to claim that a Date object represents during 1035 1035 // formatting, even though it is formatted using local time. This merely … … 1141 1141 })( this ); // AnyTime.Converter construction 1142 1142 1143 }; // AnyTime.Converter = 1143 }; // AnyTime.Converter = 1144 1144 1145 1145 //============================================================================= … … 1237 1237 // value for Sunday. 1238 1238 // 1239 // hideInput - if true, the <input> is "hidden" (the picker appears in 1239 // hideInput - if true, the <input> is "hidden" (the picker appears in 1240 1240 // its place). This actually sets the border, height, margin, padding 1241 1241 // and width of the field as small as possivle, so it can still get focus. … … 2012 2012 oH = oHmax; 2013 2013 this.oBody.height( oH - (title.AnyTime_height( true ) + oBHS) ); 2014 this.oBody.width( this.oBody.width() + 20 ); // add nominal px for scrollbar 2014 this.oBody.width( this.oBody.width() + 20 ); // add nominal px for scrollbar 2015 2015 this.oDiv.width( this.oDiv.width() + 20 ); 2016 2016 if( __msie6 || __msie7 ) // IE bugs! … … 2169 2169 // the div is clicked (shorter delays don't always work!) To prevent 2170 2170 // problems cause by scrollbar focus (except in FF), focus is 2171 // force-restored if the offset div is visible. 2171 // force-restored if the offset div is visible. 2172 2172 //--------------------------------------------------------------------- 2173 2173 … … 2336 2336 // * Ctrl+Home moves focus to the first day of the year. 2337 2337 // * Ctrl+End moves focus to the last day of the year. 2338 // * Esc closes a DatePicker that is opened as a Popup. 2338 // * Esc closes a DatePicker that is opened as a Popup. 2339 2339 // 2340 2340 // The following actions (for multiple-date selection) are NOT 2341 2341 // supported: 2342 // * Shift+Arrow performs continous selection. 2342 // * Shift+Arrow performs continous selection. 2343 2343 // * Ctrl+Space multiple selection of certain days. 2344 2344 // … … 2350 2350 // * RightArrow moves focus right or down to next value or field. 2351 2351 // * UpArrow moves focus up or left to previous value or field. 2352 // * DownArrow moves focus down or right to next value or field 2352 // * DownArrow moves focus down or right to next value or field 2353 2353 // * PageUp moves focus to the current value in the previous units 2354 2354 // (for example, from ten-minutes to hours or one-minutes to 2355 2355 // ten-minutes or months to years). 2356 2356 // * PageDown moves focus to the current value in the next units 2357 // (for example, from hours to ten-minutes or ten-minutes to 2357 // (for example, from hours to ten-minutes or ten-minutes to 2358 2358 // one-minutes or years to months). 2359 2359 // * Home moves the focus to the first unit button. -
tapas/web/resources/js/classesForJQuery/LoginButton.js
r767 r779 228 228 { 229 229 this.errors = jQuery.parseJSON( result ).errors; 230 this.setJSONUser( null != jQuery.parseJSO etherN( result ).jSONUser ? jQuery.parseJSON( result ).jSONUser : false );230 this.setJSONUser( null != jQuery.parseJSON( result ).jSONUser ? jQuery.parseJSON( result ).jSONUser : false ); 231 231 if( null == this.errors ) 232 232 this.updateLoginOrLogout(); … … 252 252 this.anotherOnClickLogout(); 253 253 254 document.location.href = "project?methodName=home ";254 document.location.href = "project?methodName=home_en"; 255 255 256 256 }, -
tapas/web/resources/jsp/dataProtocol_en.jsp
r767 r779 2 2 <BR/> 3 3 By using TAPAS, the user takes full responsibility of whatever may happen as a result of its use. The organizations establishing and maintaining the TAPAS web site and services should not be hold responsible for any inconvenient that may result in the use of TAPAS. 4 Most of the discrepancies between actual observations and the predictions of the simulated transmission noted during the validation period can be assigned to 4 main causes : 4 Most of the discrepancies between actual observations and the predictions of the simulated transmission noted during the validation period can be assigned to 4 main causes :<br> 5 5 - highly saturated regions of absorption, where the transmission is actually 0 or very small.<br> 6 6 - an instrument PSF which differs from the user-defined Gaussian, either because of an incorrect choice of PFS width, or because the true PSF is not Gaussian. The actual PSF of an instrument may evolve along the spectrum.<br> 7 7 - an incorrect wavelength calibration of the instrument.<br> 8 8 - a difference of H2O content between the meteorological estimate and the reality.<br> 9 - the continuum absorption of O2 (collision induced absorption), which is now available in the HITRAN data base, is not yet implemented in TAPAS. 9 10 10 11 -
tapas/web/resources/jsp/dataProtocol_fr.jsp
r767 r779 1 1 <div class="title1">TAPAS Protocole de données</div> 2 < BR/>2 <br/> 3 3 En utilisant TAPAS, l'utilisateur assume l'entiÚre responsabilité de tout ce qui peut se produire en raison de son utilisation. Les organisations qui maintiennent le site Web TAPAS et les services associés ne pourront pas être tenus responsable pour tout inconvénient qui pourrait résulter de l'utilisation de TAPAS. 4 4 La plupart des écarts entre les observations réelles et les prévisions de la transmission simulée notée au cours de la période de validation provient de 4 causes principales :<br> 5 - Les régions fortement saturées en absorption, où la transmission est en fait 0 ou trÚs faible <br>5 - Les régions fortement saturées en absorption, où la transmission est en fait 0 ou trÚs faible <br> 6 6 - Un instrument qui diffÚre de la fonction gaussienne définie par l'utilisateur, soit en raison d'un mauvais choix de largeur PFS, soit parce que le vrai PSF n'est pas gaussien. Le PSF réelle d'un instrument est susceptible d'évoluer le long du spectre. <br> 7 7 - Un étalonnage de longueur d'ondes incorrect de l'instrument. <br> 8 - Une différence de teneur en H2O entre l'estimation météorologique et la réalité. 9 <BR/> 8 - Une différence de teneur en H2O entre l'estimation météorologique et la réalité.<br> 9 - L'absorption continue de O2 (absorption induite par collision), qui est maintenant disponible dans la base de données HITRAN, n'est pas encore implémentée dans TAPAS. 10 <br/> 10 11 <a href="project?methodName=downloadFileDataProtocolFr"> 11 12 <button class="dataProtocolDownloadButton">Télécharger</button> -
tapas/web/src/com/ether/Controller.java
r512 r779 234 234 private static final Log LOGGER = LogFactory.getLog( Controller.class ); 235 235 236 private static final String VIEW_INDEX = "init ";236 private static final String VIEW_INDEX = "init_en"; 237 237 private static final String VIEW_FORM_TAPAS = "project/formTapas"; 238 238 } -
tapas/web/src/messages_en.properties
r767 r779 28 28 label.eco2=CO2 extinction 29 29 label.eo3=O3 extinction 30 label.ech4=CH4 extinction 31 label.en2o=N2O extinction 30 32 31 33 text.validnum=shoud be numeric -
tapas/web/src/messages_fr.properties
r767 r779 27 27 label.eco2=Extinction CO2 28 28 label.eo3=Extinction O3 29 label.ech4=CH4 extinction 30 label.en2o=N2O extinction 29 31 30 32 label.observatory=Observatoire
Note: See TracChangeset
for help on using the changeset viewer.