From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 3 Jul 2011 00:00:01 +0000 (-0500)
Subject: Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d8db3f112e5b666815f0c9af4b9b1d0800fac822;p=mediagoblin.git

Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'

Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/media.html
---

d8db3f112e5b666815f0c9af4b9b1d0800fac822
diff --cc mediagoblin/templates/mediagoblin/user_pages/media.html
index e84c9872,e16f1e00..0c13f5c4
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@@ -20,20 -20,21 +20,26 @@@
  {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
  
  {% block mediagoblin_content %}
 -  {# temporarily, an "image gallery" that isn't one really ;) #}
    {% if media %}
      <div class="grid_8 alpha media_image">
-       <img src="{{ request.app.public_store.file_url(
-                     media.media_files.main) }}" />
 -      <h1>
 -        {{media.title}}
 -      </h1>
+       {% 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>
 +
 +      {% autoescape False %}
 +        <p>{{ media.description_html }}</p>
 +      {% endautoescape %}
 +
        <p>
 -        Uploaded on
 +        &mdash;&nbsp;uploaded on
          {{ "%4d-%02d-%02d"|format(media.created.year,
                                    media.created.month, media.created.day) }}
          by