merge with master

CHANGELOG.md

@@ -3,11 +3,14 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
-- Added travis and coveralls setup
-- Updated the download 4x4 codes for Money transfers
 - Removed view code to parse narratives as jsonp (now straight json)
 - Added a url and view option to demo the landing page with a local json file
 
+## [1.2.6] - 2016-10-06
+- Copy updated for `submit-a-complaint` and `process`
+- Added travis and coveralls setup
+- Updated the download 4x4 codes for Money transfers
+
 ## [1.2.2] - 2016-06-06
 ### Fixed
 - Fix 404 for link to Narrative Scrubbing Standard PDF

bower.json

@@ -21,7 +21,7 @@
     "ie8": "https://github.com/WebReflection/ie8.git"
   },
   "devDependencies": {
-    "django-assets": "https://github.com/virginiacc/django-assets.git",
+    "django-assets": "https://github.com/cfpb/django-assets.git",
     "respond": "~1.4.2"
   }
 }

complaint/templates/process.html

@@ -85,7 +85,7 @@ <h2><strong>4.</strong> Complaint published</h2>
                     <div class="content-l_col content-l_col-3-4">
                         <h2><strong>5.</strong> Consumer review</h2>
                         <p class="short-desc">
-                            We will let you know when the company responds. You can review that response and give us feedback.
+                            We will let you know when the company responds. You’ll be able to review the company’s response and will have 60 days to give us feedback about the response.
                         </p>
                     </div>
                 </div>

complaint/templates/submit-a-complaint.html

@@ -568,7 +568,7 @@ <h2 class="h2-demi">Submit an other financial service complaint to the CFPB</h2>
             <h2>What happens after I submit a complaint?</h2>
             <div>
               <p>We’ll forward your complaint to the company and work to get a response. After we forward your complaint, the company has 15 days to respond to you and the CFPB. Companies are expected to close all but the most complicated complaints within 60 days.</p>
-              <p>You’ll be able to review the response and give us feedback. If we find that another agency would be better able to assist, we will forward your complaint and let you know.</p>
+              <p>You’ll be able to review the company’s response and will have 60 days to give us feedback about the response. If we find that another agency would be better able to assist, we will forward your complaint and let you know.</p>
             </div>
             <a href="/complaint/process/" class="btn btn__super btn__secondary">Learn more</a>
           </div>

complaint_common/templates/base_responsive.html

@@ -24,7 +24,7 @@
 
 {% block app_js %}
   <!--[if lte IE 8]>
-      <script src="{% static 'complaint_common/js/ie8.js' %}"></script>
+      <script src="{% static 'complaint_common/js/ie8.min.js' %}"></script>
   <![endif]-->
       <script src="{% static 'complaint_common/js/main.js' %}"></script>
 {% endblock %}

setup.py

@@ -1,10 +1,5 @@
 import os
 from setuptools import setup
-from subprocess import call
-from setuptools import Command
-from distutils.command.build_ext import build_ext as _build_ext
-from setuptools.command.bdist_egg import bdist_egg as _bdist_egg
-from wheel.bdist_wheel import bdist_wheel as _bdist_wheel
 
 
 def read_file(filename):
@@ -17,43 +12,6 @@ def read_file(filename):
         return ''
 
 
-class build_frontend(Command):
-    """ A command class to run `setup.sh` """
-    description = 'build front-end JavaScript and CSS'
-    user_options = []
-
-    def initialize_options(self):
-        pass
-
-    def finalize_options(self):
-        pass
-
-    def run(self):
-        print __file__
-        call(['sh', './setup.sh'],
-                cwd=os.path.dirname(os.path.abspath(__file__)))
-
-
-class build_ext(_build_ext):
-    """ A build_ext subclass that adds build_frontend """
-    def run(self):
-        self.run_command('build_frontend')
-        _build_ext.run(self)
-
-
-class bdist_egg(_bdist_egg):
-    """ A bdist_egg subclass that runs build_frontend """
-    def run(self):
-        self.run_command('build_frontend')
-        _bdist_egg.run(self)
-
-
-class bdist_wheel(_bdist_wheel):
-    """ A bdist_wheel subclass that runs build_frontend """
-    def run(self):
-        self.run_command('build_frontend')
-        _bdist_wheel.run(self)
-
 setup(
     name='complaintdatabase',
     version='1.2.2',
@@ -76,10 +34,6 @@ def run(self):
     ],
     long_description=read_file('README.md'),
     zip_safe=False,
-    cmdclass={
-        'build_frontend': build_frontend,
-        'build_ext': build_ext,
-        'bdist_egg': bdist_egg,
-        'bdist_wheel': bdist_wheel,
-    },
+    setup_requires=['cfgov-setup==1.2',],
+    frontend_build_script= 'setup.sh',
 )