Skip to content

Commit cbe0971

Browse files
pacesmpacesm
committed
Merge branch 'upstreammerge'
2 parents 4aa0894 + 82a77c0 commit cbe0971

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1557
-9534
lines changed

‎Gruntfile.js‎

Lines changed: 29 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,38 @@
1-
// Generated on 2013-07-09 using generator-webapp 0.2.6
1+
//-------------------------------------------------------------------------------
2+
//
3+
// Project: EOxClient <https://github.com/EOX-A/EOxClient>
4+
// Authors: Daniel Santillan <[email protected]>
5+
//
6+
//-------------------------------------------------------------------------------
7+
// Copyright (C) 2014 EOX IT Services GmbH
8+
//
9+
// Permission is hereby granted, free of charge, to any person obtaining a copy
10+
// of this software and associated documentation files (the "Software"), to deal
11+
// in the Software without restriction, including without limitation the rights
12+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
// copies of the Software, and to permit persons to whom the Software is
14+
// furnished to do so, subject to the following conditions:
15+
//
16+
// The above copyright notice and this permission notice shall be included in all
17+
// copies of this Software or works derived from this Software.
18+
//
19+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25+
// THE SOFTWARE.
26+
//-------------------------------------------------------------------------------
27+
28+
229
'use strict';
330
var LIVERELOAD_PORT = 35729;
431
var lrSnippet = require('connect-livereload')({port: LIVERELOAD_PORT});
532
var mountFolder = function (connect, dir) {
633
return connect.static(require('path').resolve(dir));
734
};
835

9-
// # Globbing
10-
// for performance reasons we're only matching one level down:
11-
// 'test/spec/{,*/}*.js'
12-
// use this if you want to recursively match all subfolders:
13-
// 'test/spec/**/*.js'
14-
1536

1637
module.exports = function (grunt) {
1738
// load all grunt tasks
@@ -31,10 +52,6 @@ module.exports = function (grunt) {
3152
files: ['<%= yeoman.app %>/scripts/{,*/}*.coffee'],
3253
tasks: ['coffee:dist']
3354
},
34-
coffeeTest: {
35-
files: ['test/spec/{,*/}*.coffee'],
36-
tasks: ['coffee:test']
37-
},
3855
compass: {
3956
files: ['<%= yeoman.app %>/styles/{,*/}*.{scss,sass}'],
4057
tasks: ['compass:server']
@@ -81,16 +98,6 @@ module.exports = function (grunt) {
8198
}
8299
}
83100
},
84-
test: {
85-
options: {
86-
middleware: function (connect) {
87-
return [
88-
mountFolder(connect, '.tmp'),
89-
mountFolder(connect, 'test')
90-
];
91-
}
92-
}
93-
},
94101
dist: {
95102
options: {
96103
middleware: function (connect) {
@@ -126,8 +133,7 @@ module.exports = function (grunt) {
126133
all: [
127134
'Gruntfile.js',
128135
'<%= yeoman.app %>/scripts/{,*/}*.js',
129-
'!<%= yeoman.app %>/scripts/vendor/*',
130-
'test/spec/{,*/}*.js'
136+
'!<%= yeoman.app %>/scripts/vendor/*'
131137
]
132138
},
133139
mocha: {
@@ -147,15 +153,6 @@ module.exports = function (grunt) {
147153
dest: '.tmp/scripts',
148154
ext: '.js'
149155
}]
150-
},
151-
test: {
152-
files: [{
153-
expand: true,
154-
cwd: 'test/spec',
155-
src: '{,*/}*.coffee',
156-
dest: '.tmp/spec',
157-
ext: '.js'
158-
}]
159156
}
160157
},
161158
compass: {
@@ -394,9 +391,6 @@ module.exports = function (grunt) {
394391
'compass',
395392
'coffee:dist'
396393
],
397-
test: [
398-
'coffee'
399-
],
400394
dist: [
401395
'coffee',
402396
'compass',
@@ -430,13 +424,6 @@ module.exports = function (grunt) {
430424
]);
431425
});
432426

