Remove meta_mixin references

This commit is contained in:
Iacopo Spalletti 2016-04-30 00:54:55 +02:00
parent 4024a860dd
commit 335a12bdd5
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
6 changed files with 13 additions and 9 deletions

View file

@ -6,9 +6,13 @@ History
0.8.0 (unreleased) 0.8.0 (unreleased)
++++++++++++++++++ ++++++++++++++++++
* Add django-knocker integration * Added django-knocker integration
* Change the default value of date_published to null * Changed the default value of date_published to null
* Clear menu cache when changing menu layout in apphook config * Cleared menu cache when changing menu layout in apphook config
* Fixed error with wizard multiple registration
* Made django CMS 3.2 the default version
* Fixed error with on_site filter
* Removed meta-mixin compatibility code
0.7.0 (2016-03-19) 0.7.0 (2016-03-19)
++++++++++++++++++ ++++++++++++++++++

View file

@ -5,7 +5,7 @@ import cms.models.fields
import django.utils.timezone import django.utils.timezone
import djangocms_text_ckeditor.fields import djangocms_text_ckeditor.fields
import filer.fields.image import filer.fields.image
import meta_mixin.models import meta.models
import taggit_autosuggest.managers import taggit_autosuggest.managers
from django.conf import settings from django.conf import settings
from django.db import migrations, models from django.db import migrations, models
@ -106,7 +106,7 @@ class Migration(migrations.Migration):
'verbose_name': 'blog article', 'verbose_name': 'blog article',
'verbose_name_plural': 'blog articles', 'verbose_name_plural': 'blog articles',
}, },
bases=(meta_mixin.models.ModelMeta, models.Model), bases=(meta.models.ModelMeta, models.Model),
), ),
migrations.CreateModel( migrations.CreateModel(
name='PostTranslation', name='PostTranslation',

View file

@ -15,7 +15,7 @@ from django.utils.text import slugify
from django.utils.translation import get_language, ugettext_lazy as _ from django.utils.translation import get_language, ugettext_lazy as _
from djangocms_text_ckeditor.fields import HTMLField from djangocms_text_ckeditor.fields import HTMLField
from filer.fields.image import FilerImageField from filer.fields.image import FilerImageField
from meta_mixin.models import ModelMeta from meta.models import ModelMeta
from parler.models import TranslatableModel, TranslatedFields from parler.models import TranslatableModel, TranslatedFields
from parler.utils.context import switch_language from parler.utils.context import switch_language
from taggit_autosuggest.managers import TaggableManager from taggit_autosuggest.managers import TaggableManager

View file

@ -10,7 +10,7 @@ MENU_TYPE_NONE = 'none'
def get_setting(name): def get_setting(name):
from django.conf import settings from django.conf import settings
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from meta_mixin import settings as meta_settings from meta import settings as meta_settings
PERMALINKS = ( PERMALINKS = (
('full_date', _('Full date')), ('full_date', _('Full date')),

View file

@ -2,7 +2,7 @@
{% block meta %} {% block meta %}
{% if meta %} {% if meta %}
{% include "meta_mixin/meta.html" %} {% include "meta/meta.html" %}
{% endif %} {% endif %}
{% endblock meta %} {% endblock meta %}

View file

@ -5,7 +5,7 @@
<title>{% block title %}{% page_attribute 'title' %}{% endblock title %}</title> <title>{% block title %}{% page_attribute 'title' %}{% endblock title %}</title>
{% render_block "css" %} {% render_block "css" %}
{% block canonical_url %}{% endblock canonical_url %} {% block canonical_url %}{% endblock canonical_url %}
{% include "meta_mixin/meta.html" %} {% include "meta/meta.html" %}
<style type="text/css"> <style type="text/css">
.nav { .nav {
padding-left: 0; padding-left: 0;