From 9d2b0161b9e6f570e7b429127d6ebb83c125c1c6 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 11 Oct 2013 11:48:22 -0500 Subject: [PATCH] Make showing the Terms of Service a user option, and move it to the footer. This commit sponsored by Gjalt-Jorn Peters. Thank you! --- mediagoblin/config_spec.ini | 5 +++++ mediagoblin/templates/mediagoblin/base.html | 5 ----- mediagoblin/templates/mediagoblin/bits/base_footer.html | 7 +++++++ mediagoblin/views.py | 5 ++++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index d738074d..971b6153 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -45,6 +45,11 @@ comments_ascending = boolean(default=True) # Enable/disable reporting allow_reporting = boolean(default=True) +# Enable/disable terms of service +# ... Note: you can override the terms of service template on a +# per-site basis... +show_tos = boolean(default=True) + # By default not set, but you might want something like: # "%(here)s/user_dev/templates/" local_templates = string() diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 6394fa4f..c7ed6d8e 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -94,11 +94,6 @@ "javascript:;" {% endif %} >{% trans %}log out{% endtrans %} -

- - {%- trans %}Terms of Service{%- endtrans %} - -

{% endif %} {%- elif auth %} AGPL. Source code available. {%- endtrans %} + {% if app_config['show_tos'] %} +

+ + {%- trans %}Terms of Service{%- endtrans %} + +

+ {% endif %} {%- endblock mediagoblin_footer -%} diff --git a/mediagoblin/views.py b/mediagoblin/views.py index 1d7be813..4185c1b6 100644 --- a/mediagoblin/views.py +++ b/mediagoblin/views.py @@ -17,7 +17,7 @@ from mediagoblin import mg_globals from mediagoblin.db.models import MediaEntry from mediagoblin.tools.pagination import Pagination -from mediagoblin.tools.response import render_to_response +from mediagoblin.tools.response import render_to_response, render_404 from mediagoblin.decorators import uses_pagination, user_not_banned @@ -46,5 +46,8 @@ def simple_template_render(request): request, template_name, {}) def terms_of_service(request): + if mg_globals.app_config["show_tos"] is False: + return render_404(request) + return render_to_response(request, 'mediagoblin/terms_of_service.html', {})