Changes 2.3.1:

* Introducing Django 1.4 support, dropped support for Django 1.2
* Lazy page tree loading in admin
* Toolbar isolation
* Plugin cancel button fixed
* Tests refactor
* Moving text plugins to different placeholders no longer loses inline plugins
* Minor improvements

3 files changed, 147 insertions, 11 deletions

diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index f8c234a1220..40f581d41f5 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2012/04/08 19:09:16 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2012/08/26 13:34:46 adam Exp $
 
-DISTNAME=	django-cms-2.2
+DISTNAME=	django-cms-2.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www python
 MASTER_SITES=	http://pypi.python.org/packages/source/d/django-cms/
@@ -22,6 +22,7 @@ DEPENDS+=	${PYPKGPREFIX}-django-classy-tags-[0-9]*:../../www/py-django-classy-ta
 DEPENDS+=	${PYPKGPREFIX}-django-appmedia-[0-9]*:../../www/py-django-appmedia
 DEPENDS+=	${PYPKGPREFIX}-django-mptt-[0-9]*:../../www/py-django-mptt
 DEPENDS+=	${PYPKGPREFIX}-django-sekizai-[0-9]*:../../www/py-django-sekizai
+DEPENDS+=	${PYPKGPREFIX}-django-reversion-[0-9]*:../../www/py-django-reversion
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-django-cms/PLIST b/www/py-django-cms/PLIST
index 3e44762959b..a7d8d49d644 100644
--- a/www/py-django-cms/PLIST
+++ b/www/py-django-cms/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/01/08 07:56:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/08/26 13:34:46 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -140,6 +140,10 @@ ${PYSITELIB}/cms/locale/es_AR/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/es_AR/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/es_AR/LC_MESSAGES/djangojs.mo
 ${PYSITELIB}/cms/locale/es_AR/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/es_BO/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/es_BO/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/es_BO/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/es_BO/LC_MESSAGES/djangojs.po
 ${PYSITELIB}/cms/locale/et/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/et/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/et/LC_MESSAGES/djangojs.mo
@@ -172,6 +176,10 @@ ${PYSITELIB}/cms/locale/hi/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/hi/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/hi/LC_MESSAGES/djangojs.mo
 ${PYSITELIB}/cms/locale/hi/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/hr/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/hr/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/hr/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/hr/LC_MESSAGES/djangojs.po
 ${PYSITELIB}/cms/locale/hu/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/hu/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/hu/LC_MESSAGES/djangojs.mo
@@ -184,10 +192,14 @@ ${PYSITELIB}/cms/locale/ja/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/ja/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/ja/LC_MESSAGES/djangojs.mo
 ${PYSITELIB}/cms/locale/ja/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/ka/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/ka/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/km/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/km/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/km/LC_MESSAGES/djangojs.mo
 ${PYSITELIB}/cms/locale/km/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/ku_IQ/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/ku_IQ/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/nl/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/nl/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/nl/LC_MESSAGES/djangojs.mo
@@ -224,6 +236,10 @@ ${PYSITELIB}/cms/locale/sl_SI/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/sl_SI/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/sl_SI/LC_MESSAGES/djangojs.mo
 ${PYSITELIB}/cms/locale/sl_SI/LC_MESSAGES/djangojs.po
+${PYSITELIB}/cms/locale/sr@latin/LC_MESSAGES/django.mo
+${PYSITELIB}/cms/locale/sr@latin/LC_MESSAGES/django.po
+${PYSITELIB}/cms/locale/sr@latin/LC_MESSAGES/djangojs.mo
+${PYSITELIB}/cms/locale/sr@latin/LC_MESSAGES/djangojs.po
 ${PYSITELIB}/cms/locale/sv/LC_MESSAGES/django.mo
 ${PYSITELIB}/cms/locale/sv/LC_MESSAGES/django.po
 ${PYSITELIB}/cms/locale/sv/LC_MESSAGES/djangojs.mo
