You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by jo...@apache.org on 2014/07/21 15:24:37 UTC
[01/50] git commit: Add timeline directive
Repository: climate
Updated Branches:
refs/heads/master 99acc8cc9 -> ee6b1b970
Add timeline directive
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/b39b3ddc
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/b39b3ddc
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/b39b3ddc
Branch: refs/heads/master
Commit: b39b3ddcd7860a3ff6a220c9bc93dc646a11a14c
Parents: e0c0898
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 10:19:28 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 10:19:28 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 1 +
.../app/scripts/directives/timeline.js | 35 ++++++++++++++++++++
.../test/spec/directives/timeline.js | 20 +++++++++++
3 files changed, 56 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/b39b3ddc/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index 2b5aa63..2b07b4d 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -103,6 +103,7 @@
<script src="scripts/directives/onblur.js"></script>
<script src="scripts/directives/predictivefilebrowserinput.js"></script>
<script src="scripts/directives/previewmap.js"></script>
+ <script src="scripts/directives/timeline.js"></script>
<!-- endbuild -->
</body>
</html>
http://git-wip-us.apache.org/repos/asf/climate/blob/b39b3ddc/ocw-ui/frontend-new/app/scripts/directives/timeline.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/directives/timeline.js b/ocw-ui/frontend-new/app/scripts/directives/timeline.js
new file mode 100644
index 0000000..2ba5d5e
--- /dev/null
+++ b/ocw-ui/frontend-new/app/scripts/directives/timeline.js
@@ -0,0 +1,35 @@
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name ocwUiApp.directive:timeline
+ * @description
+ * # timeline
+ */
+angular.module('ocwUiApp')
+.directive('timeline', function($rootScope, $window) {
+ return {
+ restrict: 'C',
+ replace: true,
+ transclude: true,
+ template: '<div id="OCWtimeline"></div>',
+ link: function(scope, element, attrs) {
+ // Instantiate timeline object.
+ $rootScope.timeline = new links.Timeline(document.getElementById('OCWtimeline'));
+
+ // Redraw the timeline whenever the window is resized
+ angular.element($window).bind('resize', function() {
+ $rootScope.timeline.checkResize();
+ });
+
+ var options = {
+ "width": "100%",
+ "showCurrentTime": false,
+ "moveable": false,
+ "zoomable": false
+ };
+
+ $rootScope.timeline.draw([], options);
+ }
+ }
+});
http://git-wip-us.apache.org/repos/asf/climate/blob/b39b3ddc/ocw-ui/frontend-new/test/spec/directives/timeline.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/test/spec/directives/timeline.js b/ocw-ui/frontend-new/test/spec/directives/timeline.js
new file mode 100644
index 0000000..e326f73
--- /dev/null
+++ b/ocw-ui/frontend-new/test/spec/directives/timeline.js
@@ -0,0 +1,20 @@
+'use strict';
+
+describe('Directive: timeline', function () {
+
+ // load the directive's module
+ beforeEach(module('ocwUiApp'));
+
+ var element,
+ scope;
+
+ beforeEach(inject(function ($rootScope) {
+ scope = $rootScope.$new();
+ }));
+
+ it('should make hidden element visible', inject(function ($compile) {
+ element = angular.element('<timeline></timeline>');
+ element = $compile(element)(scope);
+ expect(element.text()).toBe('this is the timeline directive');
+ }));
+});
[20/50] git commit: Add selectobservation view
Posted by jo...@apache.org.
Add selectobservation view
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/e19a5acc
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/e19a5acc
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/e19a5acc
Branch: refs/heads/master
Commit: e19a5acc256dd8c016f62b0c8f1e78444d4de26a
Parents: 1047bd7
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 16:36:44 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 16:36:44 2014 -0700
----------------------------------------------------------------------
.../app/views/selectobservation.html | 58 ++++++++++++++++++++
1 file changed, 58 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/e19a5acc/ocw-ui/frontend-new/app/views/selectobservation.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/selectobservation.html b/ocw-ui/frontend-new/app/views/selectobservation.html
new file mode 100644
index 0000000..c560b6f
--- /dev/null
+++ b/ocw-ui/frontend-new/app/views/selectobservation.html
@@ -0,0 +1,58 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+
+<div ng-controller="ObservationSelectCtrl">
+ <form class="form-inline" autocomplete="off">
+ <input id="observationFileInput" predictive-file-browser-input ng-model="filePathInput" type="text" class="input-xlarge" autocomplete="off" />
+ <button class="btn" ng-click="uploadLocalFile()" ng-disabled="shouldDisableLoadButton()">
+ <div ng-hide="loadingFile">Parse File</div>
+ <div ng-show="loadingFile"><i class="icon-spinner icon-spin"></i></div>
+ </button>
+ </form>
+
+ <div class="row">
+ <div class="span2 text-center">
+ Evaluation Variable
+ </div>
+ <div class="span3">
+ <select ng-model="paramSelect" ng-options="param for param in params"></select>
+ </div>
+ <div class="span2 text-center">
+ Latitude Variable
+ </div>
+ <div class="span3">
+ <select ng-model="latsSelect" ng-options="lat for lat in lats"></select>
+ </div>
+ <div class="span2 text-center">
+ Longitude Variable
+ </div>
+ <div class="span3">
+ <select ng-model="lonsSelect" ng-options="lon for lon in lons"></select>
+ </div>
+ <div class="span2 text-center">
+ Date/Time Variable
+ </div>
+ <div class="span3">
+ <select ng-model="timeSelect" ng-options="time for time in times"></select>
+ </div>
+ </div>
+
+ <button class="btn btn-primary pull-left" ng-click="addDataSet()">Add Dataset</button>
+ <div class="pull-left small-alert" ng-show="fileAdded">Successfully added dataset...</div>
+</div>
[38/50] git commit: Properly scale result images in resultsdetail
Posted by jo...@apache.org.
Properly scale result images in resultsdetail
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/f922ce66
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/f922ce66
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/f922ce66
Branch: refs/heads/master
Commit: f922ce666afff5e4f57237fad3a4ff1c9468387f
Parents: 8f37553
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 13:51:09 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 13:51:09 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/resultsdetail.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/f922ce66/ocw-ui/frontend-new/app/views/resultsdetail.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/resultsdetail.html b/ocw-ui/frontend-new/app/views/resultsdetail.html
index 40a55a2..2febdd2 100644
--- a/ocw-ui/frontend-new/app/views/resultsdetail.html
+++ b/ocw-ui/frontend-new/app/views/resultsdetail.html
@@ -4,7 +4,7 @@
<div class="{{alertClass}}">{{alertMessage}}</div>
<ul>
<li ng-repeat="figure in figures">
- <img class="result-figures" ng-src="{{baseURL}}/static/eval_results/{{figure}}" alt="" />
+ <img class="img-responsive" ng-src="{{baseURL}}/static/eval_results/{{figure}}" alt="" />
</li>
</ul>
</div>
[26/50] git commit: Fix settings modal
Posted by jo...@apache.org.
Fix settings modal
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/60d750bc
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/60d750bc
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/60d750bc
Branch: refs/heads/master
Commit: 60d750bc9d213757ac7385f177c399537bb7a4cd
Parents: 93ea9c3
Author: Michael Joyce <jo...@apache.org>
Authored: Thu Jul 17 07:00:10 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Thu Jul 17 07:00:10 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/main.html | 63 +++++++++++++++-------------
1 file changed, 34 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/60d750bc/ocw-ui/frontend-new/app/views/main.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/main.html b/ocw-ui/frontend-new/app/views/main.html
index 06bc930..20be7b2 100644
--- a/ocw-ui/frontend-new/app/views/main.html
+++ b/ocw-ui/frontend-new/app/views/main.html
@@ -1,34 +1,38 @@
<!-- Modal for evaluation settings -->
- <bootstrap-modal modal-id="evaluationSettings">
- <div class="modal-header">
- <button class="close">×</button>
- <h3>Settings</h3>
- </div>
- <div class="modal-body" ng-controller="SettingsCtrl">
- <h4>Select the metrics you would like to run.</h4>
- <div ng-repeat="metric in settings.metrics">
- <label><input type="checkbox" ng-model="metric.select"> {{metric.name}}</label>
- </div>
- <hr />
- <h4>Select how you would like to temporally re-grid the datasets.</h4>
- <select ng-model="settings.temporal.selected" ng-options="opt for opt in settings.temporal.options"></select>
- <hr />
- <h4>Select which dataset to use as the reference.</h4>
- <select ng-model="settings.spatialSelect" ng-options="dataset as dataset.name for dataset in datasets"></select>
- <hr />
- <!-- Temporarily hidden for work on CLIMATE-365.-->
- <div ng-hide=true>
- <h4>Select a file which will define the bounds of subregions.</h4>
- <form class="form-inline" autocomplete="off">
- <input id="subregionFileInput" predictive-file-browser-input ng-model="settings.subregionFile" type="text" class="input-xlarge" autocomplete="off" />
- </form>
+<div class="modal fade" id="evaluationSettingsModal" role="dialog" aria-labelledby="datasetSelectModalLabel" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button class="close" data-dismiss="modal">×</button>
+ <h3>Settings</h3>
+ </div>
+ <div class="modal-body" ng-controller="SettingsCtrl">
+ <h4>Select the metrics you would like to run.</h4>
+ <div ng-repeat="metric in settings.metrics">
+ <label><input type="checkbox" ng-model="metric.select"> {{metric.name}}</label>
+ </div>
+ <hr />
+ <h4>Select how you would like to temporally re-grid the datasets.</h4>
+ <select ng-model="settings.temporal.selected" ng-options="opt for opt in settings.temporal.options"></select>
+ <hr />
+ <h4>Select which dataset to use as the reference.</h4>
+ <select ng-model="settings.spatialSelect" ng-options="dataset as dataset.name for dataset in datasets"></select>
+ <hr />
+ <!-- Temporarily hidden for work on CLIMATE-365.-->
+ <div ng-hide=true>
+ <h4>Select a file which will define the bounds of subregions.</h4>
+ <form class="form-inline" autocomplete="off">
+ <input id="subregionFileInput" predictive-file-browser-input ng-model="settings.subregionFile" type="text" class="input-xlarge" autocomplete="off" />
+ </form>
+ </div>
+ <!--End hidden section for CLIMATE-365-->
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-warning cancel" data-dismiss="modal">Close</button>
+ </div>
</div>
- <!--End hidden section for CLIMATE-365-->
- </div>
- <div class="modal-footer">
- <a href="#" class="btn btn-warning close">Close</a>
</div>
- </bootstrap-modal>
+</div>
<!-- END - Modal for evaluation settings -->
<div class="row">
@@ -222,7 +226,8 @@
</div>
<div class="row">
<div class="col-md-2 col-md-offset-6">
- <button class="btn btn-link no-color-link pull-right" bootstrap-modal-open="evaluationSettings">
+ <!--<button class="btn btn-link no-color-link pull-right" bootstrap-modal-open="evaluationSettings">-->
+ <button class="btn btn-link no-color-link pull-right" data-toggle="modal" data-target="#evaluationSettingsModal">
<span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Settings">
<span class="fa-stack fa-lg">
<i class="fa fa-square-o fa-stack-2x"></i>
[03/50] git commit: Add evaluationSettings service
Posted by jo...@apache.org.
Add evaluationSettings service
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/35e8a7ed
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/35e8a7ed
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/35e8a7ed
Branch: refs/heads/master
Commit: 35e8a7ed3a4dd5ec61260fec53f80dad723629a7
Parents: 8f13d2b
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 10:24:15 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 10:24:15 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 1 +
.../app/scripts/services/evaluationsettings.js | 37 ++++++++++++++++++++
.../test/spec/services/evaluationsettings.js | 18 ++++++++++
3 files changed, 56 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/35e8a7ed/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index 5ca9aad..375468a 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -105,6 +105,7 @@
<script src="scripts/directives/previewmap.js"></script>
<script src="scripts/directives/timeline.js"></script>
<script src="scripts/filters/isodatetomiddleendian.js"></script>
+ <script src="scripts/services/evaluationsettings.js"></script>
<!-- endbuild -->
</body>
</html>
http://git-wip-us.apache.org/repos/asf/climate/blob/35e8a7ed/ocw-ui/frontend-new/app/scripts/services/evaluationsettings.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/services/evaluationsettings.js b/ocw-ui/frontend-new/app/scripts/services/evaluationsettings.js
new file mode 100644
index 0000000..97e1d75
--- /dev/null
+++ b/ocw-ui/frontend-new/app/scripts/services/evaluationsettings.js
@@ -0,0 +1,37 @@
+'use strict';
+
+/**
+ * @ngdoc service
+ * @name ocwUiApp.evaluationSettings
+ * @description
+ * # evaluationSettings
+ * Service in the ocwUiApp.
+ */
+angular.module('ocwUiApp')
+.service('evaluationSettings', function($rootScope, $http) {
+ $http.get($rootScope.baseURL + '/processing/metrics/').then(function(data) {
+ metrics_data = data['data']['metrics'];
+ metrics = [];
+
+ for (var i = 0; i < metrics_data.length; ++i) {
+ metrics.push({'name': metrics_data[i], 'select': false});
+ }
+
+ settings['metrics'] = metrics;
+ });
+
+ var settings = {
+ 'metrics': [],
+ 'temporal': {
+ 'options': ['daily', 'monthly', 'yearly'],
+ 'selected': 'yearly',
+ },
+ 'spatialSelect': null,
+ };
+
+ return {
+ getSettings: function() {
+ return settings;
+ }
+ };
+});
http://git-wip-us.apache.org/repos/asf/climate/blob/35e8a7ed/ocw-ui/frontend-new/test/spec/services/evaluationsettings.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/test/spec/services/evaluationsettings.js b/ocw-ui/frontend-new/test/spec/services/evaluationsettings.js
new file mode 100644
index 0000000..60f6ac3
--- /dev/null
+++ b/ocw-ui/frontend-new/test/spec/services/evaluationsettings.js
@@ -0,0 +1,18 @@
+'use strict';
+
+describe('Service: evaluationSettings', function () {
+
+ // load the service's module
+ beforeEach(module('ocwUiApp'));
+
+ // instantiate service
+ var evaluationSettings;
+ beforeEach(inject(function (_evaluationSettings_) {
+ evaluationSettings = _evaluationSettings_;
+ }));
+
+ it('should do something', function () {
+ expect(!!evaluationSettings).toBe(true);
+ });
+
+});
[11/50] git commit: Add Leaflet to index.html
Posted by jo...@apache.org.
Add Leaflet to index.html
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/b1bd86e5
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/b1bd86e5
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/b1bd86e5
Branch: refs/heads/master
Commit: b1bd86e5864e4df1be017fcd144abff399ca2671
Parents: 5824420
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 13:21:15 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 13:21:15 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/b1bd86e5/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index ff26c5c..5ca395e 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -9,6 +9,7 @@
<!-- build:css(.) styles/vendor.css -->
<!-- bower:css -->
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
+ <link rel="stylesheet" href="bower_components/leaflet/dist/leaflet.css" />
<!-- endbower -->
<!-- endbuild -->
<!-- build:css(.tmp) styles/main.css -->
@@ -80,6 +81,8 @@
<script src="bower_components/angular-animate/angular-animate.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
+ <script src="bower_components/leaflet/dist/leaflet.js"></script>
+ <script src="bower_components/leaflet/dist/leaflet-src.js"></script>
<!-- endbower -->
<!-- endbuild -->
[18/50] git commit: Add resultsdetail view
Posted by jo...@apache.org.
Add resultsdetail view
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/86f8adae
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/86f8adae
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/86f8adae
Branch: refs/heads/master
Commit: 86f8adae2263ebfa41f02e6e7cd757809e785978
Parents: 8a2b483
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 16:36:22 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 16:36:22 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/resultsdetail.html | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/86f8adae/ocw-ui/frontend-new/app/views/resultsdetail.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/resultsdetail.html b/ocw-ui/frontend-new/app/views/resultsdetail.html
new file mode 100644
index 0000000..f2aab55
--- /dev/null
+++ b/ocw-ui/frontend-new/app/views/resultsdetail.html
@@ -0,0 +1,11 @@
+<div>
+ <h2>{{result}}</h2>
+ <div class="row-fluid text-center">
+ <div class="{{alertClass}}">{{alertMessage}}</div>
+ <ul>
+ <li ng-repeat="figure in figures">
+ <img class="result-figures" ng-src="{{baseURL}}/static/eval_results/{{figure}}" alt="" />
+ </li>
+ </ul>
+ </div>
+</div>
[13/50] git commit: Add font awesome
Posted by jo...@apache.org.
Add font awesome
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/828784e6
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/828784e6
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/828784e6
Branch: refs/heads/master
Commit: 828784e6040e2f2ce2ce6be986c47d021e7dd277
Parents: f613f01
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 16:09:02 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 16:09:02 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 1 +
ocw-ui/frontend-new/bower.json | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/828784e6/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index 19bc75e..b9f8a92 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -11,6 +11,7 @@
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
<link rel="stylesheet" href="bower_components/leaflet/dist/leaflet.css" />
<link rel="stylesheet" href="bower_components/chap-links-timeline/timeline.css" />
+ <link rel="stylesheet" href="bower_components/components-font-awesome/css/font-awesome.css" />
<!-- endbower -->
<!-- endbuild -->
<!-- build:css(.tmp) styles/main.css -->
http://git-wip-us.apache.org/repos/asf/climate/blob/828784e6/ocw-ui/frontend-new/bower.json
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/bower.json b/ocw-ui/frontend-new/bower.json
index b82d70b..054e532 100644
--- a/ocw-ui/frontend-new/bower.json
+++ b/ocw-ui/frontend-new/bower.json
@@ -12,7 +12,8 @@
"angular-route": "1.2.16",
"angular-ui-router": "angular-ui/ui-router#~0.2.10",
"leaflet": "~0.7.3",
- "chap-links-timeline": "~2.6.1"
+ "chap-links-timeline": "~2.6.1",
+ "components-font-awesome": "~4.1.0"
},
"devDependencies": {
"angular-mocks": "1.2.16",
[35/50] git commit: Fix timeline initialization problems
Posted by jo...@apache.org.
Fix timeline initialization problems
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/32c322a5
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/32c322a5
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/32c322a5
Branch: refs/heads/master
Commit: 32c322a544b9840750d6bcf3827e1ae1b7dc7de0
Parents: 099f91d
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 12:06:12 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 12:06:12 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/32c322a5/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index a71dfe0..917a697 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -73,6 +73,12 @@
<![endif]-->
<!-- endbuild -->
+ <!-- Google visualization library needs to be initialized for the timeline -->
+ <!-- Note that the terms of use forbid having a local copy of the code, so we're -->
+ <!-- stuck downloading it this way unfortunately. -->
+ <script type="text/javascript" src="http://www.google.com/jsapi"></script>
+ <script type="text/javascript">google.load("visualization", "1");</script>
+
<!-- build:js(.) scripts/vendor.js -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
[12/50] git commit: Add CHAP links timeline
Posted by jo...@apache.org.
Add CHAP links timeline
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/f613f016
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/f613f016
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/f613f016
Branch: refs/heads/master
Commit: f613f0160ea0653a5ea1d0952af874cc0381ec66
Parents: b1bd86e
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 13:23:24 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 13:23:24 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 2 ++
ocw-ui/frontend-new/bower.json | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/f613f016/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index 5ca395e..19bc75e 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -10,6 +10,7 @@
<!-- bower:css -->
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
<link rel="stylesheet" href="bower_components/leaflet/dist/leaflet.css" />
+ <link rel="stylesheet" href="bower_components/chap-links-timeline/timeline.css" />
<!-- endbower -->
<!-- endbuild -->
<!-- build:css(.tmp) styles/main.css -->
@@ -83,6 +84,7 @@
<script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
<script src="bower_components/leaflet/dist/leaflet.js"></script>
<script src="bower_components/leaflet/dist/leaflet-src.js"></script>
+ <script src="bower_components/chap-links-timeline/timeline-min.js"></script>
<!-- endbower -->
<!-- endbuild -->
http://git-wip-us.apache.org/repos/asf/climate/blob/f613f016/ocw-ui/frontend-new/bower.json
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/bower.json b/ocw-ui/frontend-new/bower.json
index c1b2af8..b82d70b 100644
--- a/ocw-ui/frontend-new/bower.json
+++ b/ocw-ui/frontend-new/bower.json
@@ -11,7 +11,8 @@
"angular-animate": "1.2.16",
"angular-route": "1.2.16",
"angular-ui-router": "angular-ui/ui-router#~0.2.10",
- "leaflet": "~0.7.3"
+ "leaflet": "~0.7.3",
+ "chap-links-timeline": "~2.6.1"
},
"devDependencies": {
"angular-mocks": "1.2.16",
[19/50] git commit: Add resultslist view
Posted by jo...@apache.org.
Add resultslist view
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/1047bd78
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/1047bd78
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/1047bd78
Branch: refs/heads/master
Commit: 1047bd7860e82c032a9e52bca0f6c9c0623d0e30
Parents: 86f8ada
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 16:36:34 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 16:36:34 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/resultslist.html | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/1047bd78/ocw-ui/frontend-new/app/views/resultslist.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/resultslist.html b/ocw-ui/frontend-new/app/views/resultslist.html
new file mode 100644
index 0000000..679d270
--- /dev/null
+++ b/ocw-ui/frontend-new/app/views/resultslist.html
@@ -0,0 +1,2 @@
+<h4>Select one of your previous runs. If none are displayed, please return
+ to the main page and start one!</h4>
[04/50] git commit: Add regionSelectParams service
Posted by jo...@apache.org.
Add regionSelectParams service
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/f57aa938
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/f57aa938
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/f57aa938
Branch: refs/heads/master
Commit: f57aa9382545a9888b1066b83262832ba0902739
Parents: 35e8a7e
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 10:25:02 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 10:25:02 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 1 +
.../app/scripts/services/regionselectparams.js | 27 ++++++++++++++++++++
.../test/spec/services/regionselectparams.js | 18 +++++++++++++
3 files changed, 46 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/f57aa938/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index 375468a..2941cf1 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -106,6 +106,7 @@
<script src="scripts/directives/timeline.js"></script>
<script src="scripts/filters/isodatetomiddleendian.js"></script>
<script src="scripts/services/evaluationsettings.js"></script>
+ <script src="scripts/services/regionselectparams.js"></script>
<!-- endbuild -->
</body>
</html>
http://git-wip-us.apache.org/repos/asf/climate/blob/f57aa938/ocw-ui/frontend-new/app/scripts/services/regionselectparams.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/services/regionselectparams.js b/ocw-ui/frontend-new/app/scripts/services/regionselectparams.js
new file mode 100644
index 0000000..1ac404a
--- /dev/null
+++ b/ocw-ui/frontend-new/app/scripts/services/regionselectparams.js
@@ -0,0 +1,27 @@
+'use strict';
+
+/**
+ * @ngdoc service
+ * @name ocwUiApp.regionSelectParams
+ * @description
+ * # regionSelectParams
+ * Service in the ocwUiApp.
+ */
+angular.module('ocwUiApp')
+.service('regionSelectParams', function() {
+ var parameters = {
+ "areValid" : true,
+ "latMin" : "",
+ "latMax" : "",
+ "lonMin" : "",
+ "lonMax" : "",
+ "start" : "",
+ "end" : "",
+ };
+
+ return {
+ getParameters: function() {
+ return parameters;
+ },
+ };
+});
http://git-wip-us.apache.org/repos/asf/climate/blob/f57aa938/ocw-ui/frontend-new/test/spec/services/regionselectparams.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/test/spec/services/regionselectparams.js b/ocw-ui/frontend-new/test/spec/services/regionselectparams.js
new file mode 100644
index 0000000..449d64f
--- /dev/null
+++ b/ocw-ui/frontend-new/test/spec/services/regionselectparams.js
@@ -0,0 +1,18 @@
+'use strict';
+
+describe('Service: regionSelectParams', function () {
+
+ // load the service's module
+ beforeEach(module('ocwUiApp'));
+
+ // instantiate service
+ var regionSelectParams;
+ beforeEach(inject(function (_regionSelectParams_) {
+ regionSelectParams = _regionSelectParams_;
+ }));
+
+ it('should do something', function () {
+ expect(!!regionSelectParams).toBe(true);
+ });
+
+});
[21/50] git commit: Add selectrcmed view
Posted by jo...@apache.org.
Add selectrcmed view
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/16027a2b
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/16027a2b
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/16027a2b
Branch: refs/heads/master
Commit: 16027a2bd8d9244524afa788e9ae3b18497774ce
Parents: e19a5ac
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 16:36:54 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 16:36:54 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/selectrcmed.html | 44 +++++++++++++++++++++
1 file changed, 44 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/16027a2b/ocw-ui/frontend-new/app/views/selectrcmed.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/selectrcmed.html b/ocw-ui/frontend-new/app/views/selectrcmed.html
new file mode 100644
index 0000000..4587d57
--- /dev/null
+++ b/ocw-ui/frontend-new/app/views/selectrcmed.html
@@ -0,0 +1,44 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+
+<div ng-controller="RcmedSelectionCtrl">
+ <div class="row">
+ <div class="span5">
+ Select the RCMED dataset that you would like use.
+ </div>
+ </div>
+ <div class="row">
+ <div class="span4">
+ <select ng-change="dataSelectUpdated()" class="span5" ng-model="datasetSelection" ng-options="obs as obs.longname for obs in availableObs"></select>
+ </div>
+ </div>
+ <div class="row">
+ <div class="span5">
+ Select the dataset parameter that you would like to test.
+ </div>
+ </div>
+ <div class="row">
+ <div class="span4">
+ <select class="span3" ng-model="parameterSelection" ng-options="param as param.shortname for param in retrievedObsParams"></select>
+ </div>
+ </div>
+
+ <button class="btn btn-primary pull-left" ng-click="addObservation()">Add Observation</button>
+ <div class="pull-left small-alert" ng-show="fileAdded">Successfully added dataset...</div>
+</div>
[33/50] git commit: Fix lack of 'var' in evaluationsettings
Posted by jo...@apache.org.
Fix lack of 'var' in evaluationsettings
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/896e117f
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/896e117f
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/896e117f
Branch: refs/heads/master
Commit: 896e117fc1161b51387e6964b49ce60c01b964bc
Parents: d91b103
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 10:45:37 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 10:45:37 2014 -0700
----------------------------------------------------------------------
.../app/scripts/services/evaluationsettings.js | 34 ++++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/896e117f/ocw-ui/frontend-new/app/scripts/services/evaluationsettings.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/services/evaluationsettings.js b/ocw-ui/frontend-new/app/scripts/services/evaluationsettings.js
index 97e1d75..f2faf52 100644
--- a/ocw-ui/frontend-new/app/scripts/services/evaluationsettings.js
+++ b/ocw-ui/frontend-new/app/scripts/services/evaluationsettings.js
@@ -8,10 +8,10 @@
* Service in the ocwUiApp.
*/
angular.module('ocwUiApp')
-.service('evaluationSettings', function($rootScope, $http) {
+ .service('evaluationSettings', function($rootScope, $http) {
$http.get($rootScope.baseURL + '/processing/metrics/').then(function(data) {
- metrics_data = data['data']['metrics'];
- metrics = [];
+ var metrics_data = data['data']['metrics'];
+ var metrics = [];
for (var i = 0; i < metrics_data.length; ++i) {
metrics.push({'name': metrics_data[i], 'select': false});
@@ -20,18 +20,18 @@ angular.module('ocwUiApp')
settings['metrics'] = metrics;
});
- var settings = {
- 'metrics': [],
- 'temporal': {
- 'options': ['daily', 'monthly', 'yearly'],
- 'selected': 'yearly',
- },
- 'spatialSelect': null,
- };
+ var settings = {
+ 'metrics': [],
+ 'temporal': {
+ 'options': ['daily', 'monthly', 'yearly'],
+ 'selected': 'yearly',
+ },
+ 'spatialSelect': null,
+ };
- return {
- getSettings: function() {
- return settings;
- }
- };
-});
+ return {
+ getSettings: function() {
+ return settings;
+ }
+ };
+ });
[16/50] git commit: Add modelselect view
Posted by jo...@apache.org.
Add modelselect view
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/15a2383d
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/15a2383d
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/15a2383d
Branch: refs/heads/master
Commit: 15a2383df98ee93ff8932e8221616ad62a9ca346
Parents: 5374adb
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 16:35:46 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 16:35:46 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/modelselect.html | 87 +++++++++++++++++++++
1 file changed, 87 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/15a2383d/ocw-ui/frontend-new/app/views/modelselect.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/modelselect.html b/ocw-ui/frontend-new/app/views/modelselect.html
new file mode 100644
index 0000000..17fa12b
--- /dev/null
+++ b/ocw-ui/frontend-new/app/views/modelselect.html
@@ -0,0 +1,87 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+-->
+
+<div class="container">
+ <div class="row">
+ <div class="span10 offset1 columns">
+ <div class="row">
+ <div class="span10">
+ <center>
+ <form id="modelSelectorForm">
+ <input type="file" name="modelSelector">
+ </form>
+ </center>
+ </div>
+ </div>
+ <div class="row">
+ <div class="span10 offset2">
+ <form class="form-horizontal" id="parameterSelectorForm">
+ <div class="control-group">
+ <label class="control-label" for="paramSelect">Parameter Value</label>
+ <div class="controls">
+ <select id="paramSelect">
+ <option ng-repeat="param in modelParameters">
+ {{param.text}}
+ </option>
+ </select>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="latSelect">Latitude Variable</label>
+ <div class="controls">
+ <select id="latSelect">
+ <option ng-repeat="lat in latVariables">
+ {{lat.text}}
+ </option>
+ </select>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="lonSelect">Longitude Variable</label>
+ <div class"controls">
+ <select id="lonSelect">
+ <option ng-repeat="lon in lonVariables">
+ {{lon.text}}
+ </option>
+ </select>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="dateTimeSelect">Date/Time Variable</label>
+ <div class="controls">
+ <select id="dateTimeSelect">
+ <option ng-repeat="dateTime in dateTimeVariables">
+ {{dateTime.text}}
+ </option>
+ </select>
+ </div>
+ </div>
+ <div class="control-group">
+ <div class="controls">
+ <button type="submit" class="btn btn-warn">Cancel</button>
+ <button type="submit" class="btn">Add Model</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
[36/50] git commit: Fix backend processing CORS handling
Posted by jo...@apache.org.
Fix backend processing CORS handling
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/6a501206
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/6a501206
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/6a501206
Branch: refs/heads/master
Commit: 6a501206c24244110fb6d8b7796140fc88cb11f1
Parents: 32c322a
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 13:50:24 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 13:50:24 2014 -0700
----------------------------------------------------------------------
ocw-ui/backend/processing.py | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/6a501206/ocw-ui/backend/processing.py
----------------------------------------------------------------------
diff --git a/ocw-ui/backend/processing.py b/ocw-ui/backend/processing.py
index 2b70713..e45b9c0 100644
--- a/ocw-ui/backend/processing.py
+++ b/ocw-ui/backend/processing.py
@@ -39,10 +39,24 @@ import numpy as np
processing_app = Bottle()
-@processing_app.hook('after_request')
-def enable_cors():
- ''' Allow Cross-Origin Resource Sharing for all URLs. '''
- response.headers['Access-Control-Allow-Origin'] = '*'
+class EnableCors(object):
+ name = 'enable_cors'
+ api = 2
+
+ def apply(self, fn, context):
+ def _enable_cors(*args, **kwargs):
+ # set CORS headers
+ response.headers['Access-Control-Allow-Origin'] = '*'
+ response.headers['Access-Control-Allow-Methods'] = 'GET, POST, PUT, OPTIONS'
+ response.headers['Access-Control-Allow-Headers'] = 'Origin, Accept, Content-Type, X-Requested-With, X-CSRF-Token'
+
+ if request.method != 'OPTIONS':
+ # actual request; reply with the actual response
+ return fn(*args, **kwargs)
+
+ return _enable_cors
+
+processing_app.install(EnableCors())
@processing_app.route('/metrics/')
def retrieve_metrics():
@@ -68,7 +82,7 @@ def retrieve_metrics():
return '%s(%s)' % (request.query.callback, output)
return output
-@processing_app.route('/run_evaluation/', method='POST')
+@processing_app.route('/run_evaluation/', method=['POST', 'OPTIONS'])
def run_evaluation():
''' Run an OCW Evaluation.
[46/50] git commit: Fix select box look and feel in settings modal
Posted by jo...@apache.org.
Fix select box look and feel in settings modal
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/1a788dd5
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/1a788dd5
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/1a788dd5
Branch: refs/heads/master
Commit: 1a788dd5cbccdad1f39855f989240d34e015ed98
Parents: 8375862
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 14:57:10 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 14:57:10 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/main.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/1a788dd5/ocw-ui/frontend-new/app/views/main.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/main.html b/ocw-ui/frontend-new/app/views/main.html
index 20be7b2..9ed6dd7 100644
--- a/ocw-ui/frontend-new/app/views/main.html
+++ b/ocw-ui/frontend-new/app/views/main.html
@@ -13,10 +13,10 @@
</div>
<hr />
<h4>Select how you would like to temporally re-grid the datasets.</h4>
- <select ng-model="settings.temporal.selected" ng-options="opt for opt in settings.temporal.options"></select>
+ <select class="form-control" ng-model="settings.temporal.selected" ng-options="opt for opt in settings.temporal.options"></select>
<hr />
<h4>Select which dataset to use as the reference.</h4>
- <select ng-model="settings.spatialSelect" ng-options="dataset as dataset.name for dataset in datasets"></select>
+ <select class="form-control" ng-model="settings.spatialSelect" ng-options="dataset as dataset.name for dataset in datasets"></select>
<hr />
<!-- Temporarily hidden for work on CLIMATE-365.-->
<div ng-hide=true>
[48/50] git commit: Margin adjustments for page header
Posted by jo...@apache.org.
Margin adjustments for page header
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/80490e1e
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/80490e1e
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/80490e1e
Branch: refs/heads/master
Commit: 80490e1ecb87e4872b1c997e090c2143e6ce9cf4
Parents: 2086509
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 15:21:48 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 15:21:48 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/styles/main.css | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/80490e1e/ocw-ui/frontend-new/app/styles/main.css
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/styles/main.css b/ocw-ui/frontend-new/app/styles/main.css
index 4ce3109..9e0d687 100644
--- a/ocw-ui/frontend-new/app/styles/main.css
+++ b/ocw-ui/frontend-new/app/styles/main.css
@@ -33,7 +33,7 @@ body {
}
#main-container {
- margin-top: 80px;
+ margin-top: 20px;
min-height: 400px;
height: auto !important;
height: 400px;
@@ -45,6 +45,10 @@ body {
overflow-x: hidden;
}
+#ocw-navbar {
+ margin-bottom: 0;
+}
+
#map { height: 500px; }
/* Small preview map that is displayed alongside dataset information */
[17/50] git commit: Add results view
Posted by jo...@apache.org.
Add results view
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/8a2b4839
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/8a2b4839
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/8a2b4839
Branch: refs/heads/master
Commit: 8a2b48394f9c974f11d91c6e2fa27d94c5cd477f
Parents: 15a2383
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 16:36:09 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 16:36:09 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/results.html | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/8a2b4839/ocw-ui/frontend-new/app/views/results.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/results.html b/ocw-ui/frontend-new/app/views/results.html
new file mode 100644
index 0000000..a8f58af
--- /dev/null
+++ b/ocw-ui/frontend-new/app/views/results.html
@@ -0,0 +1,15 @@
+<div class="row">
+ <div class="span3">
+ <div id="results-sidebar" class="pa-sidebar well well-small">
+ <ul class="nav nav-list">
+ <li id="results-sidebar-header" class="nav-header">Latest Run Results</li>
+ <li ng-repeat="result in results"
+ ng-class="{ active: $state.includes('results.detail') && $stateParams.resultId == result }">
+ <a href="#/results/{{result.replace('/', '')}}" >{{result}}</a>
+ </li>
+ </ul>
+ <div ui-view="menu"></div>
+ </div>
+ </div>
+ <div class="span9" ui-view ng-animate="{enter:'fade-enter'}"></div>
+</div>
[23/50] git commit: Fix view routing paths
Posted by jo...@apache.org.
Fix view routing paths
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/3885da06
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/3885da06
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/3885da06
Branch: refs/heads/master
Commit: 3885da06ffb9a3041cdd6317466f5d0466fd4b32
Parents: 2cf30a4
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 16:37:49 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 16:37:49 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/scripts/app.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/3885da06/ocw-ui/frontend-new/app/scripts/app.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/app.js b/ocw-ui/frontend-new/app/scripts/app.js
index ca830dd..6b90ff8 100644
--- a/ocw-ui/frontend-new/app/scripts/app.js
+++ b/ocw-ui/frontend-new/app/scripts/app.js
@@ -44,14 +44,14 @@ angular
.state('results.list', {
// parent: 'results',
url: '',
- templateUrl: 'views/results.list.html',
+ templateUrl: 'views/resultslist.html',
})
.state('results.detail', {
// parent: 'results',
url: '/{resultId}',
views: {
'': {
- templateUrl: 'views/results.detail.html',
+ templateUrl: 'views/resultsdetail.html',
controller: 'ResultDetailCtrl'
},
'menu': {
[05/50] git commit: Add selectedDatasetInformation service
Posted by jo...@apache.org.
Add selectedDatasetInformation service
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/e387ac55
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/e387ac55
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/e387ac55
Branch: refs/heads/master
Commit: e387ac554328307567a4ce30367af81546f7fd73
Parents: f57aa93
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 10:25:58 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 10:25:58 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 1 +
.../services/selecteddatasetinformation.js | 38 ++++++++++++++++++++
.../spec/services/selecteddatasetinformation.js | 18 ++++++++++
3 files changed, 57 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/e387ac55/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index 2941cf1..ff26c5c 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -107,6 +107,7 @@
<script src="scripts/filters/isodatetomiddleendian.js"></script>
<script src="scripts/services/evaluationsettings.js"></script>
<script src="scripts/services/regionselectparams.js"></script>
+ <script src="scripts/services/selecteddatasetinformation.js"></script>
<!-- endbuild -->
</body>
</html>
http://git-wip-us.apache.org/repos/asf/climate/blob/e387ac55/ocw-ui/frontend-new/app/scripts/services/selecteddatasetinformation.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/services/selecteddatasetinformation.js b/ocw-ui/frontend-new/app/scripts/services/selecteddatasetinformation.js
new file mode 100644
index 0000000..9034c96
--- /dev/null
+++ b/ocw-ui/frontend-new/app/scripts/services/selecteddatasetinformation.js
@@ -0,0 +1,38 @@
+'use strict';
+
+/**
+ * @ngdoc service
+ * @name ocwUiApp.selectedDatasetInformation
+ * @description
+ * # selectedDatasetInformation
+ * Service in the ocwUiApp.
+ */
+angular.module('ocwUiApp')
+.service('selectedDatasetInformation', function() {
+ var datasets = [];
+
+ return {
+ getDatasets: function() {
+ return datasets;
+ },
+ getDatasetCount: function() {
+ return datasets.length;
+ },
+ // TODO: Define the structure of the objects that are added with addDataset.
+ addDataset: function(dataset) {
+ // All datasets need a shouldDisplay attribute that is used when rendering
+ // the overlays on the map!
+ dataset.shouldDisplay = false;
+ // The regrid attribute indicates which dataset should be used for spatial regridding
+ dataset.regrid = false;
+
+ datasets.push(dataset);
+ },
+ removeDataset: function(index) {
+ datasets.splice(index, 1);
+ },
+ clearDatasets: function() {
+ datasets.length = 0;
+ },
+ };
+});
http://git-wip-us.apache.org/repos/asf/climate/blob/e387ac55/ocw-ui/frontend-new/test/spec/services/selecteddatasetinformation.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/test/spec/services/selecteddatasetinformation.js b/ocw-ui/frontend-new/test/spec/services/selecteddatasetinformation.js
new file mode 100644
index 0000000..9d13bba
--- /dev/null
+++ b/ocw-ui/frontend-new/test/spec/services/selecteddatasetinformation.js
@@ -0,0 +1,18 @@
+'use strict';
+
+describe('Service: selectedDatasetInformation', function () {
+
+ // load the service's module
+ beforeEach(module('ocwUiApp'));
+
+ // instantiate service
+ var selectedDatasetInformation;
+ beforeEach(inject(function (_selectedDatasetInformation_) {
+ selectedDatasetInformation = _selectedDatasetInformation_;
+ }));
+
+ it('should do something', function () {
+ expect(!!selectedDatasetInformation).toBe(true);
+ });
+
+});
[15/50] git commit: Fix view routing in DatasetSelectCtrl
Posted by jo...@apache.org.
Fix view routing in DatasetSelectCtrl
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/5374adb6
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/5374adb6
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/5374adb6
Branch: refs/heads/master
Commit: 5374adb6f4c00c586d1dd87be191cd3acb6df10d
Parents: e8bd4e7
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 16:15:13 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 16:15:13 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/scripts/controllers/datasetselect.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/5374adb6/ocw-ui/frontend-new/app/scripts/controllers/datasetselect.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/controllers/datasetselect.js b/ocw-ui/frontend-new/app/scripts/controllers/datasetselect.js
index 41f608f..22505f9 100644
--- a/ocw-ui/frontend-new/app/scripts/controllers/datasetselect.js
+++ b/ocw-ui/frontend-new/app/scripts/controllers/datasetselect.js
@@ -35,8 +35,8 @@ angular.module('ocwUiApp')
};
$scope.templates = [
- {title:'Local File', url: 'partials/selectObservation.html'},
- {title:'RCMED', url: 'partials/selectRcmed.html'},
+ {title:'Local File', url: 'views/selectObservation.html'},
+ {title:'RCMED', url: 'views/selectRcmed.html'},
{title:'ESG', disabled: true}
];
[14/50] git commit: Fix font awesome icons in main view
Posted by jo...@apache.org.
Fix font awesome icons in main view
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/e8bd4e70
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/e8bd4e70
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/e8bd4e70
Branch: refs/heads/master
Commit: e8bd4e70090d5b47c4efe7bdfcc5e599250375ec
Parents: 828784e
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 16:09:20 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 16:09:20 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/main.html | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/e8bd4e70/ocw-ui/frontend-new/app/views/main.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/main.html b/ocw-ui/frontend-new/app/views/main.html
index 913aeb7..dd18b23 100644
--- a/ocw-ui/frontend-new/app/views/main.html
+++ b/ocw-ui/frontend-new/app/views/main.html
@@ -41,14 +41,14 @@
<div class="col-md-1 col-md-offset-10">
<button class="btn btn-link no-color-link" ng-click="clearDatasets()" ng-disabled="shouldDisableClearButton()">
<span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Clear Datasets">
- <i class="icon-trash icon-2x"></i>
+ <i class="fa fa-trash-o fa-2x"></i>
</span>
</button>
</div>
<div class="col-md-1">
<button class="btn btn-link no-color-link" ng-click="open()">
<span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Add Dataset">
- <i class="icon-plus icon-2x"></i>
+ <i class="fa fa-plus fa-2x"></i>
</span>
</button>
</div>
@@ -88,7 +88,7 @@
<div class="col-md-1 col-md-offset-2">
<span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Remove Dataset">
<a class="no-color-link" href="#" ng-click="removeDataset($index)">
- <i class="icon-remove"></i>
+ <i class="fa fa-remove"></i>
</a>
</span>
</div>
@@ -220,9 +220,9 @@
<div class="col-md-2 col-md-offset-6">
<button class="btn btn-link no-color-link pull-right" bootstrap-modal-open="evaluationSettings">
<span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Settings">
- <span class="icon-stack">
- <i class="icon-check-empty icon-stack-base"></i>
- <i class="icon-cogs"></i>
+ <span class="fa-stack fa-lg">
+ <i class="fa fa-square-o fa-stack-2x"></i>
+ <i class="fa fa-cogs fa-stack-1x"></i>
</span>
</span>
</button>
@@ -230,7 +230,7 @@
<div class="col-md-4">
<button ng-click="runEvaluation()" ng-disabled="shouldDisableEvaluateButton()" class="btn btn-block btn-primary">
<div ng-hide="runningEval">Evaluate</div>
- <div ng-show="runningEval"><i class="icon-spinner icon-spin"></i></div>
+ <div ng-show="runningEval"><i class="fa fa-spinner fa-spin"></i></div>
</button>
</div>
</div>
[34/50] git commit: Indentation and formatting fixes in
RCMEDSelectCtrl
Posted by jo...@apache.org.
Indentation and formatting fixes in RCMEDSelectCtrl
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/099f91d9
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/099f91d9
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/099f91d9
Branch: refs/heads/master
Commit: 099f91d96f2243622ddf763961a46603358e081c
Parents: 896e117
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 12:01:26 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 12:01:26 2014 -0700
----------------------------------------------------------------------
.../app/scripts/controllers/rcmedselection.js | 153 ++++++++++---------
1 file changed, 77 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/099f91d9/ocw-ui/frontend-new/app/scripts/controllers/rcmedselection.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/controllers/rcmedselection.js b/ocw-ui/frontend-new/app/scripts/controllers/rcmedselection.js
index 827a249..454fdf7 100644
--- a/ocw-ui/frontend-new/app/scripts/controllers/rcmedselection.js
+++ b/ocw-ui/frontend-new/app/scripts/controllers/rcmedselection.js
@@ -8,29 +8,29 @@
* Controller of the ocwUiApp
*/
angular.module('ocwUiApp')
- .controller('RcmedSelectionCtrl', ['$rootScope', '$scope', '$http', '$timeout', 'selectedDatasetInformation',
- function($rootScope, $scope, $http, $timeout, selectedDatasetInformation) {
- // Grab a copy of the datasets so we can display a count to the user!
- $scope.datasetCount = selectedDatasetInformation.getDatasets();
- $scope.fileAdded = false;
+ .controller('RcmedSelectionCtrl', ['$rootScope', '$scope', '$http', '$timeout', 'selectedDatasetInformation',
+ function($rootScope, $scope, $http, $timeout, selectedDatasetInformation) {
+ // Grab a copy of the datasets so we can display a count to the user!
+ $scope.datasetCount = selectedDatasetInformation.getDatasets();
+ $scope.fileAdded = false;
- $scope.getObservations = function() {
- $http.jsonp($rootScope.baseURL + '/rcmed/datasets/?callback=JSON_CALLBACK').
- success(function(data) {
- $scope.availableObs = data;
- $scope.availableObs.splice(0, 0, {longname: 'Please select an option'});
- $scope.datasetSelection = $scope.availableObs[0];
- }).
- error(function(data) {
- $scope.availableObs = ["Unable to query RCMED"]
- });
- };
+ $scope.getObservations = function() {
+ $http.jsonp($rootScope.baseURL + '/rcmed/datasets/?callback=JSON_CALLBACK').
+ success(function(data) {
+ $scope.availableObs = data;
+ $scope.availableObs.splice(0, 0, {longname: 'Please select an option'});
+ $scope.datasetSelection = $scope.availableObs[0];
+ }).
+ error(function(data) {
+ $scope.availableObs = ["Unable to query RCMED"]
+ });
+ };
$scope.getObservationBounds = function() {
- $scope.observationBounds = {};
+ $scope.observationBounds = {};
- $http.get($rootScope.baseURL + '/rcmed/parameters/bounds/').
- success(function(data) {
+ $http.get($rootScope.baseURL + '/rcmed/parameters/bounds/')
+ .success(function(data) {
$scope.observationBounds = data;
$scope.observationBounds['default'] = {
'start': '1900-01-01 00:00:00',
@@ -40,8 +40,8 @@ angular.module('ocwUiApp')
'lonMin': -180,
'lonMax': 179,
};
- }).
- error(function(data) {
+ })
+ .error(function(data) {
$scope.observationBounds['default'] = {
'start': '1900-01-01 00:00:00',
'end': '2050-01-01 00:00:00',
@@ -54,71 +54,72 @@ angular.module('ocwUiApp')
};
$scope.getBoundsByParameterId = function(parameterId) {
- if (parameterId in $scope.observationBounds) {
- return $scope.observationBounds[parameterId];
- } else {
- return $scope.observationBounds['default'];
- }
+ if (parameterId in $scope.observationBounds) {
+ return $scope.observationBounds[parameterId];
+ } else {
+ return $scope.observationBounds['default'];
+ }
};
- $scope.dataSelectUpdated = function() {
- var urlString = $rootScope.baseURL + '/rcmed/parameters/?dataset=' +
- $scope.datasetSelection["shortname"] +
- "&callback=JSON_CALLBACK";
- $http.jsonp(urlString).
- success(function(data) {
- $scope.retrievedObsParams = data;
- if ($scope.retrievedObsParams.length > 1)
- $scope.retrievedObsParams.splice(0, 0, {shortname: 'Please select a parameter'});
- $scope.parameterSelection = $scope.retrievedObsParams[0];
- });
- };
+ $scope.dataSelectUpdated = function() {
+ var urlString = $rootScope.baseURL + '/rcmed/parameters/?dataset=' +
+ $scope.datasetSelection["shortname"] +
+ "&callback=JSON_CALLBACK";
+ $http.jsonp(urlString)
+ .success(function(data) {
+ $scope.retrievedObsParams = data;
+ if ($scope.retrievedObsParams.length > 1)
+ $scope.retrievedObsParams.splice(0, 0, {shortname: 'Please select a parameter'});
+ $scope.parameterSelection = $scope.retrievedObsParams[0];
+ });
+ };
- $scope.addObservation = function() {
- var newDataset = {};
+ $scope.addObservation = function() {
+ var newDataset = {};
- newDataset['isObs'] = 1;
- // Save the dataset id (the important part) and name (for display purposes)
- newDataset['datasetId'] = $scope.datasetSelection['dataset_id'];
- newDataset['name'] = $scope.datasetSelection['longname'];
- // Save the parameter id (the important part) and name (for display purposes)
- newDataset['id'] = $scope.parameterSelection['parameter_id'];
- newDataset['param'] = $scope.parameterSelection['parameter_id'];
- newDataset['paramName'] = $scope.parameterSelection['longname'];
+ newDataset['isObs'] = 1;
+ // Save the dataset id (the important part) and name (for display purposes)
+ newDataset['datasetId'] = $scope.datasetSelection['dataset_id'];
+ newDataset['name'] = $scope.datasetSelection['longname'];
+ // Save the parameter id (the important part) and name (for display purposes)
+ newDataset['id'] = $scope.parameterSelection['parameter_id'];
+ newDataset['param'] = $scope.parameterSelection['parameter_id'];
+ newDataset['paramName'] = $scope.parameterSelection['longname'];
- bounds = $scope.getBoundsByParameterId(newDataset['id']);
- newDataset['latlonVals'] = {
- 'latMin': bounds['lat_min'],
- 'latMax': bounds['lat_max'],
- 'lonMin': bounds['lon_min'],
- 'lonMax': bounds['lon_max'],
- };
- newDataset['timeVals'] = {
- 'start': bounds['start_date'],
- 'end': bounds['end_date'],
- };
+ var bounds = $scope.getBoundsByParameterId(newDataset['id']);
+ newDataset['latlonVals'] = {
+ 'latMin': bounds['lat_min'],
+ 'latMax': bounds['lat_max'],
+ 'lonMin': bounds['lon_min'],
+ 'lonMax': bounds['lon_max'],
+ };
+ newDataset['timeVals'] = {
+ 'start': bounds['start_date'],
+ 'end': bounds['end_date'],
+ };
- // Set some defaults for lat/lon/time variable names. This just helps
- // us display stuff later.
- newDataset['lat'] = "N/A";
- newDataset['lon'] = "N/A";
- newDataset['time'] = "N/A";
+ // Set some defaults for lat/lon/time variable names. This just helps
+ // us display stuff later.
+ newDataset['lat'] = "N/A";
+ newDataset['lon'] = "N/A";
+ newDataset['time'] = "N/A";
- selectedDatasetInformation.addDataset(newDataset);
+ selectedDatasetInformation.addDataset(newDataset);
- // Clear the user selections by requery-ing RCMED. This is really hacky, but it works for now...
- $scope.availableObs = [];
- $scope.retrievedObsParams = [];
- $scope.getObservations();
+ // Clear the user selections by requery-ing RCMED. This is really hacky, but it works for now...
+ $scope.availableObs = [];
+ $scope.retrievedObsParams = [];
+ $scope.getObservations();
- // Display a confirmation message for a little bit
- $scope.fileAdded = true;
- $timeout(function() {
- $scope.fileAdded = false;
- }, 2000);
- };
+ // Display a confirmation message for a little bit
+ $scope.fileAdded = true;
+ $timeout(function() {
+ $scope.fileAdded = false;
+ }, 2000);
+ };
// Grab the available observations from RCMED
$scope.getObservations();
$scope.getObservationBounds();
- }]);
+ }
+ ]);
[39/50] git commit: Switch over to a non-fluid grid
Posted by jo...@apache.org.
Switch over to a non-fluid grid
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/305ac4d9
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/305ac4d9
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/305ac4d9
Branch: refs/heads/master
Commit: 305ac4d94efc8ba3b1073f62bb134e04a553d36d
Parents: f922ce6
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 14:09:12 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 14:09:12 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/305ac4d9/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index 917a697..40cbd01 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -24,10 +24,10 @@
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
- <div class="container-fluid">
+ <div class="container">
<div class="row">
<div class="navbar navbar-default" role="navigation">
- <div class="container-fluid">
+ <div class="container">
<div class="navbar-header">
<a class="navbar-brand brand" href="#">OCW UI</a>
</div>
@@ -53,7 +53,7 @@
</div>
<!-- Main Content -->
<!--<div id="main-container" class="container" ui-view ng-animate="{enter:'fade-enter'}"></div>-->
- <div id="main-container" class="container-fluid" ui-view></div>
+ <div id="main-container" class="container" ui-view></div>
</div>
<!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->
[22/50] git commit: Fix view routing in datasetselect ctrl
Posted by jo...@apache.org.
Fix view routing in datasetselect ctrl
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/2cf30a41
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/2cf30a41
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/2cf30a41
Branch: refs/heads/master
Commit: 2cf30a411fa9528c87aa56065b7b482745195f18
Parents: 16027a2
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 16:37:17 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 16:37:17 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/scripts/controllers/datasetselect.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/2cf30a41/ocw-ui/frontend-new/app/scripts/controllers/datasetselect.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/controllers/datasetselect.js b/ocw-ui/frontend-new/app/scripts/controllers/datasetselect.js
index 22505f9..b59cc5a 100644
--- a/ocw-ui/frontend-new/app/scripts/controllers/datasetselect.js
+++ b/ocw-ui/frontend-new/app/scripts/controllers/datasetselect.js
@@ -35,8 +35,8 @@ angular.module('ocwUiApp')
};
$scope.templates = [
- {title:'Local File', url: 'views/selectObservation.html'},
- {title:'RCMED', url: 'views/selectRcmed.html'},
+ {title:'Local File', url: 'views/selectobservation.html'},
+ {title:'RCMED', url: 'views/selectrcmed.html'},
{title:'ESG', disabled: true}
];
[41/50] git commit: Remove jquery-ui CSS from bower build section
Posted by jo...@apache.org.
Remove jquery-ui CSS from bower build section
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/78eeaf56
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/78eeaf56
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/78eeaf56
Branch: refs/heads/master
Commit: 78eeaf56e77cce0ff16de58c7a7f0fdbb5f53e71
Parents: 2d1e11f
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 14:47:54 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 14:47:54 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/78eeaf56/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index 40cbd01..d2ba823 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -16,8 +16,8 @@
<!-- endbuild -->
<!-- build:css(.tmp) styles/main.css -->
<link rel="stylesheet" href="styles/main.css">
- <link rel="stylesheet" href="bower_components/jquery-ui/themes/smoothness/jquery-ui.css" />
<!-- endbuild -->
+ <link rel="stylesheet" href="bower_components/jquery-ui/themes/smoothness/jquery-ui.css" />
</head>
<body ng-app="ocwUiApp">
<!--[if lt IE 7]>
[43/50] git commit: Clean up in selectobservation
Posted by jo...@apache.org.
Clean up in selectobservation
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/0d16f50f
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/0d16f50f
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/0d16f50f
Branch: refs/heads/master
Commit: 0d16f50f5844413c2912e220b59652c654e59277
Parents: 9cf056e
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 14:51:49 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 14:51:49 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/selectobservation.html | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/0d16f50f/ocw-ui/frontend-new/app/views/selectobservation.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/selectobservation.html b/ocw-ui/frontend-new/app/views/selectobservation.html
index 4b9f6e7..7c4fe55 100644
--- a/ocw-ui/frontend-new/app/views/selectobservation.html
+++ b/ocw-ui/frontend-new/app/views/selectobservation.html
@@ -71,11 +71,6 @@
</div>
</div>
</div>
- <!--<div class="row">-->
- <!--<div class="col-md-4 col-md-offset-4">-->
- <!--<hr />-->
- <!--</div>-->
- <!--</div>-->
<div class="row top3">
<div class="col-md-3 col-md-offset-1">
<button class="btn btn-primary btn-block" ng-click="addDataSet()">Add Dataset</button>
[07/50] git commit: Remove about.html
Posted by jo...@apache.org.
Remove about.html
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/1f3cfaed
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/1f3cfaed
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/1f3cfaed
Branch: refs/heads/master
Commit: 1f3cfaed6940440dde4dc9016cbe6ac146185190
Parents: c3b8981
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 13:04:31 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 13:04:31 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/about.html | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/1f3cfaed/ocw-ui/frontend-new/app/views/about.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/about.html b/ocw-ui/frontend-new/app/views/about.html
deleted file mode 100644
index d21bf89..0000000
--- a/ocw-ui/frontend-new/app/views/about.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>This is the about view.</p>
[25/50] git commit: Fix dataset select modal not displaying
Posted by jo...@apache.org.
Fix dataset select modal not displaying
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/93ea9c30
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/93ea9c30
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/93ea9c30
Branch: refs/heads/master
Commit: 93ea9c30c7db40dc9c3df48850c6b87060f1cb69
Parents: 5b97450
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 19:32:17 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 19:32:17 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/main.html | 34 ++++++++++++++++------------
1 file changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/93ea9c30/ocw-ui/frontend-new/app/views/main.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/main.html b/ocw-ui/frontend-new/app/views/main.html
index dd18b23..06bc930 100644
--- a/ocw-ui/frontend-new/app/views/main.html
+++ b/ocw-ui/frontend-new/app/views/main.html
@@ -46,7 +46,7 @@
</button>
</div>
<div class="col-md-1">
- <button class="btn btn-link no-color-link" ng-click="open()">
+ <button class="btn btn-link no-color-link" data-toggle="modal" data-target="#datasetSelect">
<span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Add Dataset">
<i class="fa fa-plus fa-2x"></i>
</span>
@@ -54,20 +54,24 @@
</div>
</div>
<!-- Modal for dataset selection -->
- <div modal="datasetSelect" close="close()" options="opts">
- <div class="modal-header">
- <h3>Dataset Select</h3>
- </div>
- <div class="modal-body">
- <tabset>
- <tab ng-repeat="tab in templates" heading="{{tab.title}}" active="tab.active" disabled="tab.disabled">
- <div ng-include src="tab.url"></div>
- </tab>
- <li class="pull-right">Queued Datasets: {{datasetCount.length}}</li>
- </tabset>
- </div>
- <div class="modal-footer">
- <button class="btn btn-warning cancel" ng-click="close()">Close</button>
+ <div class="modal fade" id="datasetSelect" role="dialog" aria-labelledby="datasetSelectModalLabel" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h3>Dataset Select</h3>
+ </div>
+ <div class="modal-body">
+ <tabset>
+ <tab ng-repeat="tab in templates" heading="{{tab.title}}" active="tab.active" disabled="tab.disabled">
+ <div ng-include src="tab.url"></div>
+ </tab>
+ <li class="pull-right">Queued Datasets: {{datasetCount.length}}</li>
+ </tabset>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-warning cancel" data-dismiss="modal">Close</button>
+ </div>
+ </div>
</div>
</div>
<!-- END - Modal for dataset selection -->
[09/50] git commit: Add main.html
Posted by jo...@apache.org.
Add main.html
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/87c74965
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/87c74965
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/87c74965
Branch: refs/heads/master
Commit: 87c749652a2d5fa14ee6ee8eb0e0cae1726101d3
Parents: 7f72bc5
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 13:08:06 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 13:08:06 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/main.html | 262 ++++++++++++++++++++++++---
1 file changed, 241 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/87c74965/ocw-ui/frontend-new/app/views/main.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/main.html b/ocw-ui/frontend-new/app/views/main.html
index 7addb36..913aeb7 100644
--- a/ocw-ui/frontend-new/app/views/main.html
+++ b/ocw-ui/frontend-new/app/views/main.html
@@ -1,23 +1,243 @@
-<div class="jumbotron">
- <h1>'Allo, 'Allo!</h1>
- <p class="lead">
- <img src="images/yeoman.png" alt="I'm Yeoman"><br>
- Always a pleasure scaffolding your apps.
- </p>
- <p><a class="btn btn-lg btn-success" ng-href="#">Splendid!<span class="glyphicon glyphicon-ok"></span></a></p>
-</div>
+<!-- Modal for evaluation settings -->
+ <bootstrap-modal modal-id="evaluationSettings">
+ <div class="modal-header">
+ <button class="close">×</button>
+ <h3>Settings</h3>
+ </div>
+ <div class="modal-body" ng-controller="SettingsCtrl">
+ <h4>Select the metrics you would like to run.</h4>
+ <div ng-repeat="metric in settings.metrics">
+ <label><input type="checkbox" ng-model="metric.select"> {{metric.name}}</label>
+ </div>
+ <hr />
+ <h4>Select how you would like to temporally re-grid the datasets.</h4>
+ <select ng-model="settings.temporal.selected" ng-options="opt for opt in settings.temporal.options"></select>
+ <hr />
+ <h4>Select which dataset to use as the reference.</h4>
+ <select ng-model="settings.spatialSelect" ng-options="dataset as dataset.name for dataset in datasets"></select>
+ <hr />
+ <!-- Temporarily hidden for work on CLIMATE-365.-->
+ <div ng-hide=true>
+ <h4>Select a file which will define the bounds of subregions.</h4>
+ <form class="form-inline" autocomplete="off">
+ <input id="subregionFileInput" predictive-file-browser-input ng-model="settings.subregionFile" type="text" class="input-xlarge" autocomplete="off" />
+ </form>
+ </div>
+ <!--End hidden section for CLIMATE-365-->
+ </div>
+ <div class="modal-footer">
+ <a href="#" class="btn btn-warning close">Close</a>
+ </div>
+ </bootstrap-modal>
+<!-- END - Modal for evaluation settings -->
-<div class="row marketing">
- <h4>HTML5 Boilerplate</h4>
- <p>
- HTML5 Boilerplate is a professional front-end template for building fast, robust, and adaptable web apps or sites.
- </p>
+ <div class="row">
+ <div class="col-md-12">
+ <div class="row">
+ <div class="col-md-6">
+ <!--Dataset Select Controls-->
+ <div ng-controller="DatasetSelectCtrl">
+ <div class="row">
+ <div class="col-md-1 col-md-offset-10">
+ <button class="btn btn-link no-color-link" ng-click="clearDatasets()" ng-disabled="shouldDisableClearButton()">
+ <span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Clear Datasets">
+ <i class="icon-trash icon-2x"></i>
+ </span>
+ </button>
+ </div>
+ <div class="col-md-1">
+ <button class="btn btn-link no-color-link" ng-click="open()">
+ <span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Add Dataset">
+ <i class="icon-plus icon-2x"></i>
+ </span>
+ </button>
+ </div>
+ </div>
+ <!-- Modal for dataset selection -->
+ <div modal="datasetSelect" close="close()" options="opts">
+ <div class="modal-header">
+ <h3>Dataset Select</h3>
+ </div>
+ <div class="modal-body">
+ <tabset>
+ <tab ng-repeat="tab in templates" heading="{{tab.title}}" active="tab.active" disabled="tab.disabled">
+ <div ng-include src="tab.url"></div>
+ </tab>
+ <li class="pull-right">Queued Datasets: {{datasetCount.length}}</li>
+ </tabset>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-warning cancel" ng-click="close()">Close</button>
+ </div>
+ </div>
+ <!-- END - Modal for dataset selection -->
+ <div class="row">
+ <div class="col-md-12">
+ <hr />
+ </div>
+ </div>
+ </div>
+ <!--Dataset display-->
+ <div ng-controller="DatasetDisplayCtrl" id="datasetDiv">
+ <div ng-repeat="dataset in datasets">
+ <div class="row">
+ <!--Data section-->
+ <div class="col-md-8 col-md-offset-1 muted">
+ {{dataset.name}}
+ </div>
+ <div class="col-md-1 col-md-offset-2">
+ <span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Remove Dataset">
+ <a class="no-color-link" href="#" ng-click="removeDataset($index)">
+ <i class="icon-remove"></i>
+ </a>
+ </span>
+ </div>
+ </div>
+ <!--Time Values!-->
+ <div class="row">
+ <!--Dataset Info Section-->
+ <div class="col-md-9">
+ <div class="row">
+ <div class="col-md-2 col-md-offset-1 text-center">Start:</div>
+ <div class="col-md-2">
+ <div class="col-md-2 text-center">{{dataset.timeVals.start | ISODateToMiddleEndian}}</div>
+ </div>
+ <div class="col-md-2 text-center">End:</div>
+ <div class="col-md-2">
+ <div class="col-md-2 text-center">{{dataset.timeVals.end | ISODateToMiddleEndian}}</div>
+ </div>
+ </div>
+ <!--Lat/Long Values!-->
+ <div class="row">
+ <div class="col-md-2 col-md-offset-1 text-center">North:</div>
+ <div class="col-md-2 text-center">
+ {{dataset.latlonVals.latMax | number:2}}
+ </div>
+ <div class="col-md-2 text-center">West:</div>
+ <div class="col-md-2 text-center">
+ {{dataset.latlonVals.lonMin | number:2}}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-2 col-md-offset-1 text-center">South:</div>
+ <div class="col-md-2 text-center">
+ {{dataset.latlonVals.latMin | number:2}}
+ </div>
+ <div class="col-md-2 text-center">East:</div>
+ <div class="col-md-2 text-center">
+ {{dataset.latlonVals.lonMax | number:2}}
+ </div>
+ </div>
+ </div>
+ <!--Preview Map Section-->
+ <div class="col-md-3">
+ <!--If the dataset is global we show a picture of a globe instead of the actual map-->
+ <div ng-hide="dataset.latlonVals.lonMin == -180 && dataset.latlonVals.lonMax == 180 &&
+ dataset.latlonVals.latMin == -90 && dataset.latlonVals.latMax == 90"
+ preview-map="dataset" index="$index"></div>
+ <div ng-show="dataset.latlonVals.lonMin == -180 && dataset.latlonVals.lonMax == 180 &&
+ dataset.latlonVals.latMin == -90 && dataset.latlonVals.latMax == 90">
+ <img src="img/globe.png" class="preview-map">
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-6 col-md-offset-3"><hr /></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-6">
+ <!--Map-->
+ <div class="row" ng-controller="WorldMapCtrl">
+ <div class="col-md-12">
+ <leaflet-map id="map"></leaflet-map>
+ </div>
+ </div>
+
+ <!--Timeline-->
+ <div class="row">
+ <div class="col-md-12" ng-controller="TimelineCtrl">
+ <div class="timeline"></div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-md-12" ng-controller="ParameterSelectCtrl">
+ <div class="row">
+ <div class="col-md-2 text-center">Start Date:</div>
+ <div class="col-md-4">
+ <form>
+ <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
+ <!--reason the input boxes refused to be 100% wide when their span size was set.-->
+ <input ng-disabled="shouldDisableControls()" on-blur="checkParameters();" ng-model="displayParams.start" ui-date="datepickerSettings" ui-date-format="yy-mm-dd" type="text" class="col-md-4 text-center" style="width:100%" />
+ </form>
+ </div>
+ <div class="col-md-2 text-center">End Date:</div>
+ <div class="col-md-4">
+ <form>
+ <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
+ <!--reason the input boxes refused to be 100% wide when their span size was set.-->
+ <input ng-disabled="shouldDisableControls()" on-blur="checkParameters();" ng-model="displayParams.end" ui-date="datepickerSettings" ui-date-format="yy-mm-dd" type="text" class="col-md-4 text-center" style="width:100%"/>
+ </form>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-2 text-center">North:</div>
+ <div class="col-md-4">
+ <form action="">
+ <input ng-disabled="shouldDisableControls()" ng-model="displayParams.latMax" on-blur="checkParameters();" type="text" class="col-md-4 text-center" style="width:100%"/>
+ </form>
+ </div>
+ <div class="col-md-2 text-center">South:</div>
+ <div class="col-md-4">
+ <form action="">
+ <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
+ <!--reason the input boxes refused to be 100% wide when their span size was set.-->
+ <input ng-disabled="shouldDisableControls()" ng-model="displayParams.latMin" on-blur="checkParameters();" type="text" class="col-md-4 text-center" style="width:100%"/>
+ </form>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-2 text-center">East:</div>
+ <div class="col-md-4">
+ <form>
+ <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
+ <!--reason the input boxes refused to be 100% wide when their span size was set.-->
+ <input ng-disabled="shouldDisableControls()" ng-model="displayParams.lonMax" on-blur="checkParameters();" type="text" class="col-md-4 text-center" style="width:100%"/>
+ </form>
+ </div>
+ <div class="col-md-2 text-center">West:</div>
+ <div class="col-md-4">
+ <form>
+ <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
+ <!--reason the input boxes refused to be 100% wide when their span size was set.-->
+ <input ng-disabled="shouldDisableControls()" ng-model="displayParams.lonMin" on-blur="checkParameters();"; type="text" class="col-md-4 text-center" style="width:100%"/>
+ </form>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-2 col-md-offset-6">
+ <button class="btn btn-link no-color-link pull-right" bootstrap-modal-open="evaluationSettings">
+ <span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Settings">
+ <span class="icon-stack">
+ <i class="icon-check-empty icon-stack-base"></i>
+ <i class="icon-cogs"></i>
+ </span>
+ </span>
+ </button>
+ </div>
+ <div class="col-md-4">
+ <button ng-click="runEvaluation()" ng-disabled="shouldDisableEvaluateButton()" class="btn btn-block btn-primary">
+ <div ng-hide="runningEval">Evaluate</div>
+ <div ng-show="runningEval"><i class="icon-spinner icon-spin"></i></div>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
- <h4>Angular</h4>
- <p>
- AngularJS is a toolset for building the framework most suited to your application development.
- </p>
-
- <h4>Karma</h4>
- <p>Spectacular Test Runner for JavaScript.</p>
-</div>
[08/50] git commit: Fix routing paths
Posted by jo...@apache.org.
Fix routing paths
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/7f72bc57
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/7f72bc57
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/7f72bc57
Branch: refs/heads/master
Commit: 7f72bc5772da4ecf6cbbf337bcd0c5627b4d5d15
Parents: 1f3cfae
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 13:07:52 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 13:07:52 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/scripts/app.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/7f72bc57/ocw-ui/frontend-new/app/scripts/app.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/app.js b/ocw-ui/frontend-new/app/scripts/app.js
index cbdc4fb..ca830dd 100644
--- a/ocw-ui/frontend-new/app/scripts/app.js
+++ b/ocw-ui/frontend-new/app/scripts/app.js
@@ -33,25 +33,25 @@ angular
$stateProvider
.state('main',{
url: '/evaluate',
- templateUrl: 'partials/main.html',
+ templateUrl: 'views/main.html',
})
.state('results', {
url: '/results',
abstract: true,
- templateUrl: 'partials/results.html',
+ templateUrl: 'views/results.html',
controller: 'ResultCtrl'
})
.state('results.list', {
// parent: 'results',
url: '',
- templateUrl: 'partials/results.list.html',
+ templateUrl: 'views/results.list.html',
})
.state('results.detail', {
// parent: 'results',
url: '/{resultId}',
views: {
'': {
- templateUrl: 'partials/results.detail.html',
+ templateUrl: 'views/results.detail.html',
controller: 'ResultDetailCtrl'
},
'menu': {
[47/50] git commit: Clean up index.html spacing. Add id to navbar
Posted by jo...@apache.org.
Clean up index.html spacing. Add id to navbar
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/20865098
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/20865098
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/20865098
Branch: refs/heads/master
Commit: 20865098642efce380681ebf7414beb56e87aab3
Parents: 1a788dd
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 15:21:28 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 15:21:28 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/20865098/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index d2ba823..3867c6f 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -26,7 +26,7 @@
<div class="container">
<div class="row">
- <div class="navbar navbar-default" role="navigation">
+ <div class="navbar navbar-default" id="ocw-navbar" role="navigation">
<div class="container">
<div class="navbar-header">
<a class="navbar-brand brand" href="#">OCW UI</a>
@@ -41,7 +41,6 @@
</div>
<div class="row">
<div class="col-md-12">
- <br><br>
<div id="header">
<img id="header-img" src=""/>
<h3 id="header-title">Project Name</h3>
@@ -49,10 +48,8 @@
</div>
</div>
</div>
- <!--div>-->
</div>
<!-- Main Content -->
- <!--<div id="main-container" class="container" ui-view ng-animate="{enter:'fade-enter'}"></div>-->
<div id="main-container" class="container" ui-view></div>
</div>
[49/50] git commit: Spacing adjustments and indentation fixes for
main view
Posted by jo...@apache.org.
Spacing adjustments and indentation fixes for main view
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/dd3d262d
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/dd3d262d
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/dd3d262d
Branch: refs/heads/master
Commit: dd3d262de5a48496ba12e1db3a161abe10d06d6e
Parents: 80490e1
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 15:22:11 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 15:22:11 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/main.html | 373 ++++++++++++++-------------
1 file changed, 188 insertions(+), 185 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/dd3d262d/ocw-ui/frontend-new/app/views/main.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/main.html b/ocw-ui/frontend-new/app/views/main.html
index 9ed6dd7..cc07a3b 100644
--- a/ocw-ui/frontend-new/app/views/main.html
+++ b/ocw-ui/frontend-new/app/views/main.html
@@ -35,218 +35,221 @@
</div>
<!-- END - Modal for evaluation settings -->
- <div class="row">
- <div class="col-md-12">
- <div class="row">
- <div class="col-md-6">
- <!--Dataset Select Controls-->
- <div ng-controller="DatasetSelectCtrl">
- <div class="row">
- <div class="col-md-1 col-md-offset-10">
- <button class="btn btn-link no-color-link" ng-click="clearDatasets()" ng-disabled="shouldDisableClearButton()">
- <span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Clear Datasets">
- <i class="fa fa-trash-o fa-2x"></i>
- </span>
- </button>
- </div>
- <div class="col-md-1">
- <button class="btn btn-link no-color-link" data-toggle="modal" data-target="#datasetSelect">
- <span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Add Dataset">
- <i class="fa fa-plus fa-2x"></i>
- </span>
- </button>
- </div>
+<div class="row">
+ <div class="col-md-12">
+ <div class="row">
+ <!-- Dataset Select and Display Column -->
+ <div class="col-md-6">
+ <!--Dataset Select Controls-->
+ <div ng-controller="DatasetSelectCtrl">
+ <div class="row">
+ <div class="col-md-1 col-md-offset-10">
+ <button class="btn btn-link no-color-link" ng-click="clearDatasets()" ng-disabled="shouldDisableClearButton()">
+ <span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Clear Datasets">
+ <i class="fa fa-trash-o fa-2x"></i>
+ </span>
+ </button>
</div>
- <!-- Modal for dataset selection -->
- <div class="modal fade" id="datasetSelect" role="dialog" aria-labelledby="datasetSelectModalLabel" aria-hidden="true">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <h3>Dataset Select</h3>
- </div>
- <div class="modal-body">
- <tabset>
- <tab ng-repeat="tab in templates" heading="{{tab.title}}" active="tab.active" disabled="tab.disabled">
- <div ng-include src="tab.url"></div>
- </tab>
- <li class="pull-right">Queued Datasets: {{datasetCount.length}}</li>
- </tabset>
- </div>
- <div class="modal-footer">
- <button class="btn btn-warning cancel" data-dismiss="modal">Close</button>
- </div>
+ <div class="col-md-1">
+ <button class="btn btn-link no-color-link" data-toggle="modal" data-target="#datasetSelect">
+ <span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Add Dataset">
+ <i class="fa fa-plus fa-2x"></i>
+ </span>
+ </button>
+ </div>
+ </div>
+ <!-- Modal for dataset selection -->
+ <div class="modal fade" id="datasetSelect" role="dialog" aria-labelledby="datasetSelectModalLabel" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h3>Dataset Select</h3>
+ </div>
+ <div class="modal-body">
+ <tabset>
+ <tab ng-repeat="tab in templates" heading="{{tab.title}}" active="tab.active" disabled="tab.disabled">
+ <div ng-include src="tab.url"></div>
+ </tab>
+ <li class="pull-right">Queued Datasets: {{datasetCount.length}}</li>
+ </tabset>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-warning cancel" data-dismiss="modal">Close</button>
</div>
</div>
</div>
- <!-- END - Modal for dataset selection -->
- <div class="row">
- <div class="col-md-12">
- <hr />
- </div>
+ </div>
+ <!-- END - Modal for dataset selection -->
+ <div class="row">
+ <div class="col-md-12">
+ <hr />
</div>
</div>
- <!--Dataset display-->
- <div ng-controller="DatasetDisplayCtrl" id="datasetDiv">
- <div ng-repeat="dataset in datasets">
- <div class="row">
- <!--Data section-->
- <div class="col-md-8 col-md-offset-1 muted">
- {{dataset.name}}
- </div>
- <div class="col-md-1 col-md-offset-2">
- <span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Remove Dataset">
- <a class="no-color-link" href="#" ng-click="removeDataset($index)">
- <i class="fa fa-remove"></i>
- </a>
- </span>
- </div>
+ </div>
+ <!--Dataset display-->
+ <div ng-controller="DatasetDisplayCtrl" id="datasetDiv">
+ <div ng-repeat="dataset in datasets">
+ <div class="row">
+ <!--Data section-->
+ <div class="col-md-8 col-md-offset-1 muted">
+ {{dataset.name}}
</div>
- <!--Time Values!-->
- <div class="row">
- <!--Dataset Info Section-->
- <div class="col-md-9">
- <div class="row">
- <div class="col-md-2 col-md-offset-1 text-center">Start:</div>
- <div class="col-md-2">
- <div class="col-md-2 text-center">{{dataset.timeVals.start | ISODateToMiddleEndian}}</div>
- </div>
- <div class="col-md-2 text-center">End:</div>
- <div class="col-md-2">
- <div class="col-md-2 text-center">{{dataset.timeVals.end | ISODateToMiddleEndian}}</div>
- </div>
+ <div class="col-md-1 col-md-offset-2">
+ <span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Remove Dataset">
+ <a class="no-color-link" href="#" ng-click="removeDataset($index)">
+ <i class="fa fa-remove"></i>
+ </a>
+ </span>
+ </div>
+ </div>
+ <!--Time Values!-->
+ <div class="row">
+ <!--Dataset Info Section-->
+ <div class="col-md-9">
+ <div class="row">
+ <div class="col-md-2 col-md-offset-1 text-center">Start:</div>
+ <div class="col-md-2">
+ <div class="col-md-2 text-center">{{dataset.timeVals.start | ISODateToMiddleEndian}}</div>
+ </div>
+ <div class="col-md-2 text-center">End:</div>
+ <div class="col-md-2">
+ <div class="col-md-2 text-center">{{dataset.timeVals.end | ISODateToMiddleEndian}}</div>
</div>
- <!--Lat/Long Values!-->
- <div class="row">
- <div class="col-md-2 col-md-offset-1 text-center">North:</div>
- <div class="col-md-2 text-center">
- {{dataset.latlonVals.latMax | number:2}}
- </div>
- <div class="col-md-2 text-center">West:</div>
- <div class="col-md-2 text-center">
- {{dataset.latlonVals.lonMin | number:2}}
- </div>
+ </div>
+ <!--Lat/Long Values!-->
+ <div class="row">
+ <div class="col-md-2 col-md-offset-1 text-center">North:</div>
+ <div class="col-md-2 text-center">
+ {{dataset.latlonVals.latMax | number:2}}
</div>
- <div class="row">
- <div class="col-md-2 col-md-offset-1 text-center">South:</div>
- <div class="col-md-2 text-center">
- {{dataset.latlonVals.latMin | number:2}}
- </div>
- <div class="col-md-2 text-center">East:</div>
- <div class="col-md-2 text-center">
- {{dataset.latlonVals.lonMax | number:2}}
- </div>
+ <div class="col-md-2 text-center">West:</div>
+ <div class="col-md-2 text-center">
+ {{dataset.latlonVals.lonMin | number:2}}
</div>
</div>
- <!--Preview Map Section-->
- <div class="col-md-3">
- <!--If the dataset is global we show a picture of a globe instead of the actual map-->
- <div ng-hide="dataset.latlonVals.lonMin == -180 && dataset.latlonVals.lonMax == 180 &&
- dataset.latlonVals.latMin == -90 && dataset.latlonVals.latMax == 90"
- preview-map="dataset" index="$index"></div>
- <div ng-show="dataset.latlonVals.lonMin == -180 && dataset.latlonVals.lonMax == 180 &&
- dataset.latlonVals.latMin == -90 && dataset.latlonVals.latMax == 90">
- <img src="img/globe.png" class="preview-map">
+ <div class="row">
+ <div class="col-md-2 col-md-offset-1 text-center">South:</div>
+ <div class="col-md-2 text-center">
+ {{dataset.latlonVals.latMin | number:2}}
+ </div>
+ <div class="col-md-2 text-center">East:</div>
+ <div class="col-md-2 text-center">
+ {{dataset.latlonVals.lonMax | number:2}}
</div>
</div>
</div>
- <div class="row">
- <div class="col-md-6 col-md-offset-3"><hr /></div>
+ <!--Preview Map Section-->
+ <div class="col-md-3">
+ <!--If the dataset is global we show a picture of a globe instead of the actual map-->
+ <div ng-hide="dataset.latlonVals.lonMin == -180 && dataset.latlonVals.lonMax == 180 &&
+ dataset.latlonVals.latMin == -90 && dataset.latlonVals.latMax == 90"
+ preview-map="dataset" index="$index"></div>
+ <div ng-show="dataset.latlonVals.lonMin == -180 && dataset.latlonVals.lonMax == 180 &&
+ dataset.latlonVals.latMin == -90 && dataset.latlonVals.latMax == 90">
+ <img src="img/globe.png" class="preview-map">
+ </div>
</div>
</div>
+ <div class="row">
+ <div class="col-md-6 col-md-offset-3"><hr /></div>
+ </div>
</div>
+ </div>
+ </div>
+
+ <!-- Map, Timeline, and Parameter Control Column -->
+ <div class="col-md-6">
+ <!--Map-->
+ <div class="row" ng-controller="WorldMapCtrl">
+ <div class="col-md-12">
+ <leaflet-map id="map"></leaflet-map>
+ </div>
</div>
- <div class="col-md-6">
- <!--Map-->
- <div class="row" ng-controller="WorldMapCtrl">
- <div class="col-md-12">
- <leaflet-map id="map"></leaflet-map>
- </div>
+
+ <!--Timeline-->
+ <div class="row">
+ <div class="col-md-12" ng-controller="TimelineCtrl">
+ <div class="timeline"></div>
</div>
-
- <!--Timeline-->
- <div class="row">
- <div class="col-md-12" ng-controller="TimelineCtrl">
- <div class="timeline"></div>
+ </div>
+
+ <div class="row">
+ <div class="col-md-12" ng-controller="ParameterSelectCtrl">
+ <div class="row top3">
+ <div class="col-md-2 text-center">Start Date:</div>
+ <div class="col-md-4">
+ <form>
+ <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
+ <!--reason the input boxes refused to be 100% wide when their span size was set.-->
+ <input ng-disabled="shouldDisableControls()" on-blur="checkParameters();" ng-model="displayParams.start" ui-date="datepickerSettings" ui-date-format="yy-mm-dd" type="text" class="col-md-4 text-center" style="width:100%" />
+ </form>
+ </div>
+ <div class="col-md-2 text-center">End Date:</div>
+ <div class="col-md-4">
+ <form>
+ <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
+ <!--reason the input boxes refused to be 100% wide when their span size was set.-->
+ <input ng-disabled="shouldDisableControls()" on-blur="checkParameters();" ng-model="displayParams.end" ui-date="datepickerSettings" ui-date-format="yy-mm-dd" type="text" class="col-md-4 text-center" style="width:100%"/>
+ </form>
+ </div>
</div>
- </div>
-
- <div class="row">
- <div class="col-md-12" ng-controller="ParameterSelectCtrl">
- <div class="row">
- <div class="col-md-2 text-center">Start Date:</div>
- <div class="col-md-4">
- <form>
- <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
- <!--reason the input boxes refused to be 100% wide when their span size was set.-->
- <input ng-disabled="shouldDisableControls()" on-blur="checkParameters();" ng-model="displayParams.start" ui-date="datepickerSettings" ui-date-format="yy-mm-dd" type="text" class="col-md-4 text-center" style="width:100%" />
- </form>
- </div>
- <div class="col-md-2 text-center">End Date:</div>
- <div class="col-md-4">
- <form>
- <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
- <!--reason the input boxes refused to be 100% wide when their span size was set.-->
- <input ng-disabled="shouldDisableControls()" on-blur="checkParameters();" ng-model="displayParams.end" ui-date="datepickerSettings" ui-date-format="yy-mm-dd" type="text" class="col-md-4 text-center" style="width:100%"/>
- </form>
- </div>
+ <div class="row top3">
+ <div class="col-md-2 text-center">North:</div>
+ <div class="col-md-4">
+ <form action="">
+ <input ng-disabled="shouldDisableControls()" ng-model="displayParams.latMax" on-blur="checkParameters();" type="text" class="col-md-4 text-center" style="width:100%"/>
+ </form>
</div>
- <div class="row">
- <div class="col-md-2 text-center">North:</div>
- <div class="col-md-4">
- <form action="">
- <input ng-disabled="shouldDisableControls()" ng-model="displayParams.latMax" on-blur="checkParameters();" type="text" class="col-md-4 text-center" style="width:100%"/>
- </form>
- </div>
- <div class="col-md-2 text-center">South:</div>
- <div class="col-md-4">
- <form action="">
- <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
- <!--reason the input boxes refused to be 100% wide when their span size was set.-->
- <input ng-disabled="shouldDisableControls()" ng-model="displayParams.latMin" on-blur="checkParameters();" type="text" class="col-md-4 text-center" style="width:100%"/>
- </form>
- </div>
+ <div class="col-md-2 text-center">South:</div>
+ <div class="col-md-4">
+ <form action="">
+ <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
+ <!--reason the input boxes refused to be 100% wide when their span size was set.-->
+ <input ng-disabled="shouldDisableControls()" ng-model="displayParams.latMin" on-blur="checkParameters();" type="text" class="col-md-4 text-center" style="width:100%"/>
+ </form>
</div>
- <div class="row">
- <div class="col-md-2 text-center">East:</div>
- <div class="col-md-4">
- <form>
- <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
- <!--reason the input boxes refused to be 100% wide when their span size was set.-->
- <input ng-disabled="shouldDisableControls()" ng-model="displayParams.lonMax" on-blur="checkParameters();" type="text" class="col-md-4 text-center" style="width:100%"/>
- </form>
- </div>
- <div class="col-md-2 text-center">West:</div>
- <div class="col-md-4">
- <form>
- <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
- <!--reason the input boxes refused to be 100% wide when their span size was set.-->
- <input ng-disabled="shouldDisableControls()" ng-model="displayParams.lonMin" on-blur="checkParameters();"; type="text" class="col-md-4 text-center" style="width:100%"/>
- </form>
- </div>
+ </div>
+ <div class="row top3">
+ <div class="col-md-2 text-center">East:</div>
+ <div class="col-md-4">
+ <form>
+ <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
+ <!--reason the input boxes refused to be 100% wide when their span size was set.-->
+ <input ng-disabled="shouldDisableControls()" ng-model="displayParams.lonMax" on-blur="checkParameters();" type="text" class="col-md-4 text-center" style="width:100%"/>
+ </form>
</div>
- <div class="row">
- <div class="col-md-2 col-md-offset-6">
- <!--<button class="btn btn-link no-color-link pull-right" bootstrap-modal-open="evaluationSettings">-->
- <button class="btn btn-link no-color-link pull-right" data-toggle="modal" data-target="#evaluationSettingsModal">
- <span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Settings">
- <span class="fa-stack fa-lg">
- <i class="fa fa-square-o fa-stack-2x"></i>
- <i class="fa fa-cogs fa-stack-1x"></i>
- </span>
+ <div class="col-md-2 text-center">West:</div>
+ <div class="col-md-4">
+ <form>
+ <!--This styling HAD to be done inline. Using a class wouldn't work and for some -->
+ <!--reason the input boxes refused to be 100% wide when their span size was set.-->
+ <input ng-disabled="shouldDisableControls()" ng-model="displayParams.lonMin" on-blur="checkParameters();"; type="text" class="col-md-4 text-center" style="width:100%"/>
+ </form>
+ </div>
+ </div>
+ <div class="row top3">
+ <div class="col-md-2 col-md-offset-6">
+ <!--<button class="btn btn-link no-color-link pull-right" bootstrap-modal-open="evaluationSettings">-->
+ <button class="btn btn-link no-color-link pull-right" data-toggle="modal" data-target="#evaluationSettingsModal">
+ <span tooltip-placement="left" tooltip-popup-delay="700" tooltip="Settings">
+ <span class="fa-stack fa-lg">
+ <i class="fa fa-square-o fa-stack-2x"></i>
+ <i class="fa fa-cogs fa-stack-1x"></i>
</span>
- </button>
- </div>
- <div class="col-md-4">
- <button ng-click="runEvaluation()" ng-disabled="shouldDisableEvaluateButton()" class="btn btn-block btn-primary">
- <div ng-hide="runningEval">Evaluate</div>
- <div ng-show="runningEval"><i class="fa fa-spinner fa-spin"></i></div>
- </button>
- </div>
+ </span>
+ </button>
+ </div>
+ <div class="col-md-4">
+ <button ng-click="runEvaluation()" ng-disabled="shouldDisableEvaluateButton()" class="btn btn-block btn-primary">
+ <div ng-hide="runningEval">Evaluate</div>
+ <div ng-show="runningEval"><i class="fa fa-spinner fa-spin"></i></div>
+ </button>
</div>
</div>
</div>
</div>
- </div>
- </div>
+ </div>
+ </div>
</div>
+</div>
[24/50] git commit: Add UI Bootstrap to Bower
Posted by jo...@apache.org.
Add UI Bootstrap to Bower
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/5b974501
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/5b974501
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/5b974501
Branch: refs/heads/master
Commit: 5b9745011ed651a2f3e47596e02eb34c98a8d42b
Parents: 3885da0
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 17:06:20 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 17:06:20 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 1 +
ocw-ui/frontend-new/app/scripts/app.js | 3 ++-
ocw-ui/frontend-new/bower.json | 3 ++-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/5b974501/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index b9f8a92..e366113 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -86,6 +86,7 @@
<script src="bower_components/leaflet/dist/leaflet.js"></script>
<script src="bower_components/leaflet/dist/leaflet-src.js"></script>
<script src="bower_components/chap-links-timeline/timeline-min.js"></script>
+ <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<!-- endbower -->
<!-- endbuild -->
http://git-wip-us.apache.org/repos/asf/climate/blob/5b974501/ocw-ui/frontend-new/app/scripts/app.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/app.js b/ocw-ui/frontend-new/app/scripts/app.js
index 6b90ff8..23e5a19 100644
--- a/ocw-ui/frontend-new/app/scripts/app.js
+++ b/ocw-ui/frontend-new/app/scripts/app.js
@@ -14,7 +14,8 @@ angular
'ngCookies',
'ngResource',
'ngRoute',
- 'ui.router'
+ 'ui.router',
+ 'ui.bootstrap'
])
.config(['$stateProvider', '$routeProvider', '$urlRouterProvider',
function ($stateProvider, $routeProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/climate/blob/5b974501/ocw-ui/frontend-new/bower.json
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/bower.json b/ocw-ui/frontend-new/bower.json
index 054e532..160da2e 100644
--- a/ocw-ui/frontend-new/bower.json
+++ b/ocw-ui/frontend-new/bower.json
@@ -13,7 +13,8 @@
"angular-ui-router": "angular-ui/ui-router#~0.2.10",
"leaflet": "~0.7.3",
"chap-links-timeline": "~2.6.1",
- "components-font-awesome": "~4.1.0"
+ "components-font-awesome": "~4.1.0",
+ "angular-bootstrap": "~0.11.0"
},
"devDependencies": {
"angular-mocks": "1.2.16",
[32/50] git commit: Add angular-ui-date
Posted by jo...@apache.org.
Add angular-ui-date
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/d91b1038
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/d91b1038
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/d91b1038
Branch: refs/heads/master
Commit: d91b1038fea55fcfa8aa4f52f328a20c05e7fc58
Parents: 49e64a3
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 10:31:10 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 10:31:10 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 6 ++++++
ocw-ui/frontend-new/app/scripts/app.js | 3 ++-
ocw-ui/frontend-new/bower.json | 3 ++-
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/d91b1038/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index b9fc6f8..a71dfe0 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -16,6 +16,7 @@
<!-- endbuild -->
<!-- build:css(.tmp) styles/main.css -->
<link rel="stylesheet" href="styles/main.css">
+ <link rel="stylesheet" href="bower_components/jquery-ui/themes/smoothness/jquery-ui.css" />
<!-- endbuild -->
</head>
<body ng-app="ocwUiApp">
@@ -87,6 +88,8 @@
<script src="bower_components/leaflet/dist/leaflet-src.js"></script>
<script src="bower_components/chap-links-timeline/timeline-min.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
+ <script src="bower_components/jquery-ui/jquery-ui.js"></script>
+ <script src="bower_components/angular-ui-date/ui-date.js"></script>
<!-- endbower -->
<!-- endbuild -->
@@ -116,5 +119,8 @@
<script src="scripts/services/regionselectparams.js"></script>
<script src="scripts/services/selecteddatasetinformation.js"></script>
<!-- endbuild -->
+
+ <!-- grunt wiredep wasn't properly linking this. Had to add manually -->
+ <script src="bower_components/angular-ui-date/src/date.js"></script>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/climate/blob/d91b1038/ocw-ui/frontend-new/app/scripts/app.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/app.js b/ocw-ui/frontend-new/app/scripts/app.js
index 72eb3a9..7b84ab3 100644
--- a/ocw-ui/frontend-new/app/scripts/app.js
+++ b/ocw-ui/frontend-new/app/scripts/app.js
@@ -15,7 +15,8 @@ angular
'ngResource',
'ngRoute',
'ui.router',
- 'ui.bootstrap'
+ 'ui.bootstrap',
+ 'ui.date',
])
.config(['$stateProvider', '$routeProvider', '$urlRouterProvider',
function ($stateProvider, $routeProvider, $urlRouterProvider) {
http://git-wip-us.apache.org/repos/asf/climate/blob/d91b1038/ocw-ui/frontend-new/bower.json
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/bower.json b/ocw-ui/frontend-new/bower.json
index 160da2e..d288a19 100644
--- a/ocw-ui/frontend-new/bower.json
+++ b/ocw-ui/frontend-new/bower.json
@@ -14,7 +14,8 @@
"leaflet": "~0.7.3",
"chap-links-timeline": "~2.6.1",
"components-font-awesome": "~4.1.0",
- "angular-bootstrap": "~0.11.0"
+ "angular-bootstrap": "~0.11.0",
+ "angular-ui-date": "~0.0.3"
},
"devDependencies": {
"angular-mocks": "1.2.16",
[06/50] git commit: Remove duplicate property in previewmap
Posted by jo...@apache.org.
Remove duplicate property in previewmap
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/c3b8981d
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/c3b8981d
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/c3b8981d
Branch: refs/heads/master
Commit: c3b8981d8ae2f695d679866412effa47c328f5bf
Parents: e387ac5
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 10:30:38 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 10:30:38 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/scripts/directives/previewmap.js | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/c3b8981d/ocw-ui/frontend-new/app/scripts/directives/previewmap.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/directives/previewmap.js b/ocw-ui/frontend-new/app/scripts/directives/previewmap.js
index 07d09ee..371bea9 100644
--- a/ocw-ui/frontend-new/app/scripts/directives/previewmap.js
+++ b/ocw-ui/frontend-new/app/scripts/directives/previewmap.js
@@ -10,7 +10,6 @@ angular.module('ocwUiApp')
.directive('previewMap', function($rootScope) {
return {
restrict: 'A',
- replace: true,
scope: {dataset: '=previewMap', index: '=index'},
template: '<div id="{{dataset.name}}" class="preview-map"></div>',
replace: true,
[42/50] git commit: Adjust offsets in observation select modal
Posted by jo...@apache.org.
Adjust offsets in observation select modal
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/9cf056e9
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/9cf056e9
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/9cf056e9
Branch: refs/heads/master
Commit: 9cf056e96822aa36f394ffb95f3c9b67f5965a04
Parents: 78eeaf5
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 14:48:07 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 14:48:07 2014 -0700
----------------------------------------------------------------------
.../app/views/selectobservation.html | 41 +++++++++++---------
1 file changed, 23 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/9cf056e9/ocw-ui/frontend-new/app/views/selectobservation.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/selectobservation.html b/ocw-ui/frontend-new/app/views/selectobservation.html
index a16c4e4..4b9f6e7 100644
--- a/ocw-ui/frontend-new/app/views/selectobservation.html
+++ b/ocw-ui/frontend-new/app/views/selectobservation.html
@@ -37,42 +37,47 @@
</form>
</div>
<hr />
- <div class="row">
- <div class="col-md-6 text-center">
+ <div class="row top3">
+ <div class="col-md-5 text-center">
Evaluation Variable
</div>
- <div class="col-md-5 col-md-offset-1">
- <select ng-model="paramSelect" ng-options="param for param in params"></select>
+ <div class="col-md-6">
+ <select class="form-control" ng-model="paramSelect" ng-options="param for param in params"></select>
</div>
</div>
- <div class="row">
- <div class="col-md-6 text-center">
+ <div class="row top3">
+ <div class="col-md-5 text-center">
Latitude Variable
</div>
- <div class="col-md-5 col-md-offset-1">
- <select ng-model="latsSelect" ng-options="lat for lat in lats"></select>
+ <div class="col-md-6">
+ <select class="form-control" ng-model="latsSelect" ng-options="lat for lat in lats"></select>
</div>
</div>
- <div class="row">
- <div class="col-md-6 text-center">
+ <div class="row top3">
+ <div class="col-md-5 text-center">
Longitude Variable
</div>
- <div class="col-md-5 col-md-offset-1">
- <select ng-model="lonsSelect" ng-options="lon for lon in lons"></select>
+ <div class="col-md-6">
+ <select class="form-control" ng-model="lonsSelect" ng-options="lon for lon in lons"></select>
</div>
</div>
- <div class="row">
- <div class="col-md-6 text-center">
+ <div class="row top3">
+ <div class="col-md-5 text-center">
Date/Time Variable
</div>
- <div class="col-md-5 col-md-offset-1">
- <select ng-model="timeSelect" ng-options="time for time in times"></select>
+ <div class="col-md-6">
+ <select class="form-control" ng-model="timeSelect" ng-options="time for time in times"></select>
</div>
</div>
</div>
</div>
- <div class="row">
- <div class="col-md-4 col-md-offset-1">
+ <!--<div class="row">-->
+ <!--<div class="col-md-4 col-md-offset-4">-->
+ <!--<hr />-->
+ <!--</div>-->
+ <!--</div>-->
+ <div class="row top3">
+ <div class="col-md-3 col-md-offset-1">
<button class="btn btn-primary btn-block" ng-click="addDataSet()">Add Dataset</button>
</div>
<div class="pull-left small-alert" ng-show="fileAdded">Successfully added dataset...</div>
[02/50] git commit: Add ISODateToMiddleEndian filter
Posted by jo...@apache.org.
Add ISODateToMiddleEndian filter
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/8f13d2b9
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/8f13d2b9
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/8f13d2b9
Branch: refs/heads/master
Commit: 8f13d2b9177367e6a9cc56e6f77e6d3f0f4214b3
Parents: b39b3dd
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 10:22:11 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 10:22:11 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 1 +
.../scripts/filters/isodatetomiddleendian.js | 36 ++++++++++++++++++++
.../test/spec/filters/isodatetomiddleendian.js | 19 +++++++++++
3 files changed, 56 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/8f13d2b9/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index 2b07b4d..5ca9aad 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -104,6 +104,7 @@
<script src="scripts/directives/predictivefilebrowserinput.js"></script>
<script src="scripts/directives/previewmap.js"></script>
<script src="scripts/directives/timeline.js"></script>
+ <script src="scripts/filters/isodatetomiddleendian.js"></script>
<!-- endbuild -->
</body>
</html>
http://git-wip-us.apache.org/repos/asf/climate/blob/8f13d2b9/ocw-ui/frontend-new/app/scripts/filters/isodatetomiddleendian.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/filters/isodatetomiddleendian.js b/ocw-ui/frontend-new/app/scripts/filters/isodatetomiddleendian.js
new file mode 100644
index 0000000..fce091c
--- /dev/null
+++ b/ocw-ui/frontend-new/app/scripts/filters/isodatetomiddleendian.js
@@ -0,0 +1,36 @@
+'use strict';
+
+/**
+ * @ngdoc filter
+ * @name ocwUiApp.filter:ISODateToMiddleEndian
+ * @function
+ * @description
+ * # ISODateToMiddleEndian
+ * Filter in the ocwUiApp.
+ */
+angular.module('ocwUiApp')
+.filter('ISODateToMiddleEndian', function() {
+ return function(input) {
+ var original = input;
+
+ // Strip whitespace from the start and end of the string
+ input = input.replace(/(^\s+|\s+$)/g, '');
+
+ // ISO Standard says time is separated from Date with a 'T'. Our timestamps
+ // slightly modify that and use a space. We'll check for both here and prefer
+ // to split on a 'T' if it's available.
+ if (input.indexOf('T') != -1 || input.indexOf(' ') != -1) {
+ input = (input.indexOf('T') != -1) ? input.split('T')[0] : input.split(' ')[0];
+ }
+
+ // The components of the date should be split with hyphens. If we can't find them
+ // then the string is poorly formed.
+ if (input.indexOf('-') == -1 || input.split('-').length - 1 != 2) {
+ return original;
+ }
+
+ // At this point the date is probably valid and we should try to convert it!
+ var components = input.split('-');
+ return (components[1] + "/" + components[2] + "/" + components[0]);
+ };
+});
http://git-wip-us.apache.org/repos/asf/climate/blob/8f13d2b9/ocw-ui/frontend-new/test/spec/filters/isodatetomiddleendian.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/test/spec/filters/isodatetomiddleendian.js b/ocw-ui/frontend-new/test/spec/filters/isodatetomiddleendian.js
new file mode 100644
index 0000000..22d30a2
--- /dev/null
+++ b/ocw-ui/frontend-new/test/spec/filters/isodatetomiddleendian.js
@@ -0,0 +1,19 @@
+'use strict';
+
+describe('Filter: ISODateToMiddleEndian', function () {
+
+ // load the filter's module
+ beforeEach(module('ocwUiApp'));
+
+ // initialize a new instance of the filter before each test
+ var ISODateToMiddleEndian;
+ beforeEach(inject(function ($filter) {
+ ISODateToMiddleEndian = $filter('ISODateToMiddleEndian');
+ }));
+
+ it('should return the input prefixed with "ISODateToMiddleEndian filter:"', function () {
+ var text = 'angularjs';
+ expect(ISODateToMiddleEndian(text)).toBe('ISODateToMiddleEndian filter: ' + text);
+ });
+
+});
[44/50] git commit: Add placeholder text to file browser
Posted by jo...@apache.org.
Add placeholder text to file browser
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/af84eaed
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/af84eaed
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/af84eaed
Branch: refs/heads/master
Commit: af84eaedcc4eca2198307155fcbc03da39535fd7
Parents: 0d16f50
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 14:54:49 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 14:54:49 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/selectobservation.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/af84eaed/ocw-ui/frontend-new/app/views/selectobservation.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/selectobservation.html b/ocw-ui/frontend-new/app/views/selectobservation.html
index 7c4fe55..4b5a490 100644
--- a/ocw-ui/frontend-new/app/views/selectobservation.html
+++ b/ocw-ui/frontend-new/app/views/selectobservation.html
@@ -25,7 +25,7 @@
<form class="form" autocomplete="off">
<div class="form-group">
<div class="col-md-9">
- <input id="observationFileInput" predictive-file-browser-input ng-model="filePathInput" type="text" class="form-control" autocomplete="off" />
+ <input id="observationFileInput" predictive-file-browser-input ng-model="filePathInput" type="text" class="form-control" autocomplete="off" placeholder="Navigate to a .nc file. Start by typing '/'" />
</div>
<div class="col-md-2">
<button class="btn" ng-click="uploadLocalFile()" ng-disabled="shouldDisableLoadButton()">
[40/50] git commit: Add vertical offset helpers
Posted by jo...@apache.org.
Add vertical offset helpers
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/2d1e11fb
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/2d1e11fb
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/2d1e11fb
Branch: refs/heads/master
Commit: 2d1e11fb9c827bb2d9155738812a253bd0aee57e
Parents: 305ac4d
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 14:47:28 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 14:47:28 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/styles/main.css | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/2d1e11fb/ocw-ui/frontend-new/app/styles/main.css
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/styles/main.css b/ocw-ui/frontend-new/app/styles/main.css
index 61f461e..4ce3109 100644
--- a/ocw-ui/frontend-new/app/styles/main.css
+++ b/ocw-ui/frontend-new/app/styles/main.css
@@ -106,3 +106,10 @@ div.ocw-bar { height: 5px; }
}
#results-sidebar-header { font-size: 14px; }
+
+/* Helpers for vertical offsets */
+.top3 { margin-top: 3%; }
+.top7 { margin-top: 7%; }
+.top14 { margin-top:14%; }
+.top21 { margin-top:21%; }
+.top42 { margin-top:42%; }
[45/50] git commit: Better vertical offset in selectrcmed modal
Posted by jo...@apache.org.
Better vertical offset in selectrcmed modal
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/83758624
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/83758624
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/83758624
Branch: refs/heads/master
Commit: 83758624c8c1d42dbe496a9d4475fd94ec69f5bf
Parents: af84eae
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 14:55:20 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 14:55:20 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/selectrcmed.html | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/83758624/ocw-ui/frontend-new/app/views/selectrcmed.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/selectrcmed.html b/ocw-ui/frontend-new/app/views/selectrcmed.html
index 4438cdf..0db7451 100644
--- a/ocw-ui/frontend-new/app/views/selectrcmed.html
+++ b/ocw-ui/frontend-new/app/views/selectrcmed.html
@@ -20,17 +20,17 @@
<div ng-controller="RcmedSelectionCtrl">
<div class="row">
<div class="col-md-10 col-md-offset-1">
- <div class="row">Select the RCMED dataset that you would like use.</div>
- <div class="row">
+ <div class="row top3">Select the RCMED dataset that you would like use.</div>
+ <div class="row top3">
<select ng-change="dataSelectUpdated()" class="form-control" ng-model="datasetSelection" ng-options="obs as obs.longname for obs in availableObs"></select>
</div>
- <div class="row">Select the dataset parameter that you would like to test.</div>
- <div class="row">
+ <div class="row top3">Select the dataset parameter that you would like to test.</div>
+ <div class="row top3">
<select class="form-control" ng-model="parameterSelection" ng-options="param as param.shortname for param in retrievedObsParams"></select>
</div>
- <div class="row">
- <div class="col-md-4 col-md-offset-1">
+ <div class="row top3">
+ <div class="col-md-3">
<button class="btn btn-primary btn-block-left" ng-click="addObservation()">Add Observation</button>
</div>
<div class="pull-left small-alert" ng-show="fileAdded">Successfully added dataset...</div>
[30/50] git commit: Fix results views
Posted by jo...@apache.org.
Fix results views
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/ba1cf973
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/ba1cf973
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/ba1cf973
Branch: refs/heads/master
Commit: ba1cf97363a0597bd6e6512724a6a06faed95cb2
Parents: 5b236a1
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 09:31:53 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 09:31:53 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/results.html | 4 ++--
ocw-ui/frontend-new/app/views/resultsdetail.html | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/ba1cf973/ocw-ui/frontend-new/app/views/results.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/results.html b/ocw-ui/frontend-new/app/views/results.html
index a8f58af..7a170a0 100644
--- a/ocw-ui/frontend-new/app/views/results.html
+++ b/ocw-ui/frontend-new/app/views/results.html
@@ -1,5 +1,5 @@
<div class="row">
- <div class="span3">
+ <div class="col-md-3">
<div id="results-sidebar" class="pa-sidebar well well-small">
<ul class="nav nav-list">
<li id="results-sidebar-header" class="nav-header">Latest Run Results</li>
@@ -11,5 +11,5 @@
<div ui-view="menu"></div>
</div>
</div>
- <div class="span9" ui-view ng-animate="{enter:'fade-enter'}"></div>
+ <div class="col-md-9" ui-view ng-animate="{enter:'fade-enter'}"></div>
</div>
http://git-wip-us.apache.org/repos/asf/climate/blob/ba1cf973/ocw-ui/frontend-new/app/views/resultsdetail.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/resultsdetail.html b/ocw-ui/frontend-new/app/views/resultsdetail.html
index f2aab55..40a55a2 100644
--- a/ocw-ui/frontend-new/app/views/resultsdetail.html
+++ b/ocw-ui/frontend-new/app/views/resultsdetail.html
@@ -1,6 +1,6 @@
<div>
<h2>{{result}}</h2>
- <div class="row-fluid text-center">
+ <div class="row text-center">
<div class="{{alertClass}}">{{alertMessage}}</div>
<ul>
<li ng-repeat="figure in figures">
[37/50] git commit: Fix variable declarations in parameterselect
Posted by jo...@apache.org.
Fix variable declarations in parameterselect
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/8f375532
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/8f375532
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/8f375532
Branch: refs/heads/master
Commit: 8f375532128c06b26cefb2aee0e385763cebf545
Parents: 6a50120
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 13:50:47 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 13:50:47 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/scripts/controllers/parameterselect.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/8f375532/ocw-ui/frontend-new/app/scripts/controllers/parameterselect.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/controllers/parameterselect.js b/ocw-ui/frontend-new/app/scripts/controllers/parameterselect.js
index 2547b5c..c1f648e 100644
--- a/ocw-ui/frontend-new/app/scripts/controllers/parameterselect.js
+++ b/ocw-ui/frontend-new/app/scripts/controllers/parameterselect.js
@@ -111,7 +111,7 @@ angular.module('ocwUiApp')
// Determine the temporal resolution to use when doing a temporal rebin. The
// value is used to determine the timedelta in days to use.
- temporal_res = settings.temporal.selected;
+ var temporal_res = settings.temporal.selected;
if (temporal_res == 'daily') {
data['temporal_resolution'] = 1;
@@ -128,7 +128,7 @@ angular.module('ocwUiApp')
// Load the Metrics for the evaluation
data['metrics'] = []
- metrics = settings.metrics
+ var metrics = settings.metrics
for (var i = 0; i < metrics.length; i++) {
var metric = metrics[i];
[50/50] git commit: Resolve CLIMATE-377 and CLIMATE-378. Merge PR #92.
Posted by jo...@apache.org.
Resolve CLIMATE-377 and CLIMATE-378. Merge PR #92.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/ee6b1b97
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/ee6b1b97
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/ee6b1b97
Branch: refs/heads/master
Commit: ee6b1b970ad1e7faf1afb907214776513035ebfc
Parents: 99acc8c dd3d262
Author: Michael Joyce <jo...@apache.org>
Authored: Mon Jul 21 06:23:40 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Mon Jul 21 06:23:40 2014 -0700
----------------------------------------------------------------------
ocw-ui/backend/processing.py | 24 +-
ocw-ui/frontend-new/.bowerrc | 3 +
ocw-ui/frontend-new/.editorconfig | 21 +
ocw-ui/frontend-new/.gitattributes | 1 +
ocw-ui/frontend-new/.gitignore | 5 +
ocw-ui/frontend-new/.jshintrc | 24 +
ocw-ui/frontend-new/.travis.yml | 6 +
ocw-ui/frontend-new/Gruntfile.js | 412 ++++++++++++++
ocw-ui/frontend-new/app/.buildignore | 1 +
ocw-ui/frontend-new/app/.htaccess | 543 +++++++++++++++++++
ocw-ui/frontend-new/app/404.html | 157 ++++++
ocw-ui/frontend-new/app/favicon.ico | Bin 0 -> 4286 bytes
ocw-ui/frontend-new/app/index.html | 129 +++++
ocw-ui/frontend-new/app/robots.txt | 3 +
ocw-ui/frontend-new/app/scripts/app.js | 77 +++
.../app/scripts/controllers/about.js | 17 +
.../app/scripts/controllers/datasetdisplay.js | 24 +
.../app/scripts/controllers/datasetselect.js | 45 ++
.../app/scripts/controllers/main.js | 17 +
.../scripts/controllers/observationselect.js | 184 +++++++
.../app/scripts/controllers/parameterselect.js | 256 +++++++++
.../app/scripts/controllers/rcmedselection.js | 125 +++++
.../app/scripts/controllers/result.js | 28 +
.../app/scripts/controllers/resultdetail.js | 27 +
.../app/scripts/controllers/settings.js | 15 +
.../app/scripts/controllers/timeline.js | 84 +++
.../app/scripts/controllers/worldmap.js | 85 +++
.../app/scripts/directives/bootstrapmodal.js | 60 ++
.../scripts/directives/bootstrapmodalopen.js | 24 +
.../app/scripts/directives/leafletmap.js | 27 +
.../app/scripts/directives/onblur.js | 19 +
.../directives/predictivefilebrowserinput.js | 297 ++++++++++
.../app/scripts/directives/previewmap.js | 57 ++
.../app/scripts/directives/timeline.js | 35 ++
.../scripts/filters/isodatetomiddleendian.js | 36 ++
.../app/scripts/services/evaluationsettings.js | 37 ++
.../app/scripts/services/regionselectparams.js | 27 +
.../services/selecteddatasetinformation.js | 38 ++
ocw-ui/frontend-new/app/styles/main.css | 119 ++++
ocw-ui/frontend-new/app/views/main.html | 255 +++++++++
ocw-ui/frontend-new/app/views/modelselect.html | 87 +++
ocw-ui/frontend-new/app/views/results.html | 15 +
.../frontend-new/app/views/resultsdetail.html | 11 +
ocw-ui/frontend-new/app/views/resultslist.html | 2 +
.../app/views/selectobservation.html | 80 +++
ocw-ui/frontend-new/app/views/selectrcmed.html | 40 ++
ocw-ui/frontend-new/bower.json | 25 +
ocw-ui/frontend-new/package.json | 40 ++
ocw-ui/frontend-new/test/.jshintrc | 36 ++
ocw-ui/frontend-new/test/karma.conf.js | 73 +++
.../frontend-new/test/spec/controllers/about.js | 22 +
.../test/spec/controllers/datasetdisplay.js | 22 +
.../test/spec/controllers/datasetselect.js | 22 +
.../frontend-new/test/spec/controllers/main.js | 22 +
.../test/spec/controllers/observationselect.js | 22 +
.../test/spec/controllers/parameterselect.js | 22 +
.../test/spec/controllers/rcmedselection.js | 22 +
.../test/spec/controllers/result.js | 22 +
.../test/spec/controllers/resultdetail.js | 22 +
.../test/spec/controllers/settings.js | 22 +
.../test/spec/controllers/timeline.js | 22 +
.../test/spec/controllers/worldmap.js | 22 +
.../test/spec/directives/bootstrapmodal.js | 20 +
.../test/spec/directives/bootstrapmodalopen.js | 20 +
.../test/spec/directives/leafletmap.js | 20 +
.../frontend-new/test/spec/directives/onblur.js | 20 +
.../directives/predictivefilebrowserinput.js | 20 +
.../test/spec/directives/previewmap.js | 20 +
.../test/spec/directives/timeline.js | 20 +
.../test/spec/filters/isodatetomiddleendian.js | 19 +
.../test/spec/services/evaluationsettings.js | 18 +
.../test/spec/services/regionselectparams.js | 18 +
.../spec/services/selecteddatasetinformation.js | 18 +
73 files changed, 4225 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[31/50] git commit: 'Evaluate' link now directs to the proper state
Posted by jo...@apache.org.
'Evaluate' link now directs to the proper state
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/49e64a3b
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/49e64a3b
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/49e64a3b
Branch: refs/heads/master
Commit: 49e64a3be674082ab7fd4bcac370c4eefa71a463
Parents: ba1cf97
Author: Michael Joyce <jo...@apache.org>
Authored: Fri Jul 18 09:41:37 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Fri Jul 18 09:41:37 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/index.html | 2 +-
ocw-ui/frontend-new/app/scripts/app.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/49e64a3b/ocw-ui/frontend-new/app/index.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/index.html b/ocw-ui/frontend-new/app/index.html
index e366113..b9fc6f8 100644
--- a/ocw-ui/frontend-new/app/index.html
+++ b/ocw-ui/frontend-new/app/index.html
@@ -32,7 +32,7 @@
</div>
<div class="navbar-collapse">
<ul class="nav navbar-nav">
- <li ng-class="{ active: $state.includes('main') }"><a href="#">Evaluate</a></li>
+ <li ng-class="{ active: $state.includes('main') }"><a href="#/evalute">Evaluate</a></li>
<li ng-class="{ active: $state.includes('results') }"><a href="#/results">Results</a></li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/climate/blob/49e64a3b/ocw-ui/frontend-new/app/scripts/app.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/app.js b/ocw-ui/frontend-new/app/scripts/app.js
index 23e5a19..72eb3a9 100644
--- a/ocw-ui/frontend-new/app/scripts/app.js
+++ b/ocw-ui/frontend-new/app/scripts/app.js
@@ -21,7 +21,7 @@ angular
function ($stateProvider, $routeProvider, $urlRouterProvider) {
$urlRouterProvider
.when('/r?id', '/results/:id')
- .otherwise('/');
+ .otherwise('/evaluate');
$routeProvider
.when('/evaluation/:id', {
[10/50] git commit: Add leaflet.js
Posted by jo...@apache.org.
Add leaflet.js
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/5824420f
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/5824420f
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/5824420f
Branch: refs/heads/master
Commit: 5824420f2cc246992869bc6bb1d91eb1a2daf9f6
Parents: 87c7496
Author: Michael Joyce <jo...@apache.org>
Authored: Wed Jul 16 13:10:08 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Wed Jul 16 13:10:08 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/bower.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/5824420f/ocw-ui/frontend-new/bower.json
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/bower.json b/ocw-ui/frontend-new/bower.json
index 67ae403..c1b2af8 100644
--- a/ocw-ui/frontend-new/bower.json
+++ b/ocw-ui/frontend-new/bower.json
@@ -10,7 +10,8 @@
"angular-cookies": "1.2.16",
"angular-animate": "1.2.16",
"angular-route": "1.2.16",
- "angular-ui-router": "angular-ui/ui-router#~0.2.10"
+ "angular-ui-router": "angular-ui/ui-router#~0.2.10",
+ "leaflet": "~0.7.3"
},
"devDependencies": {
"angular-mocks": "1.2.16",
[29/50] git commit: Fix RCMED select view
Posted by jo...@apache.org.
Fix RCMED select view
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/5b236a11
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/5b236a11
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/5b236a11
Branch: refs/heads/master
Commit: 5b236a11cf65b82629b9d061c67bfd840990d294
Parents: 071bb5a
Author: Michael Joyce <jo...@apache.org>
Authored: Thu Jul 17 08:30:09 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Thu Jul 17 08:30:09 2014 -0700
----------------------------------------------------------------------
ocw-ui/frontend-new/app/views/selectrcmed.html | 36 +++++++++------------
1 file changed, 16 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/5b236a11/ocw-ui/frontend-new/app/views/selectrcmed.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/selectrcmed.html b/ocw-ui/frontend-new/app/views/selectrcmed.html
index 4587d57..4438cdf 100644
--- a/ocw-ui/frontend-new/app/views/selectrcmed.html
+++ b/ocw-ui/frontend-new/app/views/selectrcmed.html
@@ -19,26 +19,22 @@
<div ng-controller="RcmedSelectionCtrl">
<div class="row">
- <div class="span5">
- Select the RCMED dataset that you would like use.
- </div>
- </div>
- <div class="row">
- <div class="span4">
- <select ng-change="dataSelectUpdated()" class="span5" ng-model="datasetSelection" ng-options="obs as obs.longname for obs in availableObs"></select>
- </div>
- </div>
- <div class="row">
- <div class="span5">
- Select the dataset parameter that you would like to test.
- </div>
- </div>
- <div class="row">
- <div class="span4">
- <select class="span3" ng-model="parameterSelection" ng-options="param as param.shortname for param in retrievedObsParams"></select>
+ <div class="col-md-10 col-md-offset-1">
+ <div class="row">Select the RCMED dataset that you would like use.</div>
+ <div class="row">
+ <select ng-change="dataSelectUpdated()" class="form-control" ng-model="datasetSelection" ng-options="obs as obs.longname for obs in availableObs"></select>
+ </div>
+ <div class="row">Select the dataset parameter that you would like to test.</div>
+ <div class="row">
+ <select class="form-control" ng-model="parameterSelection" ng-options="param as param.shortname for param in retrievedObsParams"></select>
+ </div>
+
+ <div class="row">
+ <div class="col-md-4 col-md-offset-1">
+ <button class="btn btn-primary btn-block-left" ng-click="addObservation()">Add Observation</button>
+ </div>
+ <div class="pull-left small-alert" ng-show="fileAdded">Successfully added dataset...</div>
+ </div>
</div>
</div>
-
- <button class="btn btn-primary pull-left" ng-click="addObservation()">Add Observation</button>
- <div class="pull-left small-alert" ng-show="fileAdded">Successfully added dataset...</div>
</div>
[27/50] git commit: Drop unneeded functions/vars from
ParameterSelectCtrl
Posted by jo...@apache.org.
Drop unneeded functions/vars from ParameterSelectCtrl
- A number of lat/lon slider functions/vars that are no longer used were
still present and causing problems with the loading of the controller.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/51030e78
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/51030e78
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/51030e78
Branch: refs/heads/master
Commit: 51030e78bf54793733093e7d99f7050c2518d0bb
Parents: 60d750b
Author: Michael Joyce <jo...@apache.org>
Authored: Thu Jul 17 07:19:26 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Thu Jul 17 07:19:26 2014 -0700
----------------------------------------------------------------------
.../app/scripts/controllers/parameterselect.js | 32 +-------------------
1 file changed, 1 insertion(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/51030e78/ocw-ui/frontend-new/app/scripts/controllers/parameterselect.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/scripts/controllers/parameterselect.js b/ocw-ui/frontend-new/app/scripts/controllers/parameterselect.js
index bbcccdc..2547b5c 100644
--- a/ocw-ui/frontend-new/app/scripts/controllers/parameterselect.js
+++ b/ocw-ui/frontend-new/app/scripts/controllers/parameterselect.js
@@ -36,36 +36,6 @@ angular.module('ocwUiApp')
$scope.latSliderVal = 0;
$scope.lonSliderVal = 0;
- $('#latSlider').slider({
- value: 0,
- step: 0.25,
- min: 0.25,
- max: 180,
- slide: function(event, ui) {
- $scope.updateLatSliderDisplayValue(ui.value);
- },
- });
-
- $('#lonSlider').slider({
- value: 0,
- step: 0.25,
- min: 0.25,
- max: 360,
- slide: function(event, ui) {
- $scope.updateLonSliderDisplayValue(ui.value);
- },
- });
-
- $scope.updateLatSliderDisplayValue = function(value) {
- $scope.latSliderVal = value;
- $scope.$apply();
- };
-
- $scope.updateLonSliderDisplayValue = function(value) {
- $scope.lonSliderVal = value;
- $scope.$apply();
- };
-
// Settings for jQuery datepicker directives!
$scope.datepickerSettings = {
changeMonth: true,
@@ -282,5 +252,5 @@ angular.module('ocwUiApp')
} else {
return Math.ceil(floatVal);
}
- }
+ };
}]);
[28/50] git commit: Fix observation select view
Posted by jo...@apache.org.
Fix observation select view
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/071bb5a9
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/071bb5a9
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/071bb5a9
Branch: refs/heads/master
Commit: 071bb5a98890c95056c889f2d801601ac6baa51d
Parents: 51030e7
Author: Michael Joyce <jo...@apache.org>
Authored: Thu Jul 17 08:08:48 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Thu Jul 17 08:08:48 2014 -0700
----------------------------------------------------------------------
.../app/views/selectobservation.html | 88 ++++++++++++--------
1 file changed, 55 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/071bb5a9/ocw-ui/frontend-new/app/views/selectobservation.html
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend-new/app/views/selectobservation.html b/ocw-ui/frontend-new/app/views/selectobservation.html
index c560b6f..a16c4e4 100644
--- a/ocw-ui/frontend-new/app/views/selectobservation.html
+++ b/ocw-ui/frontend-new/app/views/selectobservation.html
@@ -18,41 +18,63 @@
-->
<div ng-controller="ObservationSelectCtrl">
- <form class="form-inline" autocomplete="off">
- <input id="observationFileInput" predictive-file-browser-input ng-model="filePathInput" type="text" class="input-xlarge" autocomplete="off" />
- <button class="btn" ng-click="uploadLocalFile()" ng-disabled="shouldDisableLoadButton()">
- <div ng-hide="loadingFile">Parse File</div>
- <div ng-show="loadingFile"><i class="icon-spinner icon-spin"></i></div>
- </button>
- </form>
-
<div class="row">
- <div class="span2 text-center">
- Evaluation Variable
- </div>
- <div class="span3">
- <select ng-model="paramSelect" ng-options="param for param in params"></select>
- </div>
- <div class="span2 text-center">
- Latitude Variable
- </div>
- <div class="span3">
- <select ng-model="latsSelect" ng-options="lat for lat in lats"></select>
- </div>
- <div class="span2 text-center">
- Longitude Variable
+ <div class="col-md-12">
+ <div class="row">
+ <!--<form class="form-inline" autocomplete="off">-->
+ <form class="form" autocomplete="off">
+ <div class="form-group">
+ <div class="col-md-9">
+ <input id="observationFileInput" predictive-file-browser-input ng-model="filePathInput" type="text" class="form-control" autocomplete="off" />
+ </div>
+ <div class="col-md-2">
+ <button class="btn" ng-click="uploadLocalFile()" ng-disabled="shouldDisableLoadButton()">
+ <div ng-hide="loadingFile">Parse File</div>
+ <div ng-show="loadingFile"><i class="icon-spinner icon-spin"></i></div>
+ </button>
+ </div>
+ </div>
+ </form>
+ </div>
+ <hr />
+ <div class="row">
+ <div class="col-md-6 text-center">
+ Evaluation Variable
+ </div>
+ <div class="col-md-5 col-md-offset-1">
+ <select ng-model="paramSelect" ng-options="param for param in params"></select>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-6 text-center">
+ Latitude Variable
+ </div>
+ <div class="col-md-5 col-md-offset-1">
+ <select ng-model="latsSelect" ng-options="lat for lat in lats"></select>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-6 text-center">
+ Longitude Variable
+ </div>
+ <div class="col-md-5 col-md-offset-1">
+ <select ng-model="lonsSelect" ng-options="lon for lon in lons"></select>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-6 text-center">
+ Date/Time Variable
+ </div>
+ <div class="col-md-5 col-md-offset-1">
+ <select ng-model="timeSelect" ng-options="time for time in times"></select>
+ </div>
+ </div>
</div>
- <div class="span3">
- <select ng-model="lonsSelect" ng-options="lon for lon in lons"></select>
- </div>
- <div class="span2 text-center">
- Date/Time Variable
- </div>
- <div class="span3">
- <select ng-model="timeSelect" ng-options="time for time in times"></select>
+ </div>
+ <div class="row">
+ <div class="col-md-4 col-md-offset-1">
+ <button class="btn btn-primary btn-block" ng-click="addDataSet()">Add Dataset</button>
</div>
+ <div class="pull-left small-alert" ng-show="fileAdded">Successfully added dataset...</div>
</div>
-
- <button class="btn btn-primary pull-left" ng-click="addDataSet()">Add Dataset</button>
- <div class="pull-left small-alert" ng-show="fileAdded">Successfully added dataset...</div>
</div>