Changeset 567
- Timestamp:
- 10/01/12 17:08:37 (12 years ago)
- Location:
- geisa/web
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
geisa/web/initGeisa.jsp
r564 r567 42 42 <fieldset class="general"><legend><span class="fieldsetGeneralTitle">Inputs :</span></legend> 43 43 <div id="database" class="database"> 44 <fieldset class="options"><legend>< b>Choosing database :</b></legend>44 <fieldset class="options"><legend><span TITLE="Texte de l'infobulle" class="caption">?</span> <b>Choosing database :</b></legend> 45 45 <div id="database1" class="containerInsideOptions"> 46 46 </div> … … 49 49 50 50 <div id="molecules" class="molecules"> 51 <fieldset class="options"><legend>< b>Choosing molecules :</b></legend>51 <fieldset class="options"><legend><span TITLE="Texte de l'infobulle" class="caption">?</span> <b>Choosing molecules :</b></legend> 52 52 <div id="BDD-GEISA2011" class="moleculesGEISA11"> 53 53 </div> … … 83 83 84 84 <div id="axeY1Gene" class="axeY1Gene"> 85 <fieldset class="options"><legend>< b>Choosing line transition parameter</b></legend>85 <fieldset class="options"><legend><span TITLE="Texte de l'infobulle" class="caption">?</span> <b>Choosing line transition parameter :</b></legend> 86 86 <div id="axeY1" class="containerInsideOptions"></div> 87 87 </fieldset> … … 89 89 90 90 <div id="drawingOptionsY1" class="drawingOptionsY1"> 91 <fieldset class="options"><legend>< b>Drawing options</b></legend>91 <fieldset class="options"><legend><span TITLE="Texte de l'infobulle" class="caption">?</span> <b>Drawing options :</b></legend> 92 92 <div id="NbCourbes" class="containerInsideOptions"></div> 93 93 <div id="scaleY1Titre" class="containerInsideOptions"></div> … … 100 100 101 101 102 <div id="showAdvancedOptions" class="showAdvancedOptions"></div>103 104 <div id="advancedOptions" class="advancedOptions">102 <div id="showAdvancedOptions" class="showAdvancedOptions"></div> 103 104 <div style="display:none;" id="advancedOptions" class="advancedOptions"> 105 105 <fieldset class="general"><legend><span class="fieldsetGeneralTitle">Advanced Options :</span></legend> 106 106 <div id="transition" class="transition"> 107 <fieldset class="options"><legend>< b>Choosing vibraional transitions</b></legend>107 <fieldset class="options"><legend><span TITLE="Texte de l'infobulle" class="caption">?</span> <b>Choosing vibrational transitions :</b></legend> 108 108 <div id="transitionValue" class="transitionValue"> 109 109 <div id="transitionUpper" class="containerInsideOptions"></div> … … 116 116 117 117 <div id="meanValue" class="meanValue"> 118 <fieldset class="options"><legend>< b>Spectral step :</b></legend>118 <fieldset class="options"><legend><span TITLE="Texte de l'infobulle" class="caption">?</span> <b>Spectral step :</b></legend> 119 119 <div id="meanValue1" class="containerInsideOptions"></div> 120 120 </fieldset> … … 122 122 123 123 <div id="axeY2Gene" class="axeY2Gene"> 124 <fieldset class="options"><legend>< b>Choosing secondary line transition parameter :</b></legend>124 <fieldset class="options"><legend><span TITLE="Texte de l'infobulle" class="caption">?</span> <b>Choosing secondary line transition parameter :</b></legend> 125 125 <div id="axeY2Titre" class="containerInsideOptions"></div> 126 126 <div id="axeY2" class="containerInsideOptions"></div> … … 129 129 130 130 <div id="drawingOptionsY2" class="drawingOptionsY2"> 131 <fieldset class="options"><legend><b> Drawing options (secondary parameter) :</b></legend>131 <fieldset class="options"><legend><b><span TITLE="Texte de l'infobulle" class="caption">?</span> Drawing options (secondary parameter) :</b></legend> 132 132 <div id="scaleY2Titre" class="containerInsideOptions"></div> 133 133 <div id="scaleY2" class="containerInsideOptions"></div> -
geisa/web/initGeisa_script.jsp
r564 r567 496 496 //Titre général (qui changera en fonction de la base geisa choisie) 497 497 document.getElementById('spectralRangeTitre').innerHTML = ""; 498 document.getElementById('spectralRangeTitre').innerHTML = "Choosing the spectral range from 0 to 35877.030506 cm<sup>-1</sup> ";498 document.getElementById('spectralRangeTitre').innerHTML = "Choosing the spectral range from 0 to 35877.030506 cm<sup>-1</sup> :"; 499 499 500 500 //Titre … … 549 549 document.getElementById("axeY1").appendChild(spaceBr); 550 550 //menu déroulant 551 var paramSelectAxeY1 = new Object(); 552 paramSelectAxeY1.id = "selectAxeY1"; 553 paramSelectAxeY1.parent = $("#axeY1"); 554 this.selectTraceAxeY1 = new Select( paramSelectAxeY1 ); 555 this.selectTraceAxeY1.add( 'B', "Intensity", jQuery.proxy(this.onClickSelectTraceAxeY1, this )); 556 this.selectTraceAxeY1.add( 'C', "Air broadening pressure halfwidth", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) ); 557 this.selectTraceAxeY1.add( 'D', "Energy of the lower transition level", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) ); 558 this.selectTraceAxeY1.add( 'F', "Temperature dependence coefficient n of the air broadening halfwidth ", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) ); 559 this.selectTraceAxeY1.add( 'N', "Self broadening pressure halfwidth (HWHM)", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) ); 560 this.selectTraceAxeY1.add( 'O', "Air pressure shift of the line transition", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) ); 561 this.selectTraceAxeY1.add( 'R', "Temperature dependence coefficient of the air pressure shift ", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) ); 562 this.selectTraceAxeY1.selectFirst( false ); 551 // var paramSelectAxeY1 = new Object(); 552 // paramSelectAxeY1.id = "selectAxeY1"; 553 // paramSelectAxeY1.parent = $("#axeY1"); 554 // this.selectTraceAxeY1 = new Select( paramSelectAxeY1 ); 555 // this.selectTraceAxeY1.add( 'B', "Intensity", jQuery.proxy(this.onClickSelectTraceAxeY1, this )); 556 // this.selectTraceAxeY1.add( 'C', "Air broadening pressure halfwidth", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) ); 557 // this.selectTraceAxeY1.add( 'D', "Energy of the lower transition level", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) ); 558 // this.selectTraceAxeY1.add( 'F', "Temperature dependence coefficient n of the air broadening halfwidth ", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) ); 559 // this.selectTraceAxeY1.add( 'N', "Self broadening pressure halfwidth (HWHM)", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) ); 560 // this.selectTraceAxeY1.add( 'O', "Air pressure shift of the line transition", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) ); 561 // this.selectTraceAxeY1.add( 'R', "Temperature dependence coefficient of the air pressure shift ", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) ); 562 // this.selectTraceAxeY1.selectFirst( false ); 563 this.selectTraceAxeY1 = $( document.createElement( "select" ) ); 564 this.selectTraceAxeY1.attr( {id:"selectAxeY1"} ); 565 this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"B", text:"Intensity"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "B" ]))); 566 this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"C", text:"Air broadening pressure halfwidth"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "C" ]))); 567 this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"D", text:"Energy of the lower transition level"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "D" ]))); 568 this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"F", text:"Temperature of the air broadening halfwidth"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "F" ]))); 569 this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"N", text:"Self broadening pressure halfwidth (HWHM)"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "N" ]))); 570 this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"O", text:"Air pressure shift of the line transition"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "O" ]))); 571 this.selectTraceAxeY1.append($( document.createElement( "option" ) ).attr( {value:"R", text:"Temperature of the air pressure shift"} ).bind( 'click', jQuery.proxy(this.onClickSelectTraceAxeY1, [this, "R" ]))); 572 $("#axeY1").append(this.selectTraceAxeY1); 573 563 574 564 575 … … 570 581 document.getElementById("NbCourbes").appendChild(spaceBr); 571 582 //menu déroulant 572 var paramNbCourbes = new Object(); 573 paramNbCourbes.id = "SelectNbCourbes"; 574 paramNbCourbes.parent = $("#NbCourbes"); 575 this.SelectNbCourbes = new Select( paramNbCourbes ); 576 this.SelectNbCourbes.add( 'ca', "One curve for all selection", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 577 this.SelectNbCourbes.add( 'cm', "One curve for each molecule selected", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 578 this.SelectNbCourbes.add( 'ci', "One curve for each isotopologue selected", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 579 this.SelectNbCourbes.add( 'gm', "One graph for each molecule selected", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 580 this.SelectNbCourbes.add( 'gi', "One graph for each isotopologue selected", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 581 this.SelectNbCourbes.selectFirst( false ); 582 583 583 //var paramNbCourbes = new Object(); 584 // paramNbCourbes.id = "SelectNbCourbes"; 585 // paramNbCourbes.parent = $("#NbCourbes"); 586 // this.SelectNbCourbes = new Select( paramNbCourbes ); 587 // this.SelectNbCourbes.add( 'cm', "One curve for each molecule selected", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 588 // this.SelectNbCourbes.add( 'ci', "One curve for each isotopologue selected", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 589 // this.SelectNbCourbes.add( 'gm', "One graph for each molecule selected", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 590 // this.SelectNbCourbes.add( 'gi', "One graph for each isotopologue selected", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 591 // this.SelectNbCourbes.add( 'ca', "One curve for all selection", jQuery.proxy(this.onClickSelectNbCourbes, this ) ); 592 // this.SelectNbCourbes.selectFirst( false ); 593 this.selectNbCourbes = $( document.createElement( "select" ) ); 594 this.selectNbCourbes.attr( {id:"SelectNbCourbes"} ); 595 this.selectNbCourbes.append($( document.createElement( "option" ) ).attr( {value:"ca", text:"One curve for all selection"} ).bind( 'click', jQuery.proxy(this.onClickSelectNbCourbes, [this, "ca" ]))); 596 this.selectNbCourbes.append($( document.createElement( "option" ) ).attr( {value:"cm", text:"One curve for each molecule selected"} ).bind( 'click', jQuery.proxy(this.onClickSelectNbCourbes, [this, "cm" ]))); 597 this.selectNbCourbes.append($( document.createElement( "option" ) ).attr( {value:"ci", text:"One curve for each isotopologue selected"} ).bind( 'click', jQuery.proxy(this.onClickSelectNbCourbes, [this, "ci" ]))); 598 this.selectNbCourbes.append($( document.createElement( "option" ) ).attr( {value:"gm", text:"One graph for each molecule selected"} ).bind( 'click', jQuery.proxy(this.onClickSelectNbCourbes, [this, "gm" ]))); 599 this.selectNbCourbes.append($( document.createElement( "option" ) ).attr( {value:"gi", text:"One graph for each isotopologue selected"} ).bind( 'click', jQuery.proxy(this.onClickSelectNbCourbes, [this, "gi" ]))); 600 $("#NbCourbes").append(this.selectNbCourbes); 584 601 585 602 … … 589 606 document.getElementById("scaleY1Titre").appendChild(titleScaleY1); 590 607 //menu déroulant 591 var paramSelectScaleY1 = new Object(); 592 paramSelectScaleY1.id = "SelectScaleY1"; 593 paramSelectScaleY1.parent = $("#scaleY1"); 594 this.selectScaleY1 = new Select( paramSelectScaleY1 ); 595 this.selectScaleY1.add( 'l', "Linear" ); 596 this.selectScaleY1.add( '-log_scale', "Logarithmic" ); 597 this.selectScaleY1.selectFirst( false ); 608 //var paramSelectScaleY1 = new Object(); 609 //paramSelectScaleY1.id = "SelectScaleY1"; 610 // paramSelectScaleY1.parent = $("#scaleY1"); 611 // this.selectScaleY1 = new Select( paramSelectScaleY1 ); 612 // this.selectScaleY1.add( 'l', "Linear" ); 613 // this.selectScaleY1.add( '-log_scale', "Logarithmic" ); 614 // this.selectScaleY1.selectFirst( false ); 615 this.selectScaleY1 = $( document.createElement( "select" ) ); 616 this.selectScaleY1.attr( {id:"SelectScaleY1"} ); 617 var optSelectScaleY1 = $( document.createElement( "option" ) ); 618 optSelectScaleY1.attr( {value:"l", text:"Linear"} ); 619 this.selectScaleY1.append(optSelectScaleY1); 620 var optSelectScaleY1 = $( document.createElement( "option" ) ); 621 optSelectScaleY1.attr( {value:"-log_scale", text:"Logarithmic"} ); 622 this.selectScaleY1.append(optSelectScaleY1); 623 $("#scaleY1").append(this.selectScaleY1); 624 598 625 599 626 // Create menu deroulant style de tracer Y1 … … 604 631 document.getElementById("typePlotY1").appendChild(spaceBr); 605 632 //menu déroulant 606 var paramSelectTypeTraceY1 = new Object(); 607 paramSelectTypeTraceY1.id = "SelectTypePlotY1"; 608 paramSelectTypeTraceY1.parent = $("#typePlotY1"); 609 this.selectTypeTraceY1 = new Select( paramSelectTypeTraceY1 ); 610 this.selectTypeTraceY1.add( 'l', "Lines" ); 611 this.selectTypeTraceY1.add( 'p', "Dots" ); 612 this.selectTypeTraceY1.add( 'i', "Peaks" ); 613 this.selectTypeTraceY1.add( 'lp', "Lines and Dots" ); 614 this.selectTypeTraceY1.selectFirst( false ); 615 616 // Show/Hide advanced options 617 // document.getElementById('showAdvancedOptions').innerHTML = ""; 618 // document.getElementById('showAdvancedOptions').innerHTML = "Show advanced options"; 619 620 621 var showHide = document.createElement('a'); 622 showHide.setAttribute('href',jQuery.proxy( this.onClickShowAdvancedOptions, this )); 623 showHide.setAttribute('title',"caption"); 624 showHide.innerHTML="Show advanced options"; 625 document.getElementById('showAdvancedOptions').appendChild(showHide); 626 627 // var showHide = $( document.createElement( "a" ) ); 628 // showHide.attr( {href:"url", title:"caption", } ); 629 // showHide.innerHTML= "Show advanced options"; 630 //showHide.bind( 'click', this, jQuery.proxy( this.onClickShowAdvancedOptions, this )); 631 // $("#showAdvancedOptions").append( showHide ); 632 633 634 633 // var paramSelectTypeTraceY1 = new Object(); 634 // paramSelectTypeTraceY1.id = "SelectTypePlotY1"; 635 // paramSelectTypeTraceY1.parent = $("#typePlotY1"); 636 // this.selectTypeTraceY1 = new Select( paramSelectTypeTraceY1 ); 637 // this.selectTypeTraceY1.add( 'l', "Lines" ); 638 // this.selectTypeTraceY1.add( 'p', "Dots" ); 639 // this.selectTypeTraceY1.add( 'i', "Peaks" ); 640 // this.selectTypeTraceY1.add( 'lp', "Lines and Dots" ); 641 // this.selectTypeTraceY1.selectFirst( false ); 642 this.selectTypeTraceY1 = $( document.createElement( "select" ) ); 643 this.selectTypeTraceY1.attr( {id:"SelectTypePlotY1"} ); 644 this.selectTypeTraceY1.append($( document.createElement( "option" ) ).attr( {value:"l", text:"Lines"} )); 645 this.selectTypeTraceY1.append($( document.createElement( "option" ) ).attr( {value:"p", text:"Dots"} )); 646 this.selectTypeTraceY1.append($( document.createElement( "option" ) ).attr( {value:"i", text:"Peaks"} )); 647 this.selectTypeTraceY1.append($( document.createElement( "option" ) ).attr( {value:"lp", text:"Lines and Dots"} )); 648 $("#typePlotY1").append(this.selectTypeTraceY1); 649 650 651 652 653 //lien pour montrer ou cacher le bloc "advanced options" 654 var showHide = $(document.createElement("a")); 655 showHide.html("Show advanced options"); 656 showHide.attr( {id:"aShowHide", class:"fieldsetGeneralTitle"} ); 657 showHide.bind( 'click', this, jQuery.proxy( this.onClickShowAdvancedOptions)); 658 $("#showAdvancedOptions").append(showHide); 635 659 636 660 637 661 //titre menu deroulant transition upper 638 var titleTransitionUpper = document.createTextNode("Upper state : ");639 document.getElementById("transitionUpper").appendChild(titleTransitionUpper);662 var titleTransitionUpper = document.createTextNode("Upper state : "); 663 document.getElementById("transitionUpper").appendChild(titleTransitionUpper); 640 664 641 665 … … 972 996 973 997 var nbCourbes = ""; 974 switch (this.SelectNbCourbes.getValue()) { 998 999 //switch (this.SelectNbCourbes.getValue()) { 1000 switch (document.getElementById('SelectNbCourbes').options[document.getElementById('SelectNbCourbes').selectedIndex].value) { 975 1001 case 'cm': 976 1002 nbCourbes = "-separate_mol -same_graph "; … … 1198 1224 1199 1225 //sélection du type d'échelle pour le parametre Y1 (il y a une valeur pour ce champ que si logaritmic est choisi et si l'option est activée) 1200 if (this.selectScaleY1.getValue() == '-log_scale' && this.selectScaleY1.isDisable == false) 1201 { 1202 var logScale = this.selectScaleY1.getValue(); 1226 //if (this.selectScaleY1.getValue() == '-log_scale' && this.selectScaleY1.isDisable == false) 1227 //{ 1228 // var logScale = this.selectScaleY1.getValue(); 1229 // } 1230 // else 1231 // { 1232 // var logScale = "" 1233 //} 1234 if (document.getElementById('SelectScaleY1').options[document.getElementById('SelectScaleY1').selectedIndex].value == '-log_scale' && document.getElementById("SelectScaleY1" ).disabled == false) 1235 { 1236 var logScale = document.getElementById('SelectScaleY1').options[document.getElementById('SelectScaleY1').selectedIndex].value; 1203 1237 } 1204 1238 else … … 1207 1241 } 1208 1242 1243 1209 1244 //sélection du type de tracé pour Y1 1210 var lineType="-line_type "+this.selectTypeTraceY1.getValue(); 1245 //var lineType="-line_type "+this.selectTypeTraceY1.getValue(); 1246 var lineType="-line_type "+document.getElementById('SelectTypePlotY1').options[document.getElementById('SelectTypePlotY1').selectedIndex].value; 1211 1247 1212 1248 … … 1256 1292 meanValue+" "+nbCourbes+" "+field+" "+logScale+" "+lineType+" "+field2+" "+logScale2+" "+lineType2; 1257 1293 1294 alert ("parameters"+parameters); 1258 1295 1259 1296 //remplacement de espace par "EEE" pour que le shell script ne voit qu'un seul argument en entrée … … 1631 1668 // EVENTS ******************************************************** 1632 1669 // 1633 onClickShowAdvancedOptions: function() 1634 { 1635 document.getElementById( "showAdvancedOptions" ).style.display = "none"; 1636 }, 1670 1637 1671 1638 1672 … … 1645 1679 { 1646 1680 document.getElementById('spectralRangeTitre').innerHTML = ""; 1647 document.getElementById('spectralRangeTitre').innerHTML = "Choosing the spectral range from 0 to 35877.030506 cm<sup>-1</sup> ";1681 document.getElementById('spectralRangeTitre').innerHTML = "Choosing the spectral range from 0 to 35877.030506 cm<sup>-1</sup> :"; 1648 1682 $("#RangeLower").val(0); 1649 1683 $("#RangeUpper").val(35877.030506); … … 1658 1692 { 1659 1693 document.getElementById('spectralRangeTitre').innerHTML = ""; 1660 document.getElementById('spectralRangeTitre').innerHTML = "Choosing spectral range (599.000793 to 3000.998767 cm<sup>-1</sup>) ";1694 document.getElementById('spectralRangeTitre').innerHTML = "Choosing spectral range (599.000793 to 3000.998767 cm<sup>-1</sup>) :"; 1661 1695 $("#RangeLower").val(599.000793); 1662 1696 $("#RangeUpper").val(3000.998767); … … 1671 1705 { 1672 1706 document.getElementById('spectralRangeTitre').innerHTML = ""; 1673 document.getElementById('spectralRangeTitre').innerHTML = "Choosing the spectral range from 0 to 35877.030506 cm<sup>-1</sup> ";1707 document.getElementById('spectralRangeTitre').innerHTML = "Choosing the spectral range from 0 to 35877.030506 cm<sup>-1</sup> :"; 1674 1708 $("#RangeLower").val(0); 1675 1709 $("#RangeUpper").val(35877.030506); … … 1683 1717 { 1684 1718 document.getElementById('spectralRangeTitre').innerHTML = ""; 1685 document.getElementById('spectralRangeTitre').innerHTML = "Choosing spectral range (599.000793 to 3000.998767 cm<sup>-1</sup>) ";1719 document.getElementById('spectralRangeTitre').innerHTML = "Choosing spectral range (599.000793 to 3000.998767 cm<sup>-1</sup>) :"; 1686 1720 $("#RangeLower").val(599.000793); 1687 1721 $("#RangeUpper").val(3000.998767); … … 1822 1856 }, 1823 1857 1858 //Faire apparatre ou disparaitre le bloc "advanced options" quand on clique sur le lien "show advanced options" 1859 onClickShowAdvancedOptions: function() 1860 { 1861 //document.getElementById( "advancedOptions" ).style.display = "none"; 1862 if( document.getElementById( "advancedOptions" ).style.display == "none" ) 1863 { 1864 document.getElementById( "advancedOptions" ).style.display = ""; 1865 document.getElementById( "aShowHide" ).innerHTML = ""; 1866 document.getElementById( "aShowHide" ).innerHTML = "Hide advanced options"; 1867 } 1868 else 1869 { 1870 document.getElementById( "advancedOptions" ).style.display = "none"; 1871 document.getElementById( "aShowHide" ).innerHTML = ""; 1872 document.getElementById( "aShowHide" ).innerHTML = "Show advanced options"; 1873 } 1874 }, 1875 1876 1824 1877 1825 1878 onBlurInputMeanValue: function() … … 1847 1900 onClickSelectNbCourbes: function(value) 1848 1901 { 1849 1850 //si plusieurs courbes ou graphe choisis pour les isotopes et ou molecules, les choix pour Y2 sont inactifs 1851 if ('ca' != value) 1902 var context = this[0]; 1903 var optionVal = this[1]; 1904 1905 //si plusieurs courbes choisis pour les isotopes et ou molecules, les choix pour Y2 sont inactifs 1906 //if ('cm' == value || 'ci' == value) 1907 if ('cm' == optionVal || 'ci' == optionVal) 1852 1908 { 1853 1909 //transformer le texte en gris … … 1861 1917 } 1862 1918 //si une seule courbe choisie pour les isotopes et ou molecules, les choix pour Y2 sont actifs 1863 if ('ca' == value) 1919 //if ('ca' == value || 'gm' == value || 'gi' == value) 1920 if ('ca' == optionVal || 'gm' == optionVal || 'gi' == optionVal) 1864 1921 { 1865 1922 //remet le texte en couleur active … … 1888 1945 } 1889 1946 } 1947 1948 1890 1949 }, 1891 1950 … … 1899 1958 document.getElementById("scaleY1Titre").className = "notActiveText"; 1900 1959 //pour rendre le menu déroulant inactif 1901 this.selectScaleY1.disable(); 1960 // this.selectScaleY1.disable(); 1961 document.getElementById("SelectScaleY1" ).disabled=true; 1902 1962 } 1903 1963 //si intensite est choisi pour Y1, le type d'échelle est actif … … 1907 1967 document.getElementById("scaleY1Titre").className = "activeText"; 1908 1968 //pour rendre le menu déroulant inactif 1909 this.selectScaleY1.enable(); 1969 // this.selectScaleY1.enable(); 1970 document.getElementById("SelectScaleY1" ).disabled=false; 1910 1971 } 1911 1972 }, -
geisa/web/resources/css/geisa.css
r564 r567 1 1 /*Feuille de style geisa.css*/ 2 2 3 body, ul, table {font-family: Arial, Helvetica, sans-serif; text-align:justify; font-size: 10pt; color: #000099 }3 body, ul, table {font-family: Arial, Helvetica, sans-serif; text-align:justify; font-size: 10pt; color: #000099;} 4 4 .titrePetit {font-family: Arial, Helvetica, sans-serif; font-size: 12pt; color: #000099} 5 5 .titreGrand {font-family: Arial, Helvetica, sans-serif; font-size: 15pt; font-weight: bold; color: #000099} 6 a {font-family: Arial, Helvetica, sans-serif; font-size: 10pt; color: #0C0CEF }7 a:hover {color: red; text-decoration: none }6 a {font-family: Arial, Helvetica, sans-serif; font-size: 10pt; color: #0C0CEF; text-decoration: underline} 7 a:hover {color: red; text-decoration: none; cursor: pointer;} 8 8 a.clien {text-decoration: none} 9 9 .divViolet {background-color:#dbe9f2; padding-right: 10px;} … … 240 240 } 241 241 242 .caption { 243 color: #FFCC33; 244 font-size: 17px; 245 font-weight: bold; 246 text-decoration:underline 247 } 248 242 249 .containerInsideOptions { 243 250 margin-left: 35px; … … 345 352 .boutonSubmit{ 346 353 float: right; 347 margin-top: 20px;354 margin-top: 40px; 348 355 } 349 356
Note: See TracChangeset
for help on using the changeset viewer.