From 4634be6a05e17f4ab47b8e62f7969c7b0e1af3cb Mon Sep 17 00:00:00 2001 From: Anne Schuth Date: Mon, 21 Oct 2024 17:35:46 +0200 Subject: [PATCH] Icon + tekst for edit button --- amt/locale/base.pot | 31 +++--- amt/locale/en_US/LC_MESSAGES/messages.mo | Bin 451 -> 451 bytes amt/locale/en_US/LC_MESSAGES/messages.po | 31 +++--- amt/locale/nl_NL/LC_MESSAGES/messages.mo | Bin 10765 -> 10766 bytes amt/locale/nl_NL/LC_MESSAGES/messages.po | 37 +++--- amt/site/templates/macros/editable.html.j2 | 105 +++++++++--------- .../templates/projects/details_base.html.j2 | 3 +- amt/site/templates/projects/new.html.j2 | 2 +- 8 files changed, 109 insertions(+), 100 deletions(-) diff --git a/amt/locale/base.pot b/amt/locale/base.pot index 3be6b69d..40600934 100644 --- a/amt/locale/base.pot +++ b/amt/locale/base.pot @@ -267,17 +267,18 @@ msgstr "" msgid "Algorithmic Management Toolkit (AMT)" msgstr "" -#: amt/site/templates/macros/editable.html.j2:21 +#: amt/site/templates/macros/editable.html.j2:23 +#: amt/site/templates/macros/editable.html.j2:26 #: amt/site/templates/projects/details_requirements.html.j2:55 msgid "Edit" msgstr "" -#: amt/site/templates/macros/editable.html.j2:58 +#: amt/site/templates/macros/editable.html.j2:62 #: amt/site/templates/projects/details_measure_modal.html.j2:84 msgid "Save" msgstr "" -#: amt/site/templates/macros/editable.html.j2:63 +#: amt/site/templates/macros/editable.html.j2:67 #: amt/site/templates/projects/details_measure_modal.html.j2:88 msgid "Cancel" msgstr "" @@ -295,10 +296,10 @@ msgid "Reviewing" msgstr "" #: amt/site/templates/macros/tasks.html.j2:32 -#: amt/site/templates/projects/details_base.html.j2:28 -#: amt/site/templates/projects/details_base.html.j2:54 -#: amt/site/templates/projects/details_base.html.j2:83 -#: amt/site/templates/projects/details_base.html.j2:106 +#: amt/site/templates/projects/details_base.html.j2:29 +#: amt/site/templates/projects/details_base.html.j2:55 +#: amt/site/templates/projects/details_base.html.j2:84 +#: amt/site/templates/projects/details_base.html.j2:107 msgid "Done" msgstr "" @@ -448,28 +449,28 @@ msgstr "" msgid "Select publication category" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:25 +#: amt/site/templates/projects/details_base.html.j2:26 msgid "Does the algorithm meet the requirements?" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:50 -#: amt/site/templates/projects/details_base.html.j2:104 +#: amt/site/templates/projects/details_base.html.j2:51 +#: amt/site/templates/projects/details_base.html.j2:105 msgid "To do" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:52 +#: amt/site/templates/projects/details_base.html.j2:53 msgid "In progress" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:69 +#: amt/site/templates/projects/details_base.html.j2:70 msgid "Go to all requirements" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:80 +#: amt/site/templates/projects/details_base.html.j2:81 msgid "Which instruments are executed?" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:121 +#: amt/site/templates/projects/details_base.html.j2:122 msgid "Go to all instruments" msgstr "" @@ -601,7 +602,7 @@ msgid "Algorithm System name" msgstr "" #: amt/site/templates/projects/new.html.j2:26 -msgid "Your algorithm system name here" +msgid "Name of the algorithm system" msgstr "" #: amt/site/templates/projects/new.html.j2:39 diff --git a/amt/locale/en_US/LC_MESSAGES/messages.mo b/amt/locale/en_US/LC_MESSAGES/messages.mo index e81e8679898917f1d78df7467f98cb9ff3d8c4dc..96833d06b9c75f348dcfb9c5eeae7b578211b54e 100644 GIT binary patch delta 60 zcmX@ie3*H{L?a^wLnA8#V{HQ?0|TxAf8C(evdrSl{5)Nk#FA7i1p@;ELtQWeGOY{@ Lv<(av9%cjp1WXVx delta 60 zcmX@ie3*H{L?Z(QBLgcVGi?JS0|TxAf8C(evdrSl{5)Nk#FA7iprnzBu7SC(k*R`_ Np_PFlP~F1Ai~t4-5K906 diff --git a/amt/locale/en_US/LC_MESSAGES/messages.po b/amt/locale/en_US/LC_MESSAGES/messages.po index 7545cfd8..d1371da5 100644 --- a/amt/locale/en_US/LC_MESSAGES/messages.po +++ b/amt/locale/en_US/LC_MESSAGES/messages.po @@ -268,17 +268,18 @@ msgstr "" msgid "Algorithmic Management Toolkit (AMT)" msgstr "" -#: amt/site/templates/macros/editable.html.j2:21 +#: amt/site/templates/macros/editable.html.j2:23 +#: amt/site/templates/macros/editable.html.j2:26 #: amt/site/templates/projects/details_requirements.html.j2:55 msgid "Edit" msgstr "" -#: amt/site/templates/macros/editable.html.j2:58 +#: amt/site/templates/macros/editable.html.j2:62 #: amt/site/templates/projects/details_measure_modal.html.j2:84 msgid "Save" msgstr "" -#: amt/site/templates/macros/editable.html.j2:63 +#: amt/site/templates/macros/editable.html.j2:67 #: amt/site/templates/projects/details_measure_modal.html.j2:88 msgid "Cancel" msgstr "" @@ -296,10 +297,10 @@ msgid "Reviewing" msgstr "" #: amt/site/templates/macros/tasks.html.j2:32 -#: amt/site/templates/projects/details_base.html.j2:28 -#: amt/site/templates/projects/details_base.html.j2:54 -#: amt/site/templates/projects/details_base.html.j2:83 -#: amt/site/templates/projects/details_base.html.j2:106 +#: amt/site/templates/projects/details_base.html.j2:29 +#: amt/site/templates/projects/details_base.html.j2:55 +#: amt/site/templates/projects/details_base.html.j2:84 +#: amt/site/templates/projects/details_base.html.j2:107 msgid "Done" msgstr "" @@ -449,28 +450,28 @@ msgstr "" msgid "Select publication category" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:25 +#: amt/site/templates/projects/details_base.html.j2:26 msgid "Does the algorithm meet the requirements?" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:50 -#: amt/site/templates/projects/details_base.html.j2:104 +#: amt/site/templates/projects/details_base.html.j2:51 +#: amt/site/templates/projects/details_base.html.j2:105 msgid "To do" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:52 +#: amt/site/templates/projects/details_base.html.j2:53 msgid "In progress" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:69 +#: amt/site/templates/projects/details_base.html.j2:70 msgid "Go to all requirements" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:80 +#: amt/site/templates/projects/details_base.html.j2:81 msgid "Which instruments are executed?" msgstr "" -#: amt/site/templates/projects/details_base.html.j2:121 +#: amt/site/templates/projects/details_base.html.j2:122 msgid "Go to all instruments" msgstr "" @@ -602,7 +603,7 @@ msgid "Algorithm System name" msgstr "" #: amt/site/templates/projects/new.html.j2:26 -msgid "Your algorithm system name here" +msgid "Name of the algorithm system" msgstr "" #: amt/site/templates/projects/new.html.j2:39 diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.mo b/amt/locale/nl_NL/LC_MESSAGES/messages.mo index 58dfd39e7f1bdddf61f5bfe3fdc3f42ed03e97ab..0a6bd48973906e4314fc0954fc26c7d7f8acab45 100644 GIT binary patch delta 1863 zcmZY9TWAzl9LMpKY_49a(YQ(6sH5=~V`LIrFRS&TXw--?+K5<)aj9cAk~KA10`)d3 z!E5!wpdx6C4?#siVd8_fVoNQh1<@2lQ4uY)7FwwaY9&GZ{<5b}!ZM$8&di+u|NPIH zJy>_B?qYYkUu=x&%QI#e7I6vTRLn;g({Tar!9_R(Z(#vG!om0-@-tb(jTwYR=-@;g zg9|YS8*wXsfdldBaO0cNG~O^U6bp$eOHm0#xhUW=)C3Kv3F9~b_gXtqfxpIFJck*0 z$$AAf&o$KiH!*^b@_l3G(CA}e3C|A9*b-bIRMW>F43 zSB(l>Yh8&-=rhd5b*Sf>aU{0-G?d9f)XL7Hw%`}*4b)0|P!m6}Rks014D2n+H(8r2N+7Ns7jBCW5uQG;6PeX=XT7x)2&IWRgi6S(O9 zC#bz&jjBYm9p7#}V(*{FaooR#gfhRU^i3ZPcEN;48M6kD;z#(>TE+p<-p5b@HlRwn z6}9r+wtpCv&EkfRrWC|a2g$^HWAEFVF2Ik?X*nm1r0V>e<)jiEhAMRgIZkFAs?;-)^KCvxjW0)S`Ff1{GbdBErVx5kv2+O*XyXW;@_c> zL*q}(!hcaKd4(!z!oWb7IYnEv-$-c*1G>vMuQ)g5JDKnVq)^`YJ1( zipr=vz09q2-2t`B%2#;pO>Ipr8_Va%l3vttUALmV|3@?Gx@E2#ye(W98c`FACH|k5 rIQ`Rlon6Iaf=$KeLcwS!9vapEOnYpj6ZewuJsWhCT*&OKE4};<4_4YB delta 1829 zcmXZcU2Ke59LMpa)9G}!rOQ+eZFy`hMamfU(l%TWq!ll#BcTMtKIw?QY)UnRJQ|@l z2qs>W-9)1yVJ#k;NL{L%4bqFc*sPbECf+WH5Xq|Y{bf!vc|PZyK6C#6^FROTiNx{5 z%{y7%7-P)PXk!9cz@!i(n1$uog)^}LeH@4PaU}kSe9UVe`8b3Qh9kyI!Wo#0b$9^l zF%SE3B0h~6&-}>X3kx!z=t`iJhXTe?8!SO>xDtQBUDmy*z?~Sz6PS(Xt-qu8=|=5; z8;kKi*5Hdmk4+gAk2NL-8&MgyU=a6X*$86}VG;AoJhtLJq-ds?a_GGZRN%SRg{XuU zVF*{C-dlqca6KxK-#i97*)h}=T(|R^cHWOV@c=5o3%fpu%bCAIB|JNtNvH;Ob*rpv zQ3tC>CDMROWILYWU|xzr9Sg(bGcVMV-ZB303+lwrNwW+;;V2wmVhkTs&O`HMs2)h5 zD$h5=7wa36?FdchQ84jXOGK^fW89SLxumY99cI4Jf z3+lZtoR5E?uH*?S@E|Ji8`RHr81?;p?m@j2MNeNWWuOx$P^C%Y&*-r~UW!Vvp^W+~qirmxG)<_DJ5gPK)V_EMRf%&L zz`yV;`lx_)WT}d5L7lV%wSEM({{@_dJ?P*7DxptPsDBrOZ!9Qa7suAgPxIg>Z|ZPrijg1}yZPI?M{OMR ztHOP`{)91pFlS?Hdz+I?-^wctIw`l!O+Os>H57B=vFiBzbbmA&iO1rV6|n^s@p(>s zPIYX~%vjw25?v8UZ_5jXn%!N=U){F!wUUYc-jZv9EVspPF-tzhm&k- fY;D`Qr`dIO@7uk{b(@`*WU|>w?c{5T>Al|p__xgU diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.po b/amt/locale/nl_NL/LC_MESSAGES/messages.po index 23b10d08..7cd30964 100644 --- a/amt/locale/nl_NL/LC_MESSAGES/messages.po +++ b/amt/locale/nl_NL/LC_MESSAGES/messages.po @@ -276,17 +276,18 @@ msgstr "Er is een fout opgetreden. Probeer het later opnieuw." msgid "Algorithmic Management Toolkit (AMT)" msgstr "Algoritme Management Toolkit (AMT)" -#: amt/site/templates/macros/editable.html.j2:21 +#: amt/site/templates/macros/editable.html.j2:23 +#: amt/site/templates/macros/editable.html.j2:26 #: amt/site/templates/projects/details_requirements.html.j2:55 msgid "Edit" -msgstr "Bewerken" +msgstr "Bewerk" -#: amt/site/templates/macros/editable.html.j2:58 +#: amt/site/templates/macros/editable.html.j2:62 #: amt/site/templates/projects/details_measure_modal.html.j2:84 msgid "Save" msgstr "Opslaan" -#: amt/site/templates/macros/editable.html.j2:63 +#: amt/site/templates/macros/editable.html.j2:67 #: amt/site/templates/projects/details_measure_modal.html.j2:88 msgid "Cancel" msgstr "Annuleren" @@ -304,10 +305,10 @@ msgid "Reviewing" msgstr "Beoordelen" #: amt/site/templates/macros/tasks.html.j2:32 -#: amt/site/templates/projects/details_base.html.j2:28 -#: amt/site/templates/projects/details_base.html.j2:54 -#: amt/site/templates/projects/details_base.html.j2:83 -#: amt/site/templates/projects/details_base.html.j2:106 +#: amt/site/templates/projects/details_base.html.j2:29 +#: amt/site/templates/projects/details_base.html.j2:55 +#: amt/site/templates/projects/details_base.html.j2:84 +#: amt/site/templates/projects/details_base.html.j2:107 msgid "Done" msgstr "Afgerond" @@ -467,28 +468,28 @@ msgstr "Selecteer levenscyclus" msgid "Select publication category" msgstr "Selecteer publicatiecategorie" -#: amt/site/templates/projects/details_base.html.j2:25 +#: amt/site/templates/projects/details_base.html.j2:26 msgid "Does the algorithm meet the requirements?" msgstr "Voldoet het algoritme aan de vereisten?" -#: amt/site/templates/projects/details_base.html.j2:50 -#: amt/site/templates/projects/details_base.html.j2:104 +#: amt/site/templates/projects/details_base.html.j2:51 +#: amt/site/templates/projects/details_base.html.j2:105 msgid "To do" msgstr "Te doen" -#: amt/site/templates/projects/details_base.html.j2:52 +#: amt/site/templates/projects/details_base.html.j2:53 msgid "In progress" msgstr "Onderhanden" -#: amt/site/templates/projects/details_base.html.j2:69 +#: amt/site/templates/projects/details_base.html.j2:70 msgid "Go to all requirements" msgstr "Ga naar alle Vereisten" -#: amt/site/templates/projects/details_base.html.j2:80 +#: amt/site/templates/projects/details_base.html.j2:81 msgid "Which instruments are executed?" msgstr "Welke instrumenten zijn uitgevoerd?" -#: amt/site/templates/projects/details_base.html.j2:121 +#: amt/site/templates/projects/details_base.html.j2:122 msgid "Go to all instruments" msgstr "Ga naar all instrumenten" @@ -619,11 +620,11 @@ msgstr "Creƫer een Algoritme Systeem" #: amt/site/templates/projects/new.html.j2:23 msgid "Algorithm System name" -msgstr "Algoritmekader" +msgstr "Naam algoritme systeem" #: amt/site/templates/projects/new.html.j2:26 -msgid "Your algorithm system name here" -msgstr "Jouw algoritme systeem naam hier" +msgid "Name of the algorithm system" +msgstr "Naam van het algoritme systeem" #: amt/site/templates/projects/new.html.j2:39 msgid "Select the lifecycle your algorithm system is currently in." diff --git a/amt/site/templates/macros/editable.html.j2 b/amt/site/templates/macros/editable.html.j2 index aa3353d4..bfcc5640 100644 --- a/amt/site/templates/macros/editable.html.j2 +++ b/amt/site/templates/macros/editable.html.j2 @@ -14,57 +14,62 @@ {{ value }} {% endif %} {% endif %} - - -{% endmacro %} -{% macro edit(obj, field_path) %} - -
-
-
-
- {% set value = nested_value(obj, field_path) %} - {% if is_nested_enum(obj, field_path) %} -
- -
- {% else %} - - {% endif %} -
-
- - + style="cursor: pointer; + float:right"> + {% trans %}Edit{% endtrans %} + + {% endmacro %} + {% macro edit(obj, field_path) %} + + +
+
+
+ {% set value = nested_value(obj, field_path) %} + {% if is_nested_enum(obj, field_path) %} +
+ +
+ {% else %} + + {% endif %} +
+
+ + +
-
- - -{% endmacro %} + + + {% endmacro %} diff --git a/amt/site/templates/projects/details_base.html.j2 b/amt/site/templates/projects/details_base.html.j2 index 0aac5194..c3eb6d80 100644 --- a/amt/site/templates/projects/details_base.html.j2 +++ b/amt/site/templates/projects/details_base.html.j2 @@ -1,4 +1,5 @@ {% extends 'layouts/base.html.j2' %} +{% from "macros/editable.html.j2" import editable with context %} {% block title %}{{ project.name }} | AMT{% endblock %} {% block content %}
-

{{ project.name }}

+

{{ editable(project, "name") }}

diff --git a/amt/site/templates/projects/new.html.j2 b/amt/site/templates/projects/new.html.j2 index cbf11a0e..d6cf3037 100644 --- a/amt/site/templates/projects/new.html.j2 +++ b/amt/site/templates/projects/new.html.j2 @@ -23,7 +23,7 @@