Merge branch 'master' of git://github.com/sehmaschine/django-grappelli

Author: Stephan Jaensch

.gitignore

@@ -1,3 +1,8 @@
 *.pyc
 docs/_build/
-.DS_Store
+.DS_Store
+dist/*
+django_grappelli.egg-info/*
+grappelli/compass/.sass-cache/
+fabfile.py
+.sass-cache

MANIFEST.in

@@ -1,3 +1,5 @@
+include AUTHORS
+include README.rst
 include LICENSE
 recursive-include docs *
 recursive-include grappelli/static *

README.rst

@@ -18,4 +18,4 @@ http://readthedocs.org/docs/django-grappelli/
 Releases
 --------
 
-The latest release is Grappelli 2.3.3, which requires Django 1.3
+The latest release is Grappelli 2.3.8 (April 3rd, 2012), which requires Django 1.3.

docs/changelog.rst

@@ -8,11 +8,41 @@
 Changelog
 =========
 
-2.3.5 (not yet released)
+2.3.8 (April 03, 2012)
+----------------------
+
+* TinyMCE Update (3.5b2)
+
+2.3.7 (February 11, 2012)
+-------------------------
+
+* Fixed compatibility issue with Python 2.5.
+* Fixed some translations.
+
+2.3.6 (February 10, 2012)
+-------------------------
+
+* Fixed issue where autocomplete/related settings could not use tuples.
+* Fixed a bug with toggle all actions on the changlist
+* Fixed a bug with adding dynamic-forms to tabular and stacked inlines (which caused the remove-handler to throw an error)
+* Autocompletes: Only do a lookup with generics, if content-type is defined.
+* Support for new URL tags, see https://docs.djangoproject.com/en/dev/releases/1.3/#changes-to-url-and-ssi.
+* Fixed a bug with m2m-lookups (return obj.pk instead of obj.id).
+* Fixed a bug with very long filters (hidden behind the footer).
+* Added german and french UI-datepicker.
+* Added support for non-integer IDs with generic relations.
+* Added pre_content and post_content to dashboard.
+* Added inline_classes.
+* Added polish translation for TinyMCE and grappelli contextmenu.
+* Removed ``title_url`` from dashboard-docs (it hasn´t been used anyway so far).
+
+2.3.5 (October 11, 2011)
 ------------------------
 
-2.3.4 (08/09/2011)
-------------------
+* Improved performance for autocomplete lookups (staticmethod autocomplete_search_fields is required from now on)
+
+2.3.4 (September 8, 2011)
+-------------------------
 
 * Moved |grappelli| to GitHub
 * Fixed a bug with the View on Site link (tabular/stacked inlines)
@@ -23,8 +53,8 @@ Changelog
 * Added error-messages to the login form
 * Fixed a bug with hidden-fields in tabular-inlines
 
-2.3.3 (28/05/2011)
-------------------
+2.3.3 (May 28, 2011)
+--------------------
 
 * Documentation update
 * FileBrowser-related updates
@@ -38,17 +68,17 @@ Changelog
 * Reversed asc-/desc-icons
 * Updated TinyMCE to 3.4.2
 
-2.3.2 (16/02/2011)
-------------------
+2.3.2 (February 16, 2011)
+-------------------------
 
 * Some smaller bugfixes on the changelist.
 * Finally deleted folder ``media`` (media-files are now in ``static``).
 * Added class submit-link for custom admin-pages.
 * Removed save-button on changelist if there is no formset.
 * Fixed a bug with using generic relations within generic-inlines (tabular and stacked).
 
-2.3.1 (03/02/2011)
-------------------
+2.3.1 (February 3, 2011)
+------------------------
 
 * Added ``related_lookup_fields`` for defining related lookups (fk, m2m, generic).
 * Fixed the limiation for using ``content_type_*`` and ``object_id_*`` with Generic Relations.

docs/conf.py

@@ -42,16 +42,16 @@
 
 # General information about the project.
 project = u'Django Grappelli'
-copyright = u'2011, Patrick Kranzlmueller'
+copyright = u'2012, Patrick Kranzlmueller'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.3.5'
+version = '2.3.8'
 # The full version, including alpha/beta/rc tags.
-release = '2.3.5'
+release = '2.3.8'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/customization.rst

@@ -40,13 +40,12 @@ A ModelAdmin example::
             }),
         )
 
-An InlineModelAdmin example::
+With `StackedInlines <https://docs.djangoproject.com/en/dev/ref/contrib/admin/#django.contrib.admin.StackedInline>`_, an additional property ``inline_classes`` is available to define the default collapsible state of the inline items (in contrast to the whole group)::
 
     class NavigationItemInline(admin.StackedInline):
         classes = ('collapse open',)
+        inline_classes = ('collapse open',)
 
-.. note::
-    With Inlines, only the Inline-Group (and not the Inline-items) are affected by the ``classes`` property.
 
 .. _customizationinlinessortables:
 
@@ -150,11 +149,19 @@ For the represantation of an object, we first check for a callable ``related_lab
 Autocomplete Lookups
 --------------------
 
+.. versionchanged:: 2.3.5
+    staticmethod ``autocomplete_search_fields`` is required, ``related_autocomplete_lookup`` has been removed.
 .. versionadded:: 2.3.4
     ``autocomplete_lookup_fields``.
 
-.. note::
-    Please note that this feature is fairly new. It´s well tested, but we still consider it experimental with this version of |grappelli|.
+Add the staticmethod ``autocomplete_search_fields`` to all models you want to search for::
+
+    class MyModel(models.Model):
+        name = models.CharField(u"Name", max_length=50)
+    
+        @staticmethod
+        def autocomplete_search_fields():
+            return ("id__iexact", "name__icontains",)
 
 Defining autocomplete lookups is very similar to related lookups::
 
@@ -202,17 +209,13 @@ If your generic relation points to a model using a custom primary key, you need
         def id(self):
             return self.cpk
 
-For the represantation of an object, we first check for a callable ``related_label``. If not given, ``__unicode__`` is being used.
-The lookup checks for a callable ``related_autocomplete_lookup`` with your model. If not given, ``__unicode__`` is being used::
+For the represantation of an object, we first check for a callable ``related_label``. If not given, ``__unicode__`` is being used::
 
     def __unicode__(self):
         return u"%s" % self.name
     
     def related_label(self):
         return u"%s (%s)" % (self.name, self.id)
-    
-    def related_autocomplete_lookup(self):
-        return u"%s,%s,%s" % (self.id, self.name, self.category)
 
 .. warning::
     Due to a bug in Django 1.3, raw_id_fields (including autocomplete-lookups) are not working with list_editables.
@@ -235,4 +238,4 @@ Using TinyMCE with Inlines is a bit more tricky because of the hidden empty-form
 * ``onBeforeRemoved``: remove TinyMCE instance(s) from the form.
 
 .. note::
-    TinyMCE with Inlines is not supported by default.
+    TinyMCE with Inlines is not supported by default.

docs/dashboard_api.rst

@@ -76,10 +76,6 @@ Dashboard modules have the following properties:
     gettext functions if your application is multilingual.
     Default value: ''.
 
-``title_url``
-    String that contains the module title URL. If given the module
-    title will be a link to this URL. Default value: ``None``.
-
 ``css_classes``
     A list of css classes to be added to the module ``div`` class
     attribute. Default value: ``None``.

docs/dashboard_setup.rst

@@ -55,6 +55,12 @@ Open your ``settings.py`` file and add the following::
 
     GRAPPELLI_INDEX_DASHBOARD = 'yourproject.dashboard.CustomIndexDashboard'
 
+If you´re using a custom admin-site (not ``django.contrib.admin.site``), you need to define the dashboard like this::
+
+    GRAPPELLI_INDEX_DASHBOARD = {
+        'yourproject.admin.admin_site': 'yourproject.my_dashboard.CustomIndexDashboard',
+    }
+
 Create custom Dashboards for multiple admin sites
 -------------------------------------------------
 

docs/index.rst

@@ -4,6 +4,7 @@
    contain the root `toctree` directive.
 .. |grappelli| replace:: Grappelli
 .. |filebrowser| replace:: FileBrowser
+.. |version| replace:: 2.3.8
 
 .. _index:
 
@@ -12,10 +13,10 @@ Documentation
 
 **A jazzy skin for the Django admin interface**.
 
-This documentation covers version 2.3.5 of |grappelli|. |grappelli| is a grid-based alternative/extension to the `Django <http://www.djangoproject.com>`_ administration interface.
+This documentation covers version |version| of |grappelli|. |grappelli| is a grid-based alternative/extension to the `Django <http://www.djangoproject.com>`_ administration interface.
 
 .. note::
-    |grappelli| 2.3.5 requires Django 1.3. |grappelli| is always developed against the lastest stable Django release and is NOT tested with Djangos trunk.
+    |grappelli| |version| requires Django 1.3. |grappelli| is always developed against the lastest stable Django release and is NOT tested with Djangos trunk.
 
 Installation & Setup
 --------------------
@@ -64,6 +65,11 @@ Code
 
 https://github.com/sehmaschine/django-grappelli
 
+Screenshots
+-----------
+
+http://sehmaschine.github.com/django-grappelli/
+
 Discussion
 ----------
 

grappelli/__init__.py

@@ -1 +1 @@
-VERSION = '2.3.5'
+VERSION = '2.3.8'

grappelli/dashboard/dashboards.py

@@ -62,6 +62,7 @@ class MyDashboard(Dashboard):
             columns = 3
             
             def __init__(self, **kwargs):
+                super(MyDashboard, self).__init__(**kwargs)
                 
                 # append an app list module for "Applications"
                 self.children.append(modules.AppList(

grappelli/dashboard/templates/grappelli/dashboard/module.html

@@ -14,18 +14,13 @@ <h2 class="module_title{% if module.collapsible %} collapse-handler{% endif %}">
             <h{% if subindex %}3{% else %}2{% endif %} class="module_title{% if module.collapsible %} collapse-handler{% endif %}">{{ module.title }}</h{% if subindex %}3{% else %}2{% endif %}>
         {% endif %}
     {% endif %}
-    
-    {# TODO: need to know in what dom we wrap the pre_content/post_content #}
-    {# if module.pre_content %}{{ module.pre_content }}{% endif #}
-    
+    {% if module.pre_content %}{{ module.pre_content|safe }}{% endif %}
     {% block module_content %}
         {% for child in module.children %}
             {{ child }}
         {% endfor %}
     {% endblock %}
-    
-    {# TODO: need to know in what dom we wrap the pre_content/post_content #}
-    {# if module.post_content %}{{ module.post_content }}{% endif #}
+    {% if module.post_content %}{{ module.post_content|safe }}{% endif %}
 
 </div>
 

grappelli/dashboard/templates/grappelli/dashboard/modules/app_list.html

@@ -3,7 +3,7 @@
 {% block module_content %}
     {% spaceless %}
     {% for child in module.children %}
-        <div class="module">
+        <div class="module" id="module-{{child.title|lower}}">
             <h{% if subindex %}4{% else %}3{% endif %}><a href="{{ child.url }}">{{ child.title }}</a></h{% if subindex %}4{% else %}3{% endif %}>
             {% for model in child.models %}
                 <div class="row">

grappelli/static/grappelli/css/components.css

@@ -182,13 +182,13 @@ fieldset.module .row + .module {
 ------------------------------------------------------------------------------------------------------ */
 
 fieldset.module .row {
-    overflow: hidden;
     padding: 8px 10px;
     line-height: 18px;
     font-weight: normal;
 }
 fieldset.module .row.cells {
     white-space: nowrap;
+    overflow: hidden;
 }
 
 
@@ -324,10 +324,22 @@ h2 + * + * + .module.table {
     padding: 3px 5px 2px 2px;
     min-height: 25px;
     font-weight: bold;
+    /*line-height: 25px;*/
+    /*text-indent: 25px;*/
+    /*background: url('../img/icons/icon-searchbox.png') 6px 50% no-repeat;*/
+}
+.selector .selector-available .selector-filter {
     line-height: 25px;
     text-indent: 25px;
     background: url('../img/icons/icon-searchbox.png') 6px 50% no-repeat;
 }
+.selector .selector-chosen .selector-filter {
+    margin: 0 0 -3px;
+    padding: 6px 5px 2px 26px;
+    /*line-height: 25px;*/
+    /*text-indent: 25px;*/
+    background: url('../img/icons/icon-searchbox.png') 6px 8px no-repeat;
+}
 .selector .selector-filter input[type=text] {
     position: relative;
     margin: 0;
@@ -342,7 +354,7 @@ h2 + * + * + .module.table {
     display: none;
 }
 .selector .selector-chosen .selector-filter:after {
-    content: " " url('../img/icons/icon-selector_add-m2m_horizontal-hover.png');
+    content: " " url('../img/icons/icon-selector_filter.png');
     opacity: .75;
 }
 .selector.stacked .selector-chosen .selector-filter:after {
@@ -553,7 +565,7 @@ ul.actions li a {
 .module.filter {
     position: relative;
     float: right;
-    z-index: 990;
+    z-index: 1001;
     padding: 8px 10px;
 }
 .module.filter + .module.search {