aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-10-11 11:48:22 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-10-11 11:48:22 -0500
commit9d2b0161b9e6f570e7b429127d6ebb83c125c1c6 (patch)
treea3e9d58d55e2b1e45ecafe4ba7e2658408517374 /mediagoblin/templates
parent0c875e1e96b77892bd3f9bd5a91959c57ab7b91c (diff)
downloadmediagoblin-9d2b0161b9e6f570e7b429127d6ebb83c125c1c6.tar.lz
mediagoblin-9d2b0161b9e6f570e7b429127d6ebb83c125c1c6.tar.xz
mediagoblin-9d2b0161b9e6f570e7b429127d6ebb83c125c1c6.zip
Make showing the Terms of Service a user option, and move it to the footer.
This commit sponsored by Gjalt-Jorn Peters. Thank you!
Diffstat (limited to 'mediagoblin/templates')
-rw-r--r--mediagoblin/templates/mediagoblin/base.html5
-rw-r--r--mediagoblin/templates/mediagoblin/bits/base_footer.html7
2 files changed, 7 insertions, 5 deletions
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 %}</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 80cd41b0..84397be2 100644
--- 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 -%}