@@ -861,7 +877,6 @@ ${PYSITELIB}/cms/static/cms/css/plugins/cms.placeholders.css
 ${PYSITELIB}/cms/static/cms/css/plugins/cms.toolbar.css
 ${PYSITELIB}/cms/static/cms/css/rte.css
 ${PYSITELIB}/cms/static/cms/css/tinymce_toolbar.css
-${PYSITELIB}/cms/static/cms/css/toolbar.css
 ${PYSITELIB}/cms/static/cms/css/wymeditor.css
 ${PYSITELIB}/cms/static/cms/images/bold.gif
 ${PYSITELIB}/cms/static/cms/images/changelist-filter-button-bg.jpg
@@ -987,6 +1002,7 @@ ${PYSITELIB}/cms/static/cms/js/plugin_editor.js
 ${PYSITELIB}/cms/static/cms/js/plugins/admincompat.js
 ${PYSITELIB}/cms/static/cms/js/plugins/cms.base.js
 ${PYSITELIB}/cms/static/cms/js/plugins/cms.placeholders.js
+${PYSITELIB}/cms/static/cms/js/plugins/cms.setup.js
 ${PYSITELIB}/cms/static/cms/js/plugins/cms.toolbar.js
 ${PYSITELIB}/cms/static/cms/js/tinymce.placeholdereditor.js
 ${PYSITELIB}/cms/static/cms/js/wymeditor.placeholdereditor.js
@@ -1113,6 +1129,8 @@ ${PYSITELIB}/cms/templates/admin/cms/page/change_list_tree.html
 ${PYSITELIB}/cms/templates/admin/cms/page/dialog/base.html
 ${PYSITELIB}/cms/templates/admin/cms/page/dialog/copy.html
 ${PYSITELIB}/cms/templates/admin/cms/page/includes/fieldset.html
+${PYSITELIB}/cms/templates/admin/cms/page/lazy_child_menu.html
+${PYSITELIB}/cms/templates/admin/cms/page/lazy_menu.html
 ${PYSITELIB}/cms/templates/admin/cms/page/loading.html
 ${PYSITELIB}/cms/templates/admin/cms/page/menu.html
 ${PYSITELIB}/cms/templates/admin/cms/page/menu_item.html
@@ -1148,18 +1166,24 @@ ${PYSITELIB}/cms/templatetags/__init__.pyo
 ${PYSITELIB}/cms/templatetags/cms_admin.py
 ${PYSITELIB}/cms/templatetags/cms_admin.pyc
 ${PYSITELIB}/cms/templatetags/cms_admin.pyo
+${PYSITELIB}/cms/templatetags/cms_js_tags.py
+${PYSITELIB}/cms/templatetags/cms_js_tags.pyc
+${PYSITELIB}/cms/templatetags/cms_js_tags.pyo
 ${PYSITELIB}/cms/templatetags/cms_tags.py
 ${PYSITELIB}/cms/templatetags/cms_tags.pyc
 ${PYSITELIB}/cms/templatetags/cms_tags.pyo
-${PYSITELIB}/cms/templatetags/js.py
-${PYSITELIB}/cms/templatetags/js.pyc
-${PYSITELIB}/cms/templatetags/js.pyo
 ${PYSITELIB}/cms/templatetags/placeholder_tags.py
 ${PYSITELIB}/cms/templatetags/placeholder_tags.pyc
 ${PYSITELIB}/cms/templatetags/placeholder_tags.pyo
 ${PYSITELIB}/cms/test_utils/__init__.py
 ${PYSITELIB}/cms/test_utils/__init__.pyc
 ${PYSITELIB}/cms/test_utils/__init__.pyo
+${PYSITELIB}/cms/test_utils/cli.py
+${PYSITELIB}/cms/test_utils/cli.pyc
+${PYSITELIB}/cms/test_utils/cli.pyo
+${PYSITELIB}/cms/test_utils/compat.py
+${PYSITELIB}/cms/test_utils/compat.pyc
+${PYSITELIB}/cms/test_utils/compat.pyo
 ${PYSITELIB}/cms/test_utils/fixtures/__init__.py
 ${PYSITELIB}/cms/test_utils/fixtures/__init__.pyc
 ${PYSITELIB}/cms/test_utils/fixtures/__init__.pyo
