Merge branch 'develop'

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - 2.5
   - 2.6
   - 2.7
   - 3.2
@@ -10,7 +9,8 @@ env:
   - DJANGO=1.4.0
   - DJANGO=1.4.5
   - DJANGO=1.5
-  - DJANGO=1.5.4
+  - DJANGO=1.5.5
+  - DJANGO=1.6.2
 before_install:
   - export DJANGO_SETTINGS_MODULE=suit.tests.settings
 install:
@@ -21,10 +21,6 @@ script:
 matrix:
   exclude:
     # Django doesn't support following combinations
-    - python: 2.5
-      env: DJANGO=1.5
-    - python: 2.5
-      env: DJANGO=1.5.4
     - python: 3.2
       env: DJANGO=1.4.0
     - python: 3.2
@@ -33,6 +29,8 @@ matrix:
       env: DJANGO=1.4.0
     - python: 3.3
       env: DJANGO=1.4.5
+    - python: 2.6
+      env: DJANGO=1.6.2
 
     # Fails. Django issue #19944
     # https://code.djangoproject.com/ticket/19944

CHANGELOG.rst

@@ -4,6 +4,15 @@ Changelog
 Only important changes are mentioned below. See `commit log <https://github.com/darklow/django-suit/commits/develop>`_ and `closed issues <https://github.com/darklow/django-suit/issues?direction=desc&sort=updated&state=closed>`_ for full changes.
 
 
+v0.2.6 (2014-02-14)
+-------------------------------------------------------------
+
+* [Fix] Fixes `#190 <https://github.com/darklow/django-suit/issues/190>`_ Django 1.6 compatibility issue: Search fails in popups
+* [Fix] Fixes `#198 <https://github.com/darklow/django-suit/pull/198>`_ Remove unknown variable: "onclick_attrib" [Thanks to @blueyed]
+* [Fix] Fixes `#105 <https://github.com/darklow/django-suit/issues/105>`_ AdminSite detection support for various python/django versions
+* [Fix] Fixes translation issues `#162 <https://github.com/darklow/django-suit/pull/162>`_  `#175 <https://github.com/darklow/django-suit/issues/175>`_
+
+
 v0.2.5 (2013-09-30)
 -------------------------------------------------------------
 

README.rst

@@ -43,7 +43,7 @@ Build Status
 
 Django Suit uses Travis CI to perform tests on different Django and Python versions.
 
-Tested using Python: 2.5, 2.6, 2.7, 3.2, 3.3. Django: 1.4, 1.5. Develop / Master:
+Tested using Python: 2.5, 2.6, 2.7, 3.2, 3.3. Django: 1.4, 1.5, 1.6. Develop / Master:
 
 .. |develop| image:: https://travis-ci.org/darklow/django-suit.png?branch=develop
    :alt: Build Status - develop branch

docs/conf.py

@@ -13,6 +13,14 @@
 
 import sys, os
 
+try:
+    import sphinx_rtd_theme
+
+    html_theme = 'sphinx_rtd_theme'
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+except ImportError:
+    html_theme = 'default'
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -48,9 +56,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.5'
+version = '0.2.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.5'
+release = '0.2.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -91,7 +99,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+# html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -100,6 +108,7 @@
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
+# html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
@@ -170,21 +179,21 @@
 # -- Options for LaTeX output --------------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'DjangoSuit.tex', u'Django Suit Documentation',
