From aee9f15afdae1c21e12b7ddc0671c0a619a7776f Mon Sep 17 00:00:00 2001
From: Radek Czajka <rczajka@rczajka.pl>
Date: Wed, 3 Feb 2021 12:32:11 +0100
Subject: [PATCH] More image properties.

---
 src/redakcja/static/css/html.css              |   4 +
 .../static/js/wiki/view_properties.js         |  59 +++++--
 src/wiki/locale/pl/LC_MESSAGES/django.mo      | Bin 4003 -> 4077 bytes
 src/wiki/locale/pl/LC_MESSAGES/django.po      | 151 +++++++++---------
 .../wiki/tabs/properties_view_item.html       |   2 +-
 5 files changed, 132 insertions(+), 84 deletions(-)

diff --git a/src/redakcja/static/css/html.css b/src/redakcja/static/css/html.css
index 5a969fb8..05c9e9ed 100644
--- a/src/redakcja/static/css/html.css
+++ b/src/redakcja/static/css/html.css
@@ -312,6 +312,10 @@
     word-spacing: 1em;
 }
 
+.htmlview .ilustr img {
+    max-width: 100%;
+}
+
 .htmlview .parse-warning {
     display: block;
     font-size: 10pt;
diff --git a/src/redakcja/static/js/wiki/view_properties.js b/src/redakcja/static/js/wiki/view_properties.js
index 571dac00..32a7101b 100644
--- a/src/redakcja/static/js/wiki/view_properties.js
+++ b/src/redakcja/static/js/wiki/view_properties.js
@@ -13,6 +13,19 @@
                     "name": "alt",
                     "type": "text",
                 },
