Make showing the Terms of Service a user option, and move it to the footer.

This commit sponsored by Gjalt-Jorn Peters.  Thank you!

diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index d738074d725c49385f572bb7dbb57aa739544283..971b615359d14039ecdc543feb4df6632d8f46a0 100644 (file)
--- 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 6394fa4f384221a3f120edf395c791c34c44ebff..c7ed6d8e70afa4dcadb605ea04750b391bd8f3c9 100644 (file)
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -94,11 +94,6 @@
                  "javascript:;"
                {% endif %}
                >{% trans %}log out{% endtrans %}</a>
-                <p class="fine_print">
-                  <a href="{{ request.urlgen('terms_of_service') }}">
-                    {%- trans %}Terms of Service{%- endtrans %}
-                  </a>
-                </p>
               {% endif %}
             {%- elif auth %}
             <a href=

diff --git a/mediagoblin/templates/mediagoblin/bits/base_footer.html b/mediagoblin/templates/mediagoblin/bits/base_footer.html
index 80cd41b038ac69f55c5f79bff9ebcf874680f9a1..84397be263a48daff1142e5488cd72f9da07c369 100644 (file)
--- a/mediagoblin/templates/mediagoblin/bits/base_footer.html
+++ b/mediagoblin/templates/mediagoblin/bits/base_footer.html
@@ -24,5 +24,12 @@
     {% trans source_link=app_config['source_link'] -%}
       Released under the <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">AGPL</a>. <a href="{{ source_link }}">Source code</a> available.
     {%- endtrans %}
+    {% if app_config['show_tos'] %}
+      <p class="fine_print">
+        <a href="{{ request.urlgen('terms_of_service') }}">
+          {%- trans %}Terms of Service{%- endtrans %}
+        </a>
+      </p>
+    {% endif %}
   </footer>
 {%- endblock mediagoblin_footer -%}

diff --git a/mediagoblin/views.py b/mediagoblin/views.py
index 1d7be8135584e90f3f395170172aac03b8f365e3..4185c1b695870176d7d956a5b98de01f986faad6 100644 (file)
--- 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', {})