Merge branch 'article' into dev

Conflicts:
	app/custom/models.py
	app/local_settings.py
	app/organization/core/admin.py
	app/organization/magazine/models.py
	app/settings.py

diff --cc app/local_settings.py
index 29df194cfef412f04245bf2844e9f95b1b365847,6a46b456f905681995dfe7ae03e1ea483ea5ca5f..c07e0f7d685e35a0d94928109d48f67015cc4d0d
--- 1/app/local_settings.py
--- 2/app/local_settings.py
+++ b/app/local_settings.py
@@@ -78,19 -78,17 +78,20 @@@ SITE_TAGLINE = 'Festival 2 juin | 2 jui
  SILENCED_SYSTEM_CHECKS = ['fields.W342',]
  
  ADMIN_MENU_ORDER = (
 -    (_("Content"), ("pages.Page", "mezzanine_agenda.Event",
 -        "festival.Artist", "festival.Video", "festival.Audio", "festival.Playlist",
 -        "festival.Featured",
 -        "generic.ThreadedComment", (_("Media Library"), "fb_browse"),)),
 -
 +    (_('Content'), ('pages.Page', 'blog.BlogPost', 'mezzanine_agenda.Event',
 +        'generic.ThreadedComment', (_('Media Library'), 'fb_browse'),)),
+     (_("Magazine"), ("magazine.Article",)),
 -    (_("Site"), ("sites.Site", "redirects.Redirect", "conf.Setting")),
 -    (_("Users"), ("auth.User", "auth.Group",)),
 -    (_("Festival"), ("mezzanine_agenda.EventLocation",
 -        "mezzanine_agenda.EventCategory", "mezzanine_agenda.EventPrice",
 -        "festival.PageCategory",)),
 +    (_('Structure'), ('organization.structure.Organization', 'organization.structure.Team',
 +        'organization.structure.Department', 'organization.structure.Person',
 +        'organization.structure.Activity')),
 +    (_('Projects'), ('organization.project.Project')),
 +    (_('Festival'), ('organization.festival.Artist', 'organization.festival.Video',
 +    'organization.festival.Audio', 'organization.festival.Playlist',
 +    'organization.festival.Featured', 'mezzanine_agenda.EventLocation',
 +        'mezzanine_agenda.EventCategory', 'mezzanine_agenda.EventPrice',
 +        'festival.PageCategory',)),
 +    (_('Users'), ('auth.User', 'auth.Group',)),
 +    (_('Site'), ('sites.Site', 'redirects.Redirect', 'conf.Setting')),
  )
  
  GRAPPELLI_ADMIN_TITLE = 'IRCAM Admin'

diff --cc app/organization/core/admin.py
index fad5b45107e8cda4f4971e9d7d149c76c4fcc789,0000000000000000000000000000000000000000..7c1ae9bcb9686ecde5bb1f7b7094a19f924e0bab
mode 100644,000000..100644
--- 1/app/organization/core/admin.py
--- /dev/null
+++ b/app/organization/core/admin.py
@@@ -1,18 -1,0 +1,28 @@@
- # page_fieldsets = deepcopy(PageAdmin.fieldsets)
- # page_fieldsets[0][1]["fields"] += ("sub_title",)
- # print(page_fieldsets[0][1]["fields"])
- # PageAdmin.fieldsets = page_fieldsets
 +from django.contrib import admin
 +from copy import deepcopy
 +from mezzanine.pages.models import Page
 +from mezzanine.pages.admin import PageAdmin
 +from mezzanine.pages.models import RichTextPage
++<<<<<<< HEAD:app/organization/core/admin.py
 +from organization.core.models import BasicPage
++=======
++from mezzanine.core.admin import DisplayableAdmin
++from custom.models import BasicPage
++>>>>>>> article:app/custom/admin.py
 +
 +
- # admin.site.unregister(RichTextPage)
- # admin.site.register(RichTextPage, PageAdmin)
++# class SubTitleAdmin(DisplayableAdmin):
++#         """
++#         Admin class for blog posts.
++#             return False
++
++#admin.site.register(SubTitle, DisplayableAdmin)
++
++
++# class SubTitleAdmin(admin.ModelAdmin):
 +#
++#     model = SubTitle
++
 +
 +
 +admin.site.register(BasicPage, PageAdmin)

