diff --git a/myhpi/core/templates/core/information_page.html b/myhpi/core/templates/core/information_page.html index bb77f44f..f2257080 100644 --- a/myhpi/core/templates/core/information_page.html +++ b/myhpi/core/templates/core/information_page.html @@ -17,34 +17,23 @@

- - {% if page.attachments.all %} - - {% endif %} + {% include "core/sidebar.html" %}
diff --git a/myhpi/core/templates/core/minutes.html b/myhpi/core/templates/core/minutes.html index f1e4beea..5db9013d 100644 --- a/myhpi/core/templates/core/minutes.html +++ b/myhpi/core/templates/core/minutes.html @@ -8,69 +8,69 @@
{% with page.body|markdown as parsed_md %}
-

{{ page.title }}

+

{{ page.title }}

{{ parsed_md.0 }}
-

{% translate "Date" %}

-

{{ page.date }}

-

{% translate "Moderator" %}

-

{{ page.moderator.get_full_name }}

-

{% translate "Minutes taker" %}

-

{{ page.author.get_full_name }}

-

{% translate "Participants" %}

-
    - {% for participant in page.participants.all %} -
  • {{ participant.get_full_name }}
    • - {% endfor %} -
-

{% translate "Guests" %}

- {% if page.guests %} + + + + + + + {% include "core/sidebar.html" %}
-
-
- {% prev_minutes page as prev %} - {% if prev %} - < {% translate "Previous minutes" %} - {% endif %} -
-
- {% next_minutes page as next %} - {% if next %} - {% translate "Next minutes" %} > - {% endif %} -
+
+
+ {% prev_minutes page as prev %} + {% if prev %} + < {% translate "Previous minutes" %} + {% endif %} +
+
+ {% next_minutes page as next %} + {% if next %} + {% translate "Next minutes" %} > + {% endif %} +
+
{% endwith %}
{% endblock %} diff --git a/myhpi/core/templates/core/minutes_list.html b/myhpi/core/templates/core/minutes_list.html index 203bd4f8..47e35c8c 100644 --- a/myhpi/core/templates/core/minutes_list.html +++ b/myhpi/core/templates/core/minutes_list.html @@ -11,8 +11,8 @@

{{ year }}

