Merge branch 'feature/opengraph-improvements' into 'master'

Make it possible to change the opengraph title per page and add more specific tags if preferred

Closes #270

See merge request !389

website/activemembers/templates/activemembers/board_detail.html

@@ -2,6 +2,7 @@
 {% load i18n thumbnail static %}
 
 {% block title %}{% trans "Board" %} {{ board.since.year }}-{{ board.until.year }} — {% trans "Boards" %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans "Board" %} {{ board.since.year }}-{{ board.until.year }} — {% trans "Boards" %} — {{ block.super }}{% endblock %}
 
 {% block body %}
 <h1>

website/activemembers/templates/activemembers/board_index.html

 {% extends "base.html" %}
 {% load i18n thumbnail static %}
 {% block title %}{% trans 'Boards' %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans 'Boards' %} — {{ block.super }}{% endblock %}
 
 {% block body %}
 <h1>{% trans 'Boards' %}</h1>

website/activemembers/templates/activemembers/committee_detail.html

 {% extends "base.html" %}
 {% load i18n static thumbnail %}
 {% block title %}{{ committee.name }} — {% trans 'Committees' %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{{ committee.name }} — {% trans 'Committees' %} — {{ block.super }}{% endblock %}
 
 {% block body %}
 <h1>{{ committee.name }}

website/activemembers/templates/activemembers/committee_index.html

 {% extends "base.html" %}
 {% load i18n thumbnail static %}
 {% block title %}{% trans 'Committees' %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans 'Committees' %} — {{ block.super }}{% endblock %}
 
 {% block body %}
 <h1>{% trans 'committees'|capfirst %}</h1>

website/documents/templates/documents/index.html

@@ -4,6 +4,7 @@
 {% load compress %}
 
 {% block title %}{% trans 'Documents' %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans 'Documents' %} — {{ block.super }}{% endblock %}
 
 {% block css_head %}
     {{ block.super }}

website/education/templates/education/add_exam.html

@@ -2,6 +2,7 @@
 {% load i18n fieldtype %}
 
 {% block title %}{% trans "Submit Exam" %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans "Submit Exam" %} — {{ block.super }}{% endblock %}
 
 {% block body %}
 <h1>{% trans "Submit Exam" %}</h1>
@@ -36,4 +37,4 @@
 
     <input type="submit" value="{% trans 'submit'|capfirst %}" class="btn btn-style1 pull-right login" />
 </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

website/education/templates/education/add_summary.html

@@ -2,6 +2,7 @@
 {% load i18n fieldtype %}
 
 {% block title %}{% trans "Submit Summary" %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans "Submit Summary" %} — {{ block.super }}{% endblock %}
 
 {% block body %}
 <h1>{% trans "Submit Summary" %}</h1>

website/education/templates/education/books.html

@@ -2,6 +2,7 @@
 {% load i18n %}
 
 {% block title %}{% trans "Book Sale" %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans "Book Sale" %} — {{ block.super }}{% endblock %}
 
 {% block body %}
     <h1>{% trans "Book Sale" %}</h1>
@@ -18,4 +19,4 @@
     In case books are missing from the catalog, or if you discover any other problems with the books, send an email to <a href="mailto:onderwijs@thalia.nu">onderwijs@thalia.nu</a>.
     {% endblocktrans %}
     </p>
-{% endblock %}}
\ No newline at end of file
+{% endblock %}}

website/education/templates/education/course.html

