add department and team templates, ignore comments and blogposts in admin

diff --git a/app/local_settings.py b/app/local_settings.py
index edc49eec9422e98129c7817caa07fb4bd16e1dfe..54d3e6bfb63eb528bd78510e8027184142e74e8f 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -80,6 +80,11 @@ ADMIN_MENU_ORDER = (
     (_('Site'), ('sites.Site', 'redirects.Redirect', 'conf.Setting')),
 )
 
+# ADMIN_REMOVAL = [
+#     'mezzanine.blog.models.BlogPost',
+#     'generic.ThreadedComment',
+# ]
+
 GRAPPELLI_ADMIN_TITLE = 'IRCAM Admin'
 
 SEARCH_MODEL_CHOICES = ()

diff --git a/app/organization/team/admin.py b/app/organization/team/admin.py
index b1ead7cebd7eb466535c0d497cdeacaab3242ae0..f343182dedd8672d47c6099fc7469b4b3bd33ac0 100644 (file)
--- a/app/organization/team/admin.py
+++ b/app/organization/team/admin.py
@@ -26,6 +26,9 @@ class TeamAdmin(PageAdmin):
 
     inlines = [PageBlockInline,]
 
+    def in_menu(self):
+        return True
+
 
 class PersonAdminBase(admin.ModelAdmin):
 
@@ -50,5 +53,6 @@ admin.site.register(Organization, OrganizationAdmin)
 admin.site.register(OrganizationType)
 admin.site.register(Department, PageAdmin)
 admin.site.register(Team, TeamAdmin)
+# admin.site.register(Team)
 admin.site.register(Person, PersonAdmin)
 admin.site.register(Activity, ActivityAdmin)

diff --git a/app/templates/pages/department.html b/app/templates/pages/department.html
new file mode 100644 (file)
index 0000000..d16e0f0
--- /dev/null
+++ b/app/templates/pages/department.html
@@ -0,0 +1,55 @@
+{% extends "base.html" %}
+{% load i18n mezzanine_tags keyword_tags featured_tags pages_tags %}
+
+{% block meta_title %}{{ page.meta_title }}{% endblock %}
+
+{% block meta_keywords %}{% metablock %}
+{% keywords_for page as keywords %}
+{% for keyword in keywords %}
+    {% if not forloop.first %}, {% endif %}
+    {{ keyword }}
+{% endfor %}
+{% endmetablock %}{% endblock %}
+
+{% block meta_description %}{% metablock %}
+{{ page.description }}
+{% endmetablock %}{% endblock %}
+
+{% block title %}
+    {% editable page.title %}
+        {{ page.title }}
+    {% endeditable %}
+
+    {% editable page.department.sub_title %}
+        {{ page.department.sub_title }}
+    {% endeditable %}
+{% endblock %}
+
+{% block main %}
+
+    <div class="row">
+        <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
+            {% editable page.department.title %}
+                <h1 class="dotted">{{ page.department.title }}</h1>
+            {% endeditable %}
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-sm-3 col-lg-2">
+            {% page_menu "pages/menus/current_tree_summary.html" %}
+        </div>
+        <div class="col-sm-9 col-lg-8">
+            {% editable page.department.content %}
+                {{ page.department.content|richtext_filters|safe }}
+            {% endeditable %}
+        </div>
+    </div>
+
+    {% for pageblock in page.department.pageblock_set.all %}
+     <div class="row">
+         {{ pageblock.content|richtext_filters|safe }}
+    </div>
+    {% endfor %}
+
+{% endblock %}

diff --git a/app/templates/pages/team.html b/app/templates/pages/team.html
new file mode 100644 (file)
index 0000000..916142b
--- /dev/null
+++ b/app/templates/pages/team.html
@@ -0,0 +1,55 @@
+{% extends "base.html" %}
+{% load i18n mezzanine_tags keyword_tags featured_tags pages_tags %}
+
+{% block meta_title %}{{ page.meta_title }}{% endblock %}
+
+{% block meta_keywords %}{% metablock %}
+{% keywords_for page as keywords %}
+{% for keyword in keywords %}
+    {% if not forloop.first %}, {% endif %}
+    {{ keyword }}
+{% endfor %}
+{% endmetablock %}{% endblock %}
+
+{% block meta_description %}{% metablock %}
+{{ page.description }}
+{% endmetablock %}{% endblock %}
+
+{% block title %}
+    {% editable page.title %}
+        {{ page.title }}
+    {% endeditable %}
+
+    {% editable page.team.sub_title %}
+        {{ page.team.sub_title }}
+    {% endeditable %}
+{% endblock %}
+
+{% block main %}
+
+    <div class="row">
+        <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
+            {% editable page.team.title %}
+                <h1 class="dotted">{{ page.team.title }}</h1>
+            {% endeditable %}
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-sm-3 col-lg-2">
+            {% page_menu "pages/menus/current_tree_summary.html" %}
+        </div>
+        <div class="col-sm-9 col-lg-8">
+            {% editable page.team.content %}
+                {{ page.team.content|richtext_filters|safe }}
+            {% endeditable %}
+        </div>
+    </div>
+
+    {% for pageblock in page.team.pageblock_set.all %}
+     <div class="row">
+         {{ pageblock.content|richtext_filters|safe }}
+    </div>
+    {% endfor %}
+
+{% endblock %}