diff options
| -rw-r--r-- | mediagoblin/static/css/base.css | 3 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 46 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/gallery.html | 9 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 18 |
4 files changed, 41 insertions, 35 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 78604613..e39770d5 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -147,7 +147,7 @@ a.mediagoblin_logo:hover { } .form_field_input input, .form_field_input textarea { - width:460px; + width:100%; font-size:18px; } @@ -191,6 +191,7 @@ li.media_thumbnail { display:inline-block; vertical-align:top; margin:0px 10px 10px 0px; + text-align:center; zoom:1; . *display:inline; } diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 63749f68..2b47a14c 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -30,41 +30,43 @@ {% block mediagoblin_body %} <div class="mediagoblin_body"> {% block mediagoblin_header %} - <div class="mediagoblin_header"> - <div class="container_12"> - <div class="grid_12"> - {% block mediagoblin_logo %} - <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"></a> - {% endblock %}{% block mediagoblin_header_title %}{% endblock %} - <div class="mediagoblin_header_right"> - {% if request.user %} - <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', - user= request.user['username']) }}"> - {{ request.user['username'] }}</a>'s account - (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>) - {% else %} - <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> - Login</a> - {% endif %} + <div class="mediagoblin_header"> + <div class="container_12"> + <div class="grid_12"> + {% block mediagoblin_logo %} + <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"></a> + {% endblock %}{% block mediagoblin_header_title %}{% endblock %} + <div class="mediagoblin_header_right"> + {% if request.user %} + <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', + user= request.user['username']) }}"> + {{ request.user['username'] }}</a>'s account + (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>) + {% else %} + <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> + Login</a> + {% endif %} + </div> </div> </div> </div> - </div> {% endblock %} + <div class="container_12 mediagoblin_content"> <div class="grid_12"> {% block mediagoblin_content %} {% endblock mediagoblin_content %} </div> </div> + {% block mediagoblin_footer %} - <div class="mediagoblin_footer"> - <div class="container_12"> - <div class="grid_12"> - Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU project</a> + <div class="mediagoblin_footer"> + <div class="container_12"> + <div class="grid_12"> + Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU project</a> + </div> </div> </div> - </div> {% endblock %} {% endblock mediagoblin_body %} </div> diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html index 33732d0d..28290cfd 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html +++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html @@ -20,15 +20,16 @@ {% block mediagoblin_head %} <link rel="alternate" type="application/atom+xml" href="{{ request.urlgen( - 'mediagoblin.user_pages.atom_feed', + 'mediagoblin.user_pages.atom_feed', user=user.username) }}"> {% endblock mediagoblin_head %} {% block mediagoblin_content -%} {% if user %} - <h1><a href="{{ request.urlgen( - 'mediagoblin.user_pages.user_home', - user=user.username) }}">{{ user.username }}</a>'s media</h1> + <h1> + <a href="{{ request.urlgen( + 'mediagoblin.user_pages.user_home', + user=user.username) }}">{{ user.username }}</a>'s media</h1> {% include "mediagoblin/utils/object_gallery.html" %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index d221f61e..97ff8e51 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -25,16 +25,18 @@ </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> + <p>{{ media.description_html }}</p> {% 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'] %} <p><a href="{{ request.urlgen('mediagoblin.edit.edit_media', user= media.uploader().username, |