From 866adffd7bb37071c6b41ff4049b85b3f887dbcc Mon Sep 17 00:00:00 2001
From: Brandon Taylor <btaylorweb@gmail.com>
Date: Mon, 9 Jul 2012 11:05:59 -0400
Subject: [PATCH] Updated CSS classing of sortable inline and stacked items.
 Concatenated classing of sortable inlines into one stylesheet. Updated
 version to 1.3.3 Updated README

---
 README                                        |   6 +--
 adminsortable/__init__.py                     |   2 +-
 .../templates/adminsortable/change_form.html  |  15 ++++---
 .../adminsortable/edit_inline/stacked.html    |  38 +++++++++---------
 sample_project/adminsortable.sqlite           | Bin 54272 -> 56320 bytes
 sample_project/app/admin.py                   |   1 +
 .../css/admin.sortable.inline.css             |   4 ++
 .../css/admin.sortable.tabular.inline.css     |   4 --
 8 files changed, 36 insertions(+), 34 deletions(-)
 create mode 100644 sample_project/static/adminsortable/css/admin.sortable.inline.css
 delete mode 100644 sample_project/static/adminsortable/css/admin.sortable.tabular.inline.css

diff --git a/README b/README
index 611ed95..5465578 100644
--- a/README
+++ b/README
@@ -130,10 +130,10 @@ Status
 admin-sortable is currently used in production.
 
 
-What's new in 1.3.2
+What's new in 1.3.3
 =============
-- Fixed an issue that prevented sorting on classes that specified a SortableForeignKey
-class, where the SortableForeignKey model itself did not inherit from Sortable.
+- Fixed an issue where sortable inlines weren't getting the correct CSS class
+which gave them the appearance of not being sortable.
 
 Features
 =============
diff --git a/adminsortable/__init__.py b/adminsortable/__init__.py
index d9bae1e..1109fe1 100755
--- a/adminsortable/__init__.py
+++ b/adminsortable/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (1, 3, 2)  # following PEP 386
+VERSION = (1, 3, 3)  # following PEP 386
 DEV_N = None
 
 
diff --git a/adminsortable/templates/adminsortable/change_form.html b/adminsortable/templates/adminsortable/change_form.html
index d27b7de..e8f0c17 100644
--- a/adminsortable/templates/adminsortable/change_form.html
+++ b/adminsortable/templates/adminsortable/change_form.html
@@ -5,22 +5,21 @@
 {% block extrahead %}
     {{ block.super }}
     {% url 'admin:jsi18n' as jsi18nurl %}
-    
+
     {% if has_sortable_tabular_inlines or has_sortable_stacked_inlines %}
-    {% include 'adminsortable/shared/javascript_includes.html' %}
+        {% include 'adminsortable/shared/javascript_includes.html' %}
     {% endif %}
     {% if has_sortable_tabular_inlines %}
-    <script type="text/javascript" src="{{ STATIC_URL }}adminsortable/js/admin.sortable.tabular.inlines.js"></script>
+        <script type="text/javascript" src="{{ STATIC_URL }}adminsortable/js/admin.sortable.tabular.inlines.js"></script>
     {% endif %}
     {% if has_sortable_stacked_inlines %}
-    <script type="text/javascript" src="{{ STATIC_URL }}adminsortable/js/jquery.effects.core.js"></script>
+        <script type="text/javascript" src="{{ STATIC_URL }}adminsortable/js/jquery.effects.core.js"></script>
     {% endif %}
 {% endblock %}
 
 {% block extrastyle %}
     {{ block.super }}
-    {% if has_sortable_tabular_inlines %}
-    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}adminsortable/css/admin.sortable.tabular.inline.css" />
+    {% if has_sortable_tabular_inlines or has_sortable_stacked_inlines %}
+        <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}adminsortable/css/admin.sortable.inline.css" />
     {% endif %}
-    
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/adminsortable/templates/adminsortable/edit_inline/stacked.html b/adminsortable/templates/adminsortable/edit_inline/stacked.html
index 01e7f4e..bb930b3 100644
--- a/adminsortable/templates/adminsortable/edit_inline/stacked.html
+++ b/adminsortable/templates/adminsortable/edit_inline/stacked.html
@@ -1,24 +1,26 @@
 {% load i18n adminmedia %}
 <div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
