xeniac/kasu
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

added localized deschription fields osed for the meta description tag on the page for SEO.

Browse Source
This commit is contained in:
Christian Berg
2016-10-14 21:25:23 +02:00
parent ba44e97e9a
commit bbe16b2d13
6 changed files with 194 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/content/models.py
View File

@@ -1,20 +1,20 @@
# -*- coding: utf-8 -*-
from os import path
from ckeditor.fields import RichTextField
from django.conf import settings
from django.utils.timezone import now
from django.core.urlresolvers import reverse
from django.core.cache import cache
from django.core.exceptions import ValidationError
from django.core.urlresolvers import reverse
from django.db import models
from django.template.defaultfilters import slugify
from django.utils import timezone
from django.utils.safestring import mark_safe
from django.utils.translation import get_language, ugettext as _
from django.core.exceptions import ValidationError
from ckeditor.fields import RichTextField
from utils import STATUS_CHOICES, STATUS_WAITING, STATUS_PUBLISHED, \
cleaner
CONTENT_CHOICES = (
(0, u'Django View'),
(1, u'HTML'),
@@ -39,12 +39,12 @@ def get_upload_path(instance, filename):
class ArticleManager(models.Manager):
def get_queryset(self):
return super(ArticleManager, self).get_queryset().select_related('author', 'category')
return super(ArticleManager, self).get_queryset().select_related(
'author', 'category')
def published(self):
return self.filter(status=STATUS_PUBLISHED, date_created__lte=now())
return self.filter(status=STATUS_PUBLISHED, date_created__lte=timezone.now())
class Article(models.Model):
@@ -60,7 +60,7 @@ class Article(models.Model):
verbose_name=_('Author'))
status = models.SmallIntegerField(_('Status'), choices=STATUS_CHOICES,
default=STATUS_PUBLISHED)
date_created = models.DateTimeField(_('Created'), blank=True)
date_created = models.DateTimeField(_('Created'), auto_now_add=True)
date_modified = models.DateTimeField(_('Modified'), auto_now=True)
objects = ArticleManager()
@@ -71,7 +71,7 @@ class Article(models.Model):
def clean(self):
if not self.date_created:
self.date_created = now()
self.date_created = timezone.now()
if not self.slug:
self.slug = slugify(self.headline_de)[:50]
self.content_de = cleaner.clean_html(self.content_de)
@@ -121,42 +121,83 @@ class Page(models.Model):
angeboten.
"""
menu_name_de = models.CharField(
'Menü Name',
max_length=255,
verbose_name='Menü Name',
help_text=_('The short name for the menu-entry of this page')
)
menu_name_en = models.CharField(
'Menu Name',
max_length=255,
blank=True,
verbose_name='Menu Name',
help_text=_('The short name for the menu-entry of this page')
)
title_de = models.CharField('Titel', max_length=255,
help_text=_(
'This title appears in the HTML header'))
title_en = models.CharField('Title', max_length=255, blank=True,
help_text=_(
'This title appears in the HTML header'))
slug = models.SlugField(_('slug'))
path = models.CharField(_('Path'), max_length=100, db_index=True,
editable=False, unique=True)
parent = models.ForeignKey('self', blank=True, null=True,
related_name='subpages',
on_delete=models.SET_NULL)
position = models.PositiveSmallIntegerField(_('Position'),
blank=True, null=True)
status = models.SmallIntegerField(_('status'), choices=STATUS_CHOICES,
default=STATUS_WAITING)
content_type = models.IntegerField(choices=CONTENT_CHOICES)
title_de = models.CharField(
max_length=255,
verbose_name='Titel',
help_text=_("The page title as you'd like it to be seen by the public"))
title_en = models.CharField(
max_length=255,
blank=True,
verbose_name='Title',
help_text=_("The page title as you'd like it to be seen by the public"))
slug = models.SlugField(
verbose_name=_('slug'),
max_length=100,
help_text=_("The name of the page as it will appear in URLs e.g http://domain.com/blog/[my-slug]/")
)
path = models.CharField(
max_length=255,
db_index=True,
editable=False,
unique=True,
verbose_name=_('Path'),
)
parent = models.ForeignKey(
'self',
blank=True,
null=True,
related_name='subpages',
on_delete=models.SET_NULL
)
position = models.PositiveSmallIntegerField(
blank=True,
null=True,
verbose_name=_('Position')
)
status = models.SmallIntegerField(
choices=STATUS_CHOICES,
default=STATUS_WAITING,
verbose_name=_('status')
)
description_de = models.TextField(verbose_name=_('search description'), blank=True)
description_en = models.TextField(verbose_name=_('search description'), blank=True)
content_type = models.IntegerField(
choices=CONTENT_CHOICES,
verbose_name=_('content type'))
content_de = RichTextField('Inhalt', blank=True)
content_en = RichTextField('Content', blank=True)
enable_comments = models.BooleanField(_('enable comments'), default=True)
template = models.CharField(_('Template'), max_length=100,
default="content/page.html")
enable_comments = models.BooleanField(
default=True,
verbose_name=_('enable comments')
)
template = models.CharField(
max_length=255,
default="content/page.html",
verbose_name=_('Template'),
)
pdf_de = models.FileField(upload_to='pdf/de/', blank=True, null=True)
pdf_en = models.FileField(upload_to='pdf/en/', blank=True, null=True)
date_created = models.DateTimeField(
auto_now_add=True,
db_index=True,
editable=False,
verbose_name=_('first created at'),
)
date_modified = models.DateTimeField(
auto_now=True,
editable=False,
verbose_name=_('latest updated at'),
)
def __unicode__(self):
return u'%s' % self.title
@@ -170,6 +211,10 @@ class Page(models.Model):
def css_class(self):
return CONTENT_CHOICES[self.content_type][1].lower().replace(' ', '_')
@property
def description(self):
return getattr(self, "description_%s" % get_language()) or self.description_de
@property
def menu_name(self):
return getattr(self,