Use generic service template, the app is now FULLY generic ! :P

diff --git a/app/organization/core/templatetags/organization_tags.py b/app/organization/core/templatetags/organization_tags.py
index 0596a544af784ae90329e77ac769fc6328f6299f..0cda8e9d6fa5f0133f3c9d0e7125d083e511ba71 100644 (file)
--- a/app/organization/core/templatetags/organization_tags.py
+++ b/app/organization/core/templatetags/organization_tags.py
@@ -176,7 +176,7 @@ def slice_ng(qs, indexes):
     index_2 = 0
     if len(index_split) > 1:
         index_2 = int(index_split[1])
-    if index_1 > 0 and index_2:
+    if index_1 >= 0 and index_2:
         return list[index_1:index_2]
     else:
         return [list[index_1]]

diff --git a/app/organization/network/migrations/0068_auto_20161216_1639.py b/app/organization/network/migrations/0068_auto_20161216_1639.py
new file mode 100644 (file)
index 0000000..dfe2a44
--- /dev/null
+++ b/app/organization/network/migrations/0068_auto_20161216_1639.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2016-12-16 15:39
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0067_auto_20161216_1606'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='organizationservice',
+            name='box_size',
+            field=models.IntegerField(choices=[(3, 3), (6, 6)], default=3, verbose_name='box size'),
+        ),
+        migrations.AddField(
+            model_name='organizationservice',
+            name='css_color',
+            field=models.CharField(blank=True, choices=[('orange', 'orange'), ('blue', 'blue'), ('green', 'green')], help_text='Determine color on home.', max_length=64, null=True, verbose_name='class color'),
+        ),
+    ]

diff --git a/app/organization/network/migrations/0069_auto_20161216_1649.py b/app/organization/network/migrations/0069_auto_20161216_1649.py
new file mode 100644 (file)
index 0000000..a18f115
--- /dev/null
+++ b/app/organization/network/migrations/0069_auto_20161216_1649.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2016-12-16 15:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0068_auto_20161216_1639'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='organizationservice',
+            name='css_banner_type',
+            field=models.CharField(blank=True, choices=[('fsxxl', 'fsxxl'), ('fsxxxl', 'fsxxxl')], max_length=64, null=True, verbose_name='css banner type'),
+        ),
+        migrations.AlterField(
+            model_name='organizationservice',
+            name='css_color',
+            field=models.CharField(blank=True, choices=[('orange', 'orange'), ('blue', 'blue'), ('green', 'green')], max_length=64, null=True, verbose_name='css color'),
+        ),
+    ]