-  <h2>{{ inline_admin_formset.opts.verbose_name_plural|title }} {% if inline_admin_formset.opts.is_sortable %} - drag and drop to change order{% endif %}</h2>
-{{ inline_admin_formset.formset.management_form }}
-{{ inline_admin_formset.formset.non_form_errors }}
+    <h2>{{ inline_admin_formset.opts.verbose_name_plural|title }} {% if inline_admin_formset.opts.is_sortable %} - drag and drop to change order{% endif %}</h2>
+    {{ inline_admin_formset.formset.management_form }}
+    {{ inline_admin_formset.formset.non_form_errors }}
 
-{% for inline_admin_form in inline_admin_formset %}<div class="inline-related{% if forloop.last %} empty-form last-related{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">
-  <h3><b>{{ inline_admin_formset.opts.verbose_name|title }}:</b>&nbsp;<span class="inline_label">{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% else %}#{{ forloop.counter }}{% endif %}</span>
-    {% if inline_admin_form.show_url %}<a href="../../../r/{{ inline_admin_form.original_content_type_id }}/{{ inline_admin_form.original.id }}/">{% trans "View on site" %}</a>{% endif %}
-    {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}<span class="delete">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>{% endif %}
-  </h3>
-  {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %}
-  {% for fieldset in inline_admin_form %}
-    {% include "admin/includes/fieldset.html" %}
-  {% endfor %}
-  {% 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 %}
-  <input type="hidden" name="admin_sorting_url" value="{% url admin:admin_do_sorting inline_admin_form.original.model_type_id %}" />
-  {% endif %}
-</div>{% endfor %}
+    {% for inline_admin_form in inline_admin_formset %}
+    <div class="inline-related{% if forloop.last %} empty-form last-related{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">
+        <h3><b>{{ inline_admin_formset.opts.verbose_name|title }}:</b>&nbsp;<span class="inline_label">{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% else %}#{{ forloop.counter }}{% endif %}</span>
+            {% if inline_admin_form.show_url %}<a href="../../../r/{{ inline_admin_form.original_content_type_id }}/{{ inline_admin_form.original.id }}/">{% trans "View on site" %}</a>{% endif %}
+            {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}<span class="delete">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>{% endif %}
+        </h3>
+        {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %}
+        {% for fieldset in inline_admin_form %}
+            {% include "admin/includes/fieldset.html" %}
+        {% endfor %}
+        {% 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 %}
+            <input type="hidden" name="admin_sorting_url" value="{% url admin:admin_do_sorting inline_admin_form.original.model_type_id %}" />
+        {% endif %}
+    </div>
+    {% endfor %}
 </div>
 
 <script type="text/javascript">
