Skip to content

Commit

Permalink
Acknowledgement and legal.
Browse files Browse the repository at this point in the history
- Rename NOTICE.txt to LICENSE_NOTICE.txt so that is stands out.
- Put footer on dashboard as well and acknowledge JB and WA.
- Remove attribution from header - redundant with footer.

see #113

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>
  • Loading branch information
yeban committed Dec 9, 2015
1 parent 1c53ccc commit 90eaea1
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 37 deletions.
3 changes: 1 addition & 2 deletions NOTICE.txt → LICENSE_NOTICE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Parts of Afra may be considered a derivative work of JBrowse (JB) and WebApollo
(WA).
Parts of Afra are a derivative work of JBrowse (JB) and WebApollo (WA).

1. JB is multi-licensed under GNU Lesser Public License (LGPL) 2.1 and above,
and Artistic License (AL) 2.0. We choose to use JB under AL 2.0.
Expand Down
2 changes: 1 addition & 1 deletion README.mkd
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,5 @@ Please [email](mailto:a.priyam@qmul.ac.uk) if you:
<p align="center">
Afra is Copyright (©) 2013 Queen Mary, University of London.
<br/>
Parts of Afra are forked from or inspired by <a href="http://jbrowse.org/">JBrowse</a> and <a href="http://genomearchitect.org/">WebApollo</a>.
Parts of Afra are a derivative work of <a href="http://jbrowse.org/">JBrowse</a> and <a href="http://genomearchitect.org/">WebApollo</a> which are respectively copyright (c) 2000-2006 The Perl Foundation and copyright (c) 2010 Regents of the University of California.
</p>
21 changes: 21 additions & 0 deletions www/templates/_footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<hr class="soften">

<footer>
<p>
By <a href="http://wurmlab.github.io">Wurm Lab</a>, <a href="http://sbcs.qmul.ac.uk">Queen Mary, University of London</a>.
Funded by <a href="http://www.bbsrc.ac.uk/home/home.aspx">BBSRC</a> and <a href="http://www.qminnovation.co.uk/">QMI</a>.
<br>
Parts of Afra are a derivative work of <a href="http://jbrowse.org/">JBrowse</a> and <a href="http://genomearchitect.org/">WebApollo</a>.
<br>
<a
href="https://github.com/yeban/afra"
target="_blank" title="To view code, file bugs, request features.">
<i class="fa fa-github"></i>
View source code.
</a>
</p>
<p>
<a href="http://www.bbsrc.ac.uk/home/home.aspx"><img src="img/nostrap-bbsrc-colour.png" width="90"></a>
<a href="http://sbcs.qmul.ac.uk"><img src="img/qmul-logo.png" width="90"></a>
</p>
</footer>
6 changes: 0 additions & 6 deletions www/templates/_nav-full.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
<div class="row">
<div class="col-md-9">
<a href="about" class="navbar-brand">Afra</a>
<span class="navbar-brand-attribution">
by
<a href="http://yannick.poulet.org/" target="_blank">Wurm Lab</a>,
<a href="http://sbcs.qmul.ac.uk/" target="_blank">Queen Mary University of London</a>.
Funded by <a href="http://www.bbsrc.ac.uk/home/home.aspx" target="_blank">BBSRC</a>.
</span>
<ul
id="user-links"
ng-show="user.name"
Expand Down
6 changes: 0 additions & 6 deletions www/templates/_nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
<a href="about" class="navbar-brand">
Afra
</a>
<span class="navbar-brand-attribution">
by
<a href="http://yannick.poulet.org/" target="_blank">Wurm Lab</a>,
<a href="http://sbcs.qmul.ac.uk/" target="_blank">Queen Mary University of London</a>.
Funded by <a href="http://www.bbsrc.ac.uk/home/home.aspx" target="_blank">BBSRC</a>.
</span>
<ul
id="user-links"
ng-show="user.name"
Expand Down
22 changes: 1 addition & 21 deletions www/templates/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -135,26 +135,6 @@ <h3>Are You a Biologist?</h3>
</div>

<br>
<hr class="soften">

<footer>
<p>Developed by <a href="http://github.com/yeban">Anurag Priyam</a> at
<a href="http://yannick.poulet.org">Wurm Lab</a>,
<a href="http://sbcs.qmul.ac.uk">Queen Mary, University of London</a>.
Funded by <a href="http://www.bbsrc.ac.uk/home/home.aspx">BBSRC</a>.
</p>
<p>
View source code:
<a
href="https://github.com/yeban/afra"
target="_blank" title="To view code, file bugs, request features.">
<i class="fa fa-github"></i>
yeban/afra
</a>
</p>
<p>
<a href="http://www.bbsrc.ac.uk/home/home.aspx"><img src="img/nostrap-bbsrc-colour.png" width="90px"></a>
<a href="http://sbcs.qmul.ac.uk"><img src="img/qmul-logo.png" width="90px"></a>
</p>
</footer>
<ng-include src="'templates/_footer.html'"></ng-include>
</article>
5 changes: 4 additions & 1 deletion www/templates/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -255,5 +255,8 @@ <h3>Contribution activity</h3>
</ul>
</div>
</div>
</article>

<br>

<ng-include src="'templates/_footer.html'"></ng-include>
</article>

0 comments on commit 90eaea1

Please sign in to comment.