Merge pull request #3 from ixc/master

minor bugfixes

CHANGES.txt

@@ -1 +1,3 @@
 v0.0.1, 2010-09-31 -- Initial release.
+v0.0.2, 2011-01-05 -- Fixed packaging problems.
+v0.0.3, 2011-06-08 -- Fixed javascript bug on multiple sortable inlines

MANIFEST.in

@@ -0,0 +1,2 @@
+recursive-include adminboost/templates *
+recursive-include adminboost/media *

README.rst

@@ -10,11 +10,12 @@ Assumptions:
 Usage example:
     In the change_form.html of our model which has inlines "Feature", "HomeFullWidthFeature" etc. 
 
-    {% load admin_enhancements_includes %}
+    {% load adminboost_tags %}
 
     {% block extrahead %}
         {{ block.super }}
-        {% sortable_inlines "Feature" "HomeFullWidthFeature" "HomeHalfFeature" "HomeQuarterFeature" "CollectionFeature" %}
+        {% sortable_inlines "feature_set" %}
+        {% sortable_inlines "homefullwidthfeature_set" %}
     {% endblock %}
 
 Image preview

adminboost/media/adminboost/scripts.js

@@ -93,9 +93,9 @@ function init_sortable_inlines(inlines) {
 
                     $group.inline_type = "tabular";
 
-                    $group.find("th").filter(function(index) {
-                        return $(this).text().toLowerCase() == order_field
-                    }).remove();
+                    // Hide table header
+                    var field_index = $group.find('.empty-form td.' + order_field).index()
+                    $group.find("th").eq(field_index - 1).remove();
 
                     $group.find("th[colspan=2]").removeAttr("colspan");
                     $group.find("th:first").attr("colspan", "2");

adminboost/preview.py

@@ -59,9 +59,9 @@ def render(self, name, data, attrs={}):
             if help_text is not None:
                 html += '<p class="help">%s</p>' % force_unicode(help_text)
             html += '</div>'
-            return mark_safe(html)
+            return mark_safe(unicode(html))
         else:
-            return ''
+            return u''
 
 class PreviewField(forms.Field):
     """ Dummy "field" to provide preview thumbnail. """

adminboost/templates/adminboost/sortable_inlines.html

@@ -4,6 +4,6 @@
 <script type="text/javascript" src="{{ MEDIA_URL }}adminboost/jquery-ui-1.8.4/jquery-ui-1.8.4.min.js"></script>
 <script type="text/javascript" src="{{ MEDIA_URL }}adminboost/scripts.js"></script>
 <script type="text/javascript">
-    var sortable_inlines = [[{% for inline in inlines %}"{{ inline.0 }}",{% if inline.1 %}"{{ inline.1 }}"{% else %}undefined{% endif %}],{% endfor %}];
+    var sortable_inlines = [{% for inline in inlines %}["{{ inline.0 }}",{% if inline.1 %}"{{ inline.1 }}"{% else %}undefined{% endif %}],{% endfor %}];
     init_sortable_inlines(sortable_inlines);
 </script>

setup.py

@@ -4,12 +4,11 @@
     name='glamkit-adminboost',
     author='Julien Phalip',
     author_email='julien@interaction.net.au',
-    version='0.0.1',
+    version='0.0.3',
     description='Makes the Django admin even more awesomer',
     url='http://github.com/glamkit/glamkit-admintools',
     packages=find_packages(),
-    package_data={
-    },
+    include_package_data=True,
     zip_safe=False,
     classifiers=[
         'Development Status :: 4 - Beta',