{% trans

Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/index.html =================================================================== --- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/index.html +++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/index.html @@ -9,6 +9,11 @@ {% trans 'Available lists' %} - {{ block.super }} {% endblock %} +{% block additional_og %} + + +{% endblock %} + {% block content %}

Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/message.html =================================================================== --- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/message.html +++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/message.html @@ -1,12 +1,29 @@ {% extends "hyperkitty/base.html" %} {% load i18n %} {% load hk_generic %} +{% load gravatar %} {% block head_title %} {{ message.subject }} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} {% endblock %} +{% block additional_og %} + + + + + + + +{% for tag in message.thread.tags.distinct %} + +{% endfor %} + + + +{% endblock %} + {% block content %}

Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/message_new.html =================================================================== --- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/message_new.html +++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/message_new.html @@ -8,6 +8,11 @@ {% trans "Create a new thread" %} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} {% endblock %} +{% block additional_og %} + + +{% endblock %} + {% block content %}

Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/overview.html =================================================================== --- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/overview.html +++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/overview.html @@ -4,6 +4,13 @@ {% load static %} {% load cache %} +{% block additional_og %} + + + + +{% endblock %} + {% block head_title %} {{ mlist.display_name|default:mlist.name }} - {{ block.super }} {% endblock %} Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/reattach.html =================================================================== --- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/reattach.html +++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/reattach.html @@ -9,6 +9,11 @@ {% trans "Reattach a thread" %} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} {% endblock %} +{% block additional_og %} + + +{% endblock %} + {% block content %}

Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/search_results.html =================================================================== --- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/search_results.html +++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/search_results.html @@ -8,6 +8,11 @@ {% trans "Search results for" %} "{{ query }}"{% if mlist %} - {{ mlist.display_name|default:mlist.name }} {% endif %} - {{ block.super }} {% endblock %} +{% block additional_og %} + + +{% endblock %} + {% block content %}

Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/thread.html =================================================================== --- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/thread.html +++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/thread.html @@ -3,12 +3,29 @@ {% load i18n %} {% load hk_generic %} {% load static %} +{% load gravatar %} {% block head_title %} {{ subject }} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} {% endblock %} +{% block additional_og %} + + + + + + + +{% for tag in thread.tags.distinct %} + +{% endfor %} + + + +{% endblock %} + {% block content %}

Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/thread_list.html =================================================================== --- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/thread_list.html +++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/thread_list.html @@ -13,6 +13,13 @@ {% endblock %} +{% block additional_og %} + + + + +{% endblock %} + {% block content %}

Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_posts.html =================================================================== --- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/user_posts.html +++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_posts.html @@ -8,6 +8,11 @@ {% trans "Messages by" %} {{ fullname }}{% if mlist %} - {{ mlist.display_name|default:mlist.name }} {% endif %} - {{ block.super }} {% endblock %} +{% block additional_og %} + + +{% endblock %} + {% block content %}

Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_profile/base.html =================================================================== --- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/user_profile/base.html +++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_profile/base.html @@ -5,6 +5,11 @@ {% trans "User posting activity" %} - {{ block.super }} {% endblock %} +{% block additional_og %} + + +{% endblock %} + {% block content %}

Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_public_profile.html =================================================================== --- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/user_public_profile.html +++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_public_profile.html @@ -1,12 +1,20 @@ {% extends "hyperkitty/base.html" %} {% load i18n %} {% load hk_generic %} +{% load gravatar %} {% block head_title %} {% trans 'User Profile' %} {% trans "for" %} {{ fullname }} - {{ block.super }} {% endblock %} +{% block additional_og %} + + + + +{% endblock %} + {% block content %}

Index: HyperKitty-1.3.8/hyperkitty/tests/views/test_accounts.py =================================================================== --- HyperKitty-1.3.8.orig/hyperkitty/tests/views/test_accounts.py +++ HyperKitty-1.3.8/hyperkitty/tests/views/test_accounts.py @@ -197,7 +197,7 @@ class AccountViewsTestCase(TestCase): "?list=list@example.com") self.assertEqual(response.status_code, 200) self.assertContains(response, "Dummy content", count=1, html=False) - self.assertContains(response, "Dummy Sender", count=5, html=False) + self.assertContains(response, "Dummy Sender", count=7, html=False) self.assertContains( response, 'Dummy message'.format( Index: HyperKitty-1.3.8/hyperkitty/tests/views/test_message.py =================================================================== --- HyperKitty-1.3.8.orig/hyperkitty/tests/views/test_message.py +++ HyperKitty-1.3.8/hyperkitty/tests/views/test_message.py @@ -124,8 +124,8 @@ class MessageViewsTestCase(TestCase): response = self.client.get(url) self.assertEqual(response.status_code, 200) self.assertContains(response, "Dummy message") - self.assertContains(response, "Dummy Sender", count=1) - self.assertContains(response, "Dummy Subject", count=2) + self.assertContains(response, "Dummy Sender", count=2) + self.assertContains(response, "Dummy Subject", count=4) self.assertNotContains(response, "dummy@example.com") self.assertContains( response,

{% trans "Not implemented" %}