diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-06-04 07:58:17 -0700 |
|---|---|---|
| committer | Rodney Ewing <ewing.rj@gmail.com> | 2013-06-04 07:58:17 -0700 |
| commit | 1bce0c15ba97995ba7772296ab698b36a7dc41ca (patch) | |
| tree | 6e4acccd45e1237ff104e6a3a9a54ee3855bd85b /mediagoblin | |
| parent | e784d10d2e8b8f9f7a5980883553766ce9bfaf6c (diff) | |
| download | mediagoblin-1bce0c15ba97995ba7772296ab698b36a7dc41ca.tar.lz mediagoblin-1bce0c15ba97995ba7772296ab698b36a7dc41ca.tar.xz mediagoblin-1bce0c15ba97995ba7772296ab698b36a7dc41ca.zip | |
minor changes from aaronw's review
Diffstat (limited to 'mediagoblin')
| -rw-r--r-- | mediagoblin/app.py | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html | 10 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 982e570c..ecd3de0e 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -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() diff --git a/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html index 26153694..9ef28a4d 100644 --- a/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html +++ b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html @@ -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 %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 5420752f..fb892fd7 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -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') }}" |