diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-02 19:00:01 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-07-02 19:00:01 -0500 |
| commit | d8db3f112e5b666815f0c9af4b9b1d0800fac822 (patch) | |
| tree | b10b7e31288e8f140c28ff0798a4b60a350cf110 /mediagoblin/templates | |
| parent | 841110a75d56f3e120691c43f85b3dd4b5fa1e56 (diff) | |
| parent | 93214d8e0287150aef3f4370237303bc73ec448c (diff) | |
| download | mediagoblin-d8db3f112e5b666815f0c9af4b9b1d0800fac822.tar.lz mediagoblin-d8db3f112e5b666815f0c9af4b9b1d0800fac822.tar.xz mediagoblin-d8db3f112e5b666815f0c9af4b9b1d0800fac822.zip | |
Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'
Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media.html
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index e84c9872..0c13f5c4 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -22,8 +22,14 @@ {% block mediagoblin_content %} {% if media %} <div class="grid_8 alpha media_image"> - <img src="{{ request.app.public_store.file_url( - media.media_files.main) }}" /> + {% if media.media_files.medium %} + <img class="media_image" src="{{ request.app.public_store.file_url( + media.media_files.medium) }}" /> + {% else %} + <img class="media_image" src="{{ request.app.public_store.file_url( + media.media_files.main) }}" /> + {% endif %} + <h2> {{media.title}} </h2> |