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

Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-06-26 15:22:01 -05:00
commit da0683b48c
4 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,7 @@ a.mediagoblin_logo:hover {
} }
.form_field_input input, .form_field_input textarea { .form_field_input input, .form_field_input textarea {
width:460px; width:100%;
font-size:18px; font-size:18px;
} }
@ -191,6 +191,7 @@ li.media_thumbnail {
display:inline-block; display:inline-block;
vertical-align:top; vertical-align:top;
margin:0px 10px 10px 0px; margin:0px 10px 10px 0px;
text-align:center;
zoom:1; zoom:1;
. *display:inline; . *display:inline;
} }

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

@ -30,41 +30,43 @@
{% block mediagoblin_body %} {% block mediagoblin_body %}
<div class="mediagoblin_body"> <div class="mediagoblin_body">
{% block mediagoblin_header %} {% block mediagoblin_header %}
<div class="mediagoblin_header"> <div class="mediagoblin_header">
<div class="container_12"> <div class="container_12">
<div class="grid_12"> <div class="grid_12">
{% block mediagoblin_logo %} {% block mediagoblin_logo %}
<a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"></a> <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"></a>
{% endblock %}{% block mediagoblin_header_title %}{% endblock %} {% endblock %}{% block mediagoblin_header_title %}{% endblock %}
<div class="mediagoblin_header_right"> <div class="mediagoblin_header_right">
{% if request.user %} {% if request.user %}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
user= request.user['username']) }}"> user= request.user['username']) }}">
{{ request.user['username'] }}</a>'s account {{ request.user['username'] }}</a>'s account
(<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>) (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
{% else %} {% else %}
<a href="{{ request.urlgen('mediagoblin.auth.login') }}"> <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
Login</a> Login</a>
{% endif %} {% endif %}
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}
<div class="container_12 mediagoblin_content"> <div class="container_12 mediagoblin_content">
<div class="grid_12"> <div class="grid_12">
{% 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">
<div class="grid_12"> <div class="grid_12">
Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU project</a> Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU project</a>
</div>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}
{% endblock mediagoblin_body %} {% endblock mediagoblin_body %}
</div> </div>

9
mediagoblin/templates/mediagoblin/user_pages/gallery.html
View File

@ -20,15 +20,16 @@
{% block mediagoblin_head %} {% block mediagoblin_head %}
<link rel="alternate" type="application/atom+xml" <link rel="alternate" type="application/atom+xml"
href="{{ request.urlgen( href="{{ request.urlgen(
'mediagoblin.user_pages.atom_feed', 'mediagoblin.user_pages.atom_feed',
user=user.username) }}"> user=user.username) }}">
{% endblock mediagoblin_head %} {% endblock mediagoblin_head %}
{% block mediagoblin_content -%} {% block mediagoblin_content -%}
{% if user %} {% if user %}
<h1><a href="{{ request.urlgen( <h1>
'mediagoblin.user_pages.user_home', <a href="{{ request.urlgen(
user=user.username) }}">{{ user.username }}</a>'s media</h1> 'mediagoblin.user_pages.user_home',
user=user.username) }}">{{ user.username }}</a>'s media</h1>
{% include "mediagoblin/utils/object_gallery.html" %} {% include "mediagoblin/utils/object_gallery.html" %}

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

@ -25,16 +25,18 @@
</h1> </h1>
<img class="media_image" src="{{ request.app.public_store.file_url( <img class="media_image" src="{{ request.app.public_store.file_url(
media.media_files.main) }}" /> 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 %} {% autoescape False %}
<p>{{ media.description_html }}</p> <p>{{ media.description_html }}</p>
{% endautoescape %} {% endautoescape %}
<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>
{% if media['uploader'] == request.user['_id'] %} {% if media['uploader'] == request.user['_id'] %}
<p><a href="{{ request.urlgen('mediagoblin.edit.edit_media', <p><a href="{{ request.urlgen('mediagoblin.edit.edit_media',
user= media.uploader().username, user= media.uploader().username,