Backend and frontend changes

dipy_web/settings.py.example

@@ -71,6 +71,7 @@ TEMPLATES = [
                 'django.contrib.messages.context_processors.messages',
                 'social.apps.django_app.context_processors.backends',
                 'social.apps.django_app.context_processors.login_redirect',
+                'website.context_processor.nav_pages_processor',
             ],
         },
     },

requirements.txt

@@ -11,6 +11,7 @@ python3-openid==3.0.10
 requests==2.10.0
 requests-oauthlib==0.6.1
 six==1.10.0
+bibtexparser==0.6.2
 
 # heroku dependencies
 whitenoise==3.1

website/admin.py

@@ -4,3 +4,4 @@
 
 admin.site.register(models.WebsiteSection)
 admin.site.register(models.NewsPost)
+admin.site.register(models.Publication)

website/context_processor.py

@@ -0,0 +1,7 @@
+from .models import WebsiteSection
+
+
+def nav_pages_processor(request):
+    pages = WebsiteSection.objects.filter(section_type="page",
+                                          show_in_nav=True)
+    return {'pages_in_nav': pages}

website/forms.py

@@ -2,15 +2,41 @@
 from .models import *
 
 
-class EditWebsiteSectionForm(ModelForm):
+class EditFixedSectionForm(ModelForm):
     class Meta:
         model = WebsiteSection
         fields = ['title', 'body_markdown']
 
 
-class AddWebsiteSectionForm(ModelForm):
+class AddEditPageSectionForm(ModelForm):
     class Meta:
         model = WebsiteSection
         fields = ['title', 'body_markdown',
                   'website_position_id',
-                  'website_page']
+                  'show_in_nav']
+
+
+class AddEditNewsPostForm(ModelForm):
+    class Meta:
+        model = NewsPost
+        fields = ['title', 'body_markdown', 'post_date']
+
+
+class AddEditPublicationForm(ModelForm):
+    class Meta:
+        model = Publication
+        fields = ['title', 'url', 'author', 'doi', 'entry_type',
+                  'published_in', 'publisher', 'year_of_publication',
+                  'month_of_publication', 'bibtex']
+
+
+class AddEditCarouselImageForm(ModelForm):
+    class Meta:
+        model = CarouselImage
+        fields = ['image_caption', 'image_url']
+
+
+class AddEditHoneycombPostForm(ModelForm):
+    class Meta:
+        model = HoneycombPost
+        fields = ['image_caption', 'image_url', 'target_url']

website/migrations/0003_auto_20160602_1828.py

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-02 18:28
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website', '0002_newspost'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Publication',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('url', models.CharField(max_length=200)),
+                ('author', models.CharField(max_length=200)),
+                ('doi', models.CharField(blank=True, max_length=100, null=True)),
+                ('journal', models.CharField(blank=True, max_length=200, null=True)),
+                ('publisher', models.CharField(blank=True, max_length=200, null=True)),
+                ('year_of_publication', models.CharField(blank=True, max_length=4, null=True)),
+                ('month_of_publication', models.CharField(blank=True, max_length=4, null=True)),
+                ('bibtex', models.TextField(blank=True, null=True)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('modified', models.DateTimeField(auto_now_add=True)),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='newspost',
+            name='post_date',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name='websitesection',
+            name='website_position_id',
+            field=models.CharField(db_index=True, max_length=100, unique=True),
+        ),
+    ]

website/migrations/0004_auto_20160604_0343.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-04 03:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website', '0003_auto_20160602_1828'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='publication',
+            name='month_of_publication',
+            field=models.CharField(blank=True, max_length=10, null=True),
+        ),
+    ]

website/migrations/0005_publication_is_highlighted.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-07 07:31
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website', '0004_auto_20160604_0343'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='publication',
+            name='is_highlighted',
+            field=models.BooleanField(default=False),
+        ),
+    ]

website/migrations/0006_carouselimage.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-09 10:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website', '0005_publication_is_highlighted'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CarouselImage',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('image_caption', models.CharField(max_length=200)),
+                ('image_url', models.URLField()),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('modified', models.DateTimeField(auto_now_add=True)),
+            ],
+        ),
+    ]

website/migrations/0007_auto_20160614_0435.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-14 04:35
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website', '0006_carouselimage'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HoneycombPost',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('image_caption', models.CharField(max_length=200)),
+                ('image_url', models.URLField()),
+                ('target_url', models.URLField()),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('modified', models.DateTimeField(auto_now_add=True)),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='websitesection',
+            name='website_page',
+            field=models.CharField(choices=[('home', 'Home'), ('installation', 'Installation'), ('overview', 'Overview')], max_length=100),
+        ),
+    ]

website/migrations/0008_auto_20160616_0536.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-16 05:36
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website', '0007_auto_20160614_0435'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='publication',
+            old_name='journal',
+            new_name='published_in',
+        ),
+        migrations.AddField(
+            model_name='publication',
+            name='entry_type',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+    ]

website/migrations/0009_auto_20160616_0757.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-16 07:57
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website', '0008_auto_20160616_0536'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='websitesection',
+            name='website_page',
+        ),
+        migrations.AddField(
+            model_name='websitesection',
+            name='section_type',
+            field=models.CharField(choices=[('fixed', 'Fixed Section'), ('page', 'Page')], default='page', max_length=100),
+        ),
+        migrations.AddField(
+            model_name='websitesection',
+            name='show_in_nav',
+            field=models.BooleanField(default=False),
+        ),
+    ]