heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor changes from aaronw's review

Browse Source
This commit is contained in:
Rodney Ewing 2013-06-04 07:58:17 -07:00
parent e784d10d2e
commit 1bce0c15ba
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/app.py
View File

@ -100,6 +100,8 @@ class MediaGoblinApp(object):
# Check if authentication plugin is enabled and respond accordingly. # Check if authentication plugin is enabled and respond accordingly.
self.auth = check_auth_enabled() self.auth = check_auth_enabled()
if not self.auth:
app_config['allow_comments'] = False
# Set up storage systems # Set up storage systems
self.public_store, self.queue_store = setup_storage() self.public_store, self.queue_store = setup_storage()

10
mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
View File

@ -22,17 +22,17 @@
<h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1> <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
<img class="right_align" src="{{ request.staticdirect('/images/frontpage_image.png') }}" /> <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> <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> <p>{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
{% if allow_registration %} {% if allow_registration %}
<p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p> <p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
{% trans register_url=request.urlgen('mediagoblin.auth.register') -%} {% trans register_url=request.urlgen('mediagoblin.auth.register') -%}
<a class="button_action_highlight" href="{{ register_url }}">Create an account at this site</a> <a class="button_action_highlight" href="{{ register_url }}">Create an account at this site</a>
or or
{%- endtrans %} {%- endtrans %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% trans %} {% trans %}
<a class="button_action" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a> <a class="button_action" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
{%- endtrans %} {%- endtrans %}

2
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -86,7 +86,7 @@
<p>{{ media.description_html }}</p> <p>{{ media.description_html }}</p>
{% endautoescape %} {% endautoescape %}
{% if comments %} {% if comments %}
{% if app_config['allow_comments'] and auth %} {% if app_config['allow_comments'] %}
<a <a
{% if not request.user %} {% if not request.user %}
href="{{ request.urlgen('mediagoblin.auth.login') }}" href="{{ request.urlgen('mediagoblin.auth.login') }}"