Commit 414cb37b authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

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
parents be831914 12b3c4cc
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{% load i18n thumbnail static %} {% load i18n thumbnail static %}
{% block title %}{% trans "Board" %} {{ board.since.year }}-{{ board.until.year }} — {% trans "Boards" %} — {{ block.super }}{% endblock %} {% 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 %} {% block body %}
<h1> <h1>
......
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n thumbnail static %} {% load i18n thumbnail static %}
{% block title %}{% trans 'Boards' %} — {{ block.super }}{% endblock %} {% block title %}{% trans 'Boards' %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans 'Boards' %} — {{ block.super }}{% endblock %}
{% block body %} {% block body %}
<h1>{% trans 'Boards' %}</h1> <h1>{% trans 'Boards' %}</h1>
......
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n static thumbnail %} {% load i18n static thumbnail %}
{% block title %}{{ committee.name }} — {% trans 'Committees' %} — {{ block.super }}{% endblock %} {% block title %}{{ committee.name }} — {% trans 'Committees' %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{{ committee.name }} — {% trans 'Committees' %} — {{ block.super }}{% endblock %}
{% block body %} {% block body %}
<h1>{{ committee.name }} <h1>{{ committee.name }}
......
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n thumbnail static %} {% load i18n thumbnail static %}
{% block title %}{% trans 'Committees' %} — {{ block.super }}{% endblock %} {% block title %}{% trans 'Committees' %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans 'Committees' %} — {{ block.super }}{% endblock %}
{% block body %} {% block body %}
<h1>{% trans 'committees'|capfirst %}</h1> <h1>{% trans 'committees'|capfirst %}</h1>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
{% load compress %} {% load compress %}
{% block title %}{% trans 'Documents' %} — {{ block.super }}{% endblock %} {% block title %}{% trans 'Documents' %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans 'Documents' %} — {{ block.super }}{% endblock %}
{% block css_head %} {% block css_head %}
{{ block.super }} {{ block.super }}
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{% load i18n fieldtype %} {% load i18n fieldtype %}
{% block title %}{% trans "Submit Exam" %} — {{ block.super }}{% endblock %} {% block title %}{% trans "Submit Exam" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Submit Exam" %} — {{ block.super }}{% endblock %}
{% block body %} {% block body %}
<h1>{% trans "Submit Exam" %}</h1> <h1>{% trans "Submit Exam" %}</h1>
...@@ -36,4 +37,4 @@ ...@@ -36,4 +37,4 @@
<input type="submit" value="{% trans 'submit'|capfirst %}" class="btn btn-style1 pull-right login" /> <input type="submit" value="{% trans 'submit'|capfirst %}" class="btn btn-style1 pull-right login" />
</form> </form>
{% endblock %} {% endblock %}
\ No newline at end of file
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{% load i18n fieldtype %} {% load i18n fieldtype %}
{% block title %}{% trans "Submit Summary" %} — {{ block.super }}{% endblock %} {% block title %}{% trans "Submit Summary" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Submit Summary" %} — {{ block.super }}{% endblock %}
{% block body %} {% block body %}
<h1>{% trans "Submit Summary" %}</h1> <h1>{% trans "Submit Summary" %}</h1>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{% load i18n %} {% load i18n %}
{% block title %}{% trans "Book Sale" %} — {{ block.super }}{% endblock %} {% block title %}{% trans "Book Sale" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Book Sale" %} — {{ block.super }}{% endblock %}
{% block body %} {% block body %}
<h1>{% trans "Book Sale" %}</h1> <h1>{% trans "Book Sale" %}</h1>
...@@ -18,4 +19,4 @@ ...@@ -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>. 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 %} {% endblocktrans %}
</p> </p>
{% endblock %}} {% endblock %}}
\ No newline at end of file
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{% load i18n %} {% load i18n %}
{% block title %}{{ course.name }} — {% trans "Course" %} — {{ block.super }}{% endblock %} {% block title %}{{ course.name }} — {% trans "Course" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{{ course.name }} — {% trans "Course" %} — {{ block.super }}{% endblock %}
{% block body %} {% block body %}
<h1>{{ course.name }}</h1> <h1>{{ course.name }}</h1>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{% load i18n %} {% load i18n %}
{% block title %}{% trans "Course overview" %} — {{ block.super }}{% endblock %} {% block title %}{% trans "Course overview" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Course overview" %} — {{ block.super }}{% endblock %}
{% block body %} {% block body %}
<h1 class="main-title">{% trans "Course overview" %}</h1> <h1 class="main-title">{% trans "Course overview" %}</h1>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
{% load i18n %} {% load i18n %}
{% block title %}{% trans "Student Participation" %} — {{ block.super }}{% endblock %} {% block title %}{% trans "Student Participation" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Student Participation" %} — {{ block.super }}{% endblock %}
{% block body %} {% block body %}
...@@ -34,4 +35,4 @@ ...@@ -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 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> student organizations from the university. You can read more about the USC <a href="http://www.ru.nl/usr/">here</a>.</p>
{% endblocktrans %} {% endblocktrans %}
{% endblock %} {% endblock %}
\ No newline at end of file
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{% load i18n admin_urls static admin_modify %} {% load i18n admin_urls static admin_modify %}
{% block title %}{{ event.title }} | {{ site_title|default:_('Thalia site admin') }}{% endblock %} {% 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 extrastyle %}
{{ block.super }} {{ block.super }}
......
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
{% load i18n static bleach_tags thumbnail %} {% load i18n static bleach_tags thumbnail %}
{% block title %}{{ event.title }} — {% trans "Calendar"|capfirst %} — {{ block.super }}{% endblock %} {% 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 %} {% block body %}
<h1>{{ event.title }}</h1> <h1>{{ event.title }}</h1>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{% load i18n static fieldtype %} {% 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 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 %} {% block body %}
{% if action == 'update' %} {% if action == 'update' %}
...@@ -36,4 +37,4 @@ ...@@ -36,4 +37,4 @@
<a href="{% url "events:event" event.id %}" class="forgot btn pull-right btn-style2">{% trans 'Cancel' %}</a> <a href="{% url "events:event" event.id %}" class="forgot btn pull-right btn-style2">{% trans 'Cancel' %}</a>
</form> </form>
{% endblock %} {% endblock %}
\ No newline at end of file
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
{% block title %}{% trans "Calendar"|capfirst %} — {{ block.super }}{% endblock %} {% block title %}{% trans "Calendar"|capfirst %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Calendar"|capfirst %} — {{ block.super }}{% endblock %}
{% block css_head %} {% block css_head %}
{{ block.super }} {{ block.super }}
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
{% load i18n %} {% load i18n %}
{% block title %}{% trans "members"|capfirst %} — {{ block.super }}{% endblock %} {% block title %}{% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
{% block body %} {% block body %}
<h1>{% trans 'Account' %}</h1> <h1>{% trans 'Account' %}</h1>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
{% load static i18n fieldtype %} {% load static i18n fieldtype %}
{% block title %}{% trans "edit profile"|capfirst %} — {% trans "members"|capfirst %} — {{ block.super }}{% endblock %} {% 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 %} {% block body %}
<h1>{% trans "edit profile"|capfirst %}</h1> <h1>{% trans "edit profile"|capfirst %}</h1>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
{% load thumbnail %} {% load thumbnail %}
{% block title %}{% trans "members"|capfirst %} — {{ block.super }}{% endblock %} {% block title %}{% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
{% block body %} {% block body %}
<h1>{% trans "members"|capfirst %}</h1> <h1>{% trans "members"|capfirst %}</h1>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
{% load i18n %} {% load i18n %}
{% block title %}{% trans "profile"|capfirst %} — {% trans "members"|capfirst %} — {{ block.super }}{% endblock %} {% 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 %} {% block body %}
<h1> <h1>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
{% load static %} {% load static %}
{% block title %}{%trans "Statistics" %} — {{ block.super }}{% endblock %} {% block title %}{%trans "Statistics" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{%trans "Statistics" %} — {{ block.super }}{% endblock %}
{% block body %} {% block body %}
<h1>{% trans "Statistics" %}</h1> <h1>{% trans "Statistics" %}</h1>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment