more Page models, rebase core

diff --git a/app/organization/core/models.py b/app/organization/core/models.py
index 241dee18639a5014194f3253369067a29ac0c8b7..377d057ed6d92af420853afb1f4a923f3d3eef73 100644 (file)
--- a/app/organization/core/models.py
+++ b/app/organization/core/models.py
@@ -8,8 +8,11 @@ from mezzanine.core.fields import RichTextField, OrderField, FileField
 from mezzanine.core.models import Displayable, Slugged
 
 
+COLOR_CHOICES = (('black', _('black')), ('yellow', _('yellow')), ('red', _('red')))
+
+
 class Description(models.Model):
-    """Base object description"""
+    """Abstract model providing a description field"""
 
     description = models.TextField(_('description'), blank=True)
 
@@ -17,8 +20,8 @@ class Description(models.Model):
         abstract = True
 
 
-class Named(Description):
-    """Named object with description"""
+class Named(models.Model):
+    """Abstract model providing a name field"""
 
     name = models.CharField(_('name'), max_length=512)
 
@@ -33,12 +36,17 @@ class Named(Description):
         return slugify(self.__unicode__())
 
 
-class Titled(Slugged, Description):
-    """Base object with title, slug and description"""
+class Titled(models.Model):
+    """Abstract model providing a title field"""
+
+    title = models.CharField(_('name'), max_length=1024)
 
     class Meta:
         abstract = True
 
+    def __str__(self):
+        return self.title
+
 
 class SubTitle(models.Model):
 
@@ -48,7 +56,25 @@ class SubTitle(models.Model):
         abstract = True
 
 
-class BasicPage(Page, RichText, SubTitle):
+class Category(Named):
+    """Category description)"""
+
+    class Meta:
+        verbose_name = _('category')
+
+    def __str__(self):
+        return self.name
+
+
+class BasicPage(Page, SubTitle, RichText):
 
     class Meta:
         verbose_name = 'basic page'
+
+
+class PageBlock(Titled, RichText):
+
+    background_color = models.CharField(_('background color'), max_length=32, choices=COLOR_CHOICES, blank=True)
+
+    class Meta:
+        verbose_name = 'page block'

diff --git a/app/organization/magazine/admin.py b/app/organization/magazine/admin.py
index 7117eb4829f640a2c649d21f1de738c18044ef0d..88ddc9666f97713d3e05d33a2a78c5fe5877ad3c 100644 (file)
--- a/app/organization/magazine/admin.py
+++ b/app/organization/magazine/admin.py
@@ -2,7 +2,7 @@ from django.contrib import admin
 from django import forms
 from copy import deepcopy
 from mezzanine.core.admin import DisplayableAdmin
-from organization.magazine.models import Article, Brief
+from organization.magazine.models import Article, Brief, Topic
 
 
 class ArticleAdmin(admin.ModelAdmin):
@@ -19,10 +19,13 @@ class BriefAdmin(admin.ModelAdmin):
 
     model = Brief
 
+
 class BriefAdminDisplayable(DisplayableAdmin):
 
     fieldsets = deepcopy(BriefAdmin.fieldsets)
 
 
+
 admin.site.register(Article, ArticleAdminDisplayable)
 admin.site.register(Brief, BriefAdminDisplayable)
+admin.site.register(Topic)

diff --git a/app/organization/magazine/models.py b/app/organization/magazine/models.py
index 77b9955cd2b187b61483dc9fe4369f6a457b51c2..8d5dc3cefd7d806715f411037c0e727a4f542b1e 100644 (file)
--- a/app/organization/magazine/models.py
+++ b/app/organization/magazine/models.py
@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse, reverse_lazy
 from mezzanine.core.models import RichText, Displayable, Slugged
 from mezzanine.blog.models import BlogPost
-from organization.core.models import Named
+from organization.core.models import Named, Description
 
 
 class Article(BlogPost):
@@ -31,21 +31,8 @@ class Brief(Displayable, RichText):
         verbose_name = _('brief')
 
 
-class Category(Named):
-    """(Category description)"""
-
-    class Meta:
-        verbose_name = _('category')
-
-    def __unicode__(self):
-        return self.name
-
-
-class Topic(Named):
-    """(Topic description)"""
+class Topic(Named, Description):
+    """Topic for magazine menu"""
 
     class Meta:
         verbose_name = _('topic')
-
-    def __unicode__(self):
-        return self.name

diff --git a/app/organization/media/models.py b/app/organization/media/models.py
index c4dfffa052d9c633a8b48fe1109c1175ec383682..6d3269c9894fc1941c628c5f678417e7bc4e2a83 100644 (file)
--- a/app/organization/media/models.py
+++ b/app/organization/media/models.py
@@ -119,7 +119,7 @@ class VideoCategory(Slugged):
         return self.videos.published().count()+1
 
 