diff --git a/sample_project/adminsortable.sqlite b/sample_project/adminsortable.sqlite
index 1de70e6d5e6d27f48cf6bc6fb5111bfcb04800fd..c61642c0fd4b4be12fad7e71b1f8b120377a3a26 100644
GIT binary patch
delta 1903
zcmc&#&2Jk;6yMo5wu2p~1p#Rat+r86sgRwW*_~alrGhrNwc=o>NnAUL5U}>H$+uI-
zO`RZ=npWaU<v#%qNc7TJ;^P37ijc^;7bFgpk3)o%NI);NLS=RxhlZxg4g4{qH}AdQ
zy!V?oZ!Uifmp_LOo<p~8JpZeL#|0Q~KG~UpQ2hlI7P`aXm+B`Q@9I5ki-lRcMBiMR
zvMAH~h|E8I=gLDvwZ+$xQ%>ILJDaLm&X}IRv}(_h{?+*b{p|TfX?BqnGZ(GI$}%x#
zC#XDM)ry0s5kgcZG$QK}*^r1FCu*G1s4i0u+tSboRV7N}3W>{d)M(z<eMb)a1VKP>
zpO1phrwa|M!&<AK2>8<V5wk#;YE#`(8PQ9sp%6lfPJuDQRutPJ`fy@|W@ZKn|I>*X
zvo@SK!-f;N`Shx(W@g@2Gx^;7L_Rf>Ner^d>?|A3j;su4FPP>6shPR+Lv}K^Y9}+x
z1zKGUPL7{>H8(P;6qIzTGMOK(nM(R%u$>fDc9J42$~4B4sxSL}>G$3-H4-b)n5<C3
z9EYi;QlaQ*GGQ^J5Q`bQ(dZxh@@YLnWr;AC6-AHg#NYtUuF);j%@fxGLHJ(4kQCrk
zn1gGOgd{&Q2B|(sBinHbM73>=>P1I3R7=&I64jWk+G>fhLWgT~P!RscwS4BpL3{?*
z$1(22;)Vblpo1W8@G!m**BE|6FcCU*3WeKzxQEQoQH{%bR8!sJK_PX_nqQoAq;r+>
zj8m*429I-7;))TK<=B31P(LIFcebm);_kQhP*rJhS&7O_-_KJtZQHS>V#Tqit5WYk
z#agh-3zC$zR_4l;-l()!Kjc&@(~nb*Sruz)M``p%8QM1$Ugj)LSya=t{Q^SkZ~YJ=
zV%AxzN=it?0_tfAG=y9Mc^VStHGtuY0KdSua2>92(nlecMyJpvyq8kQPE9XK{AWp3
z=Op$E+@}9uHZ9O{Npfn{iY1+v<i_>#>wfsk{c`9gqz4e{?h&~k&#^@gk09bMBJ8oU
zyLbelV?BV|RJPXLcmZw;@EiODw>jiD5D9}%Ks-I1DOVjy35%YHS|SZ2PlT38)@xYq
z!f;i9AK?~!2v@=3C^>lJ<#u`PUN_!DTI6;d2XnW@JgnBKdmHzvAGvFO*SoPbdbDxp
zlfF(2n*!W}yRZ$LeB<xH=L6or8e8voKdS3?bs_AH;Ekd;HXq#l69S?qpyq?meEjCP
zxOX{n8`tkzV%*ri`RqTyo3QO|>M0Rdetp!>J+|Q<U;Y`6JtYDsxD$zd^aBd=Nx+<O
z*TnU7O|WNzJrnGi0BpN^w@~f?M?H*y$M^>v$6najixl%WfMcO&1Ri@ApWKdXuYL4C
twp-q9Q~yo7{T&6}>=6Wb_MFMT#24$!9bOkdsLQsyc>5V}-!`xC{sv~q-<$vd

delta 503
zcmZ8dziSjh7@e7KFLzvW>!t9w$OW&HOJ={_*||+29$bnDd*Ts{0h_s<l_VslSPQW+
z!NQcD+gRD85xmBX7&{?p{0nR>j9?{rMM!aosC$<}uzB$K-uJ%uz0LQq`3jz0q)*>m
z`tDi@fy7Kstia=~BAp;-OQov`rL@sddVS^o2(FKCI@(xImX%YLsvh}OPb+kE9Laj@
zDo03tPl%}FY9X<Mv9ElgI!dCSc_DYO#=RQ46?A7gpG7f^zQ;K~nP3gQ3YsHnpR-GZ
z5XNi*d1ljtEZ82+(Pp?cpPp_{U0K38FKp_yu-RT)T8JLCR_8^yczd~pH&#Qug*TgX
z#{P6f?IL_847vo~K^MB2%@atwi>;|Z)*Y>VKX78jmDIwE14Q1zD2M~$MzDLwvW!*!
zmEYB0@-wgyCl4y_II{>nPe%mD>5#AyafWdLdIY|~N9bjDUP9X2xN8dKLH>Dl%#1z!
zJyT?`Pv9%;!%il60hMbfZ;Kk2{|a$1$O^G8LxZM2+85Hp*VP?syHEt^6F7#S(9f0+
lVKN7l0t}I|Au{u4FK7KPOZy+r80+mZq=SR9DQpi;{RKsbiA?|i

diff --git a/sample_project/app/admin.py b/sample_project/app/admin.py
index a1eb445..cd88053 100644
--- a/sample_project/app/admin.py
+++ b/sample_project/app/admin.py
@@ -13,6 +13,7 @@ class CreditInline(SortableTabularInline):
 
 class NoteInline(SortableStackedInline):
     model = Note
+    extra = 0
 
 
 class ProjectAdmin(SortableAdmin):
diff --git a/sample_project/static/adminsortable/css/admin.sortable.inline.css b/sample_project/static/adminsortable/css/admin.sortable.inline.css
new file mode 100644
index 0000000..251dea3
--- /dev/null
+++ b/sample_project/static/adminsortable/css/admin.sortable.inline.css
@@ -0,0 +1,4 @@
+.sortable
+{
+    cursor: move;
+}
diff --git a/sample_project/static/adminsortable/css/admin.sortable.tabular.inline.css b/sample_project/static/adminsortable/css/admin.sortable.tabular.inline.css
deleted file mode 100644
index 5b0b32b..0000000
--- a/sample_project/static/adminsortable/css/admin.sortable.tabular.inline.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.tabular .sortable
-{
-    cursor: move;
-}