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

Commit

Permalink
Merge pull request #316 from lukecampbell/attribution
Browse files Browse the repository at this point in the history
Adds attributions
  • Loading branch information
benjwadams committed Oct 13, 2014
2 parents 1e46977 + 578610a commit 3ebfff8
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 2 deletions.
19 changes: 19 additions & 0 deletions ioos_catalog/static/attributions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Earth (earth.png) - Copyright NASA under the Creative Commons 2.0 License
- Source https://www.flickr.com/photos/gsfc/

Earth Bathymetric (bathy.png) - Copyright Kevn M. Gill under the Creative Commons 2.0 Share-alike License
- Source https://www.flickr.com/photos/gsfc/

Gliders (gliders.png) - Copyright 2014 Rutgers Marine & Coastal Sciences
- One source of many http://marine.rutgers.edu/main/Featured-Student/Featured-student-Donglai-Gong.html

Wind Currents (map.png) - Image is a capture of software and not copyrighted.
- Software is Copyright 2014 Cameron Beccario under the MIT license.
- Source: http://earth.nullschool.net/
- Source: https://github.com/cambecc/earth/blob/master/LICENSE.md

Wave (wave.png) - Copyright 2010 Sunova Surfboards under Creative Commons License
- Source https://www.flickr.com/photos/sunova_surfboards/5444811562/

The remaining images are Copyright 2014 RPS ASA Used with permissions and distributed freely under the Creative Commons 2.0 Share-alike License.

8 changes: 6 additions & 2 deletions ioos_catalog/templates/landing.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,13 @@ <h5>{{ total_datasets | safe }} Datasets | {{ total_services | safe }} Services<
</a>
</div>
</div>

</div> <!-- row -->
<div class="row">
<div class="col-md-2 pull-right">
<a class="text-muted" href="{{url_for('static', filename='attributions.txt')}}">Photo Attributions</a>
</div>
</div>
<!-- row -->

<div class="row news">
<div class="col-sm-12 col-md-6"> <!-- social media -->
<h1> SOCIAL MEDIA </h1>
Expand Down

0 comments on commit 3ebfff8

Please sign in to comment.