433-
grunt.registerTask('test', [
434-
'clean:server',
435-
'concurrent:test',
436-
'connect:test',
437-
'mocha'
438-
]);
439-
440427
grunt.registerTask('build', [
441428
'clean:dist',
442429
'useminPrepare',
@@ -452,7 +439,6 @@ module.exports = function (grunt) {
452439

453440
grunt.registerTask('default', [
454441
'jshint',
455-
'test',
456442
'build'
457443
]);
458444
};

‎app/config.json‎

Lines changed: 61 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,64 @@
7777
"zoomOffset": 0
7878
}
7979
],
80-
80+
"products": [
81+
{
82+
"name": "PanEuropean Fractional Snow Cover",
83+
"visible": false,
84+
"timeSlider": true,
85+
"color":"green",
86+
"view": {
87+
"id": "daily_FSC_PanEuropean_Optical",
88+
"protocol": "WMS",
89+
"urls": [
90+
"http://neso.cryoland.enveo.at/cryoland/ows"
91+
],
92+
"style": "default"
93+
},
94+
"download": {
95+
"id": "daily_FSC_PanEuropean_Optical",
96+
"protocol": "EOWCS",
97+
"url": "http://neso.cryoland.enveo.at/cryoland/ows"
98+
}
99+
},
100+
{
101+
"name": "PanEuropean Snow Water Equivalent",
102+
"visible": false,
103+
"timeSlider": true,
104+
"color":"red",
105+
"view": {
106+
"id": "daily_SWE_PanEuropean_Microwave",
107+
"protocol": "WMS",
108+
"urls": [
109+
"http://neso.cryoland.enveo.at/cryoland/ows"
110+
],
111+
"style": "default"
112+
},
113+
"download": {
114+
"id": "daily_SWE_PanEuropean_Microwave",
115+
"protocol": "EOWCS",
116+
"url": "http://neso.cryoland.enveo.at/cryoland/ows"
117+
}
118+
},
119+
{
120+
"name": "SRTM",
121+
"visible": false,
122+
"timeSlider": false,
123+
"view": {
124+
"id": "SRTM8bit_mosaic",
125+
"protocol": "WMS",
126+
"urls": [
127+
"http://earthserver.eox.at/open/ows"
128+
],
129+
"style": "default"
130+
},
131+
"download": {
132+
"id": "SRTM_mosaic",
133+
"protocol": "EOWCS",
134+
"url": "http://earthserver.eox.at/open/ows"
135+
}
136+
}
137+
],
81138
"overlays": [
82139
{
83140
"name": "borders & labels",
@@ -282,9 +339,10 @@
282339
{
283340
"id":"download",
284341
"eventToRaise":"dialog:open:downloadSelection",
285-
"description": "WCS Download selection Tool",
342+
"description": "WCS Download Tool",
343+
"disabledDescription": "Please make sure you have selected a product layer, an area of interest and a time of interest in order to use the download tool",
286344
"icon":"icon-download-alt",
287-
"enabled":true,
345+
"enabled":false,
288346
"active":false
289347
}
290348

‎app/index.html‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
11
<!doctype html>
2+
3+
<!--
4+
Project: EOxClient <https://github.com/EOX-A/EOxClient>
5+
Authors: Daniel Santillan <[email protected]>
6+
7+
Copyright (C) 2014 EOX IT Services GmbH
8+
9+
Permission is hereby granted, free of charge, to any person obtaining a copy
10+
of this software and associated documentation files (the "Software"), to deal
11+
in the Software without restriction, including without limitation the rights
12+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13+
copies of the Software, and to permit persons to whom the Software is
14+
furnished to do so, subject to the following conditions:
15+
16+
The above copyright notice and this permission notice shall be included in all
17+
copies of this Software or works derived from this Software.
18+
19+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25+
THE SOFTWARE.
26+
-->
27+
28+
229
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
330
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
431
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
@@ -24,6 +51,7 @@
2451
<!-- build:js scripts/vendor/modernizr.js -->
2552
<script src="bower_components/modernizr/modernizr.js"></script>
2653
<!-- endbuild -->
54+
2755
</head>
2856
<body>
2957

@@ -44,11 +72,15 @@
4472
<div id="bottomBar"></div>
4573
</div>
4674

47-
<!-- HIDDEN DOWNLOAD DIV -->
75+
<div id="loadscreen" class="modal-backdrop"> <i class="fa fa-cog fa-spin fa-4x"></i> </div>
76+
77+
<!-- HIDDEN DOWNLOAD DIV -->
4878
<div id="div-downloads">
4979
<iframe name="iframe-download-post" id="iframe-download-post"></iframe>
5080
</div>
5181

82+
<div id="error-messages"></div>
83+
5284
<!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
5385
<!--<script>
5486
var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];

0 commit comments

Comments
 (0)