From abcd38fd4eb1e8863e56bf4f4be48c3c508722b1 Mon Sep 17 00:00:00 2001
From: Peter Dermott <p.dermott@fermorltd.co.uk>
Date: Tue, 14 Jan 2020 10:16:20 +0000
Subject: [PATCH 01/13] Remove unneeded import

---
 grappelli_safe/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/grappelli_safe/__init__.py b/grappelli_safe/__init__.py
index 4cc4fea..db7986c 100644
--- a/grappelli_safe/__init__.py
+++ b/grappelli_safe/__init__.py
@@ -1,2 +1 @@
-from __future__ import unicode_literals
-VERSION = '2.0'
\ No newline at end of file
+VERSION = '2.0'

From 41a4705b105ce539e4189b250abd66d6ff04e28b Mon Sep 17 00:00:00 2001
From: Peter Dermott <p.dermott@fermorltd.co.uk>
Date: Tue, 14 Jan 2020 10:16:49 +0000
Subject: [PATCH 02/13] Fix url

---
 grappelli_safe/static/grappelli/js/admin/Inline.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/grappelli_safe/static/grappelli/js/admin/Inline.js b/grappelli_safe/static/grappelli/js/admin/Inline.js
index af60d7e..c273c6a 100644
--- a/grappelli_safe/static/grappelli/js/admin/Inline.js
+++ b/grappelli_safe/static/grappelli/js/admin/Inline.js
@@ -69,6 +69,7 @@ jQuery(function($) {
             }
             if ($(this).attr('href')) {
                 $(this).attr('href', $(this).attr('href').replace(/-\d+-/g, "-" + parseInt(items - 1) + "-"));
+                $(this).attr('href', $(this).attr('href').replace(/__prefix__/g,  "" + parseInt(items - 1) ));
             }
         });
         /// remove calendars and clocks, re-init

From 5aa32d3dd53737c66e6ddf3fcf90afa69403328f Mon Sep 17 00:00:00 2001
From: Peter Dermott <p.dermott@fermorltd.co.uk>
Date: Tue, 14 Jan 2020 10:17:24 +0000
Subject: [PATCH 03/13] Move jQuery UI out to base admin template (fixes broken
 inlines)

---
 grappelli_safe/templates/admin/base.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/grappelli_safe/templates/admin/base.html b/grappelli_safe/templates/admin/base.html
index 97b5c94..ec17fa8 100644
--- a/grappelli_safe/templates/admin/base.html
+++ b/grappelli_safe/templates/admin/base.html
@@ -17,6 +17,8 @@
 <!-- JAVASCRIPTS / EXTRAHEAD -->
 {% block javascripts %}
 <script type="text/javascript" src="{% static "mezzanine/js/"|add:settings.JQUERY_FILENAME %}"></script>
+<script type="text/javascript" src="{% static "mezzanine/js/"|add:settings.JQUERY_UI_FILENAME %}"></script>
+
 <script type="text/javascript">
     // Ensures jQuery does not pollute the global namespace
     $.noConflict();

From 0a61d21ce532c45a831e934499d512d45647661f Mon Sep 17 00:00:00 2001
From: Peter Dermott <p.dermott@fermorltd.co.uk>
Date: Tue, 14 Jan 2020 10:17:50 +0000
Subject: [PATCH 04/13] Pass correct args to inlines

---
 .../templates/admin/edit_inline/tabular.html       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/grappelli_safe/templates/admin/edit_inline/tabular.html b/grappelli_safe/templates/admin/edit_inline/tabular.html
