From 7e9d305c900eb7b82a691ae7b18395c838ca5622 Mon Sep 17 00:00:00 2001
From: Brandon Taylor <alsoicode@gmail.com>
Date: Wed, 23 Dec 2015 17:16:47 -0500
Subject: [PATCH] Added template tag to get django version to allow flat admin
 specific classing for Django 1.9 or above.

---
 .../static/adminsortable/css/admin.sortable.inline.css    | 8 ++++++++
 .../templates/adminsortable/edit_inline/stacked.html      | 5 +++--
 .../templates/adminsortable/edit_inline/tabular.html      | 5 +++--
 adminsortable/templatetags/django_template_additions.py   | 8 ++++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/adminsortable/static/adminsortable/css/admin.sortable.inline.css b/adminsortable/static/adminsortable/css/admin.sortable.inline.css
index cbde4e8..4783fad 100644
--- a/adminsortable/static/adminsortable/css/admin.sortable.inline.css
+++ b/adminsortable/static/adminsortable/css/admin.sortable.inline.css
@@ -9,9 +9,17 @@
 }
 
 .sortable .inline-related .module.aligned .fa {
+    margin: 5px 10px 0 0;
+}
+
+.sortable .inline-related.flat-admin .module.aligned .fa {
     margin: 9px 10px 0 0;
 }
 
 .sortable.inline-group .module .fa {
+	margin: 26px -10px 0 10px;
+}
+
+.sortable.inline-group.flat-admin .module .fa {
 	margin: 34px -10px 0 10px;
 }
diff --git a/adminsortable/templates/adminsortable/edit_inline/stacked.html b/adminsortable/templates/adminsortable/edit_inline/stacked.html
index ff45712..a6e96f5 100644
--- a/adminsortable/templates/adminsortable/edit_inline/stacked.html
+++ b/adminsortable/templates/adminsortable/edit_inline/stacked.html
@@ -1,10 +1,11 @@
-{% load i18n admin_urls admin_static %}
+{% load i18n admin_urls admin_static django_template_additions %}
+{% get_django_version as django_version %}
 <div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
   <h2>{{ inline_admin_formset.opts.verbose_name_plural|title }} {% if inline_admin_formset.formset.initial_form_count > 1 %} - {% trans "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 %} {% if inline_admin_form.original %} has_original{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">
+{% for inline_admin_form in inline_admin_formset %}<div class="inline-related {% if django_version.major >= 1 and django_version.minor >= 9 %}flat-admin{% endif %} {% if forloop.last %} empty-form last-related{% endif %} {% if inline_admin_form.original %} has_original{% 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 }}{% if inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %} <a href="{% url inline_admin_form.model_admin.opts|admin_urlname:'change' inline_admin_form.original.pk|admin_urlquote %}" class="inlinechangelink">{% trans "Change" %}</a>{% endif %}
   {% else %}#{{ forloop.counter }}{% endif %}</span>
     {% if inline_admin_form.show_url %}<a href="{% url 'admin:view_on_site' inline_admin_form.original_content_type_id inline_admin_form.original.pk %}">{% trans "View on site" %}</a>{% endif %}
diff --git a/adminsortable/templates/adminsortable/edit_inline/tabular.html b/adminsortable/templates/adminsortable/edit_inline/tabular.html
index 9554f0d..fc69ace 100644
--- a/adminsortable/templates/adminsortable/edit_inline/tabular.html
+++ b/adminsortable/templates/adminsortable/edit_inline/tabular.html
@@ -1,5 +1,6 @@
-{% load i18n admin_urls admin_static admin_modify %}{% load cycle from future %}
-<div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
+{% load i18n admin_urls admin_static admin_modify django_template_additions %}{% load cycle from future %}
+{% get_django_version as django_version %}
+<div class="inline-group {% if django_version.major >= 1 and django_version.minor >= 9 %}flat-admin{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-group">
   <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
 {{ inline_admin_formset.formset.management_form }}
 <fieldset class="module">
diff --git a/adminsortable/templatetags/django_template_additions.py b/adminsortable/templatetags/django_template_additions.py
index 22be8a3..c05f349 100644
--- a/adminsortable/templatetags/django_template_additions.py
+++ b/adminsortable/templatetags/django_template_additions.py
@@ -1,4 +1,6 @@
 from itertools import groupby
+
+import django
 from django import template
 try:
     from django import TemplateSyntaxError
@@ -76,3 +78,9 @@ def dynamic_regroup(parser, token):
     #We also need to hand the parser to the node in order to convert the value
     #for `expression` to a FilterExpression.
     return DynamicRegroupNode(target, parser, expression, var_name)
+
+
+@register.assignment_tag
+def get_django_version():
+    version = django.VERSION
+    return {'major': version[0], 'minor': version[1]}