update team list and detail views (add pageblocks), fix urls

diff --git a/app/organization/team/urls.py b/app/organization/team/urls.py
index ee467fca293803801d0a0548f01eebc8c3b10eb9..59b66b53f6e2e862b5189b98ce888385b6e88805 100644 (file)
--- a/app/organization/team/urls.py
+++ b/app/organization/team/urls.py
@@ -11,5 +11,5 @@ from organization.team.views import *
 
 
 urlpatterns = [
-    
+    url(r'^(?P<department>.*)/teams/$', TeamListView.as_view(), name="organization-team-team-list"),
 ]

diff --git a/app/organization/urls.py b/app/organization/urls.py
index adafa01671d9bea9c6f946d0df551e79ae5e6263..5f4d6c420b1082d6f1b10620f35f0706a1e239f6 100644 (file)
--- a/app/organization/urls.py
+++ b/app/organization/urls.py
@@ -13,9 +13,9 @@ from mezzanine.conf import settings
 
 urlpatterns = [
     url("^", include('organization.core.urls')),
-    url("^festival/", include('organization.festival.urls')),
-    url("^magazine/", include('organization.magazine.urls')),
-    url("^media/", include('organization.media.urls')),
-    url("^project/", include('organization.project.urls')),
-    url("^team/", include('organization.team.urls')),
+    url("^", include('organization.festival.urls')),
+    url("^", include('organization.magazine.urls')),
+    url("^", include('organization.media.urls')),
+    url("^", include('organization.project.urls')),
+    url("^", include('organization.team.urls')),
 ]

diff --git a/app/templates/pages/team.html b/app/templates/pages/team.html
index 916142bc4818bb60f4777cdd417deb95394c596d..ab3f9febe36f695c5bfe2cf1a8a758b898f9255a 100644 (file)
--- a/app/templates/pages/team.html
+++ b/app/templates/pages/team.html
@@ -47,8 +47,13 @@
     </div>
 
     {% for pageblock in page.team.pageblock_set.all %}
-     <div class="row">
+    <div class="row">
+        <div class="col-sm-3 col-lg-2">
+        </div>
+        <h2 class="dotted">{{ pageblock.title }}</h2>
+        <div class="col-sm-9 col-lg-8">
          {{ pageblock.content|richtext_filters|safe }}
+        </div>
     </div>
     {% endfor %}
 

diff --git a/app/templates/team/team_list.html b/app/templates/team/team_list.html
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6caa35a53a977066f4c32eda054ca53ac3c968f5 100644 (file)
--- a/app/templates/team/team_list.html
+++ b/app/templates/team/team_list.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+{% load i18n mezzanine_tags keyword_tags featured_tags pages_tags %}
+
+{% block title %}
+    {% trans "Team list" %}
+{% endblock %}
+
+{% block main %}
+
+    {% for team in object_list %}
+     <div class="row">
+        <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
+         {{ team.title }}
+        </div>
+    </div>
+    {% endfor %}
+
+{% endblock %}

diff --git a/app/urls.py b/app/urls.py
index 6e0a5d17c4016a6d8e890c3f3b5a1b3c53c7ad71..2bf71e8b31d1e8724b4a5b4c5a8cf336f340730e 100644 (file)
--- a/app/urls.py
+++ b/app/urls.py
@@ -30,7 +30,7 @@ urlpatterns += [
     # App urls
 
     url("^", include('organization.urls')),
-    url("^%s/" % settings.EVENT_SLUG, include("mezzanine_agenda.urls")),
+    url("^events/%s/" % settings.EVENT_SLUG, include("mezzanine_agenda.urls")),
     url("^styles/$", direct_to_template, {"template": "styles.html"}, name="styles"),
 
     # We don't want to presume how your homepage works, so here are a