From 60cd76fcb83c476e2aa2c9da320283b91947ef28 Mon Sep 17 00:00:00 2001 From: sepro Date: Thu, 27 Oct 2016 13:16:56 +0200 Subject: [PATCH] added license --- LICENSE.md | 7 +++++++ planet/controllers/main.py | 6 +++--- planet/templates/base.html | 2 +- planet/templates/blast.html | 6 +++++- planet/templates/login.html | 5 ++++- planet/templates/register.html | 5 ++++- planet/templates/search_results.html | 7 ++++++- planet/templates/static_pages/about.html | 5 ++++- planet/templates/static_pages/contact.html | 5 ++++- planet/templates/static_pages/licence.html | 15 --------------- planet/templates/static_pages/license.html | 18 ++++++++++++++++++ planet/templates/static_pages/main.html | 4 +++- tests/website.py | 4 ++-- 13 files changed, 61 insertions(+), 28 deletions(-) create mode 100644 LICENSE.md delete mode 100644 planet/templates/static_pages/licence.html create mode 100644 planet/templates/static_pages/license.html diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..72bcb06 --- /dev/null +++ b/LICENSE.md @@ -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. \ No newline at end of file diff --git a/planet/controllers/main.py b/planet/controllers/main.py index 3f438dd..42edb2f 100644 --- a/planet/controllers/main.py +++ b/planet/controllers/main.py @@ -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') diff --git a/planet/templates/base.html b/planet/templates/base.html index 08abd2b..3fe7826 100644 --- a/planet/templates/base.html +++ b/planet/templates/base.html @@ -123,7 +123,7 @@
Planet 2.0
About
Contact
-
Licence
+
License
diff --git a/planet/templates/blast.html b/planet/templates/blast.html index 3270315..2dbc971 100644 --- a/planet/templates/blast.html +++ b/planet/templates/blast.html @@ -2,7 +2,11 @@ {% block container %}
- +
    +
  1. Home
    2. +
  2. Search
    3. +
  3. Blast
    4. +

Blast

{% if token %} diff --git a/planet/templates/login.html b/planet/templates/login.html index 668ec20..3967853 100644 --- a/planet/templates/login.html +++ b/planet/templates/login.html @@ -2,7 +2,10 @@ {% block container %}
-
+
    +
  1. Home
    2. +
  2. Log in
    3. +
diff --git a/planet/templates/register.html b/planet/templates/register.html index e13e743..73d71d6 100644 --- a/planet/templates/register.html +++ b/planet/templates/register.html @@ -2,7 +2,10 @@ {% block container %}
-
+
    +
  1. Home
    2. +
  2. Register
    3. +
diff --git a/planet/templates/search_results.html b/planet/templates/search_results.html index 3829945..db6612d 100644 --- a/planet/templates/search_results.html +++ b/planet/templates/search_results.html @@ -2,7 +2,12 @@ {% block container %}
- +
    +
  1. Home
    2. +
  2. Search
    3. +
  3. Results
    4. +
  4. {{ keyword }}
    5. +

Search results for: {{ keyword }}

{% if sequences %} diff --git a/planet/templates/static_pages/about.html b/planet/templates/static_pages/about.html index dcb93a5..edc884b 100644 --- a/planet/templates/static_pages/about.html +++ b/planet/templates/static_pages/about.html @@ -2,7 +2,10 @@ {% block container %}
- +
    +
  1. Home
    2. +
  2. About
    3. +

About PlaNet 2.0

diff --git a/planet/templates/static_pages/contact.html b/planet/templates/static_pages/contact.html index c28e914..4c439e6 100644 --- a/planet/templates/static_pages/contact.html +++ b/planet/templates/static_pages/contact.html @@ -2,7 +2,10 @@ {% block container %}
- +
    +
  1. Home
    2. +
  2. Contact
    3. +

Contact Us

diff --git a/planet/templates/static_pages/licence.html b/planet/templates/static_pages/licence.html deleted file mode 100644 index de8cd03..0000000 --- a/planet/templates/static_pages/licence.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends 'base.html' %} - -{% block container %} -
- -

PlaNet 2.0 Licence

- -
- - -
-
- -
-{% endblock %} diff --git a/planet/templates/static_pages/license.html b/planet/templates/static_pages/license.html new file mode 100644 index 0000000..8edf944 --- /dev/null +++ b/planet/templates/static_pages/license.html @@ -0,0 +1,18 @@ +{% extends 'base.html' %} + +{% block container %} +
+
    +
  1. Home
    2. +
  2. License
    3. +
+

PlaNet 2.0 License

+ +

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.

+
+ +
+{% endblock %} diff --git a/planet/templates/static_pages/main.html b/planet/templates/static_pages/main.html index a10a70f..7b588f8 100644 --- a/planet/templates/static_pages/main.html +++ b/planet/templates/static_pages/main.html @@ -2,7 +2,9 @@ {% block container %}
- +
    +
  1. Home
    2. +

Welcome to PlaNet 2.0
a platform dedicated to the visualization and analysis of plant co-expression and co-function networks.

diff --git a/tests/website.py b/tests/website.py index a55642d..b4f3a0f 100644 --- a/tests/website.py +++ b/tests/website.py @@ -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")