@@ -2,6 +2,7 @@
 {% load i18n %}
 
 {% block title %}{{ course.name }} — {% trans "Course" %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{{ course.name }} — {% trans "Course" %} — {{ block.super }}{% endblock %}
 
 {% block body %}
     <h1>{{ course.name }}</h1>

website/education/templates/education/courses.html

@@ -2,6 +2,7 @@
 {% load i18n %}
 
 {% block title %}{% trans "Course overview" %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans "Course overview" %} — {{ block.super }}{% endblock %}
 
 {% block body %}
     <h1 class="main-title">{% trans "Course overview" %}</h1>

website/education/templates/education/student_participation.html

@@ -3,6 +3,7 @@
 {% load i18n %}
 
 {% block title %}{% trans "Student Participation" %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans "Student Participation" %} — {{ block.super }}{% endblock %}
 
 {% block body %}
 
@@ -34,4 +35,4 @@
             of rooms for student organizations. The USC consists of fourteen members. Eight are chosen by students and the other six represent different
             student organizations from the university. You can read more about the USC <a href="http://www.ru.nl/usr/">here</a>.</p>
     {% endblocktrans %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}

website/events/templates/events/admin/details.html

@@ -2,6 +2,7 @@
 {% load i18n admin_urls static admin_modify %}
 
 {% block title %}{{ event.title }} | {{ site_title|default:_('Thalia site admin') }}{% endblock %}
+{% block opengraph_title %}{{ event.title }} | {{ site_title|default:_('Thalia site admin') }}{% endblock %}
 
 {% block extrastyle %}
     {{ block.super }}

website/events/templates/events/event.html

@@ -2,6 +2,11 @@
 {% load i18n static bleach_tags thumbnail %}
 
 {% block title %}{{ event.title }} — {% trans "Calendar"|capfirst %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{{ event.title }} — {% trans "Calendar"|capfirst %} — {{ block.super }}{% endblock %}
+
+{% block opengraph %}
+<meta property="og:description" content="{{ event.description|striptags|truncatewords:10 }}" />
+{% endblock %}
 
 {% block body %}
     <h1>{{ event.title }}</h1>

website/events/templates/events/event_fields.html

@@ -2,6 +2,7 @@
 {% load i18n static fieldtype %}
 
 {% block title %}{% if action == 'update' %}{% trans "Update registration" %}{% else %}{% trans "Complete registration" %}{% endif %} — {{ event.title }} — {% trans "Calendar" %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% if action == 'update' %}{% trans "Update registration" %}{% else %}{% trans "Complete registration" %}{% endif %} — {{ event.title }} — {% trans "Calendar" %} — {{ block.super }}{% endblock %}
 
 {% block body %}
     {% if action == 'update' %}
@@ -36,4 +37,4 @@
         <a href="{% url "events:event" event.id %}" class="forgot btn pull-right btn-style2">{% trans 'Cancel' %}</a>
     </form>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}

website/events/templates/events/index.html

@@ -3,6 +3,7 @@
 {% get_current_language as LANGUAGE_CODE %}
 
 {% block title %}{% trans "Calendar"|capfirst %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans "Calendar"|capfirst %} — {{ block.super }}{% endblock %}
 
 {% block css_head %}
     {{ block.super }}

website/members/templates/members/account.html

@@ -4,6 +4,7 @@
 {% load i18n %}
 
 {% block title %}{% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
 
 {% block body %}
 <h1>{% trans 'Account' %}</h1>

website/members/templates/members/edit_profile.html

@@ -3,6 +3,7 @@
 {% load static i18n fieldtype %}
 
 {% block title %}{% trans "edit profile"|capfirst %} — {% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans "edit profile"|capfirst %} — {% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
 
 {% block body %}
 <h1>{% trans "edit profile"|capfirst %}</h1>

website/members/templates/members/index.html

@@ -5,6 +5,7 @@
 {% load thumbnail %}
 
 {% block title %}{% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
 
 {% block body %}
 <h1>{% trans "members"|capfirst %}</h1>

website/members/templates/members/profile.html

@@ -4,6 +4,7 @@
 {% load i18n %}
 
 {% block title %}{% trans "profile"|capfirst %} — {% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{% trans "profile"|capfirst %} — {% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
 
 {% block body %}
 <h1>

website/members/templates/members/statistics.html

@@ -3,6 +3,7 @@
 {% load static %}
 
 {% block title %}{%trans "Statistics" %} — {{ block.super }}{% endblock %}
+{% block opengraph_title %}{%trans "Statistics" %} — {{ block.super }}{% endblock %}
 
 {% block body %}
 <h1>{% trans "Statistics" %}</h1>