Remove backup file added in b5dd245

This commit is contained in:
Andrew Browning 2018-04-04 15:24:08 -04:00
parent 7ab8ca61c4
commit fee80cf134

View File

@ -1,60 +0,0 @@
{#
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2011, 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 <http://www.gnu.org/licenses/>.
#}
<<<<<<< HEAD:mediagoblin/templates/mediagoblin/utils/metadata_table.html
{%- macro render_table(request, media_entry, format_predicate) %}
{%- set metadata=media_entry.media_metadata %}
{%- set metadata_context=metadata['@context'] %}
{%- if metadata %}
<h3>{% trans %}Metadata Information{% endtrans %}</h3>
<table class="metadata_info">
{%- for key, value in metadata.iteritems() if (
not key=='@context' and value) %}
<tr {% if loop.index%2 == 1 %}class="highlight"{% endif %}>
<th>{{ format_predicate(key) }}</th>
<td property="{{ key }}">
{{ value }}</td>
</tr>
{%- endfor %}
</table>
{% endif %}
{% if request.user and request.user.has_privilege('admin') %}
<a href="{{ request.urlgen('mediagoblin.edit.metadata',
user=media_entry.get_uploader.username,
media_id=media_entry.id) }}">
{% trans %}Edit Metadata{% endtrans %}</a>
{% endif %}
{%- endmacro %}
=======
{%- set metadata=media.media_metadata %}
{%- set metadata_context=metadata['@context'] %}
{%- if metadata %}
{#- NOTE: In some smart future where the context is more extensible,
we will need to add to the prefix here-#}
<table>
{%- for key, value in metadata.iteritems() if not key=='@context' %}
{% if value -%}
<tr>
<td>{{ rdfa_to_readable(key) }}</td>
<td property="{{ key }}">{{ value }}</td>
</tr>
{%- endif -%}
{%- endfor %}
</table>
{% endif %}
>>>>>>> acfcaf6366bd4695c1c37c7aa8ff5a176b412e2a:mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html