diff --git a/nnmon/templates/about.html b/nnmon/templates/about.html deleted file mode 100644 index bba8fe4f6a9738f43b4fc38f220ab21f6ae1535f..0000000000000000000000000000000000000000 --- a/nnmon/templates/about.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "base.html" %} -{% load bt %} -{% load i18n %} -{% block active_tab_contact %}id="current"{% endblock %} -{% block content %} -
-

{% trans "RespectMyNet.eu is an online platform enabling citizens to become the watchmen of the Internet by reporting Net Neutrality violations. Everyone is invited to report undue blocking or throttling of their Internet access, and help name and shame operators' harmful practices." %}

-

{% trans "This platform is a joint project by La Quadrature du Net, Bits of Freedom and individual contributors. It was launched on September 22nd, 2011." %}

-

{% trans "Organisations will submit reports to national and EU regulatory authorities if appropriate." %}

-

{% trans "For enquiries about the project, please contact:" %}

- -

{% trans "Initiators" %}

- -
-{% endblock %} diff --git a/nnmon/templates/base.html b/nnmon/templates/base.html index 40a35f34c5cf48c65e14635f8d4f8d3df60b4366..c2bb32dec6ecd872173d4ab1fba05bf041992642 100644 --- a/nnmon/templates/base.html +++ b/nnmon/templates/base.html @@ -1,6 +1,6 @@ -{% load i18n %}{% load bt %} - - +{% load i18n %} +{% load bt %} + @@ -23,27 +23,37 @@ +
  • +
    + {% csrf_token %} + + + + +
    + +
  • + + @@ -53,6 +63,15 @@ {% endblock %} {% block scripts %} diff --git a/nnmon/urls.py b/nnmon/urls.py index c4f8d247cc9a314d7738c2ff2f226d8e7de7ba5a..2f03f9973316388fb277dbb0f85a3e252288cfc0 100644 --- a/nnmon/urls.py +++ b/nnmon/urls.py @@ -72,8 +72,6 @@ urlpatterns = patterns('', TemplateView.as_view(template_name='nn.html')), url(r'^start/$', TemplateView.as_view(template_name='start.html')), - url(r'^contact/$', - TemplateView.as_view(template_name='about.html')), url(r'^captcha/', include('captcha.urls')), url(r'^admin/',