From 9240d73c2ae856dab59e78c75529f127ad7f47ba Mon Sep 17 00:00:00 2001 From: Laurens Weijs Date: Wed, 16 Oct 2024 14:55:14 +0200 Subject: [PATCH 01/10] 1. Make modal fitting to save button --- amt/site/templates/projects/details_base.html.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/amt/site/templates/projects/details_base.html.j2 b/amt/site/templates/projects/details_base.html.j2 index 7d6a680d..d7c5dbeb 100644 --- a/amt/site/templates/projects/details_base.html.j2 +++ b/amt/site/templates/projects/details_base.html.j2 @@ -3,7 +3,8 @@ {% block content %} From 636d8f6480dd84fc0af9b904c3fd67acfc0f1ff5 Mon Sep 17 00:00:00 2001 From: Laurens Weijs Date: Wed, 16 Oct 2024 15:28:58 +0200 Subject: [PATCH 03/10] fix link to instruments --- amt/site/templates/projects/details_base.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amt/site/templates/projects/details_base.html.j2 b/amt/site/templates/projects/details_base.html.j2 index d7c5dbeb..cc2b7fa9 100644 --- a/amt/site/templates/projects/details_base.html.j2 +++ b/amt/site/templates/projects/details_base.html.j2 @@ -106,7 +106,7 @@ {% endfor %} + href="/algorithm-system/{{ project_id }}/details/system_card/instruments"> From cf73e3dee708afa62e1b5b8df53666edea55fb4c Mon Sep 17 00:00:00 2001 From: Laurens Weijs Date: Wed, 16 Oct 2024 15:35:20 +0200 Subject: [PATCH 04/10] Change implementation to ... --- amt/locale/base.pot | 50 ++++++++++-------- amt/locale/en_US/LC_MESSAGES/messages.mo | Bin 451 -> 451 bytes amt/locale/en_US/LC_MESSAGES/messages.po | 49 +++++++++-------- amt/locale/nl_NL/LC_MESSAGES/messages.mo | Bin 10789 -> 10770 bytes amt/locale/nl_NL/LC_MESSAGES/messages.po | 49 +++++++++-------- .../projects/details_measure_modal.html.j2 | 13 ++--- 6 files changed, 86 insertions(+), 75 deletions(-) diff --git a/amt/locale/base.pot b/amt/locale/base.pot index 8fd740f0..03ca6046 100644 --- a/amt/locale/base.pot +++ b/amt/locale/base.pot @@ -3,11 +3,12 @@ # This file is distributed under the same license as the PROJECT project. # FIRST AUTHOR , 2024. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-16 14:09+0000\n" +"POT-Creation-Date: 2024-10-16 16:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -65,7 +66,6 @@ msgid "Verification and Validation" msgstr "" #: amt/api/lifecycles.py:49 -#: amt/site/templates/projects/details_measure_modal.html.j2:66 msgid "Implementation" msgstr "" @@ -279,10 +279,10 @@ msgid "Reviewing" msgstr "" #: amt/site/templates/macros/tasks.html.j2:32 -#: amt/site/templates/projects/details_base.html.j2:27 -#: amt/site/templates/projects/details_base.html.j2:52 -#: amt/site/templates/projects/details_base.html.j2:78 -#: amt/site/templates/projects/details_base.html.j2:100 +#: amt/site/templates/projects/details_base.html.j2:28 +#: amt/site/templates/projects/details_base.html.j2:53 +#: amt/site/templates/projects/details_base.html.j2:79 +#: amt/site/templates/projects/details_base.html.j2:101 msgid "Done" msgstr "" @@ -336,15 +336,15 @@ msgstr "" msgid "Algorithm Management Toolkit" msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:22 +#: amt/site/templates/pages/landingpage.html.j2:23 msgid "Grip on algorithms with the Algorithm Management Toolkit" msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:24 +#: amt/site/templates/pages/landingpage.html.j2:25 msgid "The AI Validation team" msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:25 +#: amt/site/templates/pages/landingpage.html.j2:26 msgid "" " has developed the Algorithm Management Toolkit on behalf of the Ministry" " of Interior Affairs.\n" @@ -354,19 +354,19 @@ msgid "" "ensures uniformity, transparency and reproducibility." msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:31 +#: amt/site/templates/pages/landingpage.html.j2:32 msgid "Log in" msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:31 +#: amt/site/templates/pages/landingpage.html.j2:32 msgid "or" msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:32 +#: amt/site/templates/pages/landingpage.html.j2:33 msgid "contact us" msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:33 +#: amt/site/templates/pages/landingpage.html.j2:34 msgid "for more information on how the toolkit can support your organization." msgstr "" @@ -439,28 +439,28 @@ msgstr "" msgid "Select publication category" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:24 +#: amt/site/templates/projects/details_base.html.j2:25 msgid "Does the algorithm meet the requirements?" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:48 -#: amt/site/templates/projects/details_base.html.j2:98 +#: amt/site/templates/projects/details_base.html.j2:49 +#: amt/site/templates/projects/details_base.html.j2:99 msgid "To do" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:50 +#: amt/site/templates/projects/details_base.html.j2:51 msgid "In progress" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:64 +#: amt/site/templates/projects/details_base.html.j2:65 msgid "Go to all requirements" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:75 +#: amt/site/templates/projects/details_base.html.j2:76 msgid "Which instruments are executed?" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:112 +#: amt/site/templates/projects/details_base.html.j2:113 msgid "Go to all instruments" msgstr "" @@ -573,17 +573,21 @@ msgstr "" msgid "done" msgstr "" -#: amt/site/templates/projects/details_measure_modal.html.j2:69 +#: amt/site/templates/projects/details_measure_modal.html.j2:66 +msgid "Information on how this measure is implemented" +msgstr "" + +#: amt/site/templates/projects/details_measure_modal.html.j2:71 msgid "" "Describe how the measure has been implemented, including challenges and " "solutions." msgstr "" -#: amt/site/templates/projects/details_measure_modal.html.j2:80 +#: amt/site/templates/projects/details_measure_modal.html.j2:81 msgid "Save" msgstr "" -#: amt/site/templates/projects/details_measure_modal.html.j2:84 +#: amt/site/templates/projects/details_measure_modal.html.j2:85 msgid "Cancel" msgstr "" diff --git a/amt/locale/en_US/LC_MESSAGES/messages.mo b/amt/locale/en_US/LC_MESSAGES/messages.mo index 0df1b8614b527d88813ba848146490737d48be33..2e1564f0922206c7f25b44f7f389a4678d71ec5a 100644 GIT binary patch delta 18 ZcmX@ie3*H{6m~N!QzLByqm8pQ7y&v!1(5&% delta 18 ZcmX@ie3*H{6m}CU150fKgN?H_7y&vf1&;s# diff --git a/amt/locale/en_US/LC_MESSAGES/messages.po b/amt/locale/en_US/LC_MESSAGES/messages.po index 348b5de6..b3beb8fb 100644 --- a/amt/locale/en_US/LC_MESSAGES/messages.po +++ b/amt/locale/en_US/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-16 14:09+0000\n" +"POT-Creation-Date: 2024-10-16 16:52+0200\n" "PO-Revision-Date: 2024-07-25 21:01+0200\n" "Last-Translator: FULL NAME \n" "Language: en_US\n" @@ -67,7 +67,6 @@ msgid "Verification and Validation" msgstr "" #: amt/api/lifecycles.py:49 -#: amt/site/templates/projects/details_measure_modal.html.j2:66 msgid "Implementation" msgstr "" @@ -281,10 +280,10 @@ msgid "Reviewing" msgstr "" #: amt/site/templates/macros/tasks.html.j2:32 -#: amt/site/templates/projects/details_base.html.j2:27 -#: amt/site/templates/projects/details_base.html.j2:52 -#: amt/site/templates/projects/details_base.html.j2:78 -#: amt/site/templates/projects/details_base.html.j2:100 +#: amt/site/templates/projects/details_base.html.j2:28 +#: amt/site/templates/projects/details_base.html.j2:53 +#: amt/site/templates/projects/details_base.html.j2:79 +#: amt/site/templates/projects/details_base.html.j2:101 msgid "Done" msgstr "" @@ -338,15 +337,15 @@ msgstr "" msgid "Algorithm Management Toolkit" msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:22 +#: amt/site/templates/pages/landingpage.html.j2:23 msgid "Grip on algorithms with the Algorithm Management Toolkit" msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:24 +#: amt/site/templates/pages/landingpage.html.j2:25 msgid "The AI Validation team" msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:25 +#: amt/site/templates/pages/landingpage.html.j2:26 msgid "" " has developed the Algorithm Management Toolkit on behalf of the Ministry" " of Interior Affairs.\n" @@ -356,19 +355,19 @@ msgid "" "ensures uniformity, transparency and reproducibility." msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:31 +#: amt/site/templates/pages/landingpage.html.j2:32 msgid "Log in" msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:31 +#: amt/site/templates/pages/landingpage.html.j2:32 msgid "or" msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:32 +#: amt/site/templates/pages/landingpage.html.j2:33 msgid "contact us" msgstr "" -#: amt/site/templates/pages/landingpage.html.j2:33 +#: amt/site/templates/pages/landingpage.html.j2:34 msgid "for more information on how the toolkit can support your organization." msgstr "" @@ -441,28 +440,28 @@ msgstr "" msgid "Select publication category" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:24 +#: amt/site/templates/projects/details_base.html.j2:25 msgid "Does the algorithm meet the requirements?" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:48 -#: amt/site/templates/projects/details_base.html.j2:98 +#: amt/site/templates/projects/details_base.html.j2:49 +#: amt/site/templates/projects/details_base.html.j2:99 msgid "To do" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:50 +#: amt/site/templates/projects/details_base.html.j2:51 msgid "In progress" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:64 +#: amt/site/templates/projects/details_base.html.j2:65 msgid "Go to all requirements" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:75 +#: amt/site/templates/projects/details_base.html.j2:76 msgid "Which instruments are executed?" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:112 +#: amt/site/templates/projects/details_base.html.j2:113 msgid "Go to all instruments" msgstr "" @@ -575,17 +574,21 @@ msgstr "" msgid "done" msgstr "" -#: amt/site/templates/projects/details_measure_modal.html.j2:69 +#: amt/site/templates/projects/details_measure_modal.html.j2:66 +msgid "Information on how this measure is implemented" +msgstr "" + +#: amt/site/templates/projects/details_measure_modal.html.j2:71 msgid "" "Describe how the measure has been implemented, including challenges and " "solutions." msgstr "" -#: amt/site/templates/projects/details_measure_modal.html.j2:80 +#: amt/site/templates/projects/details_measure_modal.html.j2:81 msgid "Save" msgstr "" -#: amt/site/templates/projects/details_measure_modal.html.j2:84 +#: amt/site/templates/projects/details_measure_modal.html.j2:85 msgid "Cancel" msgstr "" diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.mo b/amt/locale/nl_NL/LC_MESSAGES/messages.mo index 7469f9424de0190efff0b3929c529eb4cfd34c5b..f0cfeeded4ea10319195f4979e86be643d4e4d67 100644 GIT binary patch delta 2120 zcmXZcYix{J9LMp0F};lL(2i>B*6CVmQ^cZGWj9-)S+vcH28+}sopvT_P((s`vYVBz zWQDcXEs|yvwIL;v=?l>pB#kgHh!87Si8qZ)>+)h7-30ah?VMyXpXZ$Cne)G#^Gti~ zk=jc;QoLbic0XX|$4BVH9?ZsG4B|)3!|V}eGq4yZ;9AuD9_LZaVtfIM@hWCwFXrF? zj>f=9vof4C(!Bp4sAEEjY(fRxio~>^aX9|&?zg$|87yG_66WI_oQN+`2?fX^6^k$( zr=t>?gBiHc&DUgkX8guhGNB(tP#xIf#ye37wYd4is7@V21^yG2co(W;*KjD_!%_GE zhhQJJ;v1w1wu^^zvDM?^GcMXt3tZq!nO?&X-a=LS8dXVvY+5iEmFQ7ahfblk(0MXi9ACEeveuwlS!@X<#3^jN}S)K5?G3A)hbkl8=Z})g_=--T5v2L#CdoQmtqg9 zqhGP{O0W!-@IsuJVzvZ13!cUJUdN67Sc5%Cmuxou(GMz72~;_kp%PnxX}BKsTm;8p z43*FURE6!RExGQ-2{(R$e&X9JE)-zE-S~i&j8iyC%KST2Lba&9Y;ZMNco^hem{uamKpc{{4z_wd4DuHiM3w-Zvbock+ z=gj|xI+UHx+o<)QV;x4uv(0$J`2js0hFP2(1(=U&Z4IjORc>653LJCe{iq5Kp(>A~ zTHS?8;4!kc^`kl)IJow0)jy_oB9{ z6BW1{d7~_WdX1l;3g|^u{ti{?dsIg<*r!QYgkNB_$AxY*qYl$y)DMrNw&XNwfs4*A zRKT04j{M{7L3Q#qD&YZCf+N@`C6t5eOd)FhQq*hj&ErB3Rw4)As&FXQ<1vh&0uG`& z5+rR^Iu$ivjtWqN({VM1@Bk{I^Vo`=I1J}gz5-VuAJ3}z=D)z2QGYDIpcX!Xs-y#b z*o|zrB~Srhpcd*!1+vM>u^&}H4(d$hqXHMA)|-s#_}5si_hStg`r|o=sW^aY`5^i* zlattv*{DP>V+3#G5}Y$7+1j5ljq!138|wA_3w36$U^*sHaqeOP@$DfOYW;smmo1B< zIs{8Fgk`9Oe?WC;1E%9PRAswyF?y)ZBv6&!M|GkP_1s&`zi3s9FwEzkbMKu0a?YLO zv9qyX(pi4k%a`Gd}O9LfA;oQYkibzk6z zXd}!Dpa4I`*(1y!d|(?BIZQO60`5a%+cC_?)9(H`H}1eF^S|L(e1KE%A5@|RWRZ)X zU;}hPeW?6OJt|RdIv+qw|*{k+TY*=4DzLM5wh(z2bI7w)B>BFJKg=m zIGOoVs6%OHi;|xLo?$`@b)W)Y!fANJjh~|ueTkeady5=s zi+Guq7o*0rQ1=%h&9n_zfxB=zcAygMK@~LM`I+}HILWMxi6|<87_xmEf4!)MT2Pg>;tD*D>P#=H(&wm7yhA;gJtNbp5UNuV3~1rP&icGm zAmY_G#_JNcw6;F&H74Rsdv\n" "Language: nl_NL\n" @@ -67,7 +67,6 @@ msgid "Verification and Validation" msgstr "Verficatie en validatie" #: amt/api/lifecycles.py:49 -#: amt/site/templates/projects/details_measure_modal.html.j2:66 msgid "Implementation" msgstr "Implementeren" @@ -289,10 +288,10 @@ msgid "Reviewing" msgstr "Beoordelen" #: amt/site/templates/macros/tasks.html.j2:32 -#: amt/site/templates/projects/details_base.html.j2:27 -#: amt/site/templates/projects/details_base.html.j2:52 -#: amt/site/templates/projects/details_base.html.j2:78 -#: amt/site/templates/projects/details_base.html.j2:100 +#: amt/site/templates/projects/details_base.html.j2:28 +#: amt/site/templates/projects/details_base.html.j2:53 +#: amt/site/templates/projects/details_base.html.j2:79 +#: amt/site/templates/projects/details_base.html.j2:101 msgid "Done" msgstr "Afgerond" @@ -346,15 +345,15 @@ msgstr "AMT Placeholder informatie pagina's" msgid "Algorithm Management Toolkit" msgstr "Algoritme Management Toolkit" -#: amt/site/templates/pages/landingpage.html.j2:22 +#: amt/site/templates/pages/landingpage.html.j2:23 msgid "Grip on algorithms with the Algorithm Management Toolkit" msgstr "Grip op algoritmes met de Algoritme Management Toolkit" -#: amt/site/templates/pages/landingpage.html.j2:24 +#: amt/site/templates/pages/landingpage.html.j2:25 msgid "The AI Validation team" msgstr "Het AI Validatie team" -#: amt/site/templates/pages/landingpage.html.j2:25 +#: amt/site/templates/pages/landingpage.html.j2:26 msgid "" " has developed the Algorithm Management Toolkit on behalf of the Ministry" " of Interior Affairs.\n" @@ -371,19 +370,19 @@ msgstr "" " In samenwerking met (internationale) partners zorgt " "het voor uniformiteit, transparantie en reproduceerbaarheid." -#: amt/site/templates/pages/landingpage.html.j2:31 +#: amt/site/templates/pages/landingpage.html.j2:32 msgid "Log in" msgstr "Inloggen" -#: amt/site/templates/pages/landingpage.html.j2:31 +#: amt/site/templates/pages/landingpage.html.j2:32 msgid "or" msgstr "voor" -#: amt/site/templates/pages/landingpage.html.j2:32 +#: amt/site/templates/pages/landingpage.html.j2:33 msgid "contact us" msgstr "neem contact op" -#: amt/site/templates/pages/landingpage.html.j2:33 +#: amt/site/templates/pages/landingpage.html.j2:34 msgid "for more information on how the toolkit can support your organization." msgstr "voor meer informatie over hoe de toolkit uw organisatie kan ondersteunen." @@ -459,28 +458,28 @@ msgstr "Selecteer levenscyclus" msgid "Select publication category" msgstr "Selecteer publicatiecategorie" -#: amt/site/templates/projects/details_base.html.j2:24 +#: amt/site/templates/projects/details_base.html.j2:25 msgid "Does the algorithm meet the requirements?" msgstr "Voldoet het algoritme aan de vereisten?" -#: amt/site/templates/projects/details_base.html.j2:48 -#: amt/site/templates/projects/details_base.html.j2:98 +#: amt/site/templates/projects/details_base.html.j2:49 +#: amt/site/templates/projects/details_base.html.j2:99 msgid "To do" msgstr "Te doen" -#: amt/site/templates/projects/details_base.html.j2:50 +#: amt/site/templates/projects/details_base.html.j2:51 msgid "In progress" msgstr "Onderhanden" -#: amt/site/templates/projects/details_base.html.j2:64 +#: amt/site/templates/projects/details_base.html.j2:65 msgid "Go to all requirements" msgstr "Ga naar alle Vereisten" -#: amt/site/templates/projects/details_base.html.j2:75 +#: amt/site/templates/projects/details_base.html.j2:76 msgid "Which instruments are executed?" msgstr "Welke instrumenten zijn uitgevoerd?" -#: amt/site/templates/projects/details_base.html.j2:112 +#: amt/site/templates/projects/details_base.html.j2:113 msgid "Go to all instruments" msgstr "Ga naar all instrumenten" @@ -593,7 +592,11 @@ msgstr "Onderhanden" msgid "done" msgstr "Afgerond" -#: amt/site/templates/projects/details_measure_modal.html.j2:69 +#: amt/site/templates/projects/details_measure_modal.html.j2:66 +msgid "Information on how this measure is implemented" +msgstr "" + +#: amt/site/templates/projects/details_measure_modal.html.j2:71 msgid "" "Describe how the measure has been implemented, including challenges and " "solutions." @@ -601,11 +604,11 @@ msgstr "" "Beschrijf hoe de maatregel is geimplementeerd, inclusief uitdagingen " "enoplossingen." -#: amt/site/templates/projects/details_measure_modal.html.j2:80 +#: amt/site/templates/projects/details_measure_modal.html.j2:81 msgid "Save" msgstr "Opslaan" -#: amt/site/templates/projects/details_measure_modal.html.j2:84 +#: amt/site/templates/projects/details_measure_modal.html.j2:85 msgid "Cancel" msgstr "Annuleren" diff --git a/amt/site/templates/projects/details_measure_modal.html.j2 b/amt/site/templates/projects/details_measure_modal.html.j2 index a1445fae..1dd878a1 100644 --- a/amt/site/templates/projects/details_measure_modal.html.j2 +++ b/amt/site/templates/projects/details_measure_modal.html.j2 @@ -63,13 +63,14 @@ aria-labelledby="fieldId-label" class="utrecht-form-field utrecht-form-field--text rvo-form-field">
- +
- + From 819e3318b9295877e7090e08ad477f165e3ab0b8 Mon Sep 17 00:00:00 2001 From: Laurens Weijs Date: Wed, 16 Oct 2024 15:37:00 +0200 Subject: [PATCH 05/10] Open algoritmekader in new tab --- amt/site/templates/projects/details_measure_modal.html.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/amt/site/templates/projects/details_measure_modal.html.j2 b/amt/site/templates/projects/details_measure_modal.html.j2 index 1dd878a1..43db2abf 100644 --- a/amt/site/templates/projects/details_measure_modal.html.j2 +++ b/amt/site/templates/projects/details_measure_modal.html.j2 @@ -24,6 +24,7 @@ role="img" aria-label="Info"> {% trans %}Read more on the algoritmekader{% endtrans %} From 7140afbb9de6e7a432fb0a0d4bb486ea1b03c41c Mon Sep 17 00:00:00 2001 From: Laurens Weijs Date: Wed, 16 Oct 2024 15:37:49 +0200 Subject: [PATCH 06/10] Open references in new tab --- amt/site/templates/projects/details_info.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amt/site/templates/projects/details_info.html.j2 b/amt/site/templates/projects/details_info.html.j2 index 616927ca..7eeb1055 100644 --- a/amt/site/templates/projects/details_info.html.j2 +++ b/amt/site/templates/projects/details_info.html.j2 @@ -44,7 +44,7 @@ {% trans %}References{% endtrans %} {% for reference in system_card.references %} - {{ reference.name }} + {{ reference.name }} {% if not loop.last %}
{% endif %} {% endfor %} From 9e16ebe4c3a83df04e4e8e92f532db92f985253d Mon Sep 17 00:00:00 2001 From: Laurens Weijs Date: Wed, 16 Oct 2024 15:38:07 +0200 Subject: [PATCH 07/10] Open repository in new tab --- amt/site/templates/projects/details_info.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amt/site/templates/projects/details_info.html.j2 b/amt/site/templates/projects/details_info.html.j2 index 7eeb1055..36725414 100644 --- a/amt/site/templates/projects/details_info.html.j2 +++ b/amt/site/templates/projects/details_info.html.j2 @@ -10,7 +10,7 @@ {% trans %}Repository{% endtrans %} - {{ system_card.provenance.uri }} + {{ system_card.provenance.uri }} From 90426c9353a112c8fb055193299c87d91e96ac24 Mon Sep 17 00:00:00 2001 From: Laurens Weijs Date: Wed, 16 Oct 2024 15:39:14 +0200 Subject: [PATCH 08/10] Open minbzk github in new tab --- amt/site/templates/parts/header.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amt/site/templates/parts/header.html.j2 b/amt/site/templates/parts/header.html.j2 index 0e64a675..a20dac54 100644 --- a/amt/site/templates/parts/header.html.j2 +++ b/amt/site/templates/parts/header.html.j2 @@ -5,7 +5,7 @@
{% trans %}Beta Version{% endtrans %} {{ version }} {% trans %}This website is under development. All versions are created in an open manner.{% endtrans %} - +
From a8aad348d7ee8254df83051fcc9b17a9578cdb7a Mon Sep 17 00:00:00 2001 From: Laurens Weijs Date: Wed, 16 Oct 2024 16:48:19 +0200 Subject: [PATCH 09/10] Make te doentjes on 1 line --- .../templates/projects/details_base.html.j2 | 89 +++++++++++-------- 1 file changed, 52 insertions(+), 37 deletions(-) diff --git a/amt/site/templates/projects/details_base.html.j2 b/amt/site/templates/projects/details_base.html.j2 index cc2b7fa9..589ba5cc 100644 --- a/amt/site/templates/projects/details_base.html.j2 +++ b/amt/site/templates/projects/details_base.html.j2 @@ -4,7 +4,7 @@ @@ -15,17 +15,19 @@
-
+
- {% trans %}Does the algorithm meet the requirements?{% endtrans %} + {% trans %}Does the algorithm meet the requirements?{% endtrans %}
{{ requirements_state.count_0 }}/{{ requirements_state.count_1 }} - {% trans %}Done{% endtrans %} + {% trans %}Done{% endtrans %}
{% endif %} {% endfor %} - - + + {% trans %}Go to all requirements{% endtrans %}
-
+
- {% trans %}Which instruments are executed?{% endtrans %} + {% trans %}Which instruments are executed?{% endtrans %}
{{ instrument_state.count_0 }}/{{ instrument_state.count_1 }} - {% trans %}Done{% endtrans %} + {% trans %}Done{% endtrans %}
- - + + {% trans %}Go to all instruments{% endtrans %}
From 529f3da732cab09cd5ac8e8f4c4c84a66a1b7594 Mon Sep 17 00:00:00 2001 From: Laurens Weijs Date: Wed, 16 Oct 2024 16:55:30 +0200 Subject: [PATCH 10/10] Pre-commit stuff --- amt/locale/nl_NL/LC_MESSAGES/messages.mo | Bin 10770 -> 10888 bytes amt/locale/nl_NL/LC_MESSAGES/messages.po | 2 +- .../templates/projects/details_base.html.j2 | 57 ++++++++---------- .../projects/details_measure_modal.html.j2 | 16 ++--- 4 files changed, 35 insertions(+), 40 deletions(-) diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.mo b/amt/locale/nl_NL/LC_MESSAGES/messages.mo index f0cfeeded4ea10319195f4979e86be643d4e4d67..8a1e40d7f7ef544aa061ee62c9367477b3ffe262 100644 GIT binary patch delta 2562 zcmYM$e@vBC9LMn^Ug1K5fT3mx4|qcXBU?Z}Q0b4>Qbsj0b7RwRJp54Zz3y^>Cc1}o zh6K)50c+D$BGN{viK~{nnlfvRg{`&HKbV`bShndhtH~CEkbxzj2>>|NrbxG)6;vaN8VX_F@YCsU%~TRHPg}4FRF&{7CX1s;*xIWpK1^7G? zqj?#*WVWLMZo_nZ4R!xJm}NX;-lLJgz~{IKzr@8jiTB|js0ySqi-Q?hg{4T0rVBM; zFKV8{cKjGB&{H@MucGF;W}U($);GV{8}6VYoI#Z`g>;r+F0RHh%)%x+-fcaGD)D(N z#0ga9GpH@_r^XV?!pG>Bpst6|Q$+1Fv|tCaws{+s*#PSLNi4!McKkYK)4z$T&;nN1 zS;$8PT#2ek9qMcZQ46-Bwq~ClKbS`SnZxukpa+Ifr8;5zXHbEiwc``Wc{AUm7QTiG z@Gh!yvp5&i>D-HpFb)f`6N`|dn2%9gd?}s!v%O}L0e;P|d??acbZ|baE7J#2nN;F# z+=L4BJ5;5vptfcTm5`6sWdQLUcCNEQZ#;m|CID{n_&q0xE(61XJG_*iFsS-%zE!iwa;V9o90%sLEEMgD>F=_zLQbjiaXpuh7s$*HH`K zz!mtX?Poi&Q(I^)M$Va8iz;~)a`4S&)OZu>47`d@;1SHnA5j6u<-`)o%%MP>5Az5E z#aMv~paa=H(_?QO#8Ud_P+N5ywQwAD*TR0(Yn+LCz5tbZDeAd0RK^ihWjuTUkK}r> ze{?R|3)84W6;FLNK{9G<(oquxtPi6WUWa<0tE|c(@Zid?|Ccoq9_618AUAXb?!RK`b9O?Zg7~;c3*m z-X}EpH5d5cJHbq&zF_`FO`MV!%On@)(SIB{7N#7v;8xT`J5UR?+I|Nrfo{~cWv=O|&r_a`i;<#%3qz)-<<7 zT!&_3aA%VnbVE_Mc61=MI<43~;X2_~H^L*XQ|s<>onTE(G~(8~O?s%_y?FA!=iEr` J=uFOH|3B7R3hw{_ delta 2451 zcmYM!e@vBC9LMpm0&*d|axW5MrWX`YDQ8Rh;g6=yG2_>)EN|*4os+8)65nkNr4 zaTx|M?A+qU8{>L*(B1e1XYk+!*Z;-&7uGVKkY-knTX7bCj$s_YaacOuYyvJpVziaW zEn9;MxE6!>ChGYXoNAs~D~)6Z&f&xO1!iF%X5(-8peW1|qMwA%Vm=a^y^Wf%2{q4t zH{ON{^aLj1*Qj}}IQub`_3cOZKnxY(AgYx2aS{eeYc3YzR9uG|-|1{amG}%6;+Lq* z2T@xvf=bMvZdQVMsQWeODWa`3wBT#Vnzk2}+54#b?XG_kr_uimRhcWOGjIzPke?`2 zi2~G_n1foV7_}wK-FP+f6I&gi{`x_L0hQ=gRR0ZBK#gv^6**^i7`5<+sKB~W73;wS z{0=AL_c#`Zuo?eEiePW?u(q}t*;Q)~Qh!ZwhKnNY!4Q6f%JeoW6F<>3ViqdUHdKX< zp|<2BR7RJaS5bl7KrMV1HBTCYnl}@b(0tD|mY@QtK$R+t%5a0T7Bx{FYN1Aa1P|as zJdG6?LsjqzHeLaipaNcw(|LW%QD>o^%S-4r(Ws^oL#kx+sE>Y7h6Y6{vt#q4si#@|C7$}VRgGOhiNH5hr6ea5ex_fP>m$-xQe!9_Gw+G)OyFz(?lm}XyFbl!1Jy@fQod; zIgFeyyN@b)MkxN8W~0U*M~Z06Z~@lfEc^f!U@t16>&R}~-ysS$k49QfJb^M6p8-bGa;g?-Ay0-S+WsPTqeFMgO>8PE@p zp!WPYYJ#)QZq$O8Q5Cu7jG;<-8x`;fD!>WslLE>_RVD{De-Y~RFGM|8=Fw0oDlq{! z;$e)S792%YB!jS(>0_wz1*iq8aSpD*5VoKK`V^b73lnh>>1*Mo$Um#(!l%Hz1{(UX z>_bg_6qQK_CSfnK-4;bHcoQ|zFlr&okM~ni31p(qR5ohi9MpXIsFE+nDqM?vcRV{y zV;ln`sFIIj5~gtyPhk)h>3NJ`AC_bB%y?<{U^4w9&UV!6`!VXwTtFX2QR{q*O6Uj7 z(u?{p4XSJbj_O#Pk0C5UP5dINLhI3oucI>Cfls4{s!SA>X+NqGL#XHOU`$(^zEaG-O0?nK{zGJxl{ diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.po b/amt/locale/nl_NL/LC_MESSAGES/messages.po index 9eae6222..54b79172 100644 --- a/amt/locale/nl_NL/LC_MESSAGES/messages.po +++ b/amt/locale/nl_NL/LC_MESSAGES/messages.po @@ -594,7 +594,7 @@ msgstr "Afgerond" #: amt/site/templates/projects/details_measure_modal.html.j2:66 msgid "Information on how this measure is implemented" -msgstr "" +msgstr "Informatie over hoe deze maatregel is geïmplementeerd" #: amt/site/templates/projects/details_measure_modal.html.j2:71 msgid "" diff --git a/amt/site/templates/projects/details_base.html.j2 b/amt/site/templates/projects/details_base.html.j2 index 589ba5cc..0aac5194 100644 --- a/amt/site/templates/projects/details_base.html.j2 +++ b/amt/site/templates/projects/details_base.html.j2 @@ -4,7 +4,7 @@ @@ -15,19 +15,17 @@
-
+
- {% trans %}Does the algorithm meet the requirements?{% endtrans %} + {% trans %}Does the algorithm meet the requirements?{% endtrans %}
{{ requirements_state.count_0 }}/{{ requirements_state.count_1 }} - {% trans %}Done{% endtrans %} + {% trans %}Done{% endtrans %}
    {% for requirement in requirements_state.states %} @@ -39,15 +37,13 @@ justify-content: space-between">
    {% if requirement.state == "to do" %} -
    +
    {% elif requirement.state == "in progress" %}
    {% else %}
    {% endif %} - {{ requirement.name }} + {{ requirement.name }}
    {% if requirement.state == "to do" %} @@ -65,28 +61,26 @@
- + style="bottom: 0; + position: absolute"> + {% trans %}Go to all requirements{% endtrans %}
-
+
- {% trans %}Which instruments are executed?{% endtrans %} + {% trans %}Which instruments are executed?{% endtrans %}
{{ instrument_state.count_0 }}/{{ instrument_state.count_1 }} - {% trans %}Done{% endtrans %} + {% trans %}Done{% endtrans %}
    @@ -96,15 +90,14 @@
  • + justify-content: space-between">
    {% if instrument.in_progress == 1 %}
    {% else %}
    {% endif %} - {{ instrument.name }} + {{ instrument.name }}
    {% if instrument.in_progress == 1 %} @@ -120,11 +113,11 @@
- + style="bottom: 0; + position: absolute"> + {% trans %}Go to all instruments{% endtrans %}
diff --git a/amt/site/templates/projects/details_measure_modal.html.j2 b/amt/site/templates/projects/details_measure_modal.html.j2 index 43db2abf..29c77344 100644 --- a/amt/site/templates/projects/details_measure_modal.html.j2 +++ b/amt/site/templates/projects/details_measure_modal.html.j2 @@ -64,14 +64,16 @@ aria-labelledby="fieldId-label" class="utrecht-form-field utrecht-form-field--text rvo-form-field">
- +
- +