{{ minute.date|date:"d.m.Y" }} - {% if not minute.live %} - + {% if minute.has_unpublished_changes %} + {% endif %} diff --git a/myhpi/core/templates/core/sidebar.html b/myhpi/core/templates/core/sidebar.html new file mode 100644 index 00000000..c218abc7 --- /dev/null +++ b/myhpi/core/templates/core/sidebar.html @@ -0,0 +1,30 @@ +{% load core_extras %} +{% load i18n %} + +{% if perms.wagtail.edit_page %} + {% if page.has_unpublished_changes %} + + {% endif %} + +{% endif %} + +{% if page.attachments.all %} + +{% endif %} \ No newline at end of file diff --git a/myhpi/locale/de/LC_MESSAGES/django.po b/myhpi/locale/de/LC_MESSAGES/django.po index 26e0067b..0f23e9d5 100644 --- a/myhpi/locale/de/LC_MESSAGES/django.po +++ b/myhpi/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-12 19:24+0100\n" +"POT-Creation-Date: 2024-02-13 11:43+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,51 +18,51 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: core/markdown/extensions.py:53 +#: core/markdown/extensions.py:56 msgid "Begin of meeting" msgstr "Beginn des Meetings" -#: core/markdown/extensions.py:56 +#: core/markdown/extensions.py:59 msgid "End of meeting" msgstr "Ende des Meetings" -#: core/markdown/extensions.py:70 +#: core/markdown/extensions.py:73 #, python-brace-format msgid "*Meeting break: {time_start_break} – {time_end_break}*" msgstr "*Sitzungspause: {time_start_break} – {time_end_break}*" -#: core/markdown/extensions.py:87 +#: core/markdown/extensions.py:90 msgid "quorate" msgstr "beschlussfähig" -#: core/markdown/extensions.py:87 +#: core/markdown/extensions.py:90 msgid "not quorate" msgstr "nicht beschlussfähig" -#: core/markdown/extensions.py:90 +#: core/markdown/extensions.py:93 #, python-brace-format msgid "*{num_participants}/{max_num_participants} present → {quorate}* " msgstr "*{num_participants}/{max_num_participants} anwesend → {quorate}* " -#: core/markdown/extensions.py:114 +#: core/markdown/extensions.py:117 #, python-brace-format msgid "*{time}: {name} {event} the meeting* " msgstr "*{time}: {name} {event} das Meeting* " -#: core/markdown/extensions.py:119 +#: core/markdown/extensions.py:122 #, python-brace-format msgid "*{time}: {name} {event} the meeting via {mean_of_participation}* " msgstr "*{time}: {name} {event} das Meeting via {mean_of_participation}* " -#: core/markdown/extensions.py:129 +#: core/markdown/extensions.py:132 msgid "enters" msgstr "betritt" -#: core/markdown/extensions.py:132 +#: core/markdown/extensions.py:135 msgid "leaves" msgstr "verlässt" -#: core/markdown/extensions.py:153 +#: core/markdown/extensions.py:156 msgid "[missing link]" msgstr "[link fehlt]" @@ -70,68 +70,74 @@ msgstr "[link fehlt]" msgid "Last edited" msgstr "Zuletzt bearbeitet" -#: core/templates/core/information_page.html:23 +#: core/templates/core/information_page.html:22 +msgid "A long time ago" +msgstr "Vor langer Zeit" + +#: core/templates/core/information_page.html:26 #, python-format msgid "%(date)s at %(time)s" msgstr "%(date)s um %(time)s Uhr" -#: core/templates/core/information_page.html:28 +#: core/templates/core/information_page.html:32 msgid "by" msgstr "von" -#: core/templates/core/information_page.html:33 -#: core/templates/core/minutes.html:47 polls/templates/polls/poll.html:29 -msgid "Table of contents" -msgstr "Inhaltsverzeichnis" - -#: core/templates/core/information_page.html:38 -#: core/templates/core/minutes.html:50 -msgid "Attachments" -msgstr "Anhänge" - -#: core/templates/core/minutes.html:17 +#: core/templates/core/minutes.html:18 msgid "Date" msgstr "Datum" -#: core/templates/core/minutes.html:19 +#: core/templates/core/minutes.html:22 msgid "Moderator" msgstr "Sitzungsleitung" -#: core/templates/core/minutes.html:21 +#: core/templates/core/minutes.html:26 msgid "Minutes taker" msgstr "Protokollführung" -#: core/templates/core/minutes.html:23 +#: core/templates/core/minutes.html:30 msgid "Participants" msgstr "Teilnehmende" -#: core/templates/core/minutes.html:29 +#: core/templates/core/minutes.html:38 msgid "Guests" msgstr "Gäste" -#: core/templates/core/minutes.html:37 +#: core/templates/core/minutes.html:46 msgid "No guests" msgstr "Keine Gäste" -#: core/templates/core/minutes.html:39 +#: core/templates/core/minutes.html:50 msgid "Labels" msgstr "Labels" -#: core/templates/core/minutes.html:45 +#: core/templates/core/minutes.html:54 msgid "No labels" msgstr "Keine Labels" -#: core/templates/core/minutes.html:65 +#: core/templates/core/minutes.html:64 msgid "Previous minutes" msgstr "Vorheriges Protokoll" -#: core/templates/core/minutes.html:71 +#: core/templates/core/minutes.html:70 msgid "Next minutes" msgstr "Nächstes Protokoll" -#: core/templates/core/minutes_list.html:15 -msgid "Draft" -msgstr "Entwurf" +#: core/templates/core/minutes_list.html:15 core/templates/core/sidebar.html:7 +msgid "Page has unpublished changes!" +msgstr "Seite hat unveröffentlichte Änderungen!" + +#: core/templates/core/sidebar.html:11 +msgid "Visibility" +msgstr "Sichtbarkeit" + +#: core/templates/core/sidebar.html:16 polls/templates/polls/poll.html:29 +msgid "Table of contents" +msgstr "Inhaltsverzeichnis" + +#: core/templates/core/sidebar.html:21 +msgid "Attachments" +msgstr "Anhänge" #: polls/templates/polls/poll.html:17 msgid "You have already voted and the results are not yet visible." @@ -509,6 +515,9 @@ msgstr "{email} hat erfolgreich {list} verlassen." msgid "The subscription of {email} onto {list} was rolled back." msgstr "Die Anmeldung von {email} auf {list} wurde rückgänig gemacht." +#~ msgid "Draft" +#~ msgstr "Entwurf" + #, fuzzy #~| msgid "[missing link]" #~ msgid "[missing image]" diff --git a/myhpi/static/scss/myHPI.scss b/myhpi/static/scss/myHPI.scss index 29a64017..1e4eccee 100644 --- a/myhpi/static/scss/myHPI.scss +++ b/myhpi/static/scss/myHPI.scss @@ -144,24 +144,35 @@ p { border-top: solid 2px var(--bs-border); } -.toc-container ul { - list-style: none; - padding: 0; +.side-panel-title { + font-size: 1.05rem; + line-height: 1.1; + font-weight: 600; } -.toc-container ul li>ul { - margin-left: 0.5rem; +h1.side-panel-title::after { + margin: 0; + height: 0px; } -.toc-title { +.side-panel-warning { + background-color: #ff000011; + border: 2px solid red; + text-align: center; + border-radius: 5px; + padding: 10px; font-size: 1.05rem; line-height: 1.1; font-weight: 600; } -h1.toc-title::after { - margin: 0; - height: 0px; +.toc-container ul { + list-style: none; + padding: 0; +} + +.toc-container ul li>ul { + margin-left: 0.5rem; } .search-result-list {