Skip to content

Commit

Permalink
add header to replace duplicate html
Browse files Browse the repository at this point in the history
  • Loading branch information
CJGutz committed Feb 24, 2024
1 parent f1fefd3 commit 11714ce
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 73 deletions.
13 changes: 4 additions & 9 deletions applications/templates/applications/application_info.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,10 @@
{% load static %}
{% load i18n %}
{% block content %}
<div class="section hs-green">
<div class="container">
<div class="row white-text">
<div class="col s12">
<h4>{% trans "Informasjon om opptaket" %}</h4>
</div>
</div>
</div>
</div>

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

<div class="container white-text">
<br>
<br>
Expand Down
13 changes: 2 additions & 11 deletions news/templates/news/events.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,8 @@
{% endblock header %}

{% block content %}
<div class="section hs-green">
<div class="container">
<div class="row white-text valign-wrapper">
<div class="col s12">
<h4>
{% trans "Arrangementer" %}
</h4>
</div>
</div>
</div>
</div>
{% translate "Arrangementer" as trans_events %}
{% include "website/page_overviews/content_title.html" with title=trans_events %}
{% include "news/_list_admin_banner.html" %}
{% if drafts %}
<div class="section grey lighten-3">
Expand Down
13 changes: 2 additions & 11 deletions news/templates/news/news.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,8 @@
{% endblock header %}

{% block content %}
<div class="section hs-green">
<div class="container">
<div class="row valign-wrapper white-text">
<div class="col s12">
<h4>
{% trans "Nyheter" %}
</h4>
</div>
</div>
</div>
</div>
{% translate "Nyheter" as news %}
{% include "website/page_overviews/content_title.html" with title=news %}
{% include "news/_list_admin_banner.html" %}
{% if drafts %}
<div class="section grey lighten-3">
Expand Down
13 changes: 2 additions & 11 deletions projectarchive/templates/projectarchive/projectarchive.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,8 @@
{% endblock header %}

{% block content %}
<div class="section hs-green">
<div class="container">
<div class="row valign-wrapper white-text">
<div class="col s12">
<h4>
{% trans "Prosjektarkiv" %}
</h4>
</div>
</div>
</div>
</div>
{% translate "Prosjektarkiv" as trans_projectarchive %}
{% include "website/page_overviews/content_title.html" with title=trans_projectarchive %}
{% include "projectarchive/_list_admin_banner.html" %}
{% if drafts %}
<div class="section grey lighten-3">
Expand Down
13 changes: 3 additions & 10 deletions watchlist/templates/watchlist/watchlist.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,9 @@
{% endblock %}

{% block content %}
<div class="section hs-green white-text">
<div class="container">
<div class="row">
<div class="col s12">
<h4>Vaktliste</h4>
<p>{% trans "Vaktlisten gir en oversikt over når verkstedet er åpent og bemannet, og hva slags kompetanse de vakthavende har" %}.</p>
</div>
</div>
</div>
</div>
{% 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" %}
Expand Down
12 changes: 3 additions & 9 deletions website/templates/website/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,9 @@
{% load static %}
{% load i18n %}
{% block content %}
<div class="section hs-green white-text">
<div class="container">
<div class="row">
<div class="col s12">
<h4>{% trans "Om Hackerspace NTNU" %}</h4>
</div>
</div>
</div>
</div>
{% translate "Om Hackerspace NTNU" as trans_about_hs %}
{% include "website/page_overviews/content_title.html" with title=trans_about_hs %}

<div class="section hs-gray no-pad no-margin">
<img class="responsive-img no-pad darken-50 " src="{% static 'website/img/group_photos/gensere.JPG' %}">
</div>
Expand Down
10 changes: 10 additions & 0 deletions website/templates/website/page_overviews/content_title.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<div class="section white-text hs-green">
<div class="container row valign-wrapper">
<div class="col s12">
<h4>
{{ title }}
</h4>
<p>{{ description }}</p>
</div>
</div>
</div>
16 changes: 4 additions & 12 deletions website/templates/website/rules.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,10 @@
{% endblock header %}

{% block content %}
<div class="section hs-green">
<div class="container">
<div class="row valign-wrapper white-text">
<div class="col s12">
<h4>
{% trans "Regler" %}
</h4>
<p>{%trans "Nøvendig informasjon og regler for bruk av verkstedet og diverse utstyr" %}</p>
</div>
</div>
</div>
</div>
{% 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 %}

<div class="section">
<div class="container">
<div class="row">
Expand Down

0 comments on commit 11714ce

Please sign in to comment.