Removing the conditional that checks if there's a media in media.html
If there isn't a media, we shouldn't hit that template! The view should ensure that.
This commit is contained in:
Christopher Allan Webber
parent
21e8432956
commit
f80f5b58a8
@ -23,143 +23,139 @@
|
|||||||
{% block title %}{{ media.title }} — {{ super() }}{% endblock %}
|
{% block title %}{{ media.title }} — {{ super() }}{% endblock %}
|
||||||
|
|
||||||
{% block mediagoblin_content %}
|
{% block mediagoblin_content %}
|
||||||
{% if media %}
|
<div class="grid_11 alpha">
|
||||||
<div class="grid_11 alpha">
|
<div class="media_image_container">
|
||||||
<div class="media_image_container">
|
{% block mediagoblin_media %}
|
||||||
{% block mediagoblin_media %}
|
{% set display_media = request.app.public_store.file_url(
|
||||||
{% set display_media = request.app.public_store.file_url(
|
media.get_display_media(media.media_files)) %}
|
||||||
media.get_display_media(media.media_files)) %}
|
|
||||||
|
|
||||||
{# if there's a medium file size, that means the medium size
|
{# if there's a medium file size, that means the medium size
|
||||||
# isn't the original... so link to the original!
|
# isn't the original... so link to the original!
|
||||||
#}
|
#}
|
||||||
{% if media['media_files'].has_key('medium') %}
|
{% if media['media_files'].has_key('medium') %}
|
||||||
<a href="{{ request.app.public_store.file_url(
|
<a href="{{ request.app.public_store.file_url(
|
||||||
media['media_files']['original']) }}">
|
media['media_files']['original']) }}">
|
||||||
<img class="media_image"
|
|
||||||
src="{{ display_media }}"
|
|
||||||
alt="Image for {{ media.title }}" />
|
|
||||||
</a>
|
|
||||||
{% else %}
|
|
||||||
<img class="media_image"
|
<img class="media_image"
|
||||||
src="{{ display_media }}"
|
src="{{ display_media }}"
|
||||||
alt="Image for {{ media.title }}" />
|
alt="Image for {{ media.title }}" />
|
||||||
{% endif %}
|
</a>
|
||||||
{% endblock %}
|
{% else %}
|
||||||
</div>
|
<img class="media_image"
|
||||||
|
src="{{ display_media }}"
|
||||||
<h2 class="media_title">
|
alt="Image for {{ media.title }}" />
|
||||||
{{ media.title }}
|
|
||||||
</h2>
|
|
||||||
{% autoescape False %}
|
|
||||||
<p>{{ media.description_html }}</p>
|
|
||||||
{% endautoescape %}
|
|
||||||
<p class="media_uploader">
|
|
||||||
{% trans date=media.created.strftime("%Y-%m-%d"),
|
|
||||||
user_url=request.urlgen(
|
|
||||||
'mediagoblin.user_pages.user_home',
|
|
||||||
user=media.get_uploader().username),
|
|
||||||
username=media.get_uploader().username -%}
|
|
||||||
By <a href="{{ user_url }}">{{ username }}</a> on {{ date }}
|
|
||||||
{%- endtrans %}
|
|
||||||
</p>
|
|
||||||
<h3></h3>
|
|
||||||
{% if request.user and comments.count() %}
|
|
||||||
<p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p>
|
|
||||||
{% endif %}
|
|
||||||
{% if comments %}
|
|
||||||
{% for comment in comments %}
|
|
||||||
{% set comment_author = comment.author() %}
|
|
||||||
{% if pagination.active_id == comment._id %}
|
|
||||||
<div class="comment_wrapper comment_active" id="comment-{{ comment._id }}">
|
|
||||||
<a name="comment" id="comment"></a>
|
|
||||||
{% else %}
|
|
||||||
<div class="comment_wrapper" id="comment-{{ comment._id }}">
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<div class="comment_content">{% autoescape False %}{{ comment.content_html }}
|
|
||||||
{% endautoescape %}
|
|
||||||
<img src="{{ request.staticdirect('/images/icon_comment.png') }}" />
|
|
||||||
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
|
|
||||||
user = comment_author['username']) }}">
|
|
||||||
{{ comment_author['username'] }}</a>
|
|
||||||
{% trans %}at{% endtrans %}
|
|
||||||
<a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',
|
|
||||||
comment = comment._id,
|
|
||||||
user = media.get_uploader().username,
|
|
||||||
media = media._id) }}#comment">
|
|
||||||
{{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
|
|
||||||
{% if request.user %}
|
|
||||||
<form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment',
|
|
||||||
user= media.get_uploader().username,
|
|
||||||
media=media._id) }}" method="POST">
|
|
||||||
{{ wtforms_util.render_divs(comment_form) }}
|
|
||||||
<div class="form_submit_buttons">
|
|
||||||
<input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button_form" />
|
|
||||||
{{ csrf_token }}
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% endblock %}
|
||||||
|
</div>
|
||||||
|
|
||||||
{{ render_pagination(request, pagination,
|
<h2 class="media_title">
|
||||||
request.urlgen('mediagoblin.user_pages.media_home',
|
{{ media.title }}
|
||||||
user = media.get_uploader().username,
|
</h2>
|
||||||
media = media._id)) }}
|
{% autoescape False %}
|
||||||
</div>
|
<p>{{ media.description_html }}</p>
|
||||||
|
{% endautoescape %}
|
||||||
|
<p class="media_uploader">
|
||||||
|
{% trans date=media.created.strftime("%Y-%m-%d"),
|
||||||
|
user_url=request.urlgen(
|
||||||
|
'mediagoblin.user_pages.user_home',
|
||||||
|
user=media.get_uploader().username),
|
||||||
|
username=media.get_uploader().username -%}
|
||||||
|
By <a href="{{ user_url }}">{{ username }}</a> on {{ date }}
|
||||||
|
{%- endtrans %}
|
||||||
|
</p>
|
||||||
|
<h3></h3>
|
||||||
|
{% if request.user and comments.count() %}
|
||||||
|
<p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p>
|
||||||
|
{% endif %}
|
||||||
|
{% if comments %}
|
||||||
|
{% for comment in comments %}
|
||||||
|
{% set comment_author = comment.author() %}
|
||||||
|
{% if pagination.active_id == comment._id %}
|
||||||
|
<div class="comment_wrapper comment_active" id="comment-{{ comment._id }}">
|
||||||
|
<a name="comment" id="comment"></a>
|
||||||
|
{% else %}
|
||||||
|
<div class="comment_wrapper" id="comment-{{ comment._id }}">
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<div class="comment_content">{% autoescape False %}{{ comment.content_html }}
|
||||||
|
{% endautoescape %}
|
||||||
|
<img src="{{ request.staticdirect('/images/icon_comment.png') }}" />
|
||||||
|
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
|
||||||
|
user = comment_author['username']) }}">
|
||||||
|
{{ comment_author['username'] }}</a>
|
||||||
|
{% trans %}at{% endtrans %}
|
||||||
|
<a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',
|
||||||
|
comment = comment._id,
|
||||||
|
user = media.get_uploader().username,
|
||||||
|
media = media._id) }}#comment">
|
||||||
|
{{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% if request.user %}
|
||||||
|
<form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment',
|
||||||
|
user= media.get_uploader().username,
|
||||||
|
media=media._id) }}" method="POST">
|
||||||
|
{{ wtforms_util.render_divs(comment_form) }}
|
||||||
|
<div class="form_submit_buttons">
|
||||||
|
<input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button_form" />
|
||||||
|
{{ csrf_token }}
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{{ render_pagination(request, pagination,
|
||||||
|
request.urlgen('mediagoblin.user_pages.media_home',
|
||||||
|
user = media.get_uploader().username,
|
||||||
|
media = media._id)) }}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<div class="grid_5 omega">
|
||||||
|
{% include "mediagoblin/utils/prev_next.html" %}
|
||||||
|
|
||||||
|
{% if media['uploader'] == request.user._id or
|
||||||
|
request.user['is_admin'] %}
|
||||||
|
<p>
|
||||||
|
{% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
|
||||||
|
user= media.get_uploader().username,
|
||||||
|
media= media._id) %}
|
||||||
|
<a href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
{% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
|
||||||
|
user= media.get_uploader().username,
|
||||||
|
media= media._id) %}
|
||||||
|
<a href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
|
||||||
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div class="grid_5 omega">
|
{% if media.attachment_files|count %}
|
||||||
{% include "mediagoblin/utils/prev_next.html" %}
|
<h3>Attachments</h3>
|
||||||
|
<ul>
|
||||||
|
{% for attachment in media.attachment_files %}
|
||||||
|
<li>
|
||||||
|
<a href="{{ request.app.public_store.file_url(attachment.filepath) }}">
|
||||||
|
{{ attachment.name }}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% if media['uploader'] == request.user._id or
|
{% if app_config['allow_attachments']
|
||||||
request.user['is_admin'] %}
|
and (media['uploader'] == request.user._id
|
||||||
<p>
|
or request.user['is_admin']) %}
|
||||||
{% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
|
<p>
|
||||||
user= media.get_uploader().username,
|
<a href="{{ request.urlgen('mediagoblin.edit.attachments',
|
||||||
media= media._id) %}
|
user=media.get_uploader().username,
|
||||||
<a href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
|
media=media._id) }}">Add attachment</a>
|
||||||
</p>
|
</p>
|
||||||
<p>
|
{% endif %}
|
||||||
{% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
|
|
||||||
user= media.get_uploader().username,
|
|
||||||
media= media._id) %}
|
|
||||||
<a href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if media.attachment_files|count %}
|
{% if media.tags %}
|
||||||
<h3>Attachments</h3>
|
{% include "mediagoblin/utils/tags.html" %}
|
||||||
<ul>
|
{% endif %}
|
||||||
{% for attachment in media.attachment_files %}
|
</div>
|
||||||
<li>
|
|
||||||
<a href="{{ request.app.public_store.file_url(attachment.filepath) }}">
|
|
||||||
{{ attachment.name }}
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if app_config['allow_attachments']
|
|
||||||
and (media['uploader'] == request.user._id
|
|
||||||
or request.user['is_admin']) %}
|
|
||||||
<p>
|
|
||||||
<a href="{{ request.urlgen('mediagoblin.edit.attachments',
|
|
||||||
user=media.get_uploader().username,
|
|
||||||
media=media._id) }}">Add attachment</a>
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if media.tags %}
|
|
||||||
{% include "mediagoblin/utils/tags.html" %}
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
{% else %}
|
|
||||||
<p>{% trans %}Sorry, no such media found.{% endtrans %}<p/>
|
|
||||||
{% endif %}
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user