diff --git a/app/organization/network/models.py b/app/organization/network/models.py
index 31ff7a8f88c7f51263139062b6bfc177ccb9d541..5e391257968f95d151c518a5e0f6b7e914f5a5ec 100644 (file)
--- a/app/organization/network/models.py
+++ b/app/organization/network/models.py
@@ -80,6 +80,21 @@ PATTERN_CHOICES = [
 
 ALIGNMENT_CHOICES = (('left', _('left')), ('left', _('left')), ('right', _('right')))
 
+CSS_COLOR_CHOICES = [
+    ('orange', _('orange')),
+    ('blue', _('blue')),
+    ('green', _('green')),
+]
+
+CSS_BANNER_CHOICES = [
+    ('fsxxl', 'fsxxl'),
+    ('fsxxxl', 'fsxxxl'),
+]
+
+BOX_SIZE_CHOICES = [
+    (3, 3),
+    (6, 6),
+]
 
 class Organization(Named, Address, URL, AdminThumbRelatedMixin, Orderable):
     """(Organization description)"""
@@ -180,6 +195,9 @@ class OrganizationService(Named, URL, Orderable):
 
     organization = models.ForeignKey(Organization, verbose_name=_('organization'), related_name='services', blank=True, null=True, on_delete=models.SET_NULL)
     image = FileField(_("Image"), max_length=1024, format="Image", upload_to="images")
+    css_color = models.CharField(_('css color'), max_length=64, blank=True, null=True, choices=CSS_COLOR_CHOICES)
+    css_banner_type = models.CharField(_('css banner type'), max_length=64, blank=True, null=True, choices=CSS_BANNER_CHOICES)
+    box_size = models.IntegerField(_('box size'), default=3, choices=BOX_SIZE_CHOICES)
 
 
 class OrganizationType(Named):

diff --git a/app/templates/home/inc/bio.html b/app/templates/home/inc/bio.html
index d0e89a3ca61db1f6a3fe35c5ad57f57ca4aaf449..bd7fd283e1fe488eafa0c32291310c4d46e6c86e 100644 (file)
--- a/app/templates/home/inc/bio.html
+++ b/app/templates/home/inc/bio.html
@@ -3,7 +3,7 @@
     <div class="container">
         <div class="row">
             <div class="col-xs-12 col-md-12 col-lg-10 col-lg-push-1 ffss fsxl fwl lh2 fsl-until-sm ">
-                {% blocktrans %}<strong>IRCAM, the Institute for Research and Coordination in Acoustics/Music</strong> is one of the world’s largest public research centers dedicated to musical creation and scientific research. A unique venue where artistic vision converges with scientific and technological innovation, the institute directed by Frank Madlener brings together over 160 collaborators. IRCAM hosts the UMR9912 STMS Ircam-CNRS-UPMC science and technologies research lab.{% endblocktrans %}
+                {{ host_organization.bio|safe }}
             </div>
         </div>
     </div>

diff --git a/app/templates/home/inc/service.html b/app/templates/home/inc/service.html
new file mode 100644 (file)
index 0000000..d6648f9
--- /dev/null
+++ b/app/templates/home/inc/service.html
@@ -0,0 +1,13 @@
+{% load staticfiles i18n organization_tags %}
+<div class="col-sm-{{ service.box_size }} col-xs-6">
+    <a class="banner {% if service.css_color %}banner--colored banner--{{ service.css_color }}{% endif %} banner--light" href="{{ service.url }}" style="background-image:url({{ service.image.url }});">
+        <div class="banner__content">
+            <div class="banner__title {{ service.css_banner_type }}">
+                {{ service.name }}
+            </div>
+            <div class="banner__desc fss">
+                {{ service.description }}
+            </div>
+        </div>
+    </a>
+</div>

diff --git a/app/templates/home/inc/services.html b/app/templates/home/inc/services.html
index d36317675e34b7fcd15cd1bf1e51ec1c33fe1571..6b851a4e1fff3b9ae2b8fb94742a77aec0b455e5 100644 (file)
--- a/app/templates/home/inc/services.html
+++ b/app/templates/home/inc/services.html
@@ -1,72 +1,15 @@
-{% load staticfiles i18n %}
+{% load staticfiles i18n organization_tags %}
 
 <div class="container mb2">
     <div class="row">
-        <div class="col-sm-6 col-xs-6">
-            <a class="banner banner--light" href="{% url 'event_list_tag' 'tournees' %}" style="background-image:url({% static 'img/services/tours.jpg' %});">
-                <div class="banner__content">
-                    <div class="banner__title fsxxxl">
-                        {% trans 'On Tour' %} {{ current_season_styled }}
-                    </div>
-                    <div class="banner__desc fss">
-                        {% blocktrans %}Campo Santo, Songes et Métamorphoses, Providences, UM souverain moteur de toutes choses...{% endblocktrans %}
-                    </div>
-                </div>
-            </a>
-        </div>
-
-        <div class="col-sm-6 col-xs-6">
-            <a class="banner banner--light" href="http://ulysses-network.eu/web/home/" target="_blank" style="background-image:url({% static 'img/services/applications.jpg' %});">
-                <div class="banner__content">
-                    <div class="banner__title fsxxl">
-                        {% trans 'Calls for Applications 2017' %}
-                    </div>
-                    <div class="banner__desc fss">
-                        {% blocktrans %}Cursus – Practical Training in Composition and Computer Music, Artistic Research Residence, ManiFeste-2017, the Academy{% endblocktrans %}
-                    </div>
-                </div>
-            </a>
-        </div>
+        {% for service in host_organization.services.all|slice_ng:"0:2" %}
+            {% include "home/inc/service.html" %}
+        {% endfor %}
     </div>
 
     <div class="row">
-        <div class="col-sm-6 col-xs-12">
-            <a class="banner banner--colored banner--orange banner--light" href="http://ressources.ircam.fr/" target="_blank" style="background-image:url({% static 'img/services/resources.jpg' %});">
-                <div class="banner__content">
-                    <div class="banner__title fsxxxl">
-                        {% trans 'IRCAM Library Center' %}
-                    </div>
-                    <div class="banner__desc fss">
-                        {% blocktrans %}Audiovisual and sound archives, a database on contemporary music (BRAHMS), a catalogue of works…{% endblocktrans %}
-                    </div>
-                </div>
-            </a>
-        </div>
-
-        <div class="col-sm-3 col-xs-6">
-            <a class="banner banner--colored banner--blue banner--light" href="http://forumnet.ircam.fr/fr/" target="_blank" style="background-image:url({% static 'img/services/forumnet.jpg' %});">
-                <div class="banner__content">
-                    <div class="banner__title fsxxl">
-                        {% trans 'Forumnet' %}
-                    </div>
-                    <div class="banner__desc fss">
-                        {% blocktrans %}IRCAM software users’ community{% endblocktrans %}
-                    </div>
-                </div>
-            </a>
-        </div>
-
-        <div class="col-sm-3 col-xs-6">
-            <a class="banner banner--colored banner--green banner--light" href="http://project.ulysses-network.eu/" target="_blank" style="background-image:url({% static 'img/services/ulysses.jpg' %});">
-                <div class="banner__content">
-                    <div class="banner__title fsxxl">
-                        {% trans 'ULYSSES Network' %}
-                    </div>
-                    <div class="banner__desc fss">
-                        {% blocktrans %}European network for the promotion and support of young contemporary musical creation{% endblocktrans %}
-                    </div>
-                </div>
-            </a>
-        </div>
+        {% for service in host_organization.services.all|slice_ng:"2:5" %}
+            {% include "home/inc/service.html" %}
+        {% endfor %}
     </div>
 </div>

diff --git a/var b/var
index 46bd4824cda178e8771f50d747d8d547fe326391..a4284e579c4db28bc5c709f7b9372c41730de6c0 160000 (submodule)
--- a/var
+++ b/var
@@ -1 +1 @@
-Subproject commit 46bd4824cda178e8771f50d747d8d547fe326391
+Subproject commit a4284e579c4db28bc5c709f7b9372c41730de6c0