+                {
+                    "name": "szer",
+                    "type": "percent",
+                },
+                {
+                    "name": "wyrownanie",
+                    "type": "select",
+                    "options": ["lewo", "srodek", "prawo"],
+                },
+                {
+                    "name": "oblew",
+                    "type": "bool",
+                },
             ],
         },
         "ref": {
@@ -45,8 +58,15 @@
             self.$pane.on('change', '.form-control', function() {
                 let $input = $(this);
 
+                let inputval;
+                if ($input.attr('type') == 'checkbox') {
+                    inputval = $input.is(':checked');
+                } else {
+                    inputval = $input.val();
+                }
+                
                 if ($input.data("edited")) {
-                    $input.data("edited").text($input.val());
+                    $input.data("edited").text(inputval);
                     return;
                 }
                 
@@ -56,7 +76,8 @@
                         w(222)
                         let $xmlelem = $($.parseXML(xml));
                         w(333, $xmlelem)
-                        $xmlelem.contents().attr($input.data('property'), $input.val());
+                        w($input.data('property'), $input.val());
+                        $xmlelem.contents().attr($input.data('property'), inputval);
                         w(444, $xmlelem)
                         let newxml = (new XMLSerializer()).serializeToString($xmlelem[0]);
                         w(555, newxml)
@@ -104,7 +125,7 @@
         let nodeDef = elementDefs[node];
         if (nodeDef && nodeDef.attributes) {
             $.each(nodeDef.attributes, function(i, a) {
-                self.addEditField(a.name, a.type, $(element).attr('data-wlf-' + a.name)); // ...
+                self.addEditField(a, $(element).attr('data-wlf-' + a.name)); // ...
             })
         }
 
@@ -115,8 +136,7 @@
             $("> .RDF > .Description > [x-node]", $node).each(function() {
                 $meta = $(this);
                 self.addEditField(
-                    $meta.attr('x-node'),
-                    null,
+                    {"name": $meta.attr('x-node'),},
                     $meta.text(),
                     $meta,
                 );
@@ -124,20 +144,37 @@
         }
     };
         
-    PropertiesPerspective.prototype.addEditField = function(name, type, value, elem) {
+    PropertiesPerspective.prototype.addEditField = function(defn, value, elem) {
         let self = this;
         let $form = $("#properties-form", self.$pane);
 
         let $fg = $("<div class='form-group'>");
-        $("<label/>").attr("for", "property-" + name).text(name).appendTo($fg);
+        $("<label/>").attr("for", "property-" + defn.name).text(defn.name).appendTo($fg);
         let $input;
-        if (type == 'text') {
+        switch (defn.type) {
+        case 'text':
             $input = $("<textarea>");
+            break;
+        case 'select':
+            $input = $("<select>");
+            $.each(defn.options, function(i, e) {
+                $("<option>").text(e).appendTo($input);
+            });
+            break;
+        case 'bool':
+            $input = $("<input type='checkbox'>");
+            break;
+        default:
+            $input = $("<input>");
+        }
+
+        $input.addClass("form-control").attr("id", "property-" + defn.name).data("property", defn.name);
+        if ($input.attr('type') == 'checkbox') {
+            $input.prop('checked', value == 'true');
         } else {
-            $input = $("<input>")
+            $input.val(value);
         }
-        // val?
-        $input.addClass("form-control").attr("id", "property-" + name).data("property", name).val(value);
+        
         if (elem) {
             $input.data("edited", elem);
         }
diff --git a/src/wiki/locale/pl/LC_MESSAGES/django.mo b/src/wiki/locale/pl/LC_MESSAGES/django.mo
index ce96f6ec674a38a7efb5329af5eb3cf34f59a5a7..91c9ee0b3502ca1a9a5f57109aa6d145b769ac27 100644
GIT binary patch
delta 1561
zcmYk+OGs346vy$?=%mePmZoN7X=V?f^Rg_pEVCl07C}X?g@lQL4<yh<c%c^sVvuA|
zi;760CpEPQS3$b7MdHF1R=Zjl6uOb1zQ6Gf_{VcU|Nq=O_niM@d|WV7;7n&G-!WPv
zkx$fl%$o2_G8fu6ubCge<5HZ#<v8n(llV|$ALd{l1~7yx@DMJ;vzUP`xCXni$jq_Z
zbd=zo>jz9>JdW#d60>m@Rg;gKx}U)%h`G2D51<mB#5BBsDy$oo_&R3cAd=XgqM!UW
zPDd}ELOnPgzhU+Z`LlU0sp#S2LqDqE9MsH;Fb~U7&+m8dA3+sz3aQ;%Q15Sd?ZssB
zTR)xEIDmTaIc8!Em1qq0;?Jlh{(`0W8`%ZRrwZLKaxFzAj$k_0yB@|6<I~8W^>J~M
z=nT@)3fx1z@PX?SR6);>T=oVv(-G8JnZ!#=%>KCdJE&IQ??EN*MSZ^y*Wv)K!q=!R
z7}NS|&wlcOmUbSsL|)3*US*>WQweHD`?zRjj-qDVj5-@_sDiGb3V4VrcnE{|3RTco
z)LEH9QrW*W)?Z8S=dKbLqbjVzN<4^qum_o>UBz7NN8VvWsDv@p1m2?#-AB}WCQ#4)
zK&`+Ws_-lx(!>J}9euIfwHh_U2KRwus3kn_j@#UEFKQ;&P=((`B^pL;(OcYvpHSbQ
zL#@bPckJa$bj?YlqZb5R%P_*Y7FA(8YUU1VrZ-WEZ@J?~s072P0$!q4XarTr1ad^;
z=W8=2TERlciJxdys@6zo_VvUTLJ5^zTd;@NO(a?wokBv}M-JOcEN)7^m#85s2o;%V
zT8Z-bV8G+ebgC1dqy9JP$mw5C1F?$;5<0JH9%2Kro~R|Xh+3y&LQT7?4PD%{^EwS`
zB@4vYP~Gij$894WPDXs;c3_yOB6OxJ3H=uIL)}JbbJR)+E%;6iXwe0%4nyk4UU-9^
z)UJ-s=B|sa&9SMJs3$#K5sFlVqJ`l|O*9<K^K~XIKQVf_Y4rZN*6t2nV>i+Rp8t`k
Bdd&a;

delta 1503
zcmYM!Pe{{Y9LMo*Q_D7IHLICfv$Q{&bDPesW@aT}K^?>>BP0mxpcjQGiD(__Af7rz
z5Lk!m5Q3D0Iz$EGB~O_*qrxu3gN3K+*8B6@V?FHqdp*DX{yg93`#jrH<Z&eXHB@}h
zXq`kgk@T6J!;{4vXwOT`0{8+~;~Ol;X?H&7&gXG6-!I};)XnRm8rNbJ*I^o~unTvZ
zW$hvz4RFVK7uRq;j@$7mZo+9)PV?^iH;i$f#|;?fAq`lMWtc%F+JzeU3|8P}WMI3F
z0mip+I(qRl)Qywg1+%xv$7VQ`;wSh0XVi@HxCNJyj|I3%6RAKY5J7UYM$~&-oSmrg
zda#o5t(T5&9L5lipk6eFdhvZ!X&+$&zC@~Q3+{T}`4ctpFAQQaS;`Q`u?CfRH-{oT
zk6C4MfsS6-?;JoSG=#j%uAydn3$;fc;Eh#guiW({+3NXr)PS9+=euzm_TomoiYomW
zYN;kwe?Ogfe4!G}pw?&}wTXV9X5{Cf%7jrBX+Z6XW>iAQQ3+f^B|L~Ryn;&T32Ki_
zA+NM)ti+FH)L#QH@`W<|gH2e@Q@XJonWUY-F!ms~*dS`a5!3{3qMjdh*B_#0K7mU3
z18T;zsQbS=m$Gy;v)}H909#h2t42Lg>&}y?8ML7iK7~r854AJ{xEpVyo}WNfV#=Mr
zMn3kQgPxytW*6u*^Tjf1z&fsK#;vFscAy46=FZQe2Ixa2(2uIjFe;HzWNUck1#2bh
ziHuHYZ3Vnzjeh@!=tc=WtdeQ4b|OXaF0ZVOsEw+YC}0P%gV6dbp<RS#tjVaNwS=0M
zG3NFDACCO%>i0*}zu#W3SJ+stYy0Wwr?=9yDR&TQB1w3g5swn8-abM*TuY&KR%2zo
zMuEM5K2=SdTvd)}fCEGmQAg+>FHZP~7D7v)@~*VQboLNMxi2L#UoKo4_XXq8L?Rkb
U)g;oH=2Y&qf2b%o7p(IA1^oVOeE<Le

diff --git a/src/wiki/locale/pl/LC_MESSAGES/django.po b/src/wiki/locale/pl/LC_MESSAGES/django.po
index 1eb74fd0..7d75ae41 100644
--- a/src/wiki/locale/pl/LC_MESSAGES/django.po
+++ b/src/wiki/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Platforma Redakcyjna\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-11-06 17:26+0100\n"
+"PO-Revision-Date: 2021-02-03 12:31+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: Fundacja Nowoczesna Polska <fundacja@nowoczesnapolska.org."
 "pl>\n"
@@ -17,272 +17,279 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 2.3\n"
 
-#: wiki/forms.py:17 wiki/forms.py:61 wiki/views.py:284
+#: forms.py:17 forms.py:61 views.py:284
 msgid "Publishable"
 msgstr "Gotowe do publikacji"
 
-#: wiki/forms.py:36 wiki/forms.py:87
+#: forms.py:36 forms.py:87
 msgid "Author"
 msgstr "Autor"
 
-#: wiki/forms.py:37 wiki/forms.py:88
+#: forms.py:37 forms.py:88
 msgid "Your name"
 msgstr "Imię i nazwisko"
 
-#: wiki/forms.py:42 wiki/forms.py:93
+#: forms.py:42 forms.py:93
 msgid "Author's email"
 msgstr "E-mail autora"
 
-#: wiki/forms.py:43 wiki/forms.py:94
+#: forms.py:43 forms.py:94
 msgid "Your email address, so we can show a gravatar :)"
 msgstr "Adres e-mail, żebyśmy mogli pokazać gravatar :)"
 
-#: wiki/forms.py:49 wiki/forms.py:100
+#: forms.py:49 forms.py:100
 msgid "Your comments"
 msgstr "Twój komentarz"
 
-#: wiki/forms.py:50
+#: forms.py:50
 msgid "Describe changes you made."
 msgstr "Opisz swoje zmiany."
 
-#: wiki/forms.py:56
+#: forms.py:56
 msgid "Completed"
 msgstr "Ukończono"
 
-#: wiki/forms.py:57
+#: forms.py:57
 msgid "If you completed a life cycle stage, select it."
 msgstr "Jeśli został ukończony etap prac, wskaż go."
 
-#: wiki/forms.py:62
+#: forms.py:62
 msgid "Mark this revision as publishable."
 msgstr "Oznacz tę wersję jako gotową do publikacji."
 
-#: wiki/forms.py:101
+#: forms.py:101
 msgid "Describe the reason for reverting."
 msgstr "Opisz powód przywrócenia."
 
-#: wiki/models.py:12
+#: models.py:12
 msgid "name"
 msgstr "nazwa"
 
-#: wiki/models.py:16
+#: models.py:16
 msgid "theme"
 msgstr "motyw"
 
-#: wiki/models.py:17
+#: models.py:17
 msgid "themes"
 msgstr "motywy"
 
-#: wiki/templates/admin/wiki/theme/change_list.html:22
+#: templates/admin/wiki/theme/change_list.html:22
 msgid "Table for Redmine wiki"
 msgstr "Tabela do wiki na Redmine"
 
-#: wiki/templates/wiki/diff_table.html:5
+#: templates/wiki/diff_table.html:5
 msgid "Old version"
 msgstr "Stara wersja"
 
-#: wiki/templates/wiki/diff_table.html:6
+#: templates/wiki/diff_table.html:6
 msgid "New version"
 msgstr "Nowa wersja"
 
-#: wiki/templates/wiki/document_details.html:37
+#: templates/wiki/document_details.html:38
 msgid "Click to open/close gallery"
 msgstr "Kliknij, aby (ro)zwinąć galerię"
 
-#: wiki/templates/wiki/document_details_base.html:50
+#: templates/wiki/document_details_base.html:50
 msgid "Help"
 msgstr "Pomoc"
 
-#: wiki/templates/wiki/document_details_base.html:52
+#: templates/wiki/document_details_base.html:52
 msgid "Version"
 msgstr "Wersja"
 
-#: wiki/templates/wiki/document_details_base.html:52
+#: templates/wiki/document_details_base.html:52
 msgid "Unknown"
 msgstr "Nieznana"
 
-#: wiki/templates/wiki/document_details_base.html:54
-#: wiki/templates/wiki/pubmark_dialog.html:16
+#: templates/wiki/document_details_base.html:54
+#: templates/wiki/pubmark_dialog.html:16
 msgid "Save"
 msgstr "Zapisz"
 
-#: wiki/templates/wiki/document_details_base.html:55
+#: templates/wiki/document_details_base.html:55
 msgid "Save attempt in progress"
 msgstr "Trwa zapisywanie"
 
-#: wiki/templates/wiki/document_details_base.html:56
+#: templates/wiki/document_details_base.html:56
 msgid "There is a newer version of this document!"
 msgstr "Istnieje nowsza wersja tego dokumentu!"
 
-#: wiki/templates/wiki/pubmark_dialog.html:17
-#: wiki/templates/wiki/revert_dialog.html:40
+#: templates/wiki/pubmark_dialog.html:17 templates/wiki/revert_dialog.html:40
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: wiki/templates/wiki/revert_dialog.html:39
+#: templates/wiki/revert_dialog.html:39
 msgid "Revert"
 msgstr "Przywróć"
 
-#: wiki/templates/wiki/tabs/annotations_view.html:18
+#: templates/wiki/tabs/annotations_view.html:18
 msgid "all"
 msgstr "wszystkie"
 
-#: wiki/templates/wiki/tabs/annotations_view_item.html:3
+#: templates/wiki/tabs/annotations_view_item.html:3
 msgid "Annotations"
 msgstr "Przypisy"
 
-#: wiki/templates/wiki/tabs/gallery_view.html:6
+#: templates/wiki/tabs/gallery_view.html:7
 msgid "Go to first image of this part"
 msgstr "Przejdź na początek"
 
-#: wiki/templates/wiki/tabs/gallery_view.html:9
+#: templates/wiki/tabs/gallery_view.html:10
 msgid "Previous"
 msgstr "Poprzednie"
 
-#: wiki/templates/wiki/tabs/gallery_view.html:14
+#: templates/wiki/tabs/gallery_view.html:21
 msgid "Next"
 msgstr "Następne"
 
-#: wiki/templates/wiki/tabs/gallery_view_item.html:3
+#: templates/wiki/tabs/gallery_view_item.html:3
 msgid "Gallery"
 msgstr "Galeria"
 
-#: wiki/templates/wiki/tabs/history_view.html:6
+#: templates/wiki/tabs/history_view.html:6
 msgid "Compare versions"
 msgstr "Porównaj wersje"
 
-#: wiki/templates/wiki/tabs/history_view.html:9
+#: templates/wiki/tabs/history_view.html:9
 msgid "Mark for publishing"
 msgstr "Oznacz do publikacji"
 
-#: wiki/templates/wiki/tabs/history_view.html:12
+#: templates/wiki/tabs/history_view.html:12
 msgid "Revert document"
 msgstr "Przywróć wersję"
 
-#: wiki/templates/wiki/tabs/history_view.html:15
+#: templates/wiki/tabs/history_view.html:15
 msgid "View version"
 msgstr "Zobacz wersję"
 
-#: wiki/templates/wiki/tabs/history_view_item.html:3
+#: templates/wiki/tabs/history_view_item.html:3
+#: templates/wiki/tabs/history_view_item.html:5
 msgid "History"
 msgstr "Historia"
 
-#: wiki/templates/wiki/tabs/search_view.html:4
-#: wiki/templates/wiki/tabs/search_view.html:8
+#: templates/wiki/tabs/properties_view_item.html:3
+msgid "Properties"
+msgstr "Właściwości"
+
+#: templates/wiki/tabs/search_view.html:4
+#: templates/wiki/tabs/search_view.html:8
 msgid "Search"
 msgstr "Szukaj"
 
-#: wiki/templates/wiki/tabs/search_view.html:11
+#: templates/wiki/tabs/search_view.html:11
 msgid "Replace with"
 msgstr "Zamień na"
 
-#: wiki/templates/wiki/tabs/search_view.html:15
+#: templates/wiki/tabs/search_view.html:15
 msgid "Replace"
 msgstr "Zamień"
 
-#: wiki/templates/wiki/tabs/search_view.html:19
+#: templates/wiki/tabs/search_view.html:19
 msgid "Replace all"
 msgstr "Zamień wszystko"
 
-#: wiki/templates/wiki/tabs/search_view.html:21
+#: templates/wiki/tabs/search_view.html:21
 msgid "Options"
 msgstr "Opcje"
 
-#: wiki/templates/wiki/tabs/search_view.html:24
+#: templates/wiki/tabs/search_view.html:24
 msgid "Case sensitive"
 msgstr "Rozróżniaj wielkość liter"
 
-#: wiki/templates/wiki/tabs/search_view.html:28
+#: templates/wiki/tabs/search_view.html:28
 msgid "From cursor"
 msgstr "Zacznij od kursora"
 
-#: wiki/templates/wiki/tabs/search_view_item.html:4
+#: templates/wiki/tabs/search_view_item.html:4
 msgid "Search and replace"
 msgstr "Znajdź i zamień"
 
-#: wiki/templates/wiki/tabs/source_editor_item.html:5
+#: templates/wiki/tabs/source_editor_item.html:5
+#: templates/wiki/tabs/source_editor_item.html:7
 msgid "Source code"
 msgstr "Kod źródłowy"
 
-#: wiki/templates/wiki/tabs/summary_view.html:11
+#: templates/wiki/tabs/summary_view.html:11
 msgid "Refresh from working copy"
 msgstr "Odśwież z edytowanej wersji"
 
-#: wiki/templates/wiki/tabs/summary_view.html:15
+#: templates/wiki/tabs/summary_view.html:15
 msgid "Title"
 msgstr "Tytuł"
 
-#: wiki/templates/wiki/tabs/summary_view.html:19
+#: templates/wiki/tabs/summary_view.html:19
 msgid "Go to the book's page"
 msgstr "Przejdź do strony książki"
 
-#: wiki/templates/wiki/tabs/summary_view.html:22
+#: templates/wiki/tabs/summary_view.html:22
 msgid "Document ID"
 msgstr "ID dokumentu"
 
-#: wiki/templates/wiki/tabs/summary_view.html:26
+#: templates/wiki/tabs/summary_view.html:26
 msgid "Current version"
 msgstr "Aktualna wersja"
 
-#: wiki/templates/wiki/tabs/summary_view.html:30
+#: templates/wiki/tabs/summary_view.html:30
 msgid "Last edited by"
 msgstr "Ostatnio edytowane przez"
 
-#: wiki/templates/wiki/tabs/summary_view.html:34
+#: templates/wiki/tabs/summary_view.html:34
 msgid "Link to gallery"
 msgstr "Link do galerii"
 
-#: wiki/templates/wiki/tabs/summary_view.html:39
+#: templates/wiki/tabs/summary_view.html:39
 msgid "Characters in document"
 msgstr "Znaków w dokumencie"
 
-#: wiki/templates/wiki/tabs/summary_view.html:41
-#: wiki/templates/wiki/tabs/summary_view.html:42
-#: wiki/templates/wiki/tabs/summary_view.html:45
+#: templates/wiki/tabs/summary_view.html:41
+#: templates/wiki/tabs/summary_view.html:42
+#: templates/wiki/tabs/summary_view.html:45
 msgid "pages"
 msgstr "stron maszynopisu"
 
-#: wiki/templates/wiki/tabs/summary_view.html:41
+#: templates/wiki/tabs/summary_view.html:41
 msgid "without footnotes and themes"
 msgstr "bez przypisów i motywów"
 
-#: wiki/templates/wiki/tabs/summary_view.html:42
+#: templates/wiki/tabs/summary_view.html:42
 msgid "with footnotes and themes"
 msgstr "z przypisami i motywami"
 
-#: wiki/templates/wiki/tabs/summary_view.html:45
+#: templates/wiki/tabs/summary_view.html:45
 msgid "untagged"
 msgstr "nieotagowane"
 
-#: wiki/templates/wiki/tabs/summary_view_item.html:3
+#: templates/wiki/tabs/summary_view_item.html:3
+#: templates/wiki/tabs/summary_view_item.html:5
 msgid "Summary"
 msgstr "Podsumowanie"
 
-#: wiki/templates/wiki/tabs/wysiwyg_editor.html:7
+#: templates/wiki/tabs/wysiwyg_editor.html:7
 msgid "Insert theme"
 msgstr "Wstaw motyw"
 
-#: wiki/templates/wiki/tabs/wysiwyg_editor.html:10
+#: templates/wiki/tabs/wysiwyg_editor.html:10
 msgid "Insert annotation"
 msgstr "Wstaw przypis"
 
-#: wiki/templates/wiki/tabs/wysiwyg_editor.html:13
+#: templates/wiki/tabs/wysiwyg_editor.html:13
 msgid "Insert reference"
 msgstr "Wstaw referencję"
 
-#: wiki/templates/wiki/tabs/wysiwyg_editor_item.html:3
+#: templates/wiki/tabs/wysiwyg_editor_item.html:3
+#: templates/wiki/tabs/wysiwyg_editor_item.html:5
 msgid "Visual editor"
 msgstr "Edytor wizualny"
 
-#: wiki/views.py:286
+#: views.py:286
 msgid "Published"
 msgstr "Opublikowano"
 
-#: wiki/views.py:307
+#: views.py:307
 msgid "Revision marked"
 msgstr "Wersja oznaczona"
 
-#: wiki/views.py:309
+#: views.py:309
 msgid "Nothing changed"
 msgstr "Nic nie uległo zmianie"
 
diff --git a/src/wiki/templates/wiki/tabs/properties_view_item.html b/src/wiki/templates/wiki/tabs/properties_view_item.html
index 53524a72..89205037 100644
--- a/src/wiki/templates/wiki/tabs/properties_view_item.html
+++ b/src/wiki/templates/wiki/tabs/properties_view_item.html
@@ -1,4 +1,4 @@
 {% load i18n %}
 <li id="PropertiesPerspective" data-ui-related="side-properties" data-ui-jsclass="PropertiesPerspective" class="nav-item">
-    <a href="#" title="{% trans "Properties" %}" class="nav-link">PR</a>
+    <a href="#" title="{% trans "Properties" %}" class="nav-link">&#x1F3F7;</a>
 </li>
-- 
2.20.1