Merge remote branch 'remotes/schendje/master'
Conflicts: mediagoblin/templates/mediagoblin/user_pages/media.html
This commit is contained in:
Christopher Allan Webber
commit
a86e66b5e0
@ -215,12 +215,16 @@ a.mediagoblin_logo:hover {
|
||||
|
||||
/* media pages */
|
||||
|
||||
img.media_image {
|
||||
display:block;
|
||||
margin-left:auto;
|
||||
margin-right:auto;
|
||||
.media_image{
|
||||
width:640px;
|
||||
}
|
||||
|
||||
.media_sidebar{
|
||||
width:280px;
|
||||
}
|
||||
|
||||
/* media galleries */
|
||||
|
||||
ul.media_thumbnail {
|
||||
padding:0px;
|
||||
}
|
||||
|
||||
@ -51,16 +51,13 @@
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% include "mediagoblin/utils/messages.html" %}
|
||||
|
||||
<div class="container_12 mediagoblin_content">
|
||||
<div class="grid_12">
|
||||
{% include "mediagoblin/utils/messages.html" %}
|
||||
{% block mediagoblin_content %}
|
||||
{% endblock mediagoblin_content %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% block mediagoblin_footer %}
|
||||
<div class="mediagoblin_footer">
|
||||
<div class="container_12">
|
||||
|
||||
@ -19,14 +19,17 @@
|
||||
{% block mediagoblin_content %}
|
||||
{# temporarily, an "image gallery" that isn't one really ;) #}
|
||||
{% if media %}
|
||||
|
||||
<h1>Media details for {{media.title}}</h1>
|
||||
<div>
|
||||
<div class="grid_8 alpha media_image">
|
||||
<img src="{{ request.app.public_store.file_url(
|
||||
media.media_files.main) }}" />
|
||||
|
||||
<br/>Uploaded: {{ media.created}}
|
||||
<br/>Description: {{media.description}}
|
||||
<h1>Media details for {{media.title}}</h1>
|
||||
<p>
|
||||
<br/>Uploaded: {{ media.created}}
|
||||
<br/>Description: {{media.description}}
|
||||
</p>
|
||||
</div>
|
||||
<div class="grid_4 omega sidebar">
|
||||
<p>Uploaded: {{ media.created}}</p>
|
||||
</div>
|
||||
{% else %}
|
||||
<p>Sorry, no such media found.<p/>
|
||||
|
||||
@ -20,74 +20,83 @@
|
||||
{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
|
||||
|
||||
{% block mediagoblin_content %}
|
||||
|
||||
{# temporarily, an "image gallery" that isn't one really ;) #}
|
||||
{% if media %}
|
||||
<h1>
|
||||
{{media.title}}
|
||||
</h1>
|
||||
<img class="media_image" src="{{ request.app.public_store.file_url(
|
||||
media.media_files.main) }}" />
|
||||
<p>
|
||||
Uploaded on
|
||||
{{ "%4d-%02d-%02d"|format(media.created.year,
|
||||
media.created.month, media.created.day) }}
|
||||
by
|
||||
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
|
||||
user= media.uploader().username) }}">
|
||||
{{- media.uploader().username }}</a>
|
||||
</p>
|
||||
{% autoescape False %}
|
||||
<p>{{ media.description_html }}</p>
|
||||
{% endautoescape %}
|
||||
{% if media['uploader'] == request.user['_id'] %}
|
||||
<p><a href="{{ request.urlgen('mediagoblin.edit.edit_media',
|
||||
user= media.uploader().username,
|
||||
media= media._id) }}">Edit</a></p>
|
||||
{% endif %}
|
||||
{% if request.user %}
|
||||
<form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment',
|
||||
user= media.uploader().username,
|
||||
media=media._id) }}" method="POST">
|
||||
<h3>Post a comment!</h3>
|
||||
{{ wtforms_util.render_field_div(comment_form.comment) }}
|
||||
<div class="form_submit_buttons">
|
||||
<input type="submit" value="Submit" class="button" />
|
||||
</div>
|
||||
</form>
|
||||
{% endif %}
|
||||
{#
|
||||
{{ wtforms_util.render_textarea_div(submit_form.description) }}
|
||||
{{ wtforms_util.render_field_div(submit_form.file) }}
|
||||
#}
|
||||
{% if comments %}
|
||||
<h3>Comments</h3>
|
||||
{% for comment in comments %}
|
||||
<div class="comment_wrapper" id="comment-{{ comment['_id'] }}">
|
||||
<div class="comment_author">By:
|
||||
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
|
||||
user = comment['author']['username']) }}">
|
||||
{{ comment['author']['username'] }}
|
||||
</a>
|
||||
</div>
|
||||
<div class="comment_datetime">
|
||||
<a href="#comment-{{ comment['_id'] }}">
|
||||
{{ "%4d-%02d-%02d %02d:%02d"|format(comment.created.year,
|
||||
comment.created.month,
|
||||
comment.created.day,
|
||||
comment.created.hour,
|
||||
comment.created.minute) }}
|
||||
</a>
|
||||
</div>
|
||||
<div class="comment_content">
|
||||
{% autoescape False %}
|
||||
{{ comment.content_html }}
|
||||
{% endautoescape %}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% include "mediagoblin/utils/pagination.html" %}
|
||||
<div class="grid_8 alpha media_image">
|
||||
<h1>
|
||||
{{media.title}}
|
||||
</h1>
|
||||
<img class="media_image" src="{{ request.app.public_store.file_url(
|
||||
media.media_files.main) }}" />
|
||||
<p>
|
||||
Uploaded on
|
||||
{{ "%4d-%02d-%02d"|format(media.created.year,
|
||||
media.created.month, media.created.day) }}
|
||||
by
|
||||
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
|
||||
user= media.uploader().username) }}">
|
||||
{{- media.uploader().username }}</a>
|
||||
</p>
|
||||
|
||||
{% autoescape False %}
|
||||
<p>{{ media.description_html }}</p>
|
||||
{% endautoescape %}
|
||||
|
||||
{% if media['uploader'] == request.user['_id'] %}
|
||||
<p><a href="{{ request.urlgen('mediagoblin.edit.edit_media',
|
||||
user= media.uploader().username,
|
||||
media= media._id) }}">Edit</a></p>
|
||||
{% endif %}
|
||||
{% if request.user %}
|
||||
<form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment',
|
||||
user= media.uploader().username,
|
||||
media=media._id) }}" method="POST">
|
||||
<h3>Post a comment!</h3>
|
||||
{{ wtforms_util.render_field_div(comment_form.comment) }}
|
||||
<div class="form_submit_buttons">
|
||||
<input type="submit" value="Submit" class="button" />
|
||||
</div>
|
||||
</form>
|
||||
{% endif %}
|
||||
|
||||
{#
|
||||
{{ wtforms_util.render_textarea_div(submit_form.description) }}
|
||||
{{ wtforms_util.render_field_div(submit_form.file) }}
|
||||
#}
|
||||
|
||||
{% if comments %}
|
||||
<h3>Comments</h3>
|
||||
{% for comment in comments %}
|
||||
<div class="comment_wrapper" id="comment-{{ comment['_id'] }}">
|
||||
<div class="comment_author">By:
|
||||
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
|
||||
user = comment['author']['username']) }}">
|
||||
{{ comment['author']['username'] }}
|
||||
</a>
|
||||
</div>
|
||||
<div class="comment_datetime">
|
||||
<a href="#comment-{{ comment['_id'] }}">
|
||||
{{ "%4d-%02d-%02d %02d:%02d"|format(comment.created.year,
|
||||
comment.created.month,
|
||||
comment.created.day,
|
||||
comment.created.hour,
|
||||
comment.created.minute) }}
|
||||
</a>
|
||||
</div>
|
||||
<div class="comment_content">
|
||||
{% autoescape False %}
|
||||
{{ comment.content_html }}
|
||||
{% endautoescape %}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% include "mediagoblin/utils/pagination.html" %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="grid_4 omega media_sidebar">
|
||||
<p>This is a sidebar! Yay!</p>
|
||||
</div>
|
||||
{% else %}
|
||||
<p>Sorry, no such media found.<p/>
|
||||
{% endif %}
|
||||
|
||||
@ -19,14 +19,10 @@
|
||||
{# Display any queued messages #}
|
||||
{% set messages = fetch_messages(request) %}
|
||||
{% if messages %}
|
||||
<div class="container_12 mediagoblin_messages">
|
||||
<div class="grid_12">
|
||||
<ul class="mediagoblin_messages">
|
||||
{% for msg in messages %}
|
||||
<li class="message_{{ msg.level }}">{{ msg.text }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<ul class="mediagoblin_messages">
|
||||
{% for msg in messages %}
|
||||
<li class="message_{{ msg.level }}">{{ msg.text }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user