dependencies upgraded, some removed and migrations added in order to prepare
Django CMS 3 migration
This commit is contained in:
parent
c4fce7062a
commit
ec271c5637
7
README
7
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' %}
|
||||
|
|
|
@ -47,7 +47,6 @@ class CustomIndexDashboard(Dashboard):
|
|||
'cms.models.pagemodel.Page',
|
||||
'portail_citoyen.apps.data_source_plugin.models.DataSource',
|
||||
'feed_plugin.models.Feed',
|
||||
'stacks.*',
|
||||
),
|
||||
))
|
||||
|
||||
|
|
|
@ -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']
|
|
@ -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
|
|
@ -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',
|
||||
|
|
|
@ -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 %}
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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
|
||||
|
|
8
setup.py
8
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 = [
|
||||
|
|
Reference in New Issue