cmda-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xingwei...@apache.org
Subject [23/50] [abbrv] incubator-cmda git commit: Fix the url of the services
Date Sat, 05 Sep 2015 00:20:27 GMT
Fix the url of the services

Project: http://git-wip-us.apache.org/repos/asf/incubator-cmda/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cmda/commit/a88e3323
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cmda/tree/a88e3323
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cmda/diff/a88e3323

Branch: refs/heads/master
Commit: a88e33236e10291807c50c753407968751aa5bee
Parents: 7d2aacc
Author: mingqi830 <mqi@andrew.cmu.edu>
Authored: Thu Sep 3 17:00:16 2015 -0700
Committer: mingqi830 <mqi@andrew.cmu.edu>
Committed: Thu Sep 3 17:00:16 2015 -0700

----------------------------------------------------------------------
 .../climate/TwoDVariableZonelMean.scala.html    | 15 ++++++-----
 .../climate/threeDVariableTwoDSlice.scala.html  | 15 ++++++-----
 .../climate/threeDVariableZonalMean.scala.html  | 15 ++++++-----
 app/views/climate/twoDVariableMap.scala.html    | 12 +++++----
 .../climate/twoDVariableTimeSeries.scala.html   | 26 +++++++++++---------
 5 files changed, 48 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/a88e3323/app/views/climate/TwoDVariableZonelMean.scala.html
----------------------------------------------------------------------
diff --git a/app/views/climate/TwoDVariableZonelMean.scala.html b/app/views/climate/TwoDVariableZonelMean.scala.html
index 7fc50b0..74bb104 100644
--- a/app/views/climate/TwoDVariableZonelMean.scala.html
+++ b/app/views/climate/TwoDVariableZonelMean.scala.html
@@ -6,10 +6,13 @@
 <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"
+	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">
     var Response = null;
     var variable = "";
@@ -666,7 +669,7 @@
         $("#Response").html("Calculating ...");
         $("#data_url").html("Calculating ...");
         $("#Image").html("");
-        var url = "http:
+        var url = "http://" + window.location.hostname + ":9002/svc/twoDimZonalMean?";
         var d1 = $("#data").val();
         var model1 = d1.replace("/", "_");
         var arglist = "";
@@ -740,7 +743,7 @@
         arglist = arglist.concat("&purpose=");
         arglist = arglist.concat(purpose);
         url = url + encodeURI(arglist);
-        var urlTimeBounds = "http:
+        var urlTimeBounds = "http://" + window.location.hostname + ":9002/svc/time_bounds?";
         var arglistTB = "";
         arglistTB = arglistTB.concat("serviceType=");
         arglistTB = arglistTB.concat("1");

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/a88e3323/app/views/climate/threeDVariableTwoDSlice.scala.html
----------------------------------------------------------------------
diff --git a/app/views/climate/threeDVariableTwoDSlice.scala.html b/app/views/climate/threeDVariableTwoDSlice.scala.html
index 24273f2..9fbcbc1 100644
--- a/app/views/climate/threeDVariableTwoDSlice.scala.html
+++ b/app/views/climate/threeDVariableTwoDSlice.scala.html
@@ -6,10 +6,13 @@
 <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"
+	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">
 	 var Response = null;
     var variable = "";
@@ -340,7 +343,7 @@
         $("#Response").html("Calculating ...");
         $("#data_url").html("Calculating ...");
         $("#Image").html("");
-        var url = "http:
+        var url = "http://" + window.location.hostname + ":9002/svc/twoDimSlice3D?";
         var d1 = $("#data").val();
         var model1 = d1.replace("/", "_");
         var arglist = "";
@@ -427,7 +430,7 @@
         arglist = arglist.concat("&purpose=");
         arglist = arglist.concat(purpose);
         url = url + encodeURI(arglist);
-        var urlTimeBounds = "http:
+        var urlTimeBounds = "http://" + window.location.hostname + ":9002/svc/time_bounds?";
         var arglistTB = "";
         arglistTB = arglistTB.concat("serviceType=");
         arglistTB = arglistTB.concat("1");

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/a88e3323/app/views/climate/threeDVariableZonalMean.scala.html
----------------------------------------------------------------------
diff --git a/app/views/climate/threeDVariableZonalMean.scala.html b/app/views/climate/threeDVariableZonalMean.scala.html
index 1ecc918..c336e97 100644
--- a/app/views/climate/threeDVariableZonalMean.scala.html
+++ b/app/views/climate/threeDVariableZonalMean.scala.html
@@ -6,10 +6,13 @@
 <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"
