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

Commit

Permalink
Added AWOIAF hint to about page and on top of attributions
Browse files Browse the repository at this point in the history
  • Loading branch information
mammuth committed Apr 10, 2016
1 parent b6e25c7 commit 897079c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
3 changes: 2 additions & 1 deletion app/components/public/About/About.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ export default class About extends Component {
<Row>
<Column md={8} mdPush={2}>
<h1>Attributions</h1>
We used the sources and licenses listed on <a href="/attributions">this page</a>
<p>Most of our data was - and is periodically- scraped by <a href="http://awoiaf.westeros.org" target="_blank">A Wiki of Ice and Fire</a>. Contributing to this wiki will enhance this portal greatly, so make sure you drop a visit to our wiki-partners and request an account.</p>
<p>We used the sources and licenses listed on <a href="/attributions">this page</a>.</p>
</Column>
</Row>

Expand Down
18 changes: 9 additions & 9 deletions app/components/public/Attributions/Attributions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,26 @@ export default class Attributions extends Component {
<th>License</th>
</tr>

<tr>
<td>Game of Thrones wiki</td>
<td>Launched in 2006 by founder Jimmy Wales, Wikia Inc. is the home of Fandom and the largest entertainment fan site in the world.</td>
<td><a href="http://gameofthrones.wikia.com/" target="_blank">http://gameofthrones.wikia.com/</a></td>
<td><a href="https://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a></td>
</tr>

<tr>
<td>A Wiki of Ice and Fire</td>
<td>A Wiki of Ice and Fire is a fan-based wiki, dedicated to George R. R. Martin's created universe, covering the Novels, HBO's Game of Thrones TV series and other sources. Our goal is to build this wiki into as complete and comprehensive a guide of that universe as possible.
The Wiki is part of the Westeros.org community of fans of the series, that exist since 1999.
</td>
<td><a href="http://awoiaf.westeros.org/index.php/Main_Page" target="_blank">http://awoiaf.westeros.org/index.php/Main_Page</a></td>
<td><a href="http://awoiaf.westeros.org" target="_blank">http://awoiaf.westeros.org/</a></td>
<td><a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a></td>
</tr>

<tr>
<td>Game of Thrones wiki</td>
<td>Launched in 2006 by founder Jimmy Wales, Wikia Inc. is the home of Fandom and the largest entertainment fan site in the world.</td>
<td><a href="http://gameofthrones.wikia.com/" target="_blank">http://gameofthrones.wikia.com/</a></td>
<td><a href="https://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a></td>
</tr>

<tr>
<td>404 image</td>
<td></td>
<td><a href="http://vignette4.wikia.nocookie.net/hieloyfuego/images/4/43/Hodor_HBO.jpg/revision/latest?cb=20130815031401" target="_blank">http://vignette4.wikia.nocookie.net/hieloyfuego/images/4/43/Hodor_HBO.jpg/revision/latest?cb=20130815031401</a></td>
<td><a href="http://vignette4.wikia.nocookie.net/hieloyfuego/images/4/43/Hodor_HBO.jpg/revision/latest?cb=20130815031401" target="_blank">http://vignette4.wikia.nocookie.net</a></td>
<td><a href="https://creativecommons.org/licenses/by-sa/2.0/" target="_blank">CC-BY-SA</a></td>
</tr>

Expand Down

3 comments on commit 897079c

@mammuth
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wups, did it again 😁 I should checkout to new branches more carefully.
screen shot 2016-04-10 at 14 14 00

screen shot 2016-04-10 at 14 11 46

@sacdallago
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:D The 👎 was because of the develop commits :D But nice work

@mammuth
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, for such small changes I mostly go with a git checkout -b branch-name, then commit and push. This case I forgot the -b and didn't notice that I didn't checkout to the new branch, but stayed in develop 😉

Please sign in to comment.