[1/2] climate git commit: Addressing CLIMATE-810 Demo tab doesn't appear in ocw ui

2016-06-16 Thread omkarr 
Repository: climate
Updated Branches:
  refs/heads/master de573a5ca -> 705403a03


Addressing CLIMATE-810 Demo tab doesn't appear in ocw ui


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/16f03a51
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/16f03a51
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/16f03a51

Branch: refs/heads/master
Commit: 16f03a513afe4eefbc66f62bd8bf444bb96dd9a7
Parents: de573a5
Author: Omkar20895 
Authored: Fri Jun 17 00:45:31 2016 +0530
Committer: Omkar20895 
Committed: Fri Jun 17 00:45:31 2016 +0530

--
 ocw-ui/frontend/app/index.html | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/climate/blob/16f03a51/ocw-ui/frontend/app/index.html
--
diff --git a/ocw-ui/frontend/app/index.html b/ocw-ui/frontend/app/index.html
index 2da8183..fe3a4a4 100644
--- a/ocw-ui/frontend/app/index.html
+++ b/ocw-ui/frontend/app/index.html
@@ -56,6 +56,7 @@ under the License.
   
 Evaluate
 Results
+Demo

[1/2] climate git commit: Implementing a multilingual map in ocw UI

2016-06-16 Thread omkarr 
Repository: climate
Updated Branches:
  refs/heads/master 6b9fae9d5 -> de573a5ca


Implementing a multilingual map in ocw UI


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

Branch: refs/heads/master
Commit: dd2985d24e4f518ae09740afb03d9f6865318ade
Parents: 6b9fae9
Author: Omkar20895 
Authored: Wed Jun 15 18:03:51 2016 +0530
Committer: Omkar20895 
Committed: Wed Jun 15 18:03:51 2016 +0530

--
 ocw-ui/frontend/app/scripts/directives/leafletmap.js | 5 -
 ocw-ui/frontend/app/scripts/directives/previewmap.js | 5 -
 2 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/climate/blob/dd2985d2/ocw-ui/frontend/app/scripts/directives/leafletmap.js
--
diff --git a/ocw-ui/frontend/app/scripts/directives/leafletmap.js 
b/ocw-ui/frontend/app/scripts/directives/leafletmap.js
index 9b0a6eb..859a93e 100644
--- a/ocw-ui/frontend/app/scripts/directives/leafletmap.js
+++ b/ocw-ui/frontend/app/scripts/directives/leafletmap.js
@@ -40,7 +40,10 @@ angular.module('ocwUiApp')
worldCopyJump: true,
});
 
-   L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', 
{}).addTo($rootScope.map);
+   
L.tileLayer('http://{s}.tile.thunderforest.com/transport/{z}/{x}/{y}.png', {
+   attribution: ' http://www.thunderforest.com/;>Thunderforest,  http://www.openstreetmap.org/copyright;>OpenStreetMap',
+   maxZoom: 19
+   }).addTo($rootScope.map);
}
};
 });

http://git-wip-us.apache.org/repos/asf/climate/blob/dd2985d2/ocw-ui/frontend/app/scripts/directives/previewmap.js
--
diff --git a/ocw-ui/frontend/app/scripts/directives/previewmap.js 
b/ocw-ui/frontend/app/scripts/directives/previewmap.js
index 78aae8c..600d2f2 100644
--- a/ocw-ui/frontend/app/scripts/directives/previewmap.js
+++ b/ocw-ui/frontend/app/scripts/directives/previewmap.js
@@ -47,7 +47,10 @@ angular.module('ocwUiApp')
worldCopyJump: true,
});
 
-   
L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {}).addTo(map);
+   
L.tileLayer('http://{s}.tile.thunderforest.com/transport/{z}/{x}/{y}.png', {
+   attribution: ' http://www.thunderforest.com/;>Thunderforest,  http://www.openstreetmap.org/copyright;>OpenStreetMap',
+   maxZoom: 19
+   }).addTo(map);
 
// Zoom the map to the dataset bound regions 
(or at least try our best to do so)
var datasetBounds = 
[[scope.dataset.latlonVals.latMax, scope.dataset.latlonVals.lonMin],

[2/2] climate git commit: Implementing a multilingual map in ocw UI this closes #356

2016-06-16 Thread omkarr 
Implementing a multilingual map in ocw UI this closes #356


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

Branch: refs/heads/master
Commit: de573a5ca140cfe279a55c8ce7082b0245de4915
Parents: 6b9fae9 dd2985d
Author: Omkar20895 
Authored: Thu Jun 16 15:39:29 2016 +0530
Committer: Omkar20895 
Committed: Thu Jun 16 15:39:29 2016 +0530

--
 ocw-ui/frontend/app/scripts/directives/leafletmap.js | 5 -
 ocw-ui/frontend/app/scripts/directives/previewmap.js | 5 -
 2 files changed, 8 insertions(+), 2 deletions(-)
--