+	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">
 	var Response = null;
     var variable = "";
@@ -347,7 +350,7 @@
         $("#Response").html("Calculating ...");
         $("#data_url").html("Calculating ...");
         $("#Image").html("");
-        var url = "http:
+        var url = "http://" + window.location.hostname + ":9002/svc/threeDimZonalMean?";
         var d1 = $("#data").val();
         var model1 = d1.replace("/", "_");
         var arglist = "";
@@ -453,7 +456,7 @@
         arglist = arglist.concat("&purpose=");
         arglist = arglist.concat(purpose);
         url = url + encodeURI(arglist);
-        var urlTimeBounds = "http:
+        var urlTimeBounds = "http://" + window.location.hostname + ":9002/svc/time_bounds?";
         var arglistTB = "";
         arglistTB = arglistTB.concat("serviceType=");
         arglistTB = arglistTB.concat("1");

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/a88e3323/app/views/climate/twoDVariableMap.scala.html
----------------------------------------------------------------------
diff --git a/app/views/climate/twoDVariableMap.scala.html b/app/views/climate/twoDVariableMap.scala.html
index eeaab63..9c6a5df 100644
--- a/app/views/climate/twoDVariableMap.scala.html
+++ b/app/views/climate/twoDVariableMap.scala.html
@@ -6,9 +6,11 @@
 <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="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">
@@ -685,7 +687,7 @@
         $("#Response").html("Calculating ...");
         $("#data_url").html("Calculating ...");
         $("#Image").html("");
-        var url = "http:
+        var url = "http://" + window.location.hostname + ":9002/svc/twoDimMap?";
         var d1 = $("#data").val();
         var model1 = d1.replace("/", "_");
         var arglist = "";
@@ -765,7 +767,7 @@
         arglist = arglist.concat("&purpose=");
         arglist = arglist.concat(purpose);
         url = url + encodeURI(arglist);
-        var urlTimeBounds = "http:
+        var urlTimeBounds = "http://" + window.location.hostname + ":9002/svc/time_bounds?";
         var arglistTB = "";
         arglistTB = arglistTB.concat("serviceType=");
         arglistTB = arglistTB.concat("1");

http://git-wip-us.apache.org/repos/asf/incubator-cmda/blob/a88e3323/app/views/climate/twoDVariableTimeSeries.scala.html
----------------------------------------------------------------------
diff --git a/app/views/climate/twoDVariableTimeSeries.scala.html b/app/views/climate/twoDVariableTimeSeries.scala.html
index ecb205c..2e2ee6d 100644
--- a/app/views/climate/twoDVariableTimeSeries.scala.html
+++ b/app/views/climate/twoDVariableTimeSeries.scala.html
@@ -6,10 +6,13 @@
 <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"
+	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">
 	var Response = null;
     var variable = "";
@@ -536,7 +539,7 @@
         $("#Response").html("Calculating ...");
         $("#data_url").html("Calculating ...");
         $("#Image").html("");
-        var url = "http:
+        var url = "http://" + window.location.hostname + ":9002/svc/timeSeries2D?";
         var d1 = $("#data").val();
         var model1 = d1.replace("/", "_");
         var arglist = "";
@@ -575,7 +578,7 @@
         arglist = arglist.concat("&purpose=");
         arglist = arglist.concat(purpose);
         url = url + encodeURI(arglist);
-        var urlTimeBounds = "http:
+        var urlTimeBounds = "http://" + window.location.hostname + ":9002/svc/time_bounds?";
         var arglistTB = "";
         arglistTB = arglistTB.concat("serviceType=");
         arglistTB = arglistTB.concat("1");
@@ -686,12 +689,11 @@
 	<tr>
 		<td colspan="4">
 			<center>
-				<b>Service: 2-D Variable Time Series</b><br>
-				<br> This service generates a graph of a 2-dimensional
-				variable's time series with monthly averaged values. <br>
-				Select a data source (model or observation), a variable name, a time
-				range, and a spatial range below.<br>
-				<br>
+				<b>Service: 2-D Variable Time Series</b><br> <br> This
+				service generates a graph of a 2-dimensional variable's time series
+				with monthly averaged values. <br> Select a data source (model
+				or observation), a variable name, a time range, and a spatial range
+				below.<br> <br>
 			</center>
 		</td>
 	</tr>


Mime
View raw message