added license

proost · Oct 27, 2016 · 60cd76fcb83c476e2aa2c9da320283b91947ef28 · 60cd76f
1 parent 5c102fb
commit 60cd76fcb83c476e2aa2c9da320283b91947ef28
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 28 deletions.
diff --git a/LICENSE.md 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.
diff --git 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
@@ -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>

diff --git a/planet/templates/blast.html b/planet/templates/blast.html
@@ -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 %}
 

diff --git a/planet/templates/login.html b/planet/templates/login.html
@@ -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">

diff --git a/planet/templates/register.html b/planet/templates/register.html
@@ -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">

diff --git a/planet/templates/search_results.html b/planet/templates/search_results.html
@@ -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 %}

diff --git a/planet/templates/static_pages/about.html b/planet/templates/static_pages/about.html
@@ -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">

diff --git a/planet/templates/static_pages/contact.html b/planet/templates/static_pages/contact.html
@@ -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">

diff --git a/planet/templates/static_pages/licence.html b/planet/templates/static_pages/licence.html
diff --git a/planet/templates/static_pages/license.html b/planet/templates/static_pages/license.html
@@ -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 %}
diff --git a/planet/templates/static_pages/main.html b/planet/templates/static_pages/main.html
@@ -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">

diff --git a/tests/website.py b/tests/website.py
@@ -228,8 +228,8 @@ class WebsiteTest(TestCase):
         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")