Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add another page with documents related to the division #36

Merged
merged 6 commits into from
Nov 3, 2024
Merged

Add another page with documents related to the division #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
52f16fb
Add another page with documents related to the division
The1Penguin Oct 31, 2024
a926e8a
Fix translation about documents on the main page
The1Penguin Oct 31, 2024
927a13d
Huh
The1Penguin Oct 31, 2024
f36a5ab
Aaaa
The1Penguin Oct 31, 2024
6951ed9
Why was this removed!?
The1Penguin Oct 31, 2024
90a21eb
Not having tags in the translation file
The1Penguin Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions dtekportal/homepage/templates/homepage/documents.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{% extends "base.html" %}
{% load i18n %}
{% block content %}
<div class="large-9 columns" style="float: none; margin: auto; margin-top: -5em;">
<div class="box" style="padding: 3em;">
<h1>{% trans "StyrdokumentPage" %}</h1>
<a href='https://styrdokument.dtek.se/stadgar/stadgar.pdf'>{% trans "stadga" %}</a><br/>
<a href='https://styrdokument.dtek.se/reglemente/reglemente.pdf'>{% trans "reglemente" %}</a><br/>
<a href='https://styrdokument.dtek.se/ekonomiskt_reglemente/ekonomiskt_reglemente.pdf'>{% trans "ekonomisktreglemente" %}</a><br/>
<a href='https://styrdokument.dtek.se/policy/policy.pdf'>{% trans "policies" %}</a><br/>
<a href='https://styrdokument.dtek.se/incidenthantering/incidenthantering.pdf'>{% trans "incidenthantering" %}</a><br/>
<a href='https://styrdokument.dtek.se/date-it-styrdokument/date-it-reglemente.pdf'>{% trans "date-it" %}</a>

<br/>
<br/>
<h2>{% trans "saknas" %}</h2>
<a href='https://styrdokument.dtek.se/'>{% trans "stadgehemsidan" %}</a> {% trans "stadgetext" %}<br/>
<a href='https://wiki.dtek.se/wiki/Styrdokument'>{% trans "wikin" %}</a> {% trans "wikitext" %}
</div>
</div>

{% endblock content %}
1 change: 1 addition & 0 deletions dtekportal/homepage/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
urlpatterns = [
path("", TemplateView.as_view(template_name='homepage/index/index.html'), name='index'),
path("newsletter", TemplateView.as_view(template_name='homepage/newsletter.html'), name='newsletter'),
path("documents", TemplateView.as_view(template_name='homepage/documents.html'), name='documents'),
path('studiesocial-hjalp', RedirectView.as_view(url=static('homepage/studiesociala-natverket.pdf')), name='studiesocial-hjalp'),
]

4 changes: 1 addition & 3 deletions dtekportal/templates/header/header-menu-box.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@
{% macro_arg %}
{% trans "Styrdokument" %}
{% endmacro_arg %}
{% macro_arg %}
https://dtek.se/styrdokument
{% endmacro_arg %}
{% macro_arg %} {% url 'homepage:documents' %} {% endmacro_arg %}
{% macro_arg %}
{% trans "Styrdokument" %}
{% endmacro_arg %}
Expand Down
82 changes: 65 additions & 17 deletions locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-04 21:23+0200\n"
"POT-Creation-Date: 2024-10-31 16:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -18,6 +18,54 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: homepage/templates/homepage/documents.html:6
msgid "StyrdokumentPage"
msgstr "Documents and regulations"

#: homepage/templates/homepage/documents.html:7
msgid "stadga"
msgstr "Bylaws"

#: homepage/templates/homepage/documents.html:8
msgid "reglemente"
msgstr "Regulations"

#: homepage/templates/homepage/documents.html:9
msgid "ekonomisktreglemente"
msgstr "Economic regulations"

#: homepage/templates/homepage/documents.html:10
msgid "policies"
msgstr "Policies"

#: homepage/templates/homepage/documents.html:11
msgid "incidenthantering"
msgstr "Incident policy"

#: homepage/templates/homepage/documents.html:12
msgid "date-it"
msgstr "DatE-IT regulation"