index 15c588c..98f2c27 100644
--- a/grappelli_safe/templates/admin/edit_inline/tabular.html
+++ b/grappelli_safe/templates/admin/edit_inline/tabular.html
@@ -81,7 +81,7 @@ <h3><b>&nbsp;</b></h3>
 
 (function($) {
   var prefix = "{{ inline_admin_formset.formset.prefix|escapejs }}";
-  $("#{{ inline_admin_formset.formset.prefix|escapejs }}-group .inline-related").stackedFormset({
+  $().stackedFormset("#{{ inline_admin_formset.formset.prefix|escapejs }}-group .inline-related", {
     prefix: prefix,
     addText: "{% filter escapejs %}{% blocktrans with inline_admin_formset.opts.verbose_name|capfirst as verbose_name %}Add another {{ verbose_name }}{% endblocktrans %}{% endfilter %}",
     deleteText: "{% filter escapejs %}{% trans 'Delete Item' %}{% endfilter %}"
@@ -96,6 +96,18 @@ <h3><b>&nbsp;</b></h3>
             .addClass("deletelink")
             .attr("title", $deleteLink.text())
             .text("");
+        // Execute the TabularInlineAdded callback
+        if ($.isFunction(window.__onTabularInlineAdded)) {
+            window.__onTabularInlineAdded($row, targetPrefix);
+        }
+    }
+  });
+  $(document).on("formset:removed", function(event, $row, targetPrefix) {
+    if (targetPrefix === prefix) {
+        // Execute the StackedInlineRemoved callback
+        if ($.isFunction(window.__onTabularInlineRemoved)) {
+            window.__onTabularInlineRemoved($row, targetPrefix);
+        }
     }
   });
 })(django.jQuery);

From 1909cea88b14f6e5ece3f903d5e04c4b1fc499f8 Mon Sep 17 00:00:00 2001
From: Peter Dermott <p.dermott@fermorltd.co.uk>
Date: Tue, 21 Jan 2020 14:48:36 +0000
Subject: [PATCH 05/13] Style fix for M2M widget

---
 grappelli_safe/static/grappelli/css/widgets.css | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/grappelli_safe/static/grappelli/css/widgets.css b/grappelli_safe/static/grappelli/css/widgets.css
index edd1850..23b0b3b 100644
--- a/grappelli_safe/static/grappelli/css/widgets.css
+++ b/grappelli_safe/static/grappelli/css/widgets.css
@@ -10,7 +10,6 @@
 }
 
 .selector-available, .selector-chosen {
-    float: left;
     width: 338px;
     border: 1px solid #ccc;
     -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px;
@@ -20,7 +19,7 @@
     width: 698px;
 }
 
-.selector h2, .inline-group .selector h2, 
+.selector h2, .inline-group .selector h2,
 .inline-related fieldset .selector-available h2, .inline-related fieldset .selector-chosen h2 {
     padding: 7px 5px 6px 7px;
     font-size: 12px; line-height: 13px; font-weight: bold;
@@ -56,6 +55,11 @@
     display: none;
 }
 