@@ -1175,9 +1199,108 @@ ${PYSITELIB}/cms/test_utils/fixtures/navextenders.pyo
 ${PYSITELIB}/cms/test_utils/fixtures/templatetags.py
 ${PYSITELIB}/cms/test_utils/fixtures/templatetags.pyc
 ${PYSITELIB}/cms/test_utils/fixtures/templatetags.pyo
+${PYSITELIB}/cms/test_utils/project/__init__.py
+${PYSITELIB}/cms/test_utils/project/__init__.pyc
+${PYSITELIB}/cms/test_utils/project/__init__.pyo
+${PYSITELIB}/cms/test_utils/project/cms_urls_for_apphook_tests.py
+${PYSITELIB}/cms/test_utils/project/cms_urls_for_apphook_tests.pyc
+${PYSITELIB}/cms/test_utils/project/cms_urls_for_apphook_tests.pyo
+${PYSITELIB}/cms/test_utils/project/fakemlng/__init__.py
+${PYSITELIB}/cms/test_utils/project/fakemlng/__init__.pyc
+${PYSITELIB}/cms/test_utils/project/fakemlng/__init__.pyo
+${PYSITELIB}/cms/test_utils/project/fakemlng/models.py
+${PYSITELIB}/cms/test_utils/project/fakemlng/models.pyc
+${PYSITELIB}/cms/test_utils/project/fakemlng/models.pyo
+${PYSITELIB}/cms/test_utils/project/fileapp/__init__.py
+${PYSITELIB}/cms/test_utils/project/fileapp/__init__.pyc
+${PYSITELIB}/cms/test_utils/project/fileapp/__init__.pyo
+${PYSITELIB}/cms/test_utils/project/fileapp/models.py
+${PYSITELIB}/cms/test_utils/project/fileapp/models.pyc
+${PYSITELIB}/cms/test_utils/project/fileapp/models.pyo
+${PYSITELIB}/cms/test_utils/project/models.py
+${PYSITELIB}/cms/test_utils/project/models.pyc
+${PYSITELIB}/cms/test_utils/project/models.pyo
+${PYSITELIB}/cms/test_utils/project/noadmin_urls.py
+${PYSITELIB}/cms/test_utils/project/noadmin_urls.pyc
+${PYSITELIB}/cms/test_utils/project/noadmin_urls.pyo
+${PYSITELIB}/cms/test_utils/project/nonroot_urls.py
+${PYSITELIB}/cms/test_utils/project/nonroot_urls.pyc
+${PYSITELIB}/cms/test_utils/project/nonroot_urls.pyo
+${PYSITELIB}/cms/test_utils/project/placeholderapp/__init__.py
+${PYSITELIB}/cms/test_utils/project/placeholderapp/__init__.pyc
+${PYSITELIB}/cms/test_utils/project/placeholderapp/__init__.pyo
+${PYSITELIB}/cms/test_utils/project/placeholderapp/admin.py
+${PYSITELIB}/cms/test_utils/project/placeholderapp/admin.pyc
+${PYSITELIB}/cms/test_utils/project/placeholderapp/admin.pyo
+${PYSITELIB}/cms/test_utils/project/placeholderapp/models.py
+${PYSITELIB}/cms/test_utils/project/placeholderapp/models.pyc
+${PYSITELIB}/cms/test_utils/project/placeholderapp/models.pyo
+${PYSITELIB}/cms/test_utils/project/placeholderapp/views.py
+${PYSITELIB}/cms/test_utils/project/placeholderapp/views.pyc
+${PYSITELIB}/cms/test_utils/project/placeholderapp/views.pyo
+${PYSITELIB}/cms/test_utils/project/pluginapp/__init__.py
+${PYSITELIB}/cms/test_utils/project/pluginapp/__init__.pyc
+${PYSITELIB}/cms/test_utils/project/pluginapp/__init__.pyo
+${PYSITELIB}/cms/test_utils/project/pluginapp/models.py
+${PYSITELIB}/cms/test_utils/project/pluginapp/models.pyc
+${PYSITELIB}/cms/test_utils/project/pluginapp/models.pyo
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/__init__.py
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/__init__.pyc
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/__init__.pyo
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/__init__.py
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/__init__.pyc
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/__init__.pyo
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/cms_plugins.py
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/cms_plugins.pyc
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/cms_plugins.pyo
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/models.py
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/models.pyc
+${PYSITELIB}/cms/test_utils/project/pluginapp/plugins/manytomany_rel/models.pyo
+${PYSITELIB}/cms/test_utils/project/sampleapp/__init__.py
+${PYSITELIB}/cms/test_utils/project/sampleapp/__init__.pyc
+${PYSITELIB}/cms/test_utils/project/sampleapp/__init__.pyo
+${PYSITELIB}/cms/test_utils/project/sampleapp/admin.py
+${PYSITELIB}/cms/test_utils/project/sampleapp/admin.pyc
+${PYSITELIB}/cms/test_utils/project/sampleapp/admin.pyo
+${PYSITELIB}/cms/test_utils/project/sampleapp/cms_app.py
+${PYSITELIB}/cms/test_utils/project/sampleapp/cms_app.pyc
+${PYSITELIB}/cms/test_utils/project/sampleapp/cms_app.pyo
+${PYSITELIB}/cms/test_utils/project/sampleapp/menu.py
+${PYSITELIB}/cms/test_utils/project/sampleapp/menu.pyc
+${PYSITELIB}/cms/test_utils/project/sampleapp/menu.pyo
+${PYSITELIB}/cms/test_utils/project/sampleapp/models.py
+${PYSITELIB}/cms/test_utils/project/sampleapp/models.pyc
+${PYSITELIB}/cms/test_utils/project/sampleapp/models.pyo
+${PYSITELIB}/cms/test_utils/project/sampleapp/urls.py
+${PYSITELIB}/cms/test_utils/project/sampleapp/urls.pyc
+${PYSITELIB}/cms/test_utils/project/sampleapp/urls.pyo
+${PYSITELIB}/cms/test_utils/project/sampleapp/urls_extra.py
+${PYSITELIB}/cms/test_utils/project/sampleapp/urls_extra.pyc
+${PYSITELIB}/cms/test_utils/project/sampleapp/urls_extra.pyo
+${PYSITELIB}/cms/test_utils/project/sampleapp/views.py
+${PYSITELIB}/cms/test_utils/project/sampleapp/views.pyc
+${PYSITELIB}/cms/test_utils/project/sampleapp/views.pyo
+${PYSITELIB}/cms/test_utils/project/second_cms_urls_for_apphook_tests.py
+${PYSITELIB}/cms/test_utils/project/second_cms_urls_for_apphook_tests.pyc
+${PYSITELIB}/cms/test_utils/project/second_cms_urls_for_apphook_tests.pyo
+${PYSITELIB}/cms/test_utils/project/second_urls_for_apphook_tests.py
+${PYSITELIB}/cms/test_utils/project/second_urls_for_apphook_tests.pyc
+${PYSITELIB}/cms/test_utils/project/second_urls_for_apphook_tests.pyo
+${PYSITELIB}/cms/test_utils/project/urls.py
+${PYSITELIB}/cms/test_utils/project/urls.pyc
+${PYSITELIB}/cms/test_utils/project/urls.pyo
+${PYSITELIB}/cms/test_utils/project/urls_for_apphook_tests.py
+${PYSITELIB}/cms/test_utils/project/urls_for_apphook_tests.pyc
+${PYSITELIB}/cms/test_utils/project/urls_for_apphook_tests.pyo
+${PYSITELIB}/cms/test_utils/runners.py
+${PYSITELIB}/cms/test_utils/runners.pyc
+${PYSITELIB}/cms/test_utils/runners.pyo
 ${PYSITELIB}/cms/test_utils/testcases.py
 ${PYSITELIB}/cms/test_utils/testcases.pyc
 ${PYSITELIB}/cms/test_utils/testcases.pyo
