Skip to content

Commit

Permalink
added license
Browse files Browse the repository at this point in the history
  • Loading branch information
proost committed Oct 27, 2016
1 parent 5c102fb commit 60cd76f
Show file tree
Hide file tree
Showing 13 changed files with 61 additions and 28 deletions.
7 changes: 7 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright (c) 2016 Sebastian Proost and Marek Mutwil; Max Planck Institute for Molecular Plant Physiology

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6 changes: 3 additions & 3 deletions planet/controllers/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ def contact():
return render_template('static_pages/contact.html')


@main.route('/licence')
def licence():
@main.route('/license')
def license():
"""
Shows the license
"""
return render_template('static_pages/licence.html')
return render_template('static_pages/license.html')
2 changes: 1 addition & 1 deletion planet/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<div class="col-xs-3"><strong class="text-muted">Planet 2.0</strong></div>
<div class="col-xs-3"><a href="{{ url_for('main.about') }}" class="text-muted">About</a></div>
<div class="col-xs-3"><a href="{{ url_for('main.contact') }}" class="text-muted">Contact</a></div>
<div class="col-xs-3"><a href="{{ url_for('main.licence') }}" class="text-muted">Licence</a></div>
<div class="col-xs-3"><a href="{{ url_for('main.license') }}" class="text-muted">License</a></div>
</div>
</div>
</footer>
Expand Down
6 changes: 5 additions & 1 deletion planet/templates/blast.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

{% block container %}
<div class="top-pad">

<ol class="breadcrumb">
<li><a href="{{ url_for('main.screen') }}">Home</a></li>
<li>Search</li>
<li class="active"><strong>Blast</strong></li>
</ol>
<h1>Blast</h1>
{% if token %}

Expand Down
5 changes: 4 additions & 1 deletion planet/templates/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

{% block container %}
<div class="top-pad">
<br />
<ol class="breadcrumb">
<li><a href="{{ url_for('main.screen') }}">Home</a></li>
<li class="active"><strong>Log in</strong></li>
</ol>
<div class="row">
<div class="col-md-4 col-md-offset-4 col-xs-8 col-xs-offset-2">
<div class="panel panel-default">
Expand Down
5 changes: 4 additions & 1 deletion planet/templates/register.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

{% block container %}
<div class="top-pad">
<br />
<ol class="breadcrumb">
<li><a href="{{ url_for('main.screen') }}">Home</a></li>
<li class="active"><strong>Register</strong></li>
</ol>
<div class="row">
<div class="col-md-4 col-md-offset-4 col-xs-8 col-xs-offset-2">
<div class="panel panel-default">
Expand Down
7 changes: 6 additions & 1 deletion planet/templates/search_results.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

{% block container %}
<div class="top-pad">

<ol class="breadcrumb">
<li><a href="{{ url_for('main.screen') }}">Home</a></li>
<li>Search</li>
<li>Results</li>
<li class="active"><strong>{{ keyword }}</strong></li>
</ol>
<h1>Search results for: <strong>{{ keyword }}</strong></h1>
<div class="row">
{% if sequences %}
Expand Down
5 changes: 4 additions & 1 deletion planet/templates/static_pages/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

{% block container %}
<div class="top-pad">

<ol class="breadcrumb">
<li><a href="{{ url_for('main.screen') }}">Home</a></li>
<li class="active"><strong>About</strong></li>
</ol>
<h1>About PlaNet 2.0<br /></h1>

<div class="row">
Expand Down
5 changes: 4 additions & 1 deletion planet/templates/static_pages/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

{% block container %}
<div class="top-pad">

<ol class="breadcrumb">
<li><a href="{{ url_for('main.screen') }}">Home</a></li>
<li class="active"><strong>Contact</strong></li>
</ol>
<h1>Contact Us<br /></h1>

<div class="row">
Expand Down
15 changes: 0 additions & 15 deletions planet/templates/static_pages/licence.html

This file was deleted.

18 changes: 18 additions & 0 deletions planet/templates/static_pages/license.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{% extends 'base.html' %}

{% block container %}
<div class="top-pad">
<ol class="breadcrumb">
<li><a href="{{ url_for('main.screen') }}">Home</a></li>
<li class="active"><strong>License</strong></li>
</ol>
<h1>PlaNet 2.0 License</h1>

<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.</p>
</div>

</div>
{% endblock %}
4 changes: 3 additions & 1 deletion planet/templates/static_pages/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

{% block container %}
<div class="top-pad">

<ol class="breadcrumb">
<li class="active">Home</li>
</ol>
<h1>Welcome to PlaNet 2.0<br /> <small>a platform dedicated to the visualization and analysis of plant co-expression and co-function networks.</small></h1>

<div class="row">
Expand Down
4 changes: 2 additions & 2 deletions tests/website.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ def test_main(self):
self.assert_template_used('static_pages/contact.html')
self.assert200(response)

response = self.client.get("/licence")
self.assert_template_used('static_pages/licence.html')
response = self.client.get("/license")
self.assert_template_used('static_pages/license.html')
self.assert200(response)

response = self.client.get("/this_should_not_exist")
Expand Down

0 comments on commit 60cd76f

Please sign in to comment.