diff --git a/memopol/templatetags/memopol_tags.py b/memopol/templatetags/memopol_tags.py index b01305d1a94df7ea8968ec8c6a8a7db97ddf77cd..00817ab400775ae4d02681f31cf6692c38aaa2be 100644 --- a/memopol/templatetags/memopol_tags.py +++ b/memopol/templatetags/memopol_tags.py @@ -4,17 +4,23 @@ from django.utils.safestring import mark_safe import re register = template.Library() -link = '<a class="{network}-link" href="{url}" target="_blank">{user}</a>' +link = '<a class="{network}-link" href="{url}" target="_blank">{label}</a>' @register.filter def twitter_link(url): return mark_safe(link.format(network='twitter', url=url, - user=re.sub(r'.*/@?([^/]+)', '@\\1', url))) + label=re.sub(r'.*/@?([^/]+)', '@\\1', url))) @register.filter def facebook_link(url): return mark_safe(link.format(network='facebook', url=url, - user=re.sub(r'.*/([^/]+)', '\\1', url))) + label=re.sub(r'.*/([^/]+)', '\\1', url))) + +@register.filter +def website_link(url): + short_url = re.sub(r'^https?://([^/]+).*', '\\1', url) + return mark_safe(link.format(network='website', url=url, + label=short_url)) diff --git a/templates/representatives/_representative_block.haml b/templates/representatives/_representative_block.haml index 63fe335bce7409ec797c0a80deae255bc07c0f8b..ca5797bfc955a15594563aeb1a86e3d2ca86d7de 100644 --- a/templates/representatives/_representative_block.haml +++ b/templates/representatives/_representative_block.haml @@ -51,3 +51,9 @@ - elif site.kind == 'facebook' = site.url|facebook_link + - if representative.other_websites|length > 0 + %tr + %th Websites + %td + - for site in representative.other_websites + = site.url|website_link