+${PYSITELIB}/cms/test_utils/tmpdir.py
+${PYSITELIB}/cms/test_utils/tmpdir.pyc
+${PYSITELIB}/cms/test_utils/tmpdir.pyo
 ${PYSITELIB}/cms/test_utils/util/__init__.py
 ${PYSITELIB}/cms/test_utils/util/__init__.pyc
 ${PYSITELIB}/cms/test_utils/util/__init__.pyo
@@ -1193,6 +1316,9 @@ ${PYSITELIB}/cms/test_utils/util/mock.pyo
 ${PYSITELIB}/cms/test_utils/util/request_factory.py
 ${PYSITELIB}/cms/test_utils/util/request_factory.pyc
 ${PYSITELIB}/cms/test_utils/util/request_factory.pyo
+${PYSITELIB}/cms/test_utils/util/urls.py
+${PYSITELIB}/cms/test_utils/util/urls.pyc
+${PYSITELIB}/cms/test_utils/util/urls.pyo
 ${PYSITELIB}/cms/tests/__init__.py
 ${PYSITELIB}/cms/tests/__init__.pyc
 ${PYSITELIB}/cms/tests/__init__.pyo
@@ -1220,6 +1346,12 @@ ${PYSITELIB}/cms/tests/management.pyo
 ${PYSITELIB}/cms/tests/menu.py
 ${PYSITELIB}/cms/tests/menu.pyc
 ${PYSITELIB}/cms/tests/menu.pyo