#: homepage/templates/homepage/documents.html:16
msgid "saknas"
msgstr "Something missing?"

#: homepage/templates/homepage/documents.html:17
msgid "stadgehemsidan"
msgstr "Webpage"

#: homepage/templates/homepage/documents.html:17
msgid "stadgetext"
msgstr "with all documents"

#: homepage/templates/homepage/documents.html:18
msgid "wikin"
msgstr "The wiki"

#: homepage/templates/homepage/documents.html:18
msgid "wikitext"
msgstr "also has a list over documents"

#: homepage/templates/homepage/index/cal-box.html:5
msgid "Arrangemangskalender"
msgstr "Event calendar"
Expand Down Expand Up @@ -244,68 +292,68 @@ msgid "DTEK-wikin, där allt kul händer!"
msgstr "The DTEK-wiki, where all the fun is!"

#: templates/header/header-menu-box.html:66
#: templates/header/header-menu-box.html:72
#: templates/header/header-menu-box.html:70
msgid "Styrdokument"
msgstr ""
msgstr "Documents"

#: templates/header/header-menu-box.html:82
#: templates/header/header-menu-box.html:80
msgid "Databussen"
msgstr "Databussen"

#: templates/header/header-menu-box.html:88
#: templates/header/header-menu-box.html:86
msgid "Mer info om Databussen"
msgstr ""
"More info about the D-division's car &quot;Databussen&quot; (The Data Bus)"

#: templates/header/header-menu-box.html:98
#: templates/header/header-menu-box.html:96
msgid "Schema"
msgstr "Schedule"

#: templates/header/header-menu-box.html:104
#: templates/header/header-menu-box.html:102
msgid "TimeEdit"
msgstr "TimeEdit"

#: templates/header/header-menu-box.html:114
#: templates/header/header-menu-box.html:112
msgid "Grupprum"
msgstr "Group Rooms"

#: templates/header/header-menu-box.html:120
#: templates/header/header-menu-box.html:118
msgid "Boka grupprum på Chalmers"
msgstr "Book group rooms at Chalmers"

#: templates/header/header-menu-box.html:130
#: templates/header/header-menu-box.html:128
msgid "Kårkort"
msgstr "Student Union Card"

#: templates/header/header-menu-box.html:136
#: templates/header/header-menu-box.html:134
msgid "Genväg för att ladda ditt kårkort"
msgstr "Shortcut to charge your student union card"

#: templates/header/header-menu-box.html:146
#: templates/header/header-menu-box.html:144
msgid "Karta"
msgstr "Map"

#: templates/header/header-menu-box.html:152
#: templates/header/header-menu-box.html:150
msgid "Karta över Campus"
msgstr "Map of campus"

#: templates/header/header-menu-box.html:162
#: templates/header/header-menu-box.html:160
msgid "Veckobrev"
msgstr "Newsletter"

#: templates/header/header-menu-box.html:166
#: templates/header/header-menu-box.html:164
msgid ""
"Anmäl dig till datas veckobrev, med alla arrangemang och annat som händer på "
"sektionen"
msgstr ""
"Register to receive the D-division's newsletter to get updates about what's "
"going on at the division"

#: templates/header/header-menu-box.html:174
#: templates/header/header-menu-box.html:172
msgid "Studiesocial hjälp"
msgstr "Support"

#: templates/header/header-menu-box.html:178
#: templates/header/header-menu-box.html:176
msgid ""
"Om du känner att studierna går tufft,\n"
" du känner dig nere, känner dig kränkt eller "
Expand Down
80 changes: 64 additions & 16 deletions locale/sv/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-04 21:23+0200\n"
"POT-Creation-Date: 2024-10-31 16:38+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -18,6 +18,54 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: homepage/templates/homepage/documents.html:6
msgid "StyrdokumentPage"
msgstr "Styrdokument"

#: homepage/templates/homepage/documents.html:7
msgid "stadga"
msgstr "Stadga"

#: homepage/templates/homepage/documents.html:8
msgid "reglemente"
msgstr "Reglemente"

