diff --git a/applications/templates/applications/application_info.html b/applications/templates/applications/application_info.html index b4cd57fc1..b62fc39db 100644 --- a/applications/templates/applications/application_info.html +++ b/applications/templates/applications/application_info.html @@ -2,15 +2,10 @@ {% load static %} {% load i18n %} {% block content %} -
-
-
-
-

{% trans "Informasjon om opptaket" %}

-
-
-
-
+ + {% translate "Informasjon om opptaket" as trans_application %} + {% include "website/page_overviews/content_title.html" with title=trans_application %} +


diff --git a/news/templates/news/events.html b/news/templates/news/events.html index d9d0670a9..7de21f4ad 100644 --- a/news/templates/news/events.html +++ b/news/templates/news/events.html @@ -7,17 +7,8 @@ {% endblock header %} {% block content %} -
-
-
-
-

- {% trans "Arrangementer" %} -

-
-
-
-
+ {% translate "Arrangementer" as trans_events %} + {% include "website/page_overviews/content_title.html" with title=trans_events %} {% include "news/_list_admin_banner.html" %} {% if drafts %}
diff --git a/news/templates/news/news.html b/news/templates/news/news.html index eb80ad569..16400d596 100644 --- a/news/templates/news/news.html +++ b/news/templates/news/news.html @@ -7,17 +7,8 @@ {% endblock header %} {% block content %} -
-
-
-
-

- {% trans "Nyheter" %} -

-
-
-
-
+ {% translate "Nyheter" as news %} + {% include "website/page_overviews/content_title.html" with title=news %} {% include "news/_list_admin_banner.html" %} {% if drafts %}
diff --git a/projectarchive/templates/projectarchive/projectarchive.html b/projectarchive/templates/projectarchive/projectarchive.html index 72f9df926..8ac0039fe 100644 --- a/projectarchive/templates/projectarchive/projectarchive.html +++ b/projectarchive/templates/projectarchive/projectarchive.html @@ -7,17 +7,8 @@ {% endblock header %} {% block content %} -
-
-
-
-

- {% trans "Prosjektarkiv" %} -

-
-
-
-
+ {% translate "Prosjektarkiv" as trans_projectarchive %} + {% include "website/page_overviews/content_title.html" with title=trans_projectarchive %} {% include "projectarchive/_list_admin_banner.html" %} {% if drafts %}
diff --git a/watchlist/templates/watchlist/watchlist.html b/watchlist/templates/watchlist/watchlist.html index fce29ca51..26230f0fd 100644 --- a/watchlist/templates/watchlist/watchlist.html +++ b/watchlist/templates/watchlist/watchlist.html @@ -11,16 +11,9 @@ {% endblock %} {% block content %} -
-
-
-
-

Vaktliste

-

{% trans "Vaktlisten gir en oversikt over når verkstedet er åpent og bemannet, og hva slags kompetanse de vakthavende har" %}.

-
-
-
-
+ {% translate "Vaktliste" as trans_watchlist %} + {% translate "Vaktlisten gir en oversikt over når verkstedet er åpent og bemannet, og hva slags kompetanse de vakthavende har" as trans_watchlist_description %} + {% include "website/page_overviews/content_title.html" with title=trans_watchlist description=trans_watchlist_description %} {% if perms.watchlist.delete_shiftslot %} {% include "watchlist/_watchlist_admin_banner.html" %} diff --git a/website/templates/website/about.html b/website/templates/website/about.html index 530b52873..8310c1d54 100644 --- a/website/templates/website/about.html +++ b/website/templates/website/about.html @@ -2,15 +2,9 @@ {% load static %} {% load i18n %} {% block content %} -
-
-
-
-

{% trans "Om Hackerspace NTNU" %}

-
-
-
-
+ {% translate "Om Hackerspace NTNU" as trans_about_hs %} + {% include "website/page_overviews/content_title.html" with title=trans_about_hs %} +
diff --git a/website/templates/website/page_overviews/content_title.html b/website/templates/website/page_overviews/content_title.html new file mode 100644 index 000000000..bebb39952 --- /dev/null +++ b/website/templates/website/page_overviews/content_title.html @@ -0,0 +1,10 @@ +
+
+
+

+ {{ title }} +

+

{{ description }}

+
+
+
diff --git a/website/templates/website/rules.html b/website/templates/website/rules.html index ed51753ad..b0a166dfc 100644 --- a/website/templates/website/rules.html +++ b/website/templates/website/rules.html @@ -7,18 +7,10 @@ {% endblock header %} {% block content %} -
-
-
-
-

- {% trans "Regler" %} -

-

{%trans "Nøvendig informasjon og regler for bruk av verkstedet og diverse utstyr" %}

-
-
-
-
+ {% translate "Regler" as trans_rules %} + {% translate "Nøvendig informasjon og regler for bruk av verkstedet og diverse utstyr" as trans_rules_desc %} + {% include "website/page_overviews/content_title.html" with title=trans_rules description=trans_rules_desc %} +