+.selector select {
+    min-height: 300px;
+    width: 100%;
+}
+
 .selector select[multiple=multiple] {
     margin: 0; padding-left: 3px;
     width: 338px; height: 200px;
@@ -158,7 +162,7 @@ input.vDateField + span, input.vTimeField + span {
     vertical-align: middle;
     color: #ccc; font-size: 11px; line-height: 11px;
 }
-input.vDateField + span a:first-child, 
+input.vDateField + span a:first-child,
 input.vTimeField + span a:first-child {
     position: relative; top: 1px;
 }
@@ -166,7 +170,7 @@ input.vTimeField + span a:first-child {
 .form-row label + p.datetime {
     margin: 0;
 }
-.change-list form table input.vDateField + span, 
+.change-list form table input.vDateField + span,
 .change-list form table input.vTimeField + span {
     vertical-align: baseline;
 }
@@ -260,7 +264,7 @@ a[id^="clocklink"]:hover, a[id^="clocklink"]:active {
     color: #444;
 }
 
-.calendar td a:hover, .calendar td a:active, 
+.calendar td a:hover, .calendar td a:active,
 .timelist a:hover, .timelist a:active {
     color: #fff;
     background: #309bbf;
@@ -290,7 +294,7 @@ a.calendarnav-next {
     -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px;
     background-image: url('../img/icons/icon-calendarnav_next.png');
 }
-a.calendarnav-previous:hover, a.calendarnav-previous:active, 
+a.calendarnav-previous:hover, a.calendarnav-previous:active,
 a.calendarnav-next:hover, a.calendarnav-next:active {
     background-color: #309bbf;
 }

From 4ad85dcf7b49d2d00f5a38e8a1f12b54bde746d9 Mon Sep 17 00:00:00 2001
From: zriv <zriv@users.noreply.github.com>
Date: Fri, 28 Feb 2020 09:02:34 +0000
Subject: [PATCH 06/13] Rename admin CSS class "field-box" to "fieldBox".

(This addresses a change made in Django 2.1 to fix
Django bug #29248.)
---
 grappelli_safe/static/grappelli/css/forms.css | 2 +-
 grappelli_safe/static/grappelli/css/rtl.css   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/grappelli_safe/static/grappelli/css/forms.css b/grappelli_safe/static/grappelli/css/forms.css
index dbce61f..d2bed1c 100644
--- a/grappelli_safe/static/grappelli/css/forms.css
+++ b/grappelli_safe/static/grappelli/css/forms.css
@@ -111,7 +111,7 @@ form .aligned input + label + .help {
 td .help {
     margin-bottom: 3px; padding: 0;
 }
-fieldset .field-box {
+fieldset .fieldBox {
     float: left;
     margin-right: 45px;
     white-space: nowrap;
diff --git a/grappelli_safe/static/grappelli/css/rtl.css b/grappelli_safe/static/grappelli/css/rtl.css
index c91894b..856ecbe 100644
--- a/grappelli_safe/static/grappelli/css/rtl.css
+++ b/grappelli_safe/static/grappelli/css/rtl.css
@@ -238,7 +238,7 @@ form ul.inline li {
     padding-left: 7px;
 }
 
-fieldset .field-box {
+fieldset .fieldBox {
     float: right;
     margin-left: 20px;
 }

From b5422159421e74a72f40c3ec5d2078727872674b Mon Sep 17 00:00:00 2001
From: Peter Dermott <p.dermott@fermorltd.co.uk>
Date: Wed, 4 Mar 2020 16:35:32 +0000
Subject: [PATCH 07/13] Style fixes for selector element

---
 grappelli_safe/static/grappelli/css/widgets.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/grappelli_safe/static/grappelli/css/widgets.css b/grappelli_safe/static/grappelli/css/widgets.css
index 23b0b3b..fe07bf5 100644
--- a/grappelli_safe/static/grappelli/css/widgets.css
+++ b/grappelli_safe/static/grappelli/css/widgets.css
@@ -5,6 +5,8 @@
 ------------------------------------------------------------------------------------------------------ */
 
 .selector {
+    align-items: center;
+    display: flex;
     position: relative; float: left; overflow: hidden;
     width: 700px;
 }

From 94373ff1cf51ad3c1345edaf0632fbec2579616b Mon Sep 17 00:00:00 2001
From: Peter Dermott <p.dermott@fermorltd.co.uk>
Date: Wed, 4 Mar 2020 16:35:48 +0000
Subject: [PATCH 08/13] Update tested python versions

---
 setup.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 2a0377f..1cd5915 100644
--- a/setup.py
+++ b/setup.py
@@ -18,9 +18,7 @@
     zip_safe=False,
     classifiers=[
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.8",
     ],
 )

From 1a24ef7fdfac558fe0ba198072f349ee62bc41dd Mon Sep 17 00:00:00 2001
From: Peter Dermott <p.dermott@fermorltd.co.uk>
Date: Thu, 5 Mar 2020 10:02:27 +0000
Subject: [PATCH 09/13] More fixes for selector CSS

---
 grappelli_safe/static/grappelli/css/widgets.css | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/grappelli_safe/static/grappelli/css/widgets.css b/grappelli_safe/static/grappelli/css/widgets.css
index fe07bf5..65ea4aa 100644
--- a/grappelli_safe/static/grappelli/css/widgets.css
+++ b/grappelli_safe/static/grappelli/css/widgets.css
@@ -8,19 +8,16 @@
     align-items: center;
     display: flex;
     position: relative; float: left; overflow: hidden;
-    width: 700px;
 }
-
 .selector-available, .selector-chosen {
-    width: 338px;
     border: 1px solid #ccc;
     -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px;
     background: #ddd;
+    width: 49%;
 }
 .stacked .selector-available, .stacked .selector-chosen {
     width: 698px;
 }
-
 .selector h2, .inline-group .selector h2,
 .inline-related fieldset .selector-available h2, .inline-related fieldset .selector-chosen h2 {
     padding: 7px 5px 6px 7px;
@@ -29,7 +26,6 @@
     border-bottom: 1px solid #d0d0d0;
     background: transparent;
 }
-
 .selector .selector-filter {
     padding: 3px 5px 2px 2px;
     border-top: 1px solid #e4e4e4;
@@ -56,15 +52,13 @@
 .selector .selector-filter img {
     display: none;
 }
-
 .selector select {
     min-height: 300px;
     width: 100%;
 }
-
 .selector select[multiple=multiple] {
     margin: 0; padding-left: 3px;
-    width: 338px; height: 200px;
+    width: 100%;
     border-top: 1px solid #d0d0d0;
     border-bottom: 1px solid #d0d0d0;
     border-left: none;
@@ -80,7 +74,6 @@
     position: relative; top: -1px;
     border-top: none;
 }
-
 .selector ul.selector-chooser {
     float: left;
     margin: 110px 2px 0; padding: 0;

From 7f24d55d8ab1e10df12f5d2d9b55ab5a24fbc52d Mon Sep 17 00:00:00 2001
From: zriv <zriv@users.noreply.github.com>
Date: Fri, 6 Mar 2020 10:03:56 +0000
Subject: [PATCH 10/13] Use "select[multiple]" in CSS selectors.

(This addresses a change made in Django 2.1 to fix
Django bug #29041.)
---
 grappelli_safe/static/grappelli/css/forms.css   | 2 +-
 grappelli_safe/static/grappelli/css/widgets.css | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/grappelli_safe/static/grappelli/css/forms.css b/grappelli_safe/static/grappelli/css/forms.css
index d2bed1c..1beb811 100644
--- a/grappelli_safe/static/grappelli/css/forms.css
+++ b/grappelli_safe/static/grappelli/css/forms.css
@@ -214,7 +214,7 @@ select {
     padding: 4px 3px 4px 0;
     height: 25px;
 }
-select[multiple=multiple] {
+select[multiple] {
     padding-left: 1px;
     height: 160px;
 }
diff --git a/grappelli_safe/static/grappelli/css/widgets.css b/grappelli_safe/static/grappelli/css/widgets.css
index 65ea4aa..bd590cb 100644
--- a/grappelli_safe/static/grappelli/css/widgets.css
+++ b/grappelli_safe/static/grappelli/css/widgets.css
@@ -56,7 +56,7 @@
     min-height: 300px;
     width: 100%;
 }
-.selector select[multiple=multiple] {
+.selector select[multiple] {
     margin: 0; padding-left: 3px;
     width: 100%;
     border-top: 1px solid #d0d0d0;
@@ -64,10 +64,10 @@
     border-left: none;
     -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
 }
-.selector.stacked select[multiple=multiple] {
+.selector.stacked select[multiple] {
     width: 698px;
 }
-.selector-chosen select[multiple=multiple] {
+.selector-chosen select[multiple] {
     height: 232px;
 }
 .selector h2 + select {

From 00d1cd748c4d98c33e17509ebae833d7d2c32502 Mon Sep 17 00:00:00 2001
From: Peter Dermott <p.dermott@fermorltd.co.uk>
Date: Tue, 17 Mar 2020 11:53:07 +0000
Subject: [PATCH 11/13] Revert "More fixes for selector CSS"

This reverts commit 1a24ef7f
---
 grappelli_safe/static/grappelli/css/widgets.css | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/grappelli_safe/static/grappelli/css/widgets.css b/grappelli_safe/static/grappelli/css/widgets.css
index 65ea4aa..fe07bf5 100644
--- a/grappelli_safe/static/grappelli/css/widgets.css
+++ b/grappelli_safe/static/grappelli/css/widgets.css
@@ -8,16 +8,19 @@
     align-items: center;
     display: flex;
     position: relative; float: left; overflow: hidden;
+    width: 700px;
 }
+
 .selector-available, .selector-chosen {
+    width: 338px;
     border: 1px solid #ccc;
     -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px;
     background: #ddd;
-    width: 49%;
 }
 .stacked .selector-available, .stacked .selector-chosen {
     width: 698px;
 }
+
 .selector h2, .inline-group .selector h2,
 .inline-related fieldset .selector-available h2, .inline-related fieldset .selector-chosen h2 {
     padding: 7px 5px 6px 7px;
@@ -26,6 +29,7 @@
     border-bottom: 1px solid #d0d0d0;
     background: transparent;
 }
+
 .selector .selector-filter {
     padding: 3px 5px 2px 2px;
     border-top: 1px solid #e4e4e4;
@@ -52,13 +56,15 @@
 .selector .selector-filter img {
     display: none;
 }
+
 .selector select {
     min-height: 300px;
     width: 100%;
 }
+
 .selector select[multiple=multiple] {
     margin: 0; padding-left: 3px;
-    width: 100%;
+    width: 338px; height: 200px;
     border-top: 1px solid #d0d0d0;
     border-bottom: 1px solid #d0d0d0;
     border-left: none;
@@ -74,6 +80,7 @@
     position: relative; top: -1px;
     border-top: none;
 }
+
 .selector ul.selector-chooser {
     float: left;
     margin: 110px 2px 0; padding: 0;

From 40edbe141a31f445c6d8ec7e09ebbd2d555447e6 Mon Sep 17 00:00:00 2001
From: Peter Dermott <p.dermott@fermorltd.co.uk>
Date: Tue, 17 Mar 2020 13:20:14 +0000
Subject: [PATCH 12/13] Fix for selector widgets

---
 grappelli_safe/static/grappelli/css/widgets.css | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/grappelli_safe/static/grappelli/css/widgets.css b/grappelli_safe/static/grappelli/css/widgets.css
index ce33f02..bd590cb 100644
--- a/grappelli_safe/static/grappelli/css/widgets.css
+++ b/grappelli_safe/static/grappelli/css/widgets.css
@@ -8,19 +8,16 @@
     align-items: center;
     display: flex;
     position: relative; float: left; overflow: hidden;
-    width: 700px;
 }
-
 .selector-available, .selector-chosen {
-    width: 338px;
     border: 1px solid #ccc;
     -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px;
     background: #ddd;
+    width: 49%;
 }
 .stacked .selector-available, .stacked .selector-chosen {
     width: 698px;
 }
-
 .selector h2, .inline-group .selector h2,
 .inline-related fieldset .selector-available h2, .inline-related fieldset .selector-chosen h2 {
     padding: 7px 5px 6px 7px;
@@ -29,7 +26,6 @@
     border-bottom: 1px solid #d0d0d0;
     background: transparent;
 }
-
 .selector .selector-filter {
     padding: 3px 5px 2px 2px;
     border-top: 1px solid #e4e4e4;
@@ -56,15 +52,13 @@
 .selector .selector-filter img {
     display: none;
 }
-
 .selector select {
     min-height: 300px;
     width: 100%;
 }
-
 .selector select[multiple] {
     margin: 0; padding-left: 3px;
-    width: 338px; height: 200px;
+    width: 100%;
     border-top: 1px solid #d0d0d0;
     border-bottom: 1px solid #d0d0d0;
     border-left: none;
@@ -80,7 +74,6 @@
     position: relative; top: -1px;
     border-top: none;
 }
-
 .selector ul.selector-chooser {
     float: left;
     margin: 110px 2px 0; padding: 0;

From 3b27c9ff929035ee5f89699ef372bb081532265c Mon Sep 17 00:00:00 2001
From: Esperanza Duenas <esperanza.duenas@unplug.studio>
Date: Thu, 16 Jul 2020 10:20:18 -0600
Subject: [PATCH 13/13] Fix dynamic inlines for django 2.2

---
 grappelli_safe/templates/admin/edit_inline/stacked.html | 3 ++-
 grappelli_safe/templates/admin/edit_inline/tabular.html | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/grappelli_safe/templates/admin/edit_inline/stacked.html b/grappelli_safe/templates/admin/edit_inline/stacked.html
index b9c7d8a..9ce568d 100644
--- a/grappelli_safe/templates/admin/edit_inline/stacked.html
+++ b/grappelli_safe/templates/admin/edit_inline/stacked.html
@@ -53,7 +53,8 @@ <h3><b>Sortable Helper</b></h3>
 
 (function($) {
   var prefix = "{{ inline_admin_formset.formset.prefix|escapejs }}";
-  $("#{{ inline_admin_formset.formset.prefix|escapejs }}-group .inline-related").stackedFormset({
+  var selector = "#" + prefix + "-group .inline-related" 
+  $(selector).stackedFormset(selector, {
     prefix: prefix,
     addText: "{% filter escapejs %}{% blocktrans with inline_admin_formset.opts.verbose_name|capfirst as verbose_name %}Add another {{ verbose_name }}{% endblocktrans %}{% endfilter %}",
     deleteText: "{% filter escapejs %}{% trans 'Delete Item' %}{% endfilter %}",
diff --git a/grappelli_safe/templates/admin/edit_inline/tabular.html b/grappelli_safe/templates/admin/edit_inline/tabular.html
index 98f2c27..48f7a79 100644
--- a/grappelli_safe/templates/admin/edit_inline/tabular.html
+++ b/grappelli_safe/templates/admin/edit_inline/tabular.html
@@ -81,7 +81,8 @@ <h3><b>&nbsp;</b></h3>
 
 (function($) {
   var prefix = "{{ inline_admin_formset.formset.prefix|escapejs }}";
-  $().stackedFormset("#{{ inline_admin_formset.formset.prefix|escapejs }}-group .inline-related", {
+  var selector = "#" + prefix + "-group .inline-related" 
+  $(selector).stackedFormset(selector, {
     prefix: prefix,
     addText: "{% filter escapejs %}{% blocktrans with inline_admin_formset.opts.verbose_name|capfirst as verbose_name %}Add another {{ verbose_name }}{% endblocktrans %}{% endfilter %}",
     deleteText: "{% filter escapejs %}{% trans 'Delete Item' %}{% endfilter %}"