summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerghei MIHAI <smihai@entrouvert.com>2014-10-23 12:44:54 (GMT)
committerSerghei MIHAI <smihai@entrouvert.com>2014-10-24 15:51:46 (GMT)
commitec271c563772d9c6a8e5d22d503ac57c94daaa46 (patch)
treed2b0a38a30450c1c98d755f7a166bd70fc2f1bbf
parentc4fce7062af72ed6aa7aba8cd513bbdd367a2960 (diff)
downloadcompte-agglo-montpellier-ec271c563772d9c6a8e5d22d503ac57c94daaa46.zip
compte-agglo-montpellier-ec271c563772d9c6a8e5d22d503ac57c94daaa46.tar.gz
compte-agglo-montpellier-ec271c563772d9c6a8e5d22d503ac57c94daaa46.tar.bz2
dependencies upgraded, some removed and migrations added in order to prepare
Django CMS 3 migration
-rw-r--r--README7
-rw-r--r--compte_agglo_montpellier/dashboard.py1
-rw-r--r--compte_agglo_montpellier/migrations/0001_initial.py20
-rw-r--r--compte_agglo_montpellier/migrations/0002_add_blocks_to_text_plugins.py28
-rw-r--r--compte_agglo_montpellier/migrations/__init__.py0
-rw-r--r--compte_agglo_montpellier/settings.py14
-rw-r--r--compte_agglo_montpellier/templates/auth/login.html5
-rw-r--r--compte_agglo_montpellier/templates/registration/registration_form.html4
-rw-r--r--requirements.txt11
-rwxr-xr-xsetup.py8
10 files changed, 67 insertions, 31 deletions
diff --git a/README b/README
index 81c0dbe..bc4c29b 100644
--- a/README
+++ b/README
@@ -27,10 +27,3 @@ How to save users settings
URL of the main agglo site
-Stacks
-======
-
-You can plug editable content in any template using Django-CMS stacks::
-
- {% load stack_tags %}
- {% stack 'my_content_id' %}
diff --git a/compte_agglo_montpellier/dashboard.py b/compte_agglo_montpellier/dashboard.py
index bdcd542..b448f75 100644
--- a/compte_agglo_montpellier/dashboard.py
+++ b/compte_agglo_montpellier/dashboard.py
@@ -47,7 +47,6 @@ class CustomIndexDashboard(Dashboard):
'cms.models.pagemodel.Page',
'portail_citoyen.apps.data_source_plugin.models.DataSource',
'feed_plugin.models.Feed',
- 'stacks.*',
),
))
diff --git a/compte_agglo_montpellier/migrations/0001_initial.py b/compte_agglo_montpellier/migrations/0001_initial.py
new file mode 100644
index 0000000..ef2893d
--- /dev/null
+++ b/compte_agglo_montpellier/migrations/0001_initial.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ pass
+
+ def backwards(self, orm):
+ pass
+
+ models = {
+
+ }
+
+ complete_apps = ['compte_agglo_montpellier'] \ No newline at end of file
diff --git a/compte_agglo_montpellier/migrations/0002_add_blocks_to_text_plugins.py b/compte_agglo_montpellier/migrations/0002_add_blocks_to_text_plugins.py
new file mode 100644
index 0000000..ea379c9
--- /dev/null
+++ b/compte_agglo_montpellier/migrations/0002_add_blocks_to_text_plugins.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+from djangocms_text_ckeditor.models import Text
+
+class Migration(DataMigration):
+
+ def forwards(self, orm):
+ "Write your forwards methods here."
+ # Note: Don't use "from appname.models import ModelName".
+ # Use orm.ModelName to refer to models in this application,
+ # and orm['appname.ModelName'] for models in other applications.
+ for plugin in Text.objects.filter(plugin_type="TextPlugin"):
+ plugin.body = '<div class="block">%s</div>' % plugin.body
+ plugin.save()
+
+ def backwards(self, orm):
+ "Write your backwards methods here."
+
+ models = {
+
+ }
+
+ complete_apps = ['compte_agglo_montpellier']
+ symmetrical = True
diff --git a/compte_agglo_montpellier/migrations/__init__.py b/compte_agglo_montpellier/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/compte_agglo_montpellier/migrations/__init__.py
diff --git a/compte_agglo_montpellier/settings.py b/compte_agglo_montpellier/settings.py
index a6f3092..872aa87 100644
--- a/compte_agglo_montpellier/settings.py
+++ b/compte_agglo_montpellier/settings.py
@@ -96,7 +96,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.request',
'django.contrib.messages.context_processors.messages',
'django.core.context_processors.static',
- 'cms.context_processors.media',
+ 'cms.context_processors.cms_settings',
'sekizai.context_processors.sekizai',
'portail_citoyen.context_processors.portail_citoyen',
'authentic2.context_processors.a2_processor',
@@ -158,21 +158,15 @@ INSTALLED_APPS = (
'admin_tools.dashboard',
'django.contrib.admin',
'captcha',
- 'stacks',
'django_select2',
'registration',
'south',
'mptt',
'sekizai',
'cms',
- 'cms.plugins.file',
- 'cms.plugins.googlemap',
- 'cms.plugins.link',
- 'cms.plugins.picture',
- 'cms.plugins.snippet',
- 'cms.plugins.teaser',
- 'cms.plugins.video',
- 'cmsplugin_text_wrapper',
+ 'djangocms_text_ckeditor',
+ 'djangocms_link',
+ 'djangocms_video',
'cms_ajax_text_plugin',
'menus',
'authentic2',
diff --git a/compte_agglo_montpellier/templates/auth/login.html b/compte_agglo_montpellier/templates/auth/login.html
index 7c8ba7c..99fea5c 100644
--- a/compte_agglo_montpellier/templates/auth/login.html
+++ b/compte_agglo_montpellier/templates/auth/login.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
+{% load i18n cms_tags %}
{% load staticfiles %}
{% load sekizai_tags %}
@@ -21,8 +21,7 @@ class="narrow-page"
{% block content %}
<div id="welcome">
-{% load stack_tags %}
-{% stack 'welcome' %}
+{% static_placeholder 'welcome' %}
</div>
{% if messages %}
diff --git a/compte_agglo_montpellier/templates/registration/registration_form.html b/compte_agglo_montpellier/templates/registration/registration_form.html
index 70171dc..33ce2c4 100644
--- a/compte_agglo_montpellier/templates/registration/registration_form.html
+++ b/compte_agglo_montpellier/templates/registration/registration_form.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load i18n stack_tags %}
+{% load i18n cms_tags %}
{% block bodyargs %}
class="narrow-page"
@@ -14,7 +14,7 @@ class="narrow-page"
{% block content %}
<div id="welcome">
- {% stack 'registration' %}
+ {% static_placeholder 'registration' %}
</div>
<div class="right">
diff --git a/requirements.txt b/requirements.txt
index 1f4ff8a..02eb55a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,18 +4,19 @@
-f http://repos.entrouvert.org/tipi-payment-plugin.git/
python-entrouvert
git+git://repos.entrouvert.org/wcsinst#egg=wcsinst-0.9999999999<1.0
-git+git://repos.entrouvert.org/portail-citoyen#egg=portail-citoyen-0.1<1.0
+git+git://repos.entrouvert.org/portail-citoyen
git+git://repos.entrouvert.org/portail-citoyen-announces#egg=portail-citoyen-announces-0.1.99999>=0.1,<0.2
tipi-payment-plugin
cmsplugin-embedded-menu==0.0.7
-cmsplugin-text-wrapper==0.5
gunicorn
demjson
django-simple-captcha==0.4.0
raven
south>=0.8.4
--f https://repos.entrouvert.org/django-cms.git/
-djangocms-stacks
+django-cms>=3.0,<=3.0.3
requests_oauthlib
-django-cms-ajax-text-plugin
+djangocms-text-ckeditor
+django-cms-ajax-text-plugin>=2.1.0
python-openid
+djangocms-link
+djangocms-video
diff --git a/setup.py b/setup.py
index 8acb04a..a70b0ab 100755
--- a/setup.py
+++ b/setup.py
@@ -126,15 +126,17 @@ setup(name="compte-agglo-montpellier",
'portail-citoyen<1.0',
'portail-citoyen-announces>=0.1,<0.2',
'cmsplugin-embedded-menu==0.0.7',
- 'cmsplugin-text-wrapper==0.5',
'gunicorn',
'demjson',
'django-simple-captcha==0.4.0',
'raven',
'wcsinst<1.0',
'south>=0.8.4',
- 'djangocms-stacks',
- 'django-cms-ajax-text-plugin',
+ 'django-cms>=3.0,<=3.0.3',
+ 'djangocms-text-ckeditor',
+ 'django-cms-ajax-text-plugin>=2.1.0'
+ 'djangocms-link',
+ 'djangocms-video',
'tipi-payment-plugin',
],
dependency_links = [