diff --git a/build.config.js b/build.config.js index 73bae64c..a74d1d06 100644 --- a/build.config.js +++ b/build.config.js @@ -13,10 +13,13 @@ module.exports = { compile_dir: 'bin', build_configs: { + keys:{ + googleMaps: "" + }, configFile: appConfigFile, development: { apiRoot: "http://staging.ecosounds.org", - siteRoot: "localhost:8080", + siteRoot: "http://localhost:8080", siteDir: "/" }, staging: { @@ -25,9 +28,9 @@ module.exports = { siteDir: "/system/listen_to/" }, production: { - apiRoot: "http://ecosounds.org", - siteRoot: "http://ecosounds.org/????", - siteDir: "????" + apiRoot: "http://awb.ecosounds.org", + siteRoot: "http://awb.ecosounds.org/system/listen_to", + siteDir: "/system/listen_to/" }, current: {} diff --git a/src/app/birdWalks/_birdWalks.scss b/src/app/birdWalks/_birdWalks.scss index e69de29b..5eaef061 100644 --- a/src/app/birdWalks/_birdWalks.scss +++ b/src/app/birdWalks/_birdWalks.scss @@ -0,0 +1,4 @@ +#locationMap { + width: 100%; + height: 300px; +} \ No newline at end of file diff --git a/src/app/birdWalks/birdWalk.tpl.html b/src/app/birdWalks/birdWalk.tpl.html index 22c330d5..ca3c54bc 100644 --- a/src/app/birdWalks/birdWalk.tpl.html +++ b/src/app/birdWalks/birdWalk.tpl.html @@ -1,8 +1,11 @@
{{details.description}}
+{{walkSpec.description}}
diff --git a/src/baw.configuration.tpl.js b/src/baw.configuration.tpl.js index bf4f40fe..4a358d5a 100644 --- a/src/baw.configuration.tpl.js +++ b/src/baw.configuration.tpl.js @@ -56,8 +56,9 @@ angular.module('bawApp.configuration', []) birdWalk : { list: 'birdWalks/birdWalks.tpl.html', detail: 'birdWalks/birdWalk.tpl.html', - spec: '/assets/bird_walk/bird_walk_spec.json', - images: '/assets/bird_walk/images/' + spec: 'assets/bird_walk/bird_walk_spec.json', + stats: 'assets/bird_walk/bird_walk_stats.json', + images: 'assets/bird_walk/images/' } }, // routes used by angular diff --git a/src/components/services/services.js b/src/components/services/services.js index 3785bdb2..3870044d 100644 --- a/src/components/services/services.js +++ b/src/components/services/services.js @@ -165,7 +165,7 @@ var birdWalkService = {}; - var getUrl = function getUrl(downloadUrl, storeProperty, theScope) { + var getUrl = function getUrl(downloadUrl, storeProperty, theScope, onSuccess) { $http.get(downloadUrl, { cache: true }) @@ -176,10 +176,13 @@ } theScope.spec[storeProperty] = data; - if (data.additionalResources) { - angular.forEach(data.additionalResources, function (value, key) { - getUrl(value, key); - }); +// if (data.additionalResources) { +// angular.forEach(data.additionalResources, function (value, key) { +// getUrl(value, key); +// }); +// } + if (onSuccess) { + onSuccess(); } }).error(function (data, status, headers, config) { diff --git a/src/index.html b/src/index.html index 60b34397..a1fe0600 100644 --- a/src/index.html +++ b/src/index.html @@ -16,9 +16,9 @@ <% }); %> + + - -