❖ Browsing media by {{ username }}
- {%- endtrans %} - {% include "mediagoblin/utils/prev_next.html" %} -
- {% block mediagoblin_media %}
- {% set display_media = request.app.public_store.file_url(
- media.get_display_media(media.media_files)) %}
- {# if there's a medium file size, that means the medium size
- # isn't the original... so link to the original!
- #}
- {% if media.media_files.has_key('medium') %}
-
+
+
+ {% block mediagoblin_media %}
+ {% set display_media = request.app.public_store.file_url(
+ media.get_display_media(media.media_files)) %}
+ {# if there's a medium file size, that means the medium size
+ # isn't the original... so link to the original!
+ #}
+ {% if media.media_files.has_key('medium') %}
+
+ 
+
+ {% else %}
-
- {% else %}
-
- {% endif %}
- {% endblock %}
-
-
+ {% endif %}
+ {% endblock %}
+
{{ media.title }}
- {% if request.user and - (media.uploader == request.user._id or - request.user.is_admin) %} - {% set edit_url = request.urlgen('mediagoblin.edit.edit_media', - user= media.get_uploader.username, - media= media._id) %} - {% trans %}Edit{% endtrans %} - {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', - user= media.get_uploader.username, - media= media._id) %} - {% trans %}Delete{% endtrans %} - {% endif %} {% autoescape False %}{{ media.description_html }}
- {% endautoescape %} - {% if media.attachment_files|count %} -Attachments
--
- {% for attachment in media.attachment_files %}
-
- - - {{ attachment.name }} - - - {% endfor %} -
- Add attachment -
- {% endif %} + {% endautoescape %} ++ {% trans date=media.created.strftime("%Y-%m-%d") -%} + Added on {{ date }}. + {%- endtrans %} + {% if request.user and + (media.uploader == request.user._id or + request.user.is_admin) %} + {% set edit_url = request.urlgen('mediagoblin.edit.edit_media', + user= media.get_uploader.username, + media= media._id) %} + {% trans %}Edit{% endtrans %} + {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', + user= media.get_uploader.username, + media= media._id) %} + {% trans %}Delete{% endtrans %} + {% endif %} +
{% if comments %}+ {% if comments.count()==1 %} + {% trans comment_count=comments.count() -%}{{ comment_count }} comment{%- endtrans %} + {% elif comments.count()>1 %} + {% trans comment_count=comments.count() -%}{{ comment_count }} comments{%- endtrans %} + {% else %} + {% trans %}No comments yet.{% endtrans %} + {% endif %}
@@ -167,11 +150,35 @@ {% endif %}
- {% trans date=media.created.strftime("%Y-%m-%d") -%}
-
{% for key, tag in media.media_data.exif.useful.items() %}
Added on
-{{ date }}
- {%- endtrans %} - + {% trans user_url=request.urlgen( + 'mediagoblin.user_pages.user_home', + user=media.get_uploader.username), + username=media.get_uploader.username -%} +❖ Browsing media by {{ username }}
+ {%- endtrans %} + {% include "mediagoblin/utils/prev_next.html" %} + {% if media.attachment_files|count %} +Attachments
+-
+ {% for attachment in media.attachment_files %}
+
- + + {{ attachment.name }} + + + {% endfor %} +
+ Add attachment +
+ {% endif %} {% if media.tags %} {% include "mediagoblin/utils/tags.html" %} {% endif %} diff --git a/mediagoblin/templates/mediagoblin/utils/exif.html b/mediagoblin/templates/mediagoblin/utils/exif.html index bd2e3307..0dd187f2 100644 --- a/mediagoblin/templates/mediagoblin/utils/exif.html +++ b/mediagoblin/templates/mediagoblin/utils/exif.html @@ -20,7 +20,7 @@ {% if media.media_data.has_key('exif') and app_config['exif_visible'] and media.media_data.exif.has_key('useful') %} -EXIF
+EXIF
|
+
+ + {{ entry.title }} + {% endif %} + |
+ {% endfor %}
+
Tagged with
-+
{% trans %}View more media tagged with{% endtrans %} {% for tag in media.tags %} {% if loop.last %} {# the 'and' should only appear if there is more than one tag #} {% if media.tags|length > 1 %} - · + {% trans %}or{% endtrans %} {% endif %} {{ tag['name'] }} + tag=tag['slug']) }}">{{ tag['name'] }}. {% elif loop.revindex == 2 %} {{ tag['name'] }} · + tag=tag['slug']) }}">{{ tag['name'] }}, {% endif %} {% endfor %}
diff --git a/mediagoblin/tests/test_sql_migrations.py b/mediagoblin/tests/test_sql_migrations.py new file mode 100644 index 00000000..507a7725 --- /dev/null +++ b/mediagoblin/tests/test_sql_migrations.py @@ -0,0 +1,884 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2012, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see