+${PYSITELIB}/cms/tests/menu_page_viewperm.py
+${PYSITELIB}/cms/tests/menu_page_viewperm.pyc
+${PYSITELIB}/cms/tests/menu_page_viewperm.pyo
+${PYSITELIB}/cms/tests/menu_page_viewperm_staff.py
+${PYSITELIB}/cms/tests/menu_page_viewperm_staff.pyc
+${PYSITELIB}/cms/tests/menu_page_viewperm_staff.pyo
 ${PYSITELIB}/cms/tests/menu_utils.py
 ${PYSITELIB}/cms/tests/menu_utils.pyc
 ${PYSITELIB}/cms/tests/menu_utils.pyo
@@ -1232,6 +1364,9 @@ ${PYSITELIB}/cms/tests/multilingual.pyo
 ${PYSITELIB}/cms/tests/navextender.py
 ${PYSITELIB}/cms/tests/navextender.pyc
 ${PYSITELIB}/cms/tests/navextender.pyo
+${PYSITELIB}/cms/tests/nested_plugins.py
+${PYSITELIB}/cms/tests/nested_plugins.pyc
+${PYSITELIB}/cms/tests/nested_plugins.pyo
 ${PYSITELIB}/cms/tests/nonroot.py
 ${PYSITELIB}/cms/tests/nonroot.pyc
 ${PYSITELIB}/cms/tests/nonroot.pyo
diff --git a/www/py-django-cms/distinfo b/www/py-django-cms/distinfo
index e0a10db884c..5972cbaff8b 100644
--- a/www/py-django-cms/distinfo
+++ b/www/py-django-cms/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/01/08 07:56:58 adam Exp $
+$NetBSD: distinfo,v 1.6 2012/08/26 13:34:46 adam Exp $
 
-SHA1 (django-cms-2.2.tar.gz) = 1e4267f21c138a6e770718b82f4e34a1b8133140
-RMD160 (django-cms-2.2.tar.gz) = 1df0a58cbc649db4131a0a79df9acfb5d866a027
-Size (django-cms-2.2.tar.gz) = 6993554 bytes
+SHA1 (django-cms-2.3.1.tar.gz) = 7a1dd84c4e19a5e4b3021bb0fca0df7d65c216a9
+RMD160 (django-cms-2.3.1.tar.gz) = bb9fa264045fd3ab003284cfc082f0c554f8c7c9
+Size (django-cms-2.3.1.tar.gz) = 3541370 bytes