diff options
author | Dave Page | 2016-03-14 15:26:32 +0000 |
---|---|---|
committer | Dave Page | 2016-03-14 15:26:32 +0000 |
commit | 436364f3c5be481fc8d1d29f408f5eabe79e120a (patch) | |
tree | 89b93517c999c9c6d22ec93ad7ec613047d2106d | |
parent | 351b6efcad05da8e3b221ef4cea765cf8180aab5 (diff) |
Add boilerplate legal stuff.
-rw-r--r-- | web/pgperffarm/urls.py | 2 | ||||
-rw-r--r-- | web/pgperffarm/views.py | 11 | ||||
-rw-r--r-- | web/static/img/logo.png | bin | 28320 -> 0 bytes | |||
-rw-r--r-- | web/templates/body.html | 13 | ||||
-rw-r--r-- | web/templates/index.html | 4 | ||||
-rw-r--r-- | web/templates/licence.html | 32 | ||||
-rw-r--r-- | web/templates/ppolicy.html | 56 |
7 files changed, 111 insertions, 7 deletions
diff --git a/web/pgperffarm/urls.py b/web/pgperffarm/urls.py index f7286e8..e07097f 100644 --- a/web/pgperffarm/urls.py +++ b/web/pgperffarm/urls.py @@ -19,6 +19,8 @@ from django.views.generic.base import RedirectView urlpatterns = [ # Static pages url(r'^$', 'pgperffarm.views.index', name='index'), + url(r'^/licence$', 'pgperffarm.views.licence', name='licence'), + url(r'^/ppolicy$', 'pgperffarm.views.ppolicy', name='ppolicy'), # Admin site url(r'^admin/', include(admin.site.urls)), diff --git a/web/pgperffarm/views.py b/web/pgperffarm/views.py index 19136db..ecdf975 100644 --- a/web/pgperffarm/views.py +++ b/web/pgperffarm/views.py @@ -1,3 +1,5 @@ +"""Views for the core PGPerfFarm app""" + from django.shortcuts import render_to_response from django.http import HttpResponse, Http404 from django.template import TemplateDoesNotExist, loader, Context @@ -6,5 +8,10 @@ import datetime # Handle the static pages def index(request): - return render_to_response('index.html', { - })
\ No newline at end of file + return render_to_response('index.html') + +def licence(request): + return render_to_response('licence.html') + +def ppolicy(request): + return render_to_response('ppolicy.html')
\ No newline at end of file diff --git a/web/static/img/logo.png b/web/static/img/logo.png Binary files differdeleted file mode 100644 index 0e1a63c..0000000 --- a/web/static/img/logo.png +++ /dev/null diff --git a/web/templates/body.html b/web/templates/body.html index 0dc9d21..bcc95ad 100644 --- a/web/templates/body.html +++ b/web/templates/body.html @@ -25,7 +25,14 @@ <li><a href="#">Improved</a></li> </ul> </li> - <li><a href="mailto:[email protected]">Contact</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Help<b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="mailto:[email protected]">Contact</a></li> + <li><a href="{% url 'pgperffarm.views.licence' %}">Licence</a></li> + <li><a href="{% url 'pgperffarm.views.ppolicy' %}">Privacy Policy</a></li> + </ul> + </li> </ul> <ul class="nav navbar-nav navbar-right"> <li class="dropdown"> @@ -81,8 +88,8 @@ <hr> - <footer> - <p>© 2016, The PostgreSQL Global Development Group</p> + <footer class="pull-right"> + <i>PostgreSQL - The world's most advanced Open Source database</p> </footer> </div> </div> diff --git a/web/templates/index.html b/web/templates/index.html index bcc7c45..0492f07 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -1,7 +1,7 @@ {% extends "body.html" %} {% load staticfiles %} {% block title1 %}{% block title2 %}PG Performance Farm{% endblock %}{% endblock %} -{% block controls %}<img src="{% static "img/logo.png" %}" alt="PostgreSQL Logo">{% endblock %} + {% block content %} -<p>This is a test template</p> +<p>This is the home page</p> {% endblock %} diff --git a/web/templates/licence.html b/web/templates/licence.html new file mode 100644 index 0000000..5abd294 --- /dev/null +++ b/web/templates/licence.html @@ -0,0 +1,32 @@ +{% extends "body.html" %} +{% load staticfiles %} +{% block title1 %}{% block title2 %}Licence{% endblock %}{% endblock %} + +{% block content %} +<p>The PostgreSQL Performance Farm client and web application are licenced under +the PostgreSQL Licence:</p> + +<hr /> + +<p>Copyright © 2016, The PostgreSQL Global Development Group</p> +<p> +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement is +hereby granted, provided that the above copyright notice and this paragraph and +the following two paragraphs appear in all copies. +</p> +<p> +IN NO EVENT SHALL THE POSTGRESQL GLOBAL DEVELOPMENT GROUP BE LIABLE TO ANY PARTY FOR +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST +PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF +THE POSTGRESQL GLOBAL DEVELOPMENT GROUP HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +</p> +<p> +THE POSTGRESQL GLOBAL DEVELOPMENT GROUP SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND +THE POSTGRESQL GLOBAL DEVELOPMENT GROUP HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, +SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. +</p> +{% endblock %} diff --git a/web/templates/ppolicy.html b/web/templates/ppolicy.html new file mode 100644 index 0000000..753422f --- /dev/null +++ b/web/templates/ppolicy.html @@ -0,0 +1,56 @@ +{% extends "body.html" %} +{% load staticfiles %} +{% block title1 %}{% block title2 %}Privacy Policy{% endblock %}{% endblock %} + +{% block content %} +<p> +When you visit our website, our servers automatically log your IP address and/or +host name. +</p> +<p> +We store information such as your email address, name and locality only if you +decide to send us such information by completing a survey, or registering as a +user on one of our sites. We collect this information to help us improve the +content of our sites, customize the layout of our web pages and to contact people +for technical and support purposes. We will not share your email address with +other organizations unless required by law. +</p> +<p> +If you submit content to the website, such as listing your company as a service +provider, the information you submitted will be published. +</p> +<p> +If you post a message to one of our public mailinglists, your sending email +address and any content of the email will be published, and archived, both by +us and by other organizations. These archives are permanent, and posted emails +are not removed. By sending a message to one of these lists you implicitly grant +permission for this archival, overriding any disclaimers in the message itself. +</p> +<p> +We may collect demographic and interest category information from people via +surveys, volunteered information, suggestions from members, and other means. +Our members may voluntarily provide information, including that regarding +personal, interests, geography, and demographics. The purpose of this data +collection is to ensure we continue to understand the needs and wants of the +PostgreSQL community, and therefore can provide the most relevant information, +guides, and content. +</p> +<p> +This website uses Google Analytics, a web analytics service provided by Google, +Inc. ("Google"). Google Analytics uses "cookies", which are text files placed on +your computer, to help the website analyze how users use the site. The +information generated by the cookie about your use of the website (including +your IP address) will be transmitted to and stored by Google on servers in the +United States. Google will use this information for the purpose of evaluating +your use of the website, compiling reports on website activity for website +operators and providing other services relating to website activity and +internet usage. Google may also transfer this information to third parties +where required to do so by law, or where such third parties process the +information on Google's behalf. Google will not associate your IP address with +any other data held by Google. You may refuse the use of cookies by selecting +the appropriate settings on your browser, however please note that if you do +this you may not be able to use the full functionality of this website. By +using this website, you consent to the processing of data about you by Google +in the manner and for the purposes set out above. +</p> +{% endblock %} |