Merge branch 'develop'

.about.yml

@@ -54,7 +54,7 @@ team:
 - github: ddotrollins
   id: Duane Rollins
   role: User Experience Lead
-  
+
 - github: gemfarmer
   id: Brian Hedberg
   role: Front End Designer/Developer
@@ -109,6 +109,9 @@ licenses:
   Django REST Swagger:
     name: BSD-3-Clause
     url: http://opensource.org/licenses/BSD-3-Clause
+  Django Flat Theme:
+    name: BSD-3-Clause
+    url: http://opensource.org/licenses/BSD-3-Clause
   Waitress:
     name: ZPL-2.1
     url: https://spdx.org/licenses/ZPL-2.1.html#licenseText
@@ -145,10 +148,10 @@ links:
 - url: http://www.gsa.gov/portal/category/100122
   text: GSA OSBU Forescting Opportunities Data
   category: government resource
-  
+
 # URIs for points-of-contact
 # Items:
 # - url: URL for the link
 #   text: Anchor text for the link
 contact:
-- 
+-

forecast-admin/forecast/forecast/settings.py

@@ -36,6 +36,7 @@
 # Application definition
 
 INSTALLED_APPS = (
+    'flat',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -67,7 +68,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [os.path.join(BASE_DIR, 'templates')],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [

forecast-admin/forecast/opportunities/templates/404.html

@@ -1,7 +1,10 @@
 {% extends "layout.html" %}
 
 {% block content %}
-
-<h2>404: Page not found</h2>
-
+<section class="error-page usa-grid-full">
+	<h1 class="error-page-hero">404</h1>
+	<h2 class="error-page-header">:/</h2>
+	<p>The page you are looking for appears to be moved, deleted, or does not exist.</p>
+	<a href="/">Return to all contract opportunities <icon class="fa fa-angle-right"></icon></a>
+</section>
 {% endblock %}

forecast-admin/forecast/opportunities/templates/500.html

@@ -1,7 +1,9 @@
 {% extends "layout.html" %}
 
 {% block content %}
-
-<h2>500: Server error</h2>
-
+<section class="error-page usa-grid-full">
+	<h1 class="error-page-hero">500</h1>
+	<h2 class="error-page-header">This is a bit awkward</h2>
+	<p>Something went wrong on our end. Try refreshing the page or you can view <a href="/">all contract opportunities <icon class="fa fa-angle-right"></icon></a></p>
+</section>
 {% endblock %}

forecast-admin/forecast/opportunities/templates/main.html

@@ -6,7 +6,7 @@
 <div id="results">
   <section class="usa-grid-full">
     <div class="button-download_wrapper usa-width-one-fourth">
-        <a href="api/opportunities/?format=csv">
+        <a download="gsaforecast.csv" href="api/opportunities/?format=csv">
           <button class="usa-button usa-button-outline button-download"
             style="-webkit-appearance: button">
             <icon class="button-download_icon fa fa-download"></icon>