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

Merge remote branch 'remotes/schendje/master'

Browse Source 
Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/media.html
This commit is contained in:
Christopher Allan Webber 2011-06-30 12:57:31 -05:00
commit a86e66b5e0
5 changed files with 97 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mediagoblin/static/css/base.css
View File

@ -215,12 +215,16 @@ a.mediagoblin_logo:hover {
/* media pages */ /* media pages */
img.media_image { .media_image{
display:block; width:640px;
margin-left:auto;
margin-right:auto;
} }
.media_sidebar{
width:280px;
}
/* media galleries */
ul.media_thumbnail { ul.media_thumbnail {
padding:0px; padding:0px;
} }

5
mediagoblin/templates/mediagoblin/base.html
View File

@ -51,16 +51,13 @@
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% include "mediagoblin/utils/messages.html" %}
<div class="container_12 mediagoblin_content"> <div class="container_12 mediagoblin_content">
<div class="grid_12"> <div class="grid_12">
{% include "mediagoblin/utils/messages.html" %}
{% block mediagoblin_content %} {% block mediagoblin_content %}
{% endblock mediagoblin_content %} {% endblock mediagoblin_content %}
</div> </div>
</div> </div>
{% block mediagoblin_footer %} {% block mediagoblin_footer %}
<div class="mediagoblin_footer"> <div class="mediagoblin_footer">
<div class="container_12"> <div class="container_12">

15
mediagoblin/templates/mediagoblin/media_details.html
View File

@ -19,14 +19,17 @@
{% block mediagoblin_content %} {% block mediagoblin_content %}
{# temporarily, an "image gallery" that isn't one really ;) #} {# temporarily, an "image gallery" that isn't one really ;) #}
{% if media %} {% if media %}
<div class="grid_8 alpha media_image">
<h1>Media details for {{media.title}}</h1>
<div>
<img src="{{ request.app.public_store.file_url( <img src="{{ request.app.public_store.file_url(
media.media_files.main) }}" /> media.media_files.main) }}" />
<h1>Media details for {{media.title}}</h1>
<br/>Uploaded: {{ media.created}} <p>
<br/>Description: {{media.description}} <br/>Uploaded: {{ media.created}}
<br/>Description: {{media.description}}
</p>
</div>
<div class="grid_4 omega sidebar">
<p>Uploaded: {{ media.created}}</p>
</div> </div>
{% else %} {% else %}
<p>Sorry, no such media found.<p/> <p>Sorry, no such media found.<p/>

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

@ -20,74 +20,83 @@
{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
{% block mediagoblin_content %} {% block mediagoblin_content %}
{# temporarily, an "image gallery" that isn't one really ;) #} {# temporarily, an "image gallery" that isn't one really ;) #}
{% if media %} {% if media %}
<h1> <div class="grid_8 alpha media_image">
{{media.title}} <h1>
</h1> {{media.title}}
<img class="media_image" src="{{ request.app.public_store.file_url( </h1>
media.media_files.main) }}" /> <img class="media_image" src="{{ request.app.public_store.file_url(
<p> media.media_files.main) }}" />
Uploaded on <p>
{{ "%4d-%02d-%02d"|format(media.created.year, Uploaded on
media.created.month, media.created.day) }} {{ "%4d-%02d-%02d"|format(media.created.year,
by media.created.month, media.created.day) }}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', by
user= media.uploader().username) }}"> <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
{{- media.uploader().username }}</a> user= media.uploader().username) }}">
</p> {{- media.uploader().username }}</a>
{% autoescape False %} </p>
<p>{{ media.description_html }}</p>
{% endautoescape %} {% autoescape False %}
{% if media['uploader'] == request.user['_id'] %} <p>{{ media.description_html }}</p>
<p><a href="{{ request.urlgen('mediagoblin.edit.edit_media', {% endautoescape %}
user= media.uploader().username,
media= media._id) }}">Edit</a></p> {% if media['uploader'] == request.user['_id'] %}
{% endif %} <p><a href="{{ request.urlgen('mediagoblin.edit.edit_media',
{% if request.user %} user= media.uploader().username,
<form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', media= media._id) }}">Edit</a></p>
user= media.uploader().username, {% endif %}
media=media._id) }}" method="POST"> {% if request.user %}
<h3>Post a comment!</h3> <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment',
{{ wtforms_util.render_field_div(comment_form.comment) }} user= media.uploader().username,
<div class="form_submit_buttons"> media=media._id) }}" method="POST">
<input type="submit" value="Submit" class="button" /> <h3>Post a comment!</h3>
</div> {{ wtforms_util.render_field_div(comment_form.comment) }}
</form> <div class="form_submit_buttons">
{% endif %} <input type="submit" value="Submit" class="button" />
{# </div>
{{ wtforms_util.render_textarea_div(submit_form.description) }} </form>
{{ wtforms_util.render_field_div(submit_form.file) }} {% endif %}
#}
{% if comments %} {#
<h3>Comments</h3> {{ wtforms_util.render_textarea_div(submit_form.description) }}
{% for comment in comments %} {{ wtforms_util.render_field_div(submit_form.file) }}
<div class="comment_wrapper" id="comment-{{ comment['_id'] }}"> #}
<div class="comment_author">By:
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', {% if comments %}
user = comment['author']['username']) }}"> <h3>Comments</h3>
{{ comment['author']['username'] }} {% for comment in comments %}
</a> <div class="comment_wrapper" id="comment-{{ comment['_id'] }}">
</div> <div class="comment_author">By:
<div class="comment_datetime"> <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
<a href="#comment-{{ comment['_id'] }}"> user = comment['author']['username']) }}">
{{ "%4d-%02d-%02d %02d:%02d"|format(comment.created.year, {{ comment['author']['username'] }}
comment.created.month, </a>
comment.created.day, </div>
comment.created.hour, <div class="comment_datetime">
comment.created.minute) }} <a href="#comment-{{ comment['_id'] }}">
</a> {{ "%4d-%02d-%02d %02d:%02d"|format(comment.created.year,
</div> comment.created.month,
<div class="comment_content"> comment.created.day,
{% autoescape False %} comment.created.hour,
{{ comment.content_html }} comment.created.minute) }}
{% endautoescape %} </a>
</div> </div>
</div> <div class="comment_content">
{% endfor %} {% autoescape False %}
{% include "mediagoblin/utils/pagination.html" %} {{ comment.content_html }}
{% endautoescape %}
</div>
</div>
{% endfor %}
{% include "mediagoblin/utils/pagination.html" %}
</div>
{% endif %} {% endif %}
<div class="grid_4 omega media_sidebar">
<p>This is a sidebar! Yay!</p>
</div>
{% else %} {% else %}
<p>Sorry, no such media found.<p/> <p>Sorry, no such media found.<p/>
{% endif %} {% endif %}

14
mediagoblin/templates/mediagoblin/utils/messages.html
View File

@ -19,14 +19,10 @@
{# Display any queued messages #} {# Display any queued messages #}
{% set messages = fetch_messages(request) %} {% set messages = fetch_messages(request) %}
{% if messages %} {% if messages %}
<div class="container_12 mediagoblin_messages"> <ul class="mediagoblin_messages">
<div class="grid_12"> {% for msg in messages %}
<ul class="mediagoblin_messages"> <li class="message_{{ msg.level }}">{{ msg.text }}</li>
{% for msg in messages %} {% endfor %}
<li class="message_{{ msg.level }}">{{ msg.text }}</li> </ul>
{% endfor %}
</ul>
</div>
</div>
{% endif %} {% endif %}