Merge pull request #478 from 18F/feature/latest_updates

Latest Updates landing page

fec/fec/constants.py

@@ -123,3 +123,9 @@
     "Rulemakings",
     "Other agency actions",
 ])
+
+update_types = OrderedDict([
+    ("press-release", "Press release"),
+    ("fec-record", "FEC Record"),
+    ("weekly-digest", "Weekly Digest")
+])

fec/fec/static/js/fec.js

@@ -21,6 +21,7 @@ window.$ = window.jQuery = $;
 var Sticky = require('component-sticky');
 var calendar = require('./calendar');
 var calendarHelpers = require('./calendar-helpers');
+var FormNav = require('./form-nav').FormNav;
 
 var legal = require('./legal');
 
@@ -91,6 +92,11 @@ $(document).ready(function() {
   // Initialize filters
   var filterPanel = new FilterPanel();
 
+  if (document.querySelector('.js-form-nav')) {
+    var formNav = document.querySelector('.js-form-nav');
+    new FormNav(formNav);
+  }
+
   // Initialize calendar
   new calendar.Calendar({
     selector: '#calendar',

fec/fec/static/js/form-nav.js

@@ -0,0 +1,25 @@
+'use strict';
+
+/* FormNav
+ * Submits the form on select change and clears out unnecessary params
+ */
+
+function FormNav(form) {
+  this.form = form;
+  this.form.addEventListener('change', this.handleChange.bind(this));
+}
+
+FormNav.prototype.handleChange = function() {
+  var allSelects = this.form.querySelectorAll('select,input');
+  // Remove names from all selects with no values
+  for(var i = 0; i < allSelects.length; i++) {
+    var select = allSelects[i];
+    if(select.getAttribute('name') && !select.value) {
+      select.setAttribute('name', '');
+    }
+  }
+
+  this.form.submit();
+};
+
+module.exports = {FormNav: FormNav};

fec/fec/templates/partials/breadcrumbs.html

@@ -0,0 +1,15 @@
+<header class="page-header page-header--{{ style }}">
+  <ul class="breadcrumbs">
+    <li class="breadcrumbs__item"><a href="/" class="breadcrumbs__link" rel="Home">Home</a></li>
+    {% for link in links %}
+      <li class="breadcrumbs__item breadcrumbs__item--current">
+        <span class="breadcrumbs__separator">›</span>
+        <span>Latest updates</span>
+      </li>
+    {% endfor %}
+    <li class="breadcrumbs__item breadcrumbs__item--current">
+      <span class="breadcrumbs__separator">›</span>
+      <span>{{ page.title }}</span>
+    </li>
+  </ul>
+</header>

fec/fec/templates/partials/disclaimer.html

@@ -0,0 +1,6 @@
+  <div class="slab slab--neutral footer-disclaimer">
+    <div class="container">
+      <p class="usa-width-one-half">This site is in beta, which means we're testing content that better adheres to legal plain language requirements. This content is not finalized, is not legal advice and is subject to change.</p>
+      <p class="usa-width-one-half">Everything on this site should be read in conjunction with FEC.gov. Please let us know what you think of our new content; use the feedback tool on this page.</p>
+    </div>
+  </div>

fec/fec/templates/partials/update.html

@@ -0,0 +1,18 @@
+{% load wagtailimages_tags %}
+
+<article class="post">
+  <div class="post__pre">
+    <span class="u-float-left">{{ update.date|date:'F j, Y' }}</span>
+    <span class="u-float-right">From: {% if update.get_update_type == 'FEC Record' %}Information Division{% else %}Press Office{% endif %}</span>
+  </div>
+  <h3><a href="{{ update.url }}">{{ update.title }}</a></h3>
+  {% if update.get_update_type != 'Weekly Digest' %}
+    {{ update.body | truncatewords_html:30 }}
+  {% endif %}
+  <div class="post__meta">
+    <a class="tag tag--secondary" href="/updates?update_type={{update.get_update_type|slugify}}">{{update.get_update_type}}</a>
+    {% if update.category %}
+      in: <a href="/updates?update_type={{update.get_update_type|slugify}}&category={{update.category|slugify}}">{{ update.category }}</a>
+   {% endif %}
+  </div>
+</article>

fec/fec/urls.py

@@ -7,6 +7,7 @@
 from wagtail.wagtaildocs import urls as wagtaildocs_urls
 from wagtail.wagtailcore import urls as wagtail_urls
 
+from home import views as home_views
 from legal import views as legal_views
 from search import views as search_views
 
@@ -17,6 +18,8 @@
     url(r'^admin/', include(wagtailadmin_urls)),
     url(r'^documents/', include(wagtaildocs_urls)),
 
+    url(r'^updates/$', home_views.updates),
+
     url(r'^search/$', search_views.search, name='search'),
     url(r'^legal-resources/$', legal_views.home, name='legal'),
 

fec/home/migrations/0019_auto_20160907_2152.py

@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.9 on 2016-09-07 21:52
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import wagtail.contrib.table_block.blocks
+import wagtail.wagtailcore.blocks
+import wagtail.wagtailcore.fields
+import wagtail.wagtailimages.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wagtailcore', '0028_merge'),
+        ('home', '0018_record_digest_press_release'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PressLandingPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
+                ('hero', wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('html', wagtail.wagtailcore.blocks.RawHTMLBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('table', wagtail.contrib.table_block.blocks.TableBlock())), blank=True, null=True)),
+                ('option_blocks', wagtail.wagtailcore.fields.StreamField((('option_blocks', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('intro', wagtail.wagtailcore.blocks.RichTextBlock(blank=False, null=False, required=False)), ('button_text', wagtail.wagtailcore.blocks.CharBlock(blank=False, null=False, required=True)), ('related_page', wagtail.wagtailcore.blocks.PageChooserBlock())))),))),
+                ('feed_intro', wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('html', wagtail.wagtailcore.blocks.RawHTMLBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('table', wagtail.contrib.table_block.blocks.TableBlock())), blank=True, null=True)),
+                ('contact_intro', wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('html', wagtail.wagtailcore.blocks.RawHTMLBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('table', wagtail.contrib.table_block.blocks.TableBlock())), blank=True, null=True)),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page',),
+        ),
+        migrations.AlterField(
+            model_name='digestpage',
+            name='body',
+            field=wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('html', wagtail.wagtailcore.blocks.RawHTMLBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('table', wagtail.contrib.table_block.blocks.TableBlock())), blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='digestpageauthors',
+            name='role',
+            field=models.CharField(choices=[('author', 'Author'), ('writer', 'Written by'), ('graphics', 'Graphics by'), ('contact', 'Contact')], default='author', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='pressreleasepage',
+            name='body',
+            field=wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('html', wagtail.wagtailcore.blocks.RawHTMLBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('table', wagtail.contrib.table_block.blocks.TableBlock())), blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='pressreleasepage',
+            name='category',
+            field=models.CharField(choices=[('audit reports', 'Audit reports'), ('campaign finance data summaries', 'Campaign finance data summaries'), ('commission appointments', 'Commission appointments'), ('disclosure initiatives', 'Disclosure initiatives'), ('enforcement matters', 'Enforcement matters'), ('hearings', 'Hearings'), ('litigation', 'Litigation'), ('non-filer publications', 'Non-filer publications'), ('open meetings and related matters', 'Open meetings and related matters'), ('presidential public funds', 'Presidential public funds'), ('rulemakings', 'Rulemakings'), ('other agency actions', 'Other agency actions')], max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='pressreleasepageauthors',
+            name='role',
+            field=models.CharField(choices=[('author', 'Author'), ('writer', 'Written by'), ('graphics', 'Graphics by'), ('contact', 'Contact')], default='author', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='recordpage',
+            name='body',
+            field=wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('html', wagtail.wagtailcore.blocks.RawHTMLBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('table', wagtail.contrib.table_block.blocks.TableBlock())), blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='recordpage',
+            name='category',
+            field=models.CharField(choices=[('advisory opinions', 'Advisory opinions'), ('commission', 'Commission'), ('compliance', 'Compliance'), ('litigation', 'Litigation'), ('outreach', 'Outreach'), ('public funding', 'Public funding'), ('regulations', 'Regulations'), ('reporting', 'Reporting'), ('statistics', 'Statistics')], max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='recordpage',
+            name='related_section_title',
+            field=models.CharField(blank=True, default='Explore campaign finance data', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='recordpage',
+            name='related_section_url',
+            field=models.CharField(blank=True, default='/data/', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='recordpageauthors',
+            name='role',
+            field=models.CharField(choices=[('author', 'Author'), ('writer', 'Written by'), ('graphics', 'Graphics by'), ('contact', 'Contact')], default='author', max_length=255),
+        ),
+    ]

fec/home/migrations/0021_merge.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.9 on 2016-09-09 23:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0019_auto_20160907_2152'),
+        ('home', '0020_auto_20160909_0139'),
+    ]
+
+    operations = [
+    ]

fec/home/models.py

@@ -17,7 +17,6 @@
 
 from fec import constants
 
-
 stream_factory = functools.partial(
     StreamField,
     [
@@ -142,7 +141,6 @@ class Meta:
 class RecordPageAuthors(Orderable, PageAuthors):
     page = ParentalKey('RecordPage', related_name='authors')
 
-
 def get_previous_record_page():
     return RecordPage.objects.order_by('-date', '-pk').first()
 
@@ -172,6 +170,10 @@ class RecordPage(ContentPage):
     def content_section(self):
         return ''
 
+    @property
+    def get_update_type(self):
+        return constants.update_types['fec-record']
+
 
 class DigestPageAuthors(Orderable, PageAuthors):
     page = ParentalKey('DigestPage', related_name='authors')
@@ -197,6 +199,10 @@ class DigestPage(ContentPage):
     def content_section(self):
         return ''
 
+    @property
+    def get_update_type(self):
+        return constants.update_types['weekly-digest']
+
 
 class PressReleasePageAuthors(Orderable, PageAuthors):
     page = ParentalKey('PressReleasePage', related_name='authors')
@@ -225,6 +231,10 @@ class PressReleasePage(ContentPage):
     def content_section(self):
         return ''
 
+    @property
+    def get_update_type(self):
+        return constants.update_types['press-release']
+
 
 class CustomPage(Page):
     """Flexible customizable page."""
@@ -240,6 +250,28 @@ class CustomPage(Page):
         StreamFieldPanel('sidebar'),
     ]
 
+class OptionBlock(blocks.StructBlock):
+    title = blocks.CharBlock(required=True)
+    intro = blocks.RichTextBlock(blank=False, null=False, required=False)
+    button_text = blocks.CharBlock(required=True, null=False, blank=False)
+    related_page = blocks.PageChooserBlock()
+
+class PressLandingPage(Page):
+    hero = stream_factory(null=True, blank=True)
+    option_blocks = StreamField([
+        ('option_blocks', OptionBlock())
+    ])
+
+    feed_intro = stream_factory(null=True, blank=True)
+    contact_intro = stream_factory(null=True, blank=True)
+
+    content_panels = Page.content_panels + [
+        StreamFieldPanel('hero'),
+        StreamFieldPanel('feed_intro'),
+        StreamFieldPanel('contact_intro'),
+        StreamFieldPanel('option_blocks'),
+    ]
+
 class CollectionList(blocks.StructBlock):
     CHECKLIST = 'check'
     BULLET = 'bullet'

fec/home/templates/home/checklist_page.html

@@ -181,11 +181,6 @@ <h2>Need help?</h2>
   </div>
 </div>
 
-<div class="slab slab--neutral footer-disclaimer">
-  <div class="container">
-    <p class="usa-width-one-half">This site is in beta, which means we're testing content that better adheres to legal plain language requirements. This content is not finalized, is not legal advice and is subject to change.</p>
-    <p class="usa-width-one-half">Everything on this site should be read in conjunction with FEC.gov. Please let us know what you think of our new content; use the feedback tool on this page.</p>
-  </div>
-</div>
+{% include 'partials/disclaimer.html' %}
 
 {% endblock %}

fec/home/templates/home/custom_page.html

@@ -47,10 +47,6 @@ <h4 class="sidebar__title">{{ block }}</h4>
   </div>
 </article>
 
-<div class="slab slab--neutral footer-disclaimer">
-  <div class="container">
-    <p class="usa-width-one-half">This site is in beta, which means we're testing content that better adheres to legal plain language requirements. This content is not finalized, is not legal advice and is subject to change.</p>
-    <p class="usa-width-one-half">Everything on this site should be read in conjunction with FEC.gov. Please let us know what you think of our new content; use the feedback tool on this page.</p>
-  </div>
-</div>
+{% include 'partials/disclaimer.html' %}
+
 {% endblock %}

fec/home/templates/home/digest_page.html

@@ -10,7 +10,7 @@
     <li class="breadcrumbs__item"><a href="/" class="breadcrumbs__link" rel="Home">Home</a></li>
     <li class="breadcrumbs__item">
       <span class="breadcrumbs__separator">›</span>
-      Weekly Digests
+      <a href="/updates?update_type=weekly-digest">Weekly Digest</a>
     </li>
     <li class="breadcrumbs__item breadcrumbs__item--current">
       <span class="breadcrumbs__separator">›</span>
@@ -22,7 +22,6 @@
 <article class="main">
   <div class="container">
     <div class="main__content--full">
-
       <div class="section__heading">
         <ul class="tags" aria-hidden="false">
           <li class="tag t-upper">
@@ -63,7 +62,7 @@ <h3>Read next:</h3>
       {% if self.read_next %}
         <h4><a href="{{ self.read_next.url }}">{{ self.read_next.title }}</a></h4>
       {% endif %}
-      <h4><a href="#" class="is-disabled">More weekly digests</a> &raquo;</h4>
+      <h4><a href="#" class="is-disabled">More Weekly Digests</a> &raquo;</h4>
     </div>
   </div>
 </div>

fec/home/templates/home/landing_page.html

@@ -163,12 +163,8 @@ <h2>Need help?</h2>
       </div>
     </div>
   </div>
-  <div class="slab slab--neutral footer-disclaimer">
-    <div class="container">
-      <p class="usa-width-one-half">This site is in beta, which means we're testing content that better adheres to legal plain language requirements. This content is not finalized, is not legal advice and is subject to change.</p>
-      <p class="usa-width-one-half">Everything on this site should be read in conjunction with FEC.gov. Please let us know what you think of our new content; use the feedback tool on this page.</p>
-    </div>
-  </div>
+  {% include 'partials/disclaimer.html' %}
+
 </article>
 
 {% endblock %}