Skip to content
This repository was archived by the owner on Oct 18, 2019. It is now read-only.

Commit 3ebfff8

Browse files
committed
Merge pull request #316 from lukecampbell/attribution
Adds attributions
2 parents 1e46977 + 578610a commit 3ebfff8

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

Diff for: ioos_catalog/static/attributions.txt

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Earth (earth.png) - Copyright NASA under the Creative Commons 2.0 License
2+
- Source https://www.flickr.com/photos/gsfc/
3+
4+
Earth Bathymetric (bathy.png) - Copyright Kevn M. Gill under the Creative Commons 2.0 Share-alike License
5+
- Source https://www.flickr.com/photos/gsfc/
6+
7+
Gliders (gliders.png) - Copyright 2014 Rutgers Marine & Coastal Sciences
8+
- One source of many http://marine.rutgers.edu/main/Featured-Student/Featured-student-Donglai-Gong.html
9+
10+
Wind Currents (map.png) - Image is a capture of software and not copyrighted.
11+
- Software is Copyright 2014 Cameron Beccario under the MIT license.
12+
- Source: http://earth.nullschool.net/
13+
- Source: https://github.com/cambecc/earth/blob/master/LICENSE.md
14+
15+
Wave (wave.png) - Copyright 2010 Sunova Surfboards under Creative Commons License
16+
- Source https://www.flickr.com/photos/sunova_surfboards/5444811562/
17+
18+
The remaining images are Copyright 2014 RPS ASA Used with permissions and distributed freely under the Creative Commons 2.0 Share-alike License.
19+

Diff for: ioos_catalog/templates/landing.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,13 @@ <h5>{{ total_datasets | safe }} Datasets | {{ total_services | safe }} Services<
6464
</a>
6565
</div>
6666
</div>
67-
67+
</div> <!-- row -->
68+
<div class="row">
69+
<div class="col-md-2 pull-right">
70+
<a class="text-muted" href="{{url_for('static', filename='attributions.txt')}}">Photo Attributions</a>
71+
</div>
6872
</div>
69-
<!-- row -->
73+
7074
<div class="row news">
7175
<div class="col-sm-12 col-md-6"> <!-- social media -->
7276
<h1> SOCIAL MEDIA </h1>

0 commit comments

Comments
 (0)