diff --git a/club/templates/club/club_detail.jinja b/club/templates/club/club_detail.jinja
index 33760695..168c4b6c 100644
--- a/club/templates/club/club_detail.jinja
+++ b/club/templates/club/club_detail.jinja
@@ -9,6 +9,18 @@
{{ club.short_description }}
{%- endblock %}
+{% block metatags %}
+
+
+
+
+ {% if club.logo %}
+
+ {% else %}
+
+ {% endif %}
+{% endblock %}
+
{% block content %}
{% if club.logo %}
@@ -17,7 +29,7 @@
{% if page_revision %}
{{ page_revision|markdown }}
{% else %}
-
{% trans %}Club{% endtrans %}
+ {{ club.name }}
{% endif %}
{% endblock %}
diff --git a/com/templates/com/news_detail.jinja b/com/templates/com/news_detail.jinja
index 9ab6acff..a4c9309c 100644
--- a/com/templates/com/news_detail.jinja
+++ b/com/templates/com/news_detail.jinja
@@ -1,15 +1,20 @@
{% extends "core/base.jinja" %}
-{% from 'core/macros.jinja' import user_profile_link, facebook_share, tweet, link_news_logo, gen_news_metatags %}
+{% from 'core/macros.jinja' import user_profile_link, link_news_logo %}
{% from "com/macros.jinja" import news_moderation_alert %}
{% block title %}
- {% trans %}News{% endtrans %} -
- {{ object.title }}
+ {% trans %}News{% endtrans %} - {{ object.title }}
{% endblock %}
-{% block head %}
- {{ super() }}
- {{ gen_news_metatags(news) }}
+{% block description %}{{ news.summary }}{% endblock %}
+
+{% block metatags %}
+
+
+
+
+
+
{% endblock %}
@@ -44,8 +49,14 @@
{{ news.summary|markdown }}
{{ news.content|markdown }}
- {{ facebook_share(news) }}
- {{ tweet(news) }}
+
+ {% trans %}Share on Facebook{% endtrans %}
+