heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'metadata' of gitorious.org:mediagoblin/cwebbers-mediagoblin into metadata

Browse Source 
Conflicts:
	mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html
This commit is contained in:
tilly-Q 2014-05-12 17:14:55 -04:00
commit f14519c398
5 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
mediagoblin/templates/mediagoblin/utils/metadata_table.html → mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html
View File

@ -16,26 +16,25 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
#} #}
{%- macro render_table(request, media_entry, format_predicate) %} {%- set metadata=media.media_metadata %}
{%- set metadata=media_entry.media_metadata %} {%- set metadata_context=metadata['@context'] %}
{%- set metadata_context=metadata['@context'] %} {%- if metadata %}
{%- if metadata %} {#- NOTE: In some smart future where the context is more extensible,
<h3>{% trans %}Metadata Information{% endtrans %}</h3> we will need to add to the prefix here-#}
<table class="metadata_info"> <table>
{%- for key, value in metadata.iteritems() if ( {%- for key, value in metadata.iteritems() if not key=='@context' %}
not key=='@context' and value) %} {% if value -%}
<tr {% if loop.index%2 == 1 %}class="highlight"{% endif %}> <tr>
<th>{{ format_predicate(key) }}</th> <td>{{ rdfa_to_readable(key) }}</td>
<td property="{{ key }}"> <td property="{{ key }}">{{ value }}</td>
{{ value }}</td> </tr>
</tr> {%- endif -%}
{%- endfor %} {%- endfor %}
</table> </table>
{% endif %} {% endif %}
{% if request.user and request.user.has_privilege('admin') %} {% if request.user and request.user.has_privilege('admin') %}
<a href="{{ request.urlgen('mediagoblin.edit.metadata', <a href="{{ request.urlgen('mediagoblin.edit.metadata',
user=media_entry.get_uploader.username, user=media_entry.get_uploader.username,
media_id=media_entry.id) }}"> media_id=media_entry.id) }}">
{% trans %}Edit Metadata{% endtrans %}</a> {% trans %}Edit Metadata{% endtrans %}</a>
{% endif %} {% endif %}
{%- endmacro %}

5
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -18,7 +18,6 @@
{%- extends "mediagoblin/base.html" %} {%- extends "mediagoblin/base.html" %}
{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
{% import "/mediagoblin/utils/metadata_table.html" as metadata_util %}
{% from "mediagoblin/utils/pagination.html" import render_pagination %} {% from "mediagoblin/utils/pagination.html" import render_pagination %}
{% block title %}{{ media.title }} &mdash; {{ super() }}{% endblock %} {% block title %}{{ media.title }} &mdash; {{ super() }}{% endblock %}
@ -231,10 +230,6 @@
{% template_hook("media_sideinfo") %} {% template_hook("media_sideinfo") %}
{% block mediagoblin_sidebar %}
{{ metadata_util.render_table(request, media, rdfa_to_readable) }}
{% endblock %}
</div><!--end media_sidebar--> </div><!--end media_sidebar-->
<div class="clear"></div> <div class="clear"></div>

5
mediagoblin/tools/metadata.py
View File

@ -211,3 +211,8 @@ def expand_json(metadata, context=DEFAULT_CONTEXT):
if context is not None: if context is not None:
options["expandContext"] = context options["expandContext"] = context
return jsonld.expand(metadata, options=options) return jsonld.expand(metadata, options=options)
def rdfa_to_readable(rdfa_predicate):
readable = rdfa_predicate.split(u":")[1].capitalize()
return readable

3
mediagoblin/user_pages/lib.py
View File

@ -116,6 +116,3 @@ def build_report_object(report_form, media_entry=None, comment=None):
report_object.reporter_id = report_form.reporter_id.data report_object.reporter_id = report_form.reporter_id.data
return report_object return report_object
def rdfa_to_readable(rdfa_predicate):
readable = rdfa_predicate.split(u":")[1].capitalize()
return readable

5
mediagoblin/user_pages/views.py
View File

@ -28,7 +28,7 @@ from mediagoblin.tools.translate import pass_to_ugettext as _
from mediagoblin.tools.pagination import Pagination from mediagoblin.tools.pagination import Pagination
from mediagoblin.user_pages import forms as user_forms from mediagoblin.user_pages import forms as user_forms
from mediagoblin.user_pages.lib import (send_comment_email, from mediagoblin.user_pages.lib import (send_comment_email,
add_media_to_collection, build_report_object, rdfa_to_readable) add_media_to_collection, build_report_object)
from mediagoblin.notifications import trigger_notification, \ from mediagoblin.notifications import trigger_notification, \
add_comment_subscription, mark_comment_notification_seen add_comment_subscription, mark_comment_notification_seen
from mediagoblin.tools.pluginapi import hook_transform from mediagoblin.tools.pluginapi import hook_transform
@ -152,8 +152,7 @@ def media_home(request, media, page, **kwargs):
'comments': comments, 'comments': comments,
'pagination': pagination, 'pagination': pagination,
'comment_form': comment_form, 'comment_form': comment_form,
'app_config': mg_globals.app_config, 'app_config': mg_globals.app_config}
'rdfa_to_readable':rdfa_to_readable}
# Since the media template name gets swapped out for each media # Since the media template name gets swapped out for each media
# type, normal context hooks don't work if you want to affect all # type, normal context hooks don't work if you want to affect all