Add yellow bg to team, fix tinymce in dev mode

diff --git a/app/local_settings.py b/app/local_settings.py
index a4b541b84c4ca2692340aca039905ad06b8e10d0..e7aad2d42a301ede1cfc6b4e7853fe86563b5615 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -181,10 +181,7 @@ EVENT_PASS_URL = EVENT_DOMAIN+"/pub.php/pass/"
 EVENT_CONFIRMATION_URL = EVENT_DOMAIN+"/pub.php/cart/done?transaction_id=%s"
 EVENT_EXCLUDE_TAG_LIST = ['tournees', ]
 
-if DEBUG:
-    TINYMCE_SETUP_JS = "/srv/app/organization/core/static/js/tinymce_setup.js"
-else:
-    TINYMCE_SETUP_JS = "/static/js/tinymce_setup.js"
+TINYMCE_SETUP_JS = "/static/js/tinymce_setup.js"
 
 SLUGIFY = 'django.template.defaultfilters.slugify'
 

diff --git a/app/templates/pages/page.html b/app/templates/pages/page.html
index d364e256223a5168b12c01fb537551640bb46158..3f59429eca204605cb268591f37c12f29863a4a3 100644 (file)
--- a/app/templates/pages/page.html
+++ b/app/templates/pages/page.html
@@ -130,10 +130,10 @@
                 {% endif %}
             {% endblock %}
 
-            {% block page_sub_content_2 %}
+            {% block page_person_list_team %}
             {% endblock %}
 
-            {% block page_person_list_team %}
+            {% block page_sub_content_2 %}
             {% endblock %}
 
             {% block logo %}

diff --git a/app/templates/pages/teampage.html b/app/templates/pages/teampage.html
index ce0894e1aeb3da497df4bf9fdc9d8e3630f641ca..b077918dc773ed6cc2de01c6d4219fc3f27ee696 100644 (file)
--- a/app/templates/pages/teampage.html
+++ b/app/templates/pages/teampage.html
@@ -74,19 +74,19 @@
     {% endwith %}
 {% endblock %}
 
-{% block page_person_list_team %}
+{% block page_person_list %}
     {% activity_statuses as statuses %}
     {% if statuses|length > 0 %}
-        <div class="white-bg">
-        <hr class="mt0" />
+        <div class="page__block page__block--yellow">
+        {# <hr class="mt0" />#}
             <div class="container">
                 <div class="row">
-                    <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2 white-bg" data-summary-content>
-                        <h2 class="dotted">{% trans 'Team' %}</h2>
+                    <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2" data-summary-content>
+                        <h2 class="dotted">{% trans 'Team' %}</h2><br>
                         {% for status in statuses %}
                             {% with page.teampage.team|get_team_persons:status as persons %}
                                 {% if persons %}
-                                    <strong>{{ status.name }} :</strong>
+                                    <strong>{{ status.name }} : </strong>
                                     {% for person in persons %}
                                         <a href="{% url 'organization-network-person-detail' person.slug %}">{{ person.title }}</a>{% if not forloop.last %}, {% endif %}
                                     {% endfor %}
@@ -105,7 +105,7 @@
 {% block related_project %}
     {% if page.teampage.team.leader_projects.published or page.teampage.team.partner_projects.published %}
         <div class="white-bg pb2">
-            <hr class="mt0" />
+            {# <hr class="mt0" />#}
             <div class="container">
                 {% with page.teampage.team.partner_projects.published|get_type:"internal" as projects %}
                     {% if projects %}