-   u'Kaspars Sprogis (darklow)', 'manual'),
+    ('index', 'DjangoSuit.tex', u'Django Suit Documentation',
+     u'Kaspars Sprogis (darklow)', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -227,9 +236,10 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'DjangoSuit', u'Django Suit Documentation',
-   u'Kaspars Sprogis (darklow)', 'DjangoSuit', 'One line description of project.',
-   'Miscellaneous'),
+    ('index', 'DjangoSuit', u'Django Suit Documentation',
+     u'Kaspars Sprogis (darklow)', 'DjangoSuit',
+     'One line description of project.',
+     'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.

docs/configuration.rst

@@ -48,12 +48,12 @@ Configuration sample you can use as a start::
 
 
 Header
-======
+------
 
 Header related parameters
 
 ADMIN_NAME
-----------
+^^^^^^^^^^
 
 Admin name that will appear in header <title> tags and in footer::
 
@@ -63,9 +63,9 @@ Admin name that will appear in header <title> tags and in footer::
 
 
 HEADER_DATE_FORMAT
-------------------
+^^^^^^^^^^^^^^^^^^
 HEADER_TIME_FORMAT
-------------------
+^^^^^^^^^^^^^^^^^^
 
 Header date and time formats. Formatting according to `Django date templatefilter format <https://docs.djangoproject.com/en/dev/ref/templates/builtins/#std:templatefilter-date>`_. Default: as specified in example::
 
@@ -75,10 +75,10 @@ Header date and time formats. Formatting according to `Django date templatefilte
   }
 
 Forms
-=====
+-----
 
 SHOW_REQUIRED_ASTERISK
-----------------------
+^^^^^^^^^^^^^^^^^^^^^^
 
 Automatically adds asterisk symbol ``*`` to the end of every required field label::
 
@@ -87,7 +87,7 @@ Automatically adds asterisk symbol ``*`` to the end of every required field labe
   }
 
 CONFIRM_UNSAVED_CHANGES
------------------------
+^^^^^^^^^^^^^^^^^^^^^^^
 
 Alert will be shown, when you'll try to leave page, without saving changed form first::
 
@@ -97,10 +97,10 @@ Alert will be shown, when you'll try to leave page, without saving changed form
 
 
 Menu
-====
+----
 
 SEARCH_URL
-----------
+^^^^^^^^^^
 
 We have big plans for this field in the future, by making it global search field. However right now this field works only as a search redirect to any other urls of your admin::
 
@@ -115,7 +115,7 @@ We have big plans for this field in the future, by making it global search field
   }
 
 MENU_OPEN_FIRST_CHILD
----------------------
+^^^^^^^^^^^^^^^^^^^^^
 
 Automatically replaces app's (parent link) url with url of first model's url (child)::
 
@@ -125,7 +125,7 @@ Automatically replaces app's (parent link) url with url of first model's url (ch
 
 
 MENU_ICONS
-----------
+^^^^^^^^^^
 
 Set app icons. Use any of Twitter Bootstrap `icon classes <http://twitter.github.com/bootstrap/base-css.html#icons>`_ or add your own. Twitter Bootstrap icons are provided by `Glyphicons <http://glyphicons.com/>`_. This parameter is useful, if you don't use ``MENU`` parameter (see below) and just want to set icons for default apps::
 
@@ -137,7 +137,7 @@ Set app icons. Use any of Twitter Bootstrap `icon classes <http://twitter.github
   }
 
 MENU_EXCLUDE
-------------
+^^^^^^^^^^^^
 
 Exclude any of apps or models. You can exclude whole app or just one model from app::
 
@@ -150,12 +150,12 @@ Exclude any of apps or models. You can exclude whole app or just one model from
 
 
 MENU_ORDER
-----------
+^^^^^^^^^^
 
 `MENU_ORDER parameter <http://django-suit.readthedocs.org/en/0.1.7/configuration.html#menu-order>`_ is deprecated - use ``MENU`` instead.
 
 MENU
-----
+^^^^
 
 Most powerful of menu parameters - one parameter to rule them all :) You can rename, reorder, cross link, exclude apps and models, and even define custom menu items and child links.
 
@@ -214,10 +214,10 @@ Here is full example of ``MENU`` from simple existing app reorder to defining cu
 
 
 List
-====
+----
 
 LIST_PER_PAGE
--------------
+^^^^^^^^^^^^^
 
 Set change_list view ``list_per_page`` parameter globally for whole admin. You can still override this parameter in any ModelAdmin class::
 

docs/contributing.rst

@@ -33,7 +33,7 @@ While editing ``.less`` files, run following script, which automatically watches
 
 
 Related packages
------------------
+----------------
 
 Related packages you can contribute to:
 

docs/form_includes.rst

@@ -14,7 +14,9 @@ Each ``suit_form_includes`` item can contain 3 parameters:
   * ``bottom`` - after inlines (Default)
 3. Specify ``TAB_NAME`` if using in combination with :doc:`/form_tabs` (Optional)
 
-Example::
+Example
+-------
+::
 
     from django.contrib import admin
     from .models import Country
@@ -28,7 +30,8 @@ Example::
         )
 
 
-Preview:
+Preview
+-------
 
   .. image:: _static/img/form_includes.png
      :target: http://djangosuit.com/admin/examples/country/234/

