cmda-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xingwei...@apache.org
Subject [19/50] [abbrv] incubator-cmda git commit: delete comments
Date Sat, 05 Sep 2015 00:20:23 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/f22b3e32/app/views/climate/TwoDVariableZonelMean.scala.html
----------------------------------------------------------------------
diff --git a/app/views/climate/TwoDVariableZonelMean.scala.html b/app/views/climate/TwoDVariableZonelMean.scala.html
index a2db925..7fc50b0 100644
--- a/app/views/climate/TwoDVariableZonelMean.scala.html
+++ b/app/views/climate/TwoDVariableZonelMean.scala.html
@@ -1,47 +1,25 @@
-@(parameters: metadata.TwoDVarZonalMean)
-
-@import helper._
-
+@(parameters: metadata.TwoDVarZonalMean) @import helper._
 <link rel="stylesheet"
 	href='@routes.Assets.at("stylesheets/livefitler.css")'>
-	
 @scripts = {
-	<script src='@routes.Assets.at("javascripts/edit_button.js")'></script>
-	<script src='@routes.Assets.at("javascripts/livefilter.js")'></script>
-	<script type="text/javascript" src='@routes.Assets.at("javascripts/jquery-1.9.0.min.js")'></script>
-	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/flot/0.8.3/jquery.flot.min.js"></script>
-	<script type="text/javascript" src='@routes.Assets.at("javascripts/json2.js")'></script>
-	<script type="text/javascript" src="@routes.Assets.at("javascripts/xmisc.js")"></script>
-	<script type="text/javascript">
-
+<script src='@routes.Assets.at("javascripts/edit_button.js")'></script>
+<script src='@routes.Assets.at("javascripts/livefilter.js")'></script>
+<script type="text/javascript"
+	src='@routes.Assets.at("javascripts/jquery-1.9.0.min.js")'></script>
+<script type="text/javascript" src="https:
+	<script type="
+	text/javascript" src='@routes.Assets.at("javascripts/json2.js")'></script>
+<script type="text/javascript" src="@routes.Assets.at("javascripts/xmisc.js")"></script>
+<script type="text/javascript">
     var Response = null;
     var variable = "";
-
-    // called on load or reload
     window.onload = function() {
-      //select_all_months();
       changeDataSource(); 
       select_data();
       changeVariableName();
       select_var();
-      //enable download button
       var z=document.getElementById("download_data");
       z.disabled=false;
-      // no data to download yet
-      //disable_download_button();
-      
-      /* var var_string = $('#variableName').text();
-      alert(var_string);
-      var y=document.getElementById("var");
-  	  if (var_string == "lai"){
-  		y.options[8].selected=true;
-  	  	//$('#var option:contains('+'Leaf Area Index'+')').prop({selected: true});
-  	  }
-      else{
-    	y.options[1].selected=true;
-		//$('#var option:contains('+'Total Cloud Fraction'+')').prop({selected: true});
-      } */
-      
       $('#t0').val($('#startYearMonth').text());
       $('#t1').val($('#endYearMonth').text());
       var selectMonths = $('#selectMonths').text();
@@ -64,12 +42,9 @@
       $('#Image').html('<img src="'+imageUrl+'" width=680 />');
       $('#data_url').html($('#dataURL').text());
       $('#Response').html($('serviceResponseText').text());
-      
     }
-    
     function changeDataSource(){
     	var dataSource = $('#dataSource').text();
-     	//dataSource = "NASA_QuikSCAT";
      	var x = document.getElementById("data");
      	if(dataSource == "NASA_MODIS" ){
      		x.options[0].selected=true;
@@ -140,9 +115,7 @@
      	else if(dataSource == "ECMWF_interim" ){
      		x.options[22].selected=true;
      	}
-        //$('#data option:contains('+dataSource+')').prop({selected: true});
     }
-    
     function changeVariableName(){
     	var var_string = $('#variableName').text();
      	var x=document.getElementById("var");
@@ -197,7 +170,6 @@
         else if (var_string == "rsut")
         	x.options[24].selected=true;
     }
-    
     function select_monthsByPara(){
     	var monthsByPara = $('#monthsPara').text();
     	if(monthsByPara.search("jan")>-1){
@@ -237,22 +209,14 @@
     		document.getElementById('Dec').checked = true;
     	}
     }
-    
-    // disable download data button
     function disable_download_button()
     {
-      /* var x=document.getElementById("download_data");
-      x.disabled=true; */
     }
-
-    // enable download data button
     function enable_download_button()
     {
       var x=document.getElementById("download_data");
       x.disabled=false;
     }
-
-    // select all months in the checkboxes
     function select_all_months()
     {
         document.getElementById('Jan').checked = true;
@@ -268,8 +232,6 @@
         document.getElementById('Nov').checked = true;
         document.getElementById('Dec').checked = true;
     }
-
-    // see if no month is selected
     function no_month_check()
     {
         if (document.getElementById('Jan').checked == false &&
@@ -284,14 +246,11 @@
            document.getElementById('Oct').checked == false &&
            document.getElementById('Nov').checked == false &&
            document.getElementById('Dec').checked == false) {
-           // alert("No month check!");
            return true;
           }
         else
            return false;
     }
-
-    // unselect all months in the checkboxes
     function reset_months()
     {
         document.getElementById('Jan').checked = false;
@@ -307,12 +266,9 @@
         document.getElementById('Nov').checked = false;
         document.getElementById('Dec').checked = false;
     }
-
-    // enable all vars in dropdown menu
     function reset_vars()
     {
       var x=document.getElementById("var");
-
       x.options[0].disabled=false;
       x.options[1].disabled=false;
       x.options[2].disabled=false;
@@ -339,15 +295,9 @@
       x.options[23].disabled=false;
       x.options[24].disabled=false;
     }
-
-    // form variable string based on "var" dropdown selection
     function select_var()
     {
       var var_string = $("#var").val();
-
-      // disable the download button because of this change
-      //disable_download_button();
-
       if (var_string == "Total Cloud Fraction")
         variable = "clt";
       else if (var_string == "Surface Temperature")
@@ -398,26 +348,12 @@
         variable = "rsutcs";
       else if (var_string == "TOA Outgoing Shortwave Radiation")
         variable = "rsut";
-
-      // alert("variable: " + variable)
     }
-
-    // set up "var" dropdown based status of "data" dropdown
     function select_data()
     {
       var data_string = $("#data").val();
       var x=document.getElementById("var");
-
-      // disable the download button because of this change
-      //disable_download_button();
-
-      // enable all options in "var" dropdown first
       reset_vars();
-
-      // alert(data_string);
-
-      // disable corresponding "var" options
-
       if (data_string == "NASA/AMSRE") {
         x.options[0].disabled=true;
         x.options[1].disabled=true;
@@ -443,7 +379,6 @@
         x.options[22].disabled=true;
         x.options[23].disabled=true;
         x.options[24].disabled=true;
-
         x.options[3].selected=true;
       }
       else if (data_string == "NASA/MODIS") {
@@ -470,9 +405,7 @@
         x.options[22].disabled=true;
         x.options[23].disabled=true;
         x.options[24].disabled=true;
-
         x.options[1].selected=true;
-        //x.options[8].selected=true;
       }
       else if (data_string == "NASA/TRMM") {
         x.options[0].selected=true;
@@ -529,7 +462,6 @@
         x.options[24].disabled=true;
       }
       else if (data_string == "NASA/QuikSCAT") {
-
         x.options[0].disabled=true;
         x.options[1].disabled=true;
         x.options[2].disabled=true;
@@ -552,10 +484,7 @@
         x.options[22].disabled=true;
         x.options[23].disabled=true;
         x.options[24].disabled=true;
-
         x.options[4].selected=true;
-        //x.options[5].selected=true;
-        //x.options[6].selected=true;
       }
       else if (data_string == "NASA/AVISO") {
         x.options[0].disabled=true;
@@ -582,11 +511,9 @@
         x.options[22].disabled=true;
         x.options[23].disabled=true;
         x.options[24].disabled=true;
-
         x.options[7].selected=true;
       }
       else if (data_string == "NASA/GRACE") {
-
         x.options[0].disabled=true;
         x.options[1].disabled=true;
         x.options[2].disabled=true;
@@ -610,12 +537,9 @@
         x.options[22].disabled=true;
         x.options[23].disabled=true;
         x.options[24].disabled=true;
-
         x.options[9].selected=true;
-        //x.options[10].selected=true;
       }
       else if (data_string == "NOAA/NODC") {
-
         x.options[0].disabled=true;
         x.options[1].disabled=true;
         x.options[2].disabled=true;
@@ -639,12 +563,9 @@
         x.options[22].disabled=true;
         x.options[23].disabled=true;
         x.options[24].disabled=true;
-
         x.options[11].selected=true;
-        //x.options[12].selected=true;
       }
       else if (data_string == "NASA/CERES") {
-
         x.options[0].disabled=true;
         x.options[1].disabled=true;
         x.options[2].disabled=true;
@@ -658,11 +579,9 @@
         x.options[10].disabled=true;
         x.options[11].disabled=true;
         x.options[12].disabled=true;
-
         x.options[13].selected=true;
       }
       else if (data_string == "ECMWF/interim") {
-
         x.options[0].disabled=true;
         x.options[1].disabled=true;
         x.options[2].disabled=true;
@@ -687,227 +606,141 @@
         x.options[22].disabled=true;
         x.options[23].disabled=true;
         x.options[24].disabled=true;
-
         x.options[3].selected=true;
       }
-      // for all other models
       else {
         x.options[9].disabled=true;
         x.options[10].disabled=true;
         x.options[11].disabled=true;
         x.options[12].disabled=true;
-
         x.options[0].selected=true;
       }
-
-
- // form variable string
     select_var();
     }
-
-    // select checkboxes based on "months" dropdown
     function select_months()
     {
       var s1=document.getElementById("months");
-      // alert(s1.selectedIndex);
-      // alert(s1.options[s1.selectedIndex].value);
-
-      // disable the download button because of this change
-      //disable_download_button();
-
-      // "select none"
       if (s1.selectedIndex == 1) {
         reset_months();
       }
-      // "select all"
       if (s1.selectedIndex == 0) {
         select_all_months();
       }
-      // "summer"
       if (s1.selectedIndex == 2) {
         reset_months();
         document.getElementById('Jun').checked = true;
         document.getElementById('Jul').checked = true;
         document.getElementById('Aug').checked = true;
       }
-      // "autumn"
       if (s1.selectedIndex == 3) {
         reset_months();
         document.getElementById('Sep').checked = true;
         document.getElementById('Oct').checked = true;
         document.getElementById('Nov').checked = true;
       }
-      // "winter"
       if (s1.selectedIndex == 4) {
         reset_months();
         document.getElementById('Dec').checked = true;
         document.getElementById('Jan').checked = true;
         document.getElementById('Feb').checked = true;
       }
-      // "spring"
       if (s1.selectedIndex == 5) {
         reset_months();
         document.getElementById('Mar').checked = true;
         document.getElementById('Apr').checked = true;
         document.getElementById('May').checked = true;
       }
-        
     }
-
     $(document).ready(function(){
-    	
-     /*  $("a").click(function(event){
-        alert("As you can see, the link no longer took you to jquery.com");
-        event.preventDefault();
-      }); */
-        
-
       $("#download_data").click(function(event) {
         var durl = $("#data_url").val();
-        //alert("url"+durl);
         window.location.assign(durl);
       });
-
-
       $("#twodvarzonalmean").click(function(event) {
 		Response = null;
-
-        // no data to download yet
-        //disable_download_button();
-		
-        // flag error if no month box is checked
       	if (no_month_check()) {
-           // $("#Response").html("<span style='color:red'>Error: please check at least
one month.</span>");
            $("#Response").html("Error: please check at least one month.");
            $("#Image").html("");
-           
            return;
         } 
-        
         $("#Response").html("Calculating ...");
         $("#data_url").html("Calculating ...");
         $("#Image").html("");
-		
-        // sample url: http://cmacws.jpl.nasa.gov:9002/svc/twoDimZonalMean?model=ukmo_hadgem2-a&var=ts&start_time=199001&end_time=199512&lat1=-29&lat2=29&months=1,2,4,5,6,10,12
-
-        // form url string
-        // var url = "http://cmacws.jpl.nasa.gov:9002/svc/twoDimZonalMean?";
-        var url = "http://" + window.location.hostname + ":9002/svc/twoDimZonalMean?";
-        //var url = "http://" + "einstein.sv.cmu.edu"+":9002/svc/twoDimZonalMean?";
-         //alert(url);
-		
+        var url = "http:
         var d1 = $("#data").val();
         var model1 = d1.replace("/", "_");
-
         var arglist = "";
         arglist = arglist.concat("model=");
         arglist = arglist.concat(model1);
-
         var v1 = $("#var").val();
         arglist = arglist.concat("&var=");
         arglist = arglist.concat(variable);
-
         var t0 = $("#t0").val();
         var t1 = $("#t1").val();
-
         t0 = t0.replace("-", "");
         t1 = t1.replace("-", "");
-
         arglist = arglist.concat("&start_time=");
         arglist = arglist.concat(t0);
-
         arglist = arglist.concat("&end_time=");
         arglist = arglist.concat(t1);
-
         var lat0 = $("#lat0").val();
         var lat1 = $("#lat1").val();
-
         arglist = arglist.concat("&lat1=");
         arglist = arglist.concat(lat0);
-
         arglist = arglist.concat("&lat2=");
         arglist = arglist.concat(lat1);
-
         var s1 = document.getElementById('months');
-
-        // get months checked by client
         var month_str = "";
-
         var mm = document.getElementById('Jan');
         if (mm.checked == true)
           month_str = month_str.concat(",1");
-
         var mm = document.getElementById('Feb');
         if (mm.checked == true)
           month_str = month_str.concat(",2");
-
         var mm = document.getElementById('Mar');
         if (mm.checked == true)
           month_str = month_str.concat(",3");
-
         var mm = document.getElementById('Apr');
         if (mm.checked == true)
           month_str = month_str.concat(",4");
-
         var mm = document.getElementById('May');
         if (mm.checked == true)
           month_str = month_str.concat(",5");
-
         var mm = document.getElementById('Jun');
         if (mm.checked == true)
           month_str = month_str.concat(",6");
-
         var mm = document.getElementById('Jul');
         if (mm.checked == true)
           month_str = month_str.concat(",7");
-
         var mm = document.getElementById('Aug');
         if (mm.checked == true)
           month_str = month_str.concat(",8");
-
         var mm = document.getElementById('Sep');
         if (mm.checked == true)
           month_str = month_str.concat(",9");
-
         var mm = document.getElementById('Oct');
         if (mm.checked == true)
           month_str = month_str.concat(",10");
-
         var mm = document.getElementById('Nov');
         if (mm.checked == true)
           month_str = month_str.concat(",11");
-
         var mm = document.getElementById('Dec');
         if (mm.checked == true)
           month_str = month_str.concat(",12");
-
-        // remove the leading ','
         month_str = month_str.substr(1);
-        // alert(month_str);
-
         arglist = arglist.concat("&months=");
         arglist = arglist.concat(month_str);
-        // alert("arglist: " + arglist);
-
         arglist = arglist.concat("&scale=");
         var y = document.getElementById("radioLin").checked;
-        // alert(y);
         if (y == true)
           arglist = arglist.concat('0');
         else
           arglist = arglist.concat('2');
-
         var purpose = $("#purpose").val();
         arglist = arglist.concat("&purpose=");
         arglist = arglist.concat(purpose);
-
-        // url = url + encodeURIComponent(arglist);
         url = url + encodeURI(arglist);
-        // url = url + arglist;
-        //alert("url: " + url);
-
-        var urlTimeBounds = "http://" + window.location.hostname + ":9002/svc/time_bounds?";
-        //var urlTimeBounds = "http://einstein.sv.cmu.edu" + ":9002/svc/time_bounds?";
+        var urlTimeBounds = "http:
         var arglistTB = "";
         arglistTB = arglistTB.concat("serviceType=");
         arglistTB = arglistTB.concat("1");
@@ -916,9 +749,6 @@
         arglistTB = arglistTB.concat("&var=");
         arglistTB = arglistTB.concat(variable);
         urlTimeBounds = urlTimeBounds + encodeURI(arglistTB);
-        //alert("urlTimeBounds: " + urlTimeBounds);
-
-		
         $.ajax({
             type: "GET",
             url: urlTimeBounds,
@@ -926,9 +756,7 @@
             data: null,
             success: function(data, textStatus, xhr) {
                 Response = data;
-                // alert("data: " + data);
                 if (data.success == false) {
-                    // alert(data.error);
                     Response = null;
                     var text = JSON.stringify(data, null, 4);
                     text = "Error in backend: <br>" + text; 
@@ -937,44 +765,29 @@
                     return;
                 }
                 var text = JSON.stringify(data, null, 4);
-                // alert("text: " + text);
-                // $("#Response").html("<pre>"+text+"</pre>");
-                // $("#Response").html(text);
-
                 var tb = data.time_bounds;
                 var bds = String(tb).split(",");
-                // alert("tb: " + tb);
-                // alert("bds: " + bds);
                 var lowerT = parseInt(bds[0]);
                 var upperT = parseInt(bds[1]);
-                // alert("lowerT: " + lowerT);
-                // alert("upperT: " + upperT);
                 var t0I = parseInt(t0);
                 var t1I = parseInt(t1);
-                // alert("t0: " + t0I);
-                // alert("t1: " + t1I);
-
                 if ( lowerT == 0 && upperT ==0 ) {
                   alert("We do not have data for this source and variable configuration.");
                   return;
                 }
-
                 if (t0I < lowerT && t1I < lowerT ||
                     t0I > upperT && t1I > upperT) {
                   alert("We do not have data that span your time range. Try the range inside
["+lowerT+", "+upperT+"].");
                   return;
                 }
-
                 if (t0I < lowerT && t1I <= upperT) {
                   alert("Your start year-month is out of bound. It has to be in or later
than " + lowerT +
                         ". We will use the range ["+lowerT+", "+t1I+"] for you.");
                 }
-
                 if (t1I > upperT && t0I >= lowerT) {
                   alert("Your end year-month is out of bound. It has to be in or earlier
than " + upperT +
                         ". We will use the range ["+t0I+", "+upperT+"] for you.");
                 }
-
                 if (t0I < lowerT && t1I > upperT ) {
                   alert("Both of your start and end year-months are out of bounds. They have
to be in or earlier than " + upperT +
                         ", and in or later than " + lowerT + ". We will use the range ["+lowerT+",
"+upperT+"] for you.");
@@ -983,15 +796,10 @@
             error: function(xhr, textStatus, errorThrown) {
 				$("#Response").html("error!");
 				$("#data_url").html("error!");
-                 //alert("xhr.status: "+xhr.status);
-                 //alert("error status: "+textStatus);
             },
             complete: function(xhr, textStatus) {
-                //alert("complete status: "+textStatus);
             }
         });
-
-		//alert("url" + url);
         $.ajax({
             type: "GET",
             url: url,
@@ -999,243 +807,179 @@
             data: null,
             success: function(data, textStatus, xhr) {
                 Response = data;
-                // alert("data: " + data);
                 if (data.success == false) {
-                    // alert(data.error);
                     Response = null;
                     var text = JSON.stringify(data, null, 4);
                     text = "Error in backend: <br>" + text; 
-                    // $("#Response").html("<span style='color:red'>" + text + "</span>");
                     $("#Response").html(text);
                     $("#data_url").html(text);
                     return;
                 }
                 var text = JSON.stringify(data, null, 4);
-                // alert(text);
-                // $("#Response").html("<pre>"+text+"</pre>");
                 $("#Response").html(text);
-
                 var html1 = "<img src='"+data.url+"' width='680' style=ā€˜display: block;
margin: 0 auto;ā€™/>";
-                // alert(html1);
                 $("#Image").html(html1);
-
-                // post dataUrl to textarea and enable download button
                 $("#data_url").html(data.dataUrl);
                 enable_download_button();
-
             },
             error: function(xhr, textStatus, errorThrown) {
 		$("#Response").html("error!");
                 $("#data_url").html("error!");
-                // alert("xhr.status: "+xhr.status);
-                // alert("error status: "+textStatus);
             },
             complete: function(xhr, textStatus) {
-                //alert("complete status: "+textStatus);
             }
         });
-
       });
-
-
     });
-    
   </script>
-<!--
-
-//-->
-</script>
-}
-
-@main("Parameters of ConfId", scripts){
-	
-	@flash_message()   
-	 
-    <p>
-<div id="dataSource" style="display: none;">@parameters.getDataSource()</div>
-<div id="variableName" style="display: none;">@parameters.getVariableName()</div>
-<div id="startYearMonth" style="display: none;">@parameters.getStartYearMonth()</div>
-<div id="endYearMonth" style="display: none;">@parameters.getEndYearMonth()</div>
-<div id="selectMonths" style="display: none;">@parameters.getSelectMonths()</div>
-<div id="monthsPara" style="display: none;">@parameters.getMonth()</div>
-<div id="startLat" style="display: none;">@parameters.getStartLat()</div>
-<div id="endLat" style="display: none;">@parameters.getEndLat()</div>
-<div id="variableScale" style="display: none;">@parameters.getVariableScale()</div>
-<div id="executionPurpose" style="display: none;">@parameters.getExecutionPurpose()</div>
-<div id="image" style="display: none;">@parameters.getImage()</div>
-<div id="dataURL" style="display: none;">@parameters.getDataURL()</div>
-<div id="serviceResponseText" style="display: none;">@parameters.getServiceResponseText()</div>
-<table border="1" align="center">
-
-<tr>
-<td colspan="4">
-<center>
-<b>Service: 2-D Variable Zonal Mean</b> <br><br>
-This service generates a graph of a 2-dimensional variable's zonal mean with time averaing.
<br>
-Select a data source (model or observation), a variable name, and a time range below.<br><br>
-</center>
-</td>
-</tr>
-
-<tr>
-<td>data source:</td><td><select name="data", id="data" onchange="select_data()">
-<!-- <option>NASA/obs4MIPs</option>  -->
 <optgroup label="Observation">
-<option>NASA/MODIS</option>
-<option>NASA/AMSRE</option>
-<option>NASA/TRMM</option>
-<option>NASA/GPCP</option>
-<option>NASA/QuikSCAT</option>
-<option>NASA/AVISO</option>
-<option>NASA/GRACE</option>
-<option>NOAA/NODC</option>
-<option>NASA/CERES</option>
+	<option>NASA/MODIS</option>
+	<option>NASA/AMSRE</option>
+	<option>NASA/TRMM</option>
+	<option>NASA/GPCP</option>
+	<option>NASA/QuikSCAT</option>
+	<option>NASA/AVISO</option>
+	<option>NASA/GRACE</option>
+	<option>NOAA/NODC</option>
+	<option>NASA/CERES</option>
 </optgroup>
 <optgroup label="Model: Historical">
-<option>CCCMA/CANESM2</option>
-<option>GFDL/ESM2G</option>
-<option>GISS/E2-H</option>
-<option>GISS/E2-R</option>
-<option>NCAR/CAM5</option>
-<option>NCC/NORESM</option>
-<option>UKMO/HadGEM2-ES</option>
+	<option>CCCMA/CANESM2</option>
+	<option>GFDL/ESM2G</option>
+	<option>GISS/E2-H</option>
+	<option>GISS/E2-R</option>
+	<option>NCAR/CAM5</option>
+	<option>NCC/NORESM</option>
+	<option>UKMO/HadGEM2-ES</option>
 </optgroup>
 <optgroup label="Model: AMIP">
-<option>CCCMA/CANAM4</option>
-<option>CSIRO/MK3.6</option>
-<option>GFDL/CM3</option>
-<option>IPSL/CM5A-LR</option>
-<option>MIROC/MIROC5</option>
-<option>UKMO/HadGEM2-A</option>
+	<option>CCCMA/CANAM4</option>
+	<option>CSIRO/MK3.6</option>
+	<option>GFDL/CM3</option>
+	<option>IPSL/CM5A-LR</option>
+	<option>MIROC/MIROC5</option>
+	<option>UKMO/HadGEM2-A</option>
 </optgroup>
 <optgroup label="Reanalysis">
-<option>ECMWF/interim</option>
+	<option>ECMWF/interim</option>
 </optgroup>
-</select></td>
-
-<td>variable name:</td><td><select name="var", id="var" onchange="select_var()">
-<option>Precipitation Flux</option>
-<option>Total Cloud Fraction</option>
-<option>Surface Temperature</option>
-<option>Sea Surface Temperature</option>
-<option>Eastward Near-Surface Wind</option>
-<option>Northward Near-Surface Wind</option>
-<option>Near-Surface Wind Speed</option>
-<option>Sea Surface Height</option>
-<option>Leaf Area Index</option>
-<option>Equivalent Water Height Over Land</option>
-<option>Equivalent Water Height Over Ocean</option>
-<option>Ocean Heat Content Anomaly within 700 m Depth</option>
-<option>Ocean Heat Content Anomaly within 2000 m Depth</option>
-<option>Surface Downwelling Longwave Radiation</option>
-<option>Surface Downwelling Shortwave Radiation</option>
-<option>Surface Upwelling Longwave Radiation</option>
-<option>Surface Upwelling Shortwave Radiation</option>
-<option>Surface Downwelling Clear-Sky Longwave Radiation</option>
-<option>Surface Downwelling Clear-Sky Shortwave Radiation</option>
-<option>Surface Upwelling Clear-Sky Shortwave Radiation</option>
-<option>TOA Incident Shortwave Radiation</option>
-<option>TOA Outgoing Longwave Radiation</option>
-<option>TOA Outgoing Shortwave Radiation</option>
-<option>TOA Outgoing Clear-Sky Longwave Radiation</option>
-<option>TOA Outgoing Clear-Sky Shortwave Radiation</option>
+</select>
+</td>
+<td>variable name:</td>
+<td><select name="var" , id="var" onchange="select_var()">
+		<option>Precipitation Flux</option>
+		<option>Total Cloud Fraction</option>
+		<option>Surface Temperature</option>
+		<option>Sea Surface Temperature</option>
+		<option>Eastward Near-Surface Wind</option>
+		<option>Northward Near-Surface Wind</option>
+		<option>Near-Surface Wind Speed</option>
+		<option>Sea Surface Height</option>
+		<option>Leaf Area Index</option>
+		<option>Equivalent Water Height Over Land</option>
+		<option>Equivalent Water Height Over Ocean</option>
+		<option>Ocean Heat Content Anomaly within 700 m Depth</option>
+		<option>Ocean Heat Content Anomaly within 2000 m Depth</option>
+		<option>Surface Downwelling Longwave Radiation</option>
+		<option>Surface Downwelling Shortwave Radiation</option>
+		<option>Surface Upwelling Longwave Radiation</option>
+		<option>Surface Upwelling Shortwave Radiation</option>
+		<option>Surface Downwelling Clear-Sky Longwave Radiation</option>
+		<option>Surface Downwelling Clear-Sky Shortwave Radiation</option>
+		<option>Surface Upwelling Clear-Sky Shortwave Radiation</option>
+		<option>TOA Incident Shortwave Radiation</option>
+		<option>TOA Outgoing Longwave Radiation</option>
+		<option>TOA Outgoing Shortwave Radiation</option>
+		<option>TOA Outgoing Clear-Sky Longwave Radiation</option>
+		<option>TOA Outgoing Clear-Sky Shortwave Radiation</option>
 </select></td>
 </tr>
-
 <tr>
-<td>start year-month:</td><td><input id="t0" value="2004-01" alt="start"/></td>
-<td>end year-month:</td><td><input id="t1" value="2004-12" alt="end"/></td>
+	<td>start year-month:</td>
+	<td><input id="t0" value="2004-01" alt="start" /></td>
+	<td>end year-month:</td>
+	<td><input id="t1" value="2004-12" alt="end" /></td>
 </tr>
-
 <tr>
-<td>select months:</td>
-<td><select name="months" id="months" onchange="select_months()">
-<option id="all">select all</option>
-<option id="none">select none</option>
-<option id="summer">Summer:Jun-Jul-Aug</option>
-<option id="autum">Autumn:Sep-Oct-Nov</option>
-<option id="winter">Winter:Dec-Jan-Feb</option>
-<option id="spring">Spring:Mar-Apr-May</option> </select>
-</td>
-<td>
-</td>
-<td>
+	<td>select months:</td>
+	<td><select name="months" id="months" onchange="select_months()">
+			<option id="all">select all</option>
+			<option id="none">select none</option>
+			<option id="summer">Summer:Jun-Jul-Aug</option>
+			<option id="autum">Autumn:Sep-Oct-Nov</option>
+			<option id="winter">Winter:Dec-Jan-Feb</option>
+			<option id="spring">Spring:Mar-Apr-May</option>
+	</select></td>
+	<td></td>
+	<td>
 </tr>
-
 <tr>
-<td>
-<label><input type="checkbox" name="option1" id="Jan" value="Jan" /> Jan<br></label>
-<label><input type="checkbox" name="option1" id="Feb" value="Feb" /> Feb<br></label>
-<label><input type="checkbox" name="option1" id="Mar" value="Mar" /> Mar<br></label>
-</td>
-<td>
-<label><input type="checkbox" name="option1" id="Apr" value="Apr" /> Apr<br></label>
-<label><input type="checkbox" name="option1" id="May" value="May" /> May<br></label>
-<label><input type="checkbox" name="option1" id="Jun" value="Jun" /> Jun<br></label>
-</td>
-<td>
-<label><input type="checkbox" name="option1" id="Jul" value="Jul" /> Jul<br></label>
-<label><input type="checkbox" name="option1" id="Aug" value="Aug" /> Aug<br></label>
-<label><input type="checkbox" name="option1" id="Sep" value="Sep" /> Sep<br></label>
-</td>
-<td>
-<label><input type="checkbox" name="option1" id="Oct" value="Oct" /> Oct<br></label>
-<label><input type="checkbox" name="option1" id="Nov" value="Nov" /> Nov<br></label>
-<label><input type="checkbox" name="option1" id="Dec" value="Dec" /> Dec<br></label>
-</td>
+	<td><label><input type="checkbox" name="option1" id="Jan"
+			value="Jan" /> Jan<br></label> <label><input type="checkbox"
+			name="option1" id="Feb" value="Feb" /> Feb<br></label> <label><input
+			type="checkbox" name="option1" id="Mar" value="Mar" /> Mar<br></label>
+	</td>
+	<td><label><input type="checkbox" name="option1" id="Apr"
+			value="Apr" /> Apr<br></label> <label><input type="checkbox"
+			name="option1" id="May" value="May" /> May<br></label> <label><input
+			type="checkbox" name="option1" id="Jun" value="Jun" /> Jun<br></label>
+	</td>
+	<td><label><input type="checkbox" name="option1" id="Jul"
+			value="Jul" /> Jul<br></label> <label><input type="checkbox"
+			name="option1" id="Aug" value="Aug" /> Aug<br></label> <label><input
+			type="checkbox" name="option1" id="Sep" value="Sep" /> Sep<br></label>
+	</td>
+	<td><label><input type="checkbox" name="option1" id="Oct"
+			value="Oct" /> Oct<br></label> <label><input type="checkbox"
+			name="option1" id="Nov" value="Nov" /> Nov<br></label> <label><input
+			type="checkbox" name="option1" id="Dec" value="Dec" /> Dec<br></label>
+	</td>
 </tr>
-
 <tr>
-<td>start lat (deg):</td><td><input id="lat0" value="-90"/></td>
-<td>end lat (deg):</td><td><input id="lat1" value="90"/></td>
+	<td>start lat (deg):</td>
+	<td><input id="lat0" value="-90" /></td>
+	<td>end lat (deg):</td>
+	<td><input id="lat1" value="90" /></td>
 </tr>
-
-<tr>               
-<td colspan="1">   
-variable scale:       
-</td>              
-<td colspan="3">   
-<form> <input type="radio" name="scale1" value="linear" id="radioLin" checked>linear
-<input type="radio" name="scale1" value="logarithmic" id="radioLog">logarithmic
-</form>        
-</td>          
-</tr> 
-
 <tr>
-<td colspan="1">
-Execution purpose
-</td>
-<td colspan="3">
-<form>
-<textarea name="purpose" id="purpose" rows="4" cols="50"> </textarea>
-</form>
-</td>
+	<td colspan="1">variable scale:</td>
+	<td colspan="3">
+		<form>
+			<input type="radio" name="scale1" value="linear" id="radioLin"
+				checked>linear <input type="radio" name="scale1"
+				value="logarithmic" id="radioLog">logarithmic
+		</form>
+	</td>
 </tr>
-
 <tr>
-<td colspan="2" align="center"><input id="twodvarzonalmean" type="submit" value="
           Run  Again            " style="height:28px"/></td>
-<form>
-<td colspan="2" align="center"><input id="download_data" type="button" value="Download
Data" style="height:28px"/>
-</td>
-</form>
-
+	<td colspan="1">Execution purpose</td>
+	<td colspan="3">
+		<form>
+			<textarea name="purpose" id="purpose" rows="4" cols="50"> </textarea>
+		</form>
+	</td>
+</tr>
+<tr>
+	<td colspan="2" align="center"><input id="twodvarzonalmean"
+		type="submit" value="            Run  Again            "
+		style="height: 28px" /></td>
+	<form>
+		<td colspan="2" align="center"><input id="download_data"
+			type="button" value="Download Data" style="height: 28px" /></td>
+	</form>
 </tr>
-
 <td colspan="4">
-<div id="Image">Image Here</div>
+	<div id="Image">Image Here</div>
 </td>
 </tr>
 <tr>
-<td colspan="4" align="center">
-<textarea readonly id="data_url" cols="89" rows="2">Data URL Here</textarea>
-</td>
+	<td colspan="4" align="center"><textarea readonly id="data_url"
+			cols="89" rows="2">Data URL Here</textarea></td>
 </tr>
 <tr>
-<td colspan="4" align="center">
-<textarea readonly id="Response" cols="89" rows="6">Service Response Text Here</textarea>
-</td>
+	<td colspan="4" align="center"><textarea readonly id="Response"
+			cols="89" rows="6">Service Response Text Here</textarea></td>
 </tr>
 </p>
-
 </table>
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/f22b3e32/app/views/climate/climateServices.scala.html
----------------------------------------------------------------------
diff --git a/app/views/climate/climateServices.scala.html b/app/views/climate/climateServices.scala.html
index 3fe95d3..9c47938 100644
--- a/app/views/climate/climateServices.scala.html
+++ b/app/views/climate/climateServices.scala.html
@@ -7,7 +7,7 @@
 	<script src='@routes.Assets.at("javascripts/edit_button.js")'></script>
 	<script type="text/javascript">
 	$(document).ready(function(){
-		//alert($("#url").text());
+
 	});
 	</script>
 }


Mime
View raw message