From 7e681cc47d06375168f239ed163499a03345df55 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 7 Nov 2016 10:46:52 +0100
Subject: [PATCH] Add order and display activity metadata, add demo detail view

---
 .../migrations/0050_auto_20161106_2147.py     | 33 ++++++++++++++
 .../migrations/0051_auto_20161106_2213.py     | 21 +++++++++
 .../migrations/0052_auto_20161106_2239.py     | 24 +++++++++++
 .../projects/project_demo_detail.html         | 43 +++++++++++++++++++
 4 files changed, 121 insertions(+)
 create mode 100644 app/organization/network/migrations/0050_auto_20161106_2147.py
 create mode 100644 app/organization/network/migrations/0051_auto_20161106_2213.py
 create mode 100644 app/organization/network/migrations/0052_auto_20161106_2239.py
 create mode 100644 app/templates/projects/project_demo_detail.html

diff --git a/app/organization/network/migrations/0050_auto_20161106_2147.py b/app/organization/network/migrations/0050_auto_20161106_2147.py
new file mode 100644
index 00000000..35b33cd2
--- /dev/null
+++ b/app/organization/network/migrations/0050_auto_20161106_2147.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.10 on 2016-11-06 20:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0049_auto_20161104_1453'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='activitystatus',
+            options={'ordering': ['-order'], 'verbose_name': 'activity status'},
+        ),
+        migrations.AlterModelOptions(
+            name='personactivity',
+            options={'ordering': ['person__last_name'], 'verbose_name': 'activity', 'verbose_name_plural': 'activities'},
+        ),
+        migrations.AddField(
+            model_name='activitystatus',
+            name='display',
+            field=models.BooleanField(default=False, verbose_name='display on team page'),
+        ),
+        migrations.AddField(
+            model_name='activitystatus',
+            name='order',
+            field=models.IntegerField(default=1, verbose_name='order number'),
+        ),
+    ]
diff --git a/app/organization/network/migrations/0051_auto_20161106_2213.py b/app/organization/network/migrations/0051_auto_20161106_2213.py
new file mode 100644
index 00000000..1cf5bc11
--- /dev/null
+++ b/app/organization/network/migrations/0051_auto_20161106_2213.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.10 on 2016-11-06 21:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0050_auto_20161106_2147'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='personactivity',
+            name='status',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='activities', to='organization-network.ActivityStatus', verbose_name='status'),
+        ),
+    ]
diff --git a/app/organization/network/migrations/0052_auto_20161106_2239.py b/app/organization/network/migrations/0052_auto_20161106_2239.py
new file mode 100644
index 00000000..3697ba76
--- /dev/null
+++ b/app/organization/network/migrations/0052_auto_20161106_2239.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.10 on 2016-11-06 21:39
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0051_auto_20161106_2213'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='activitystatus',
+            options={'ordering': ['order'], 'verbose_name': 'activity status'},
+        ),
+        migrations.AlterField(
+            model_name='activitystatus',
+            name='order',
+            field=models.IntegerField(default=100, verbose_name='order number'),
+        ),
+    ]
diff --git a/app/templates/projects/project_demo_detail.html b/app/templates/projects/project_demo_detail.html
new file mode 100644
index 00000000..42df2cac
--- /dev/null
+++ b/app/templates/projects/project_demo_detail.html
@@ -0,0 +1,43 @@
+{% extends "pages/page.html" %}
+{% load i18n mezzanine_tags keyword_tags pages_tags organization_tags %}
+
+{% block meta_title %}{% trans "Demo" %}{% endblock %}
+
+{% block meta_description %}
+    {% metablock %}
+        {{ demo.description }}
+    {% endmetablock %}
+{% endblock %}
+
+{% block page_class %}
+    demo
+{% endblock %}
+
+{% block breadcrumb_menu %}
+    {{ block.super }}
+    <li class="breadcrumb__item active">{% trans "Demos" %}</li>
+    <li class="breadcrumb__item active">{{ demo.title }}</li>
+{% endblock %}
+
+{% block page_title %}
+    {% editable project.title %}
+        <h1 class="dotted">{{ demo.title }}</h1>
+    {% endeditable %}
+
+    {% if demo.description %}
+        {% editable demo.description %}
+            <div class="chapo">
+                {{ demo.description }}
+            </div>
+        {% endeditable %}
+    {% endif %}
+{% endblock %}
+
+{% block page_sidebar %}
+{% endblock %}
+
+{% block page_slider %}
+<div style="position: relative;">
+    <iframe width="100%" height="960px" scrolling="auto" src="{{ demo.repository.relative_url }}" frameborder="0" allowfullscreen=""></iframe>
+</div>
+{% endblock %}
-- 
2.39.5