#: homepage/templates/homepage/documents.html:9
msgid "ekonomisktreglemente"
msgstr "Ekonomiskt reglemente"

#: homepage/templates/homepage/documents.html:10
msgid "policies"
msgstr "Policys"

#: homepage/templates/homepage/documents.html:11
msgid "incidenthantering"
msgstr "Incidenthanterings policy"

#: homepage/templates/homepage/documents.html:12
msgid "date-it"
msgstr "DatE-IT reglemente"

#: homepage/templates/homepage/documents.html:16
msgid "saknas"
msgstr "Saknas något?"

#: homepage/templates/homepage/documents.html:17
msgid "stadgehemsidan"
msgstr "Hemsida"

#: homepage/templates/homepage/documents.html:17
msgid "stadgetext"
msgstr "med alla styrdokuments filer"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kanske ändra till "med alla styrdokument"


#: homepage/templates/homepage/documents.html:18
msgid "wikin"
msgstr "Wikin"

#: homepage/templates/homepage/documents.html:18
msgid "wikitext"
msgstr "har även en lista över dokument"

#: homepage/templates/homepage/index/cal-box.html:5
msgid "Arrangemangskalender"
msgstr "Arrangemangskalender"
Expand Down Expand Up @@ -240,67 +288,67 @@ msgid "DTEK-wikin, där allt kul händer!"
msgstr "DTEK-wikin, där allt kul händer!"

#: templates/header/header-menu-box.html:66
#: templates/header/header-menu-box.html:72
#: templates/header/header-menu-box.html:70
msgid "Styrdokument"
msgstr "Styrdokument"

#: templates/header/header-menu-box.html:82
#: templates/header/header-menu-box.html:80
msgid "Databussen"
msgstr "Databussen"

#: templates/header/header-menu-box.html:88
#: templates/header/header-menu-box.html:86
msgid "Mer info om Databussen"
msgstr "Mer info om Databussen"

#: templates/header/header-menu-box.html:98
#: templates/header/header-menu-box.html:96
msgid "Schema"
msgstr "Schema"

#: templates/header/header-menu-box.html:104
#: templates/header/header-menu-box.html:102
msgid "TimeEdit"
msgstr "TimeEdit"

#: templates/header/header-menu-box.html:114
#: templates/header/header-menu-box.html:112
msgid "Grupprum"
msgstr "Grupprum"

#: templates/header/header-menu-box.html:120
#: templates/header/header-menu-box.html:118
msgid "Boka grupprum på Chalmers"
msgstr "Boka grupprum på Chalmers"

#: templates/header/header-menu-box.html:130
#: templates/header/header-menu-box.html:128
msgid "Kårkort"
msgstr "Kårkort"

#: templates/header/header-menu-box.html:136
#: templates/header/header-menu-box.html:134
msgid "Genväg för att ladda ditt kårkort"
msgstr "Genväg för att ladda ditt kårkort"

#: templates/header/header-menu-box.html:146
#: templates/header/header-menu-box.html:144
msgid "Karta"
msgstr "Karta"

#: templates/header/header-menu-box.html:152
#: templates/header/header-menu-box.html:150
msgid "Karta över Campus"
msgstr "Karta över Campus"

#: templates/header/header-menu-box.html:162
#: templates/header/header-menu-box.html:160
msgid "Veckobrev"
msgstr "Veckobrev"

#: templates/header/header-menu-box.html:166
#: templates/header/header-menu-box.html:164
msgid ""
"Anmäl dig till datas veckobrev, med alla arrangemang och annat som händer på "
"sektionen"
msgstr ""
"Anmäl dig till datas veckobrev, med alla arrangemang och annat som händer på "
"sektionen"

#: templates/header/header-menu-box.html:174
#: templates/header/header-menu-box.html:172
msgid "Studiesocial hjälp"
msgstr "Studiesocial hjälp"

#: templates/header/header-menu-box.html:178
#: templates/header/header-menu-box.html:176
msgid ""
"Om du känner att studierna går tufft,\n"
" du känner dig nere, känner dig kränkt eller "
Expand Down
Loading