diff --cc app/organization/core/translation.py
index bce03dea11001e0f70ede16a82f4629f5e611b47,0000000000000000000000000000000000000000..571ac7caf74d9c2b15d34ab880bb0da04f8ab161
mode 100644,000000..100644
--- 1/app/organization/core/translation.py
--- /dev/null
+++ b/app/organization/core/translation.py
@@@ -1,11 -1,0 +1,15 @@@
 +from modeltranslation.translator import translator, register, TranslationOptions
 +from mezzanine.pages.models import Page, RichText
 +from mezzanine.pages.translation import TranslatedRichText
 +
 +from organization.core.models import BasicPage
 +
++# @register(SubTitle)
++# class SubTitleTranslationOptions(TranslationOptions):
++#
++#     fields = ('sub_title',)
 +
 +@register(BasicPage)
 +class BasicPageTranslationOptions(TranslationOptions):
 +
 +    fields = ('sub_title',)

diff --cc app/organization/magazine/models.py
index fe40d65a8971dafaccd84dd2fe6087b8c870b699,0000000000000000000000000000000000000000..1897fbaed9aedf2fef78373717caed1f0c690b99
mode 100644,000000..100644
--- 1/app/organization/magazine/models.py
--- /dev/null
+++ b/app/organization/magazine/models.py
@@@ -1,26 -1,0 +1,33 @@@
- 
 +from __future__ import unicode_literals
 +from django.db import models
 +from django.utils.translation import ugettext_lazy as _
++from django.core.urlresolvers import reverse, reverse_lazy
++from mezzanine.blog.models import BlogPost
++from organization.core.models import Named
 +
++class Article(BlogPost):
 +from organization.core.models import Named
 +
++    sub_title = models.CharField(_('sub title'), blank=True, max_length=1000)
++
++     class Meta:
++        verbose_name = _('article')
 +
 +class Category(Named):
 +    """(Category description)"""
 +
 +    class Meta:
 +        verbose_name = _('category')
 +
 +    def __unicode__(self):
 +        return self.name
 +
 +
 +class Topic(Named):
 +    """(Topic description)"""
 +
 +    class Meta:
 +        verbose_name = _('topic')
 +
 +    def __unicode__(self):
 +        return self.name

diff --cc app/organization/project/admin.py
index 8c38f3f3dad51e4585f3984282c2a4bec5349c1e,0000000000000000000000000000000000000000..1ea6c2ff55ae4ae4f5cda73ef6b0dbe7d4373046
mode 100644,000000..100644
--- 1/app/organization/project/admin.py
--- /dev/null
+++ b/app/organization/project/admin.py
@@@ -1,3 -1,0 +1,25 @@@
- # Register your models here.
 +from django.contrib import admin
++from mezzanine.blog.admin import BlogPostAdmin
++from magazine.models import Article
++#from custom.admin import SubTitleAdmin
++from copy import deepcopy
 +
++from django.contrib import admin
++from django.utils.translation import ugettext_lazy as _
++from mezzanine.core.admin import DisplayableAdmin, OwnableAdmin
++
++# class ArticleAdmin(BlogPostAdmin, SubTitleAdmin):
++#
++#     model = Article
++
++#admin.site.register(Article, BlogPostAdmin)
++class ArticleAdmin(admin.ModelAdmin):
++
++    model = Article
++
++
++class ArticleAdminDisplayable(DisplayableAdmin):
++
++    fieldsets = deepcopy(ArticleAdmin.fieldsets)
++
++admin.site.register(Article, ArticleAdminDisplayable)

diff --cc app/settings.py
index bd023de3062cf5f78d5bc7af6060f913f830d740,6a388f9115599d2368ef43d0bcf607dc202ca223..f0fbaf50ed0779672721864ff5dc9d42fe2f2e89
--- 1/app/settings.py
--- 2/app/settings.py
+++ b/app/settings.py
@@@ -250,8 -248,9 +251,9 @@@ MIGRATION_MODULES = 
  }
  
  MODELTRANSLATION_TRANSLATION_FILES = (
 -    'custom.translations',
 -    'magazine.translations',
 -    'translations',
 +    'organization.core.translation',
 +    'organization.festival.translation',
++    'organization.magazine.translation'
  )
  
  TEMPLATES = [{'APP_DIRS': True,