docs/form_tabs.rst

@@ -1,5 +1,5 @@
 Form tabs
-==========
+=========
 
 Form tabs help you organize form fieldsets and inlines into tabs. Before reading further, take a look on the tabs `in the demo app <http://djangosuit.com/admin/examples/country/234/>`_.
 
@@ -16,7 +16,9 @@ To organize form into tabs you must:
 3. To use with inlines, specify same css classes in ``suit_classes`` parameter for ``inline`` classes
 
 
-Full example::
+Example
+-------
+::
 
     from django.contrib import admin
     from .models import Country
@@ -61,7 +63,8 @@ Same way you can organize any HTML into tabs, just wrap it in previously mention
 
   <div class="suit-tab suit-tab-TAB_NAME">...</div>
 
-Preview:
+Preview
+-------
 
   .. image:: _static/img/form_tabs.png
      :target: http://djangosuit.com/admin/examples/country/234/

docs/index.rst

@@ -13,7 +13,7 @@ Django Suit is alternative theme/skin/extension for `Django <http://www.djangopr
    :target: http://travis-ci.org/darklow/django-suit
 
 Licence
---------
+-------
 
 * Django Suit is licensed under `Creative Commons Attribution-NonCommercial 3.0 <http://creativecommons.org/licenses/by-nc/3.0/>`_ license.
 * See licence and pricing: http://djangosuit.com/pricing/
@@ -28,7 +28,7 @@ Resources
 * Github: https://github.com/darklow/django-suit
 * Demo app on Github: https://github.com/darklow/django-suit-examples
 * Changelog: `Changelog.rst <https://github.com/darklow/django-suit/blob/develop/CHANGELOG.rst>`_
-* Supports: Django 1.4/1.5. Python: 2.5-3.3 |master|
+* Supports: Django 1.4/1.5/1.6. Python: 2.6-3.3 |master|
 * `Supported apps`_
 
 
@@ -59,7 +59,7 @@ Installation
         'django.contrib.admin',
     )
 
-  .. warning:: ``'suit'`` must be added before ``'django.contrib.admin'``, and if you are using third-party apps with special admin support (like django-cms) you also need to add ``'suit'`` before ``'cms'``.
+  .. warning:: ``'suit'`` must be added before ``'django.contrib.admin'`` and if you are using third-party apps with special admin support (like django-cms) you also need to add ``'suit'`` before ``'cms'``.
 
 3. You also need to add ``'django.core.context_processors.request'`` to ``TEMPLATE_CONTEXT_PROCESSORS`` setting in your Django project ``settings.py`` file.::
 
@@ -86,7 +86,7 @@ Develop branch
 `Develop branch <https://github.com/darklow/django-suit/commits/develop>`_ is considered as release candidate version. Check `commits <https://github.com/darklow/django-suit/commits/develop>`_ and `changelog <https://github.com/darklow/django-suit/blob/develop/CHANGELOG.rst>`_ of develop branch first, before installing develop version. It is quite stable and always tested, but can contain some flaws or behaviour changes too. To install latest develop version use::
 
   pip uninstall django-suit
-  pip install -e git+https://github.com/darklow/django-suit@develop#egg=django-suit
+  pip install https://github.com/darklow/django-suit/tarball/develop
 
 
 Customization

docs/js_css.rst

@@ -1,8 +1,11 @@
+JavaScript & CSS
+================
+
 JavaScript goodies
-==================
+------------------
 
 Inlines hook
-------------
+^^^^^^^^^^^^
 
 When working with Django inlines and JavaScript, very often we want to hook/attach to event - when new inline row is added. Django Suit gives us such chance.
 
@@ -23,7 +26,7 @@ Use JavaScript ``Suit.after_inline.register`` to register/attach your function t
 
 
 jQuery
-------
+^^^^^^
 
 Django Suit provides jQuery (currently v1.8.3) and it is using custom namespace to avoid collisions between different apps which also provide jQuery.
 
@@ -49,7 +52,7 @@ To use jQuery from Django Suit package:
 
 
 CSS goodies
-===========
+-----------
 
 `Original <https://docs.djangoproject.com/en/dev/ref/contrib/admin/#django.contrib.admin.ModelAdmin.fieldsets>`_ ``collapse`` and ``wide`` fieldset classes are also supported by Django Suit. Usage::