From 35e1f68eae3b28db550af4d4120c8394d4d8ff9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vi=CC=81=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Thu, 19 May 2016 11:19:51 +0200 Subject: [PATCH] Boilerplate for law required stuff. --- bornhack/static_src/css/bornhack.css | 10 ++++++++++ bornhack/templates/base.html | 6 ++++++ bornhack/templates/contact.html | 20 +++++++++++++++++++ bornhack/urls.py | 5 +++++ shop/templates/bank_transfer.html | 4 ++-- shop/templates/checkout.html | 4 ++-- shop/templates/epay_form.html | 4 ++-- shop/templates/epay_thanks.html | 4 ++-- shop/templates/law/base.html | 16 +++++++++++++++ .../law/general_terms_and_conditions.html | 9 +++++++++ shop/templates/law/privacy_policy.html | 9 +++++++++ shop/templates/law/return_policy.html | 9 +++++++++ shop/templates/order_detail.html | 4 ++-- shop/templates/order_list.html | 4 ++-- shop/templates/product_detail.html | 4 ++-- shop/templates/shop_base.html | 14 +++++++++++++ shop/templates/shop_index.html | 4 ++-- shop/urls.py | 3 +++ 18 files changed, 117 insertions(+), 16 deletions(-) create mode 100644 bornhack/templates/contact.html create mode 100644 shop/templates/law/base.html create mode 100644 shop/templates/law/general_terms_and_conditions.html create mode 100644 shop/templates/law/privacy_policy.html create mode 100644 shop/templates/law/return_policy.html create mode 100644 shop/templates/shop_base.html diff --git a/bornhack/static_src/css/bornhack.css b/bornhack/static_src/css/bornhack.css index cc035e18..a5180753 100644 --- a/bornhack/static_src/css/bornhack.css +++ b/bornhack/static_src/css/bornhack.css @@ -86,3 +86,13 @@ a, a:active, a:focus { height: 500px; } + +/* Footer */ +footer { + position: fixed; + width: 700px; + text-align: center; + background-color: white; + bottom: 0px; + padding: 5px; +} diff --git a/bornhack/templates/base.html b/bornhack/templates/base.html index 813c1b7a..905657f7 100644 --- a/bornhack/templates/base.html +++ b/bornhack/templates/base.html @@ -53,6 +53,7 @@ {% endif %}
  • Info
    • +
  • Contact
    • {% if user.is_authenticated %}
  • Profile
  • Logout
    • @@ -69,6 +70,11 @@
    {% bootstrap_messages %} {% block content %}{% endblock %} +
    +
    + {% block footer %}{% endblock %} +
    +
    {% bootstrap_javascript jquery=1 %} diff --git a/bornhack/templates/contact.html b/bornhack/templates/contact.html new file mode 100644 index 00000000..27ce684b --- /dev/null +++ b/bornhack/templates/contact.html @@ -0,0 +1,20 @@ +{% extends 'base.html' %} + +{% block content %} + +

    +The legal entity behind BornHack is:
    +BornHack IVS c/o Thomas Steen Rasmussen
    +Offenbachsvej 34, 2. tv.
    +2450 Copenhagen SV
    +Denmark
    +CVR# 37666521
    +

    + +

    +Email us at info@bornhack.dk
    +Tweet us at @bornhax
    +Hit us up on IRC at #bornhack @ irc.baconsvin.org (TLS port 6697)
    +

    + +{% endblock %} \ No newline at end of file diff --git a/bornhack/urls.py b/bornhack/urls.py index ccef83cb..72e96c04 100644 --- a/bornhack/urls.py +++ b/bornhack/urls.py @@ -21,6 +21,11 @@ urlpatterns = [ TemplateView.as_view(template_name='good_to_know.html'), name='good-to-know' ), + url( + r'contact/', + TemplateView.as_view(template_name='contact.html'), + name='contact' + ), url( r'^login/$', LoginView.as_view(), diff --git a/shop/templates/bank_transfer.html b/shop/templates/bank_transfer.html index 5f56fc6e..9185487b 100644 --- a/shop/templates/bank_transfer.html +++ b/shop/templates/bank_transfer.html @@ -1,7 +1,7 @@ -{% extends 'base.html' %} +{% extends 'shop_base.html' %} {% load bootstrap3 %} -{% block content %} +{% block shop_content %}

    Pay by Bank Transfer

    diff --git a/shop/templates/checkout.html b/shop/templates/checkout.html index 7ff501bc..eda03661 100644 --- a/shop/templates/checkout.html +++ b/shop/templates/checkout.html @@ -1,8 +1,8 @@ -{% extends 'base.html' %} +{% extends 'shop_base.html' %} {% load bootstrap3 %} -{% block content %} +{% block shop_content %}
    {% csrf_token %} diff --git a/shop/templates/epay_form.html b/shop/templates/epay_form.html index 4db2bdae..9bc5ffbb 100644 --- a/shop/templates/epay_form.html +++ b/shop/templates/epay_form.html @@ -1,6 +1,6 @@ -{% extends "base.html" %} +{% extends "shop_base.html" %} {% load bootstrap3 %} -{% block content %} +{% block shop_content %} {% bootstrap_javascript jquery=1 %}