diff --git a/README.md b/README.md
index 3a69e43..af1789d 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,6 @@ This project makes it easy to add drag-and-drop ordering to any model in
Django admin. Inlines for a sortable model may also be made sortable,
enabling individual items or groups of items to be sortable.
-## Requirements
-jQuery
-
## Supported Django Versions
If you're using Django 1.4.x, use django-admin-sortable 1.4.9 or below.
For Django 1.5.x, use the latest version of django-admin-sortable.
@@ -231,18 +228,14 @@ ordering on top of that just seemed a little much in my opinion.
django-admin-sortable is currently used in production.
-### What's new in 1.5.4?
-- Eliminated loading jQuery and jQueryUI from external CDNs.
-- All jQuery-based JavaScript code now leverages the django.jQuery namespace and version of jQuery included in Django Admin.
-- Eliminated needing to include jQueryUI effects core to do highlighting on drag complete.
-- Added CSRF protection to sort views (thanks @dokterbob)
-- Static includes now leverage {% static %} template tag.
+### What's new in 1.5.5?
+- Improved url resolution to sorting urls
+- Fixed a potential issue with JavaScript namespace on sortable() calls that could prevent sortable from working in environments where jQuery is already included, such as Django-CMS
### Future
- Support for foreign keys that are self referential
-- More unit tests
-- Move unit tests out of sample project
+- Move unit tests out of sample project (I could really use some help with this one)
- Travis CI integration
diff --git a/adminsortable/__init__.py b/adminsortable/__init__.py
index 4ac7174..7195d58 100755
--- a/adminsortable/__init__.py
+++ b/adminsortable/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 5, 4) # following PEP 386
+VERSION = (1, 5, 5) # following PEP 386
DEV_N = None
diff --git a/adminsortable/static/adminsortable/js/admin.sortable.js b/adminsortable/static/adminsortable/js/admin.sortable.js
index 697d835..b854f52 100644
--- a/adminsortable/static/adminsortable/js/admin.sortable.js
+++ b/adminsortable/static/adminsortable/js/admin.sortable.js
@@ -1,7 +1,7 @@
(function($){
$(function() {
- $('.sortable').sortable({
+ jQuery('.sortable').sortable({
axis : 'y',
containment : 'parent',
tolerance : 'pointer',
diff --git a/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js b/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js
index ec14154..74097e5 100644
--- a/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js
+++ b/adminsortable/static/adminsortable/js/admin.sortable.stacked.inlines.js
@@ -6,7 +6,7 @@
var sortable_inline_rows = $('.inline-group .inline-related');
sortable_inline_rows.addClass('sortable');
- $('.inline-group').sortable({
+ jQuery('.inline-group').sortable({
axis : 'y',
containment : 'parent',
create: function(event, ui) {
diff --git a/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js b/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js
index 97194a8..a97cd5f 100644
--- a/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js
+++ b/adminsortable/static/adminsortable/js/admin.sortable.tabular.inlines.js
@@ -5,7 +5,7 @@
{
var tabular_inline_rows = $('.tabular table tbody tr');
tabular_inline_rows.addClass('sortable');
- $('.tabular.inline-related').sortable({
+ jQuery('.tabular.inline-related').sortable({
axis : 'y',
containment : 'parent',
create: function(event, ui)
diff --git a/adminsortable/templates/adminsortable/edit_inline/stacked.html b/adminsortable/templates/adminsortable/edit_inline/stacked.html
index 0516298..bc7ce69 100644
--- a/adminsortable/templates/adminsortable/edit_inline/stacked.html
+++ b/adminsortable/templates/adminsortable/edit_inline/stacked.html
@@ -17,7 +17,7 @@
{% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
{{ inline_admin_form.fk_field.field }}
{% if inline_admin_form.original %}
-
+
{% endif %}
{% endfor %}
diff --git a/adminsortable/templates/adminsortable/edit_inline/tabular.html b/adminsortable/templates/adminsortable/edit_inline/tabular.html
index 5953908..34555ee 100644
--- a/adminsortable/templates/adminsortable/edit_inline/tabular.html
+++ b/adminsortable/templates/adminsortable/edit_inline/tabular.html
@@ -41,7 +41,7 @@
{% endfor %}
{% endspaceless %}
{% if inline_admin_form.original %}
-
+
{% endif %}
{% for fieldset in inline_admin_form %}
diff --git a/adminsortable/templates/adminsortable/shared/object_rep.html b/adminsortable/templates/adminsortable/shared/object_rep.html
index 6e898da..05dfb16 100644
--- a/adminsortable/templates/adminsortable/shared/object_rep.html
+++ b/adminsortable/templates/adminsortable/shared/object_rep.html
@@ -3,4 +3,4 @@
-{{ object }}
+{{ object }}
diff --git a/sample_project/app/tests.py b/sample_project/app/tests.py
index 31badde..2a50495 100644
--- a/sample_project/app/tests.py
+++ b/sample_project/app/tests.py
@@ -102,10 +102,6 @@ class SortableTestCase(TestCase):
template_names = [t.name for t in response.templates]
self.assertTrue('adminsortable/change_list.html' in template_names,
'adminsortable/change_list.html was not rendered')
- self.assertTrue('adminsortable/shared/javascript_includes.html'
- in template_names,
- 'JavaScript includes for adminsortable change list '
- 'were not rendered')
def test_adminsortable_change_list_sorting_fails_if_not_ajax(self):
logged_in = self.client.login(username=self.user.username,
diff --git a/sample_project/database/test_project.sqlite b/sample_project/database/test_project.sqlite
index 5b6876e..2e83ece 100644
Binary files a/sample_project/database/test_project.sqlite and b/sample_project/database/test_project.sqlite differ