minor changes from aaronw's review
This commit is contained in:
parent
e784d10d2e
commit
1bce0c15ba
@ -100,6 +100,8 @@ class MediaGoblinApp(object):
|
||||
|
||||
# Check if authentication plugin is enabled and respond accordingly.
|
||||
self.auth = check_auth_enabled()
|
||||
if not self.auth:
|
||||
app_config['allow_comments'] = False
|
||||
|
||||
# Set up storage systems
|
||||
self.public_store, self.queue_store = setup_storage()
|
||||
|
@ -22,17 +22,17 @@
|
||||
<h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
|
||||
<img class="right_align" src="{{ request.staticdirect('/images/frontpage_image.png') }}" />
|
||||
<p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p>
|
||||
{% if auth %}
|
||||
{% if auth %}
|
||||
<p>{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
|
||||
{% if allow_registration %}
|
||||
<p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
|
||||
{% trans register_url=request.urlgen('mediagoblin.auth.register') -%}
|
||||
<a class="button_action_highlight" href="{{ register_url }}">Create an account at this site</a>
|
||||
or
|
||||
{%- endtrans %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% trans %}
|
||||
{%- endtrans %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% trans %}
|
||||
<a class="button_action" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
|
||||
{%- endtrans %}
|
||||
|
||||
|
@ -86,7 +86,7 @@
|
||||
<p>{{ media.description_html }}</p>
|
||||
{% endautoescape %}
|
||||
{% if comments %}
|
||||
{% if app_config['allow_comments'] and auth %}
|
||||
{% if app_config['allow_comments'] %}
|
||||
<a
|
||||
{% if not request.user %}
|
||||
href="{{ request.urlgen('mediagoblin.auth.login') }}"
|
||||
|
Loading…
x
Reference in New Issue
Block a user