-class Playlist(Titled):
+class Playlist(Slugged, Description):
     """(Playlist description)"""
 
     audios = models.ManyToManyField('Audio', verbose_name=_('audios'), related_name='playlists', blank=True)

diff --git a/app/organization/team/models.py b/app/organization/team/models.py
index f187876bc37c9f76cea3e057150422ca882ba537..3357fbe31e9de51a1e7251a9fa3aa70c05f34422 100644 (file)
--- a/app/organization/team/models.py
+++ b/app/organization/team/models.py
@@ -15,15 +15,16 @@ from django.core.urlresolvers import reverse, reverse_lazy
 from django.conf import settings
 from django.contrib.auth.models import User
 
+from mezzanine.pages.models import Page
 from mezzanine.core.models import RichText, Displayable, Slugged
 from mezzanine.core.fields import RichTextField, OrderField, FileField
 from mezzanine.utils.models import AdminThumbMixin, upload_to
 
 from organization.media.models import Photo
-from organization.core.models import Named, Titled
+from organization.core.models import Named, Titled, Description, SubTitle
 
 from django_countries.fields import CountryField
-from .nationalities.fields import NationalityField
+# from .nationalities.fields import NationalityField
 
 
 # Hack to have these strings translated
@@ -41,8 +42,7 @@ TITLE_CHOICES = [
     ('Prof Dr', _('Prof Dr')),
 ]
 
-ALIGNMENT_CHOICES = (('left', _('left')), ('right', _('right')))
-
+ALIGNMENT_CHOICES = (('left', _('left')), ('left', _('left')), ('right', _('right')))
 
 
 class Address(models.Model):
@@ -59,7 +59,7 @@ class Address(models.Model):
             abstract = True
 
 
-class Organization(Titled, Address, Photo):
+class Organization(Slugged, Description, Address, Photo):
     """(Organization description)"""
 
     type = models.ForeignKey('OrganizationType', verbose_name=_('organization type'), blank=True, null=True, on_delete=models.SET_NULL)
@@ -77,7 +77,7 @@ class OrganizationType(Named):
         verbose_name = _('organization type')
 
 
-class Department(Titled):
+class Department(Page, SubTitle, RichText):
     """(Department description)"""
 
     organization = models.ForeignKey('Organization', verbose_name=_('organization'))
@@ -88,10 +88,10 @@ class Department(Titled):
         verbose_name = _('department')
 
 
-class Team(Titled):
+class Team(Page, SubTitle, RichText):
     """(Team description)"""
 
-    department = models.ForeignKey('Department', verbose_name=_('department'), blank=True, null=True, on_delete=models.SET_NULL)
+    # department = models.ForeignKey('Department', verbose_name=_('department'), related_name="teams", blank=True, null=True, on_delete=models.SET_NULL)
     partner_organizations = models.ManyToManyField(Organization, verbose_name=_('partner organizations'), blank=True)
     partner_teams = models.ManyToManyField('Team', verbose_name=_('partner teams'), blank=True)
 
@@ -99,11 +99,11 @@ class Team(Titled):
         verbose_name = _('team')
 
 
-class Person(AdminThumbMixin, Photo):
+class Person(Displayable, AdminThumbMixin, Photo):
     """(Person description)"""
 
     user = models.ForeignKey(User, verbose_name=_('user'), blank=True, null=True, on_delete=models.SET_NULL)
-    title = models.CharField(_('title'), max_length=16, choices=TITLE_CHOICES, blank=True)
+    person_title = models.CharField(_('title'), max_length=16, choices=TITLE_CHOICES, blank=True)
     gender = models.CharField(_('gender'), max_length=16, choices=GENDER_CHOICES, blank=True)
     first_name = models.CharField(_('first name'), max_length=255, blank=True, null=True)
     last_name = models.CharField(_('last name'), max_length=255, blank=True, null=True)

diff --git a/app/organization/team/translation.py b/app/organization/team/translation.py
index 4d4302e4e6883f79985cfcc677e1824d93f90fce..b9712626bf3c10642a25ba6b431304ea7ee444f9 100644 (file)
--- a/app/organization/team/translation.py
+++ b/app/organization/team/translation.py
@@ -11,15 +11,11 @@ class OrganizationTranslationOptions(TranslationOptions):
 
 @register(Department)
 class DepartmentTranslationOptions(TranslationOptions):
-
-    fields = ('title', 'description',)
-
+    pass
 
 @register(Team)
 class TeamTranslationOptions(TranslationOptions):
-
-    fields = ('title', 'description',)
-
+    pass
 
 @register(Person)
 class PersonTranslationOptions(TranslationOptions):