Skip to content

Commit

Permalink
Merge babc696 into a7085ca
Browse files Browse the repository at this point in the history
  • Loading branch information
anselmbradford committed Apr 11, 2018
2 parents a7085ca + babc696 commit 8bf7454
Show file tree
Hide file tree
Showing 86 changed files with 369 additions and 374 deletions.
6 changes: 3 additions & 3 deletions .env_SAMPLE
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export SHEER_ELASTICSEARCH_INDEX=content
export VENV_NAME=cfgov-refresh

# WordPress content API base URL.
export WORDPRESS=http://www.consumerfinance.gov
export WORDPRESS=https://www.consumerfinance.gov

#############################################################
# U.S. Department of Housing and Urban Development (HUD) API.
Expand All @@ -122,7 +122,7 @@ export HUD_API_ENDPOINT=http://localhost:8000/hud-api-replace/
# REGULATIONS.GOV (optional) - for working with the regs.gov Comment API.
#########################################################################

#export REGSGOV_BASE_URL=http://api.data.gov/TEST/regulations/v3/comment.json
#export REGSGOV_BASE_URL=https://api.data.gov/TEST/regulations/v3/comment.json
#export REGSGOV_API_KEY=<api_key>

# Forwarding locations on subscription success and error.
Expand All @@ -143,7 +143,7 @@ export HUD_API_ENDPOINT=http://localhost:8000/hud-api-replace/
export SITE_DESC=cfgov
export TEST_HTTP_HOST=localhost

# Web service ID for accessibility testing via http://achecker.ca site.
# Web service ID for accessibility testing via https://achecker.ca site.
#export ACHECKER_ID=<web_service_id>

#################################################################
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ env:

# Linting rules for ESLint.
# 0's ignore a rule, 1's produce a warning, and 2's throw an error.
# See http://eslint.org/docs/rules/ for full documentation.
# See https://eslint.org/docs/rules/ for full documentation.
rules:

# Rules for flagging POSSIBLE ERRORS.
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,4 @@ features. For more information visit the [Babel documentation site]

- https://developer.microsoft.com/en-us/microsoft-edge/tools/vms/
- https://saucelabs.com/beta/dashboard/tests
- http://developer.samsung.com/remotetestlab/rtlDeviceList.action#
- https://developer.samsung.com/remotetestlab/rtlDeviceList.action
10 changes: 3 additions & 7 deletions TERMS.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,16 @@ When using or citing the work, you should not imply endorsement by the
author or the affirmer.

[policy]: https://github.com/cfpb/source-code-policy/
[CC0]: http://creativecommons.org/publicdomain/zero/1.0/legalcode
[CC0]: https://creativecommons.org/publicdomain/zero/1.0/legalcode


## Exceptions

- [box-sizing Polyfill](http://github.com/Schepp/box-sizing-polyfill) by
Christian Schepp Schaefer is licensed under LGPL 3.0.
- [HTML5 Shiv](https://github.com/aFarkas/html5shiv) by Alexander Farkas,
et al., is licensed under MIT/GPL2.
- [jQuery](http://jquery.com/) by The jQuery Foundation is licensed under the
- [jQuery](https://jquery.com) by The jQuery Foundation is licensed under the
MIT License.
- [Modernizr](https://github.com/Modernizr/Modernizr) by Faruk Ateş, et al.,
is licensed under MIT License.
- [Normalize](http://necolas.github.io/normalize.css/) by Nicolas Gallagher,
- [Normalize](https://necolas.github.io/normalize.css/) by Nicolas Gallagher,
co-created with Jonathan Neal, is licensed under the MIT License.
- [Slick](http://kenwheeler.github.io/slick/) by Ken Wheeler is licensed under
the MIT License.
2 changes: 1 addition & 1 deletion ansible.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# config file for ansible -- http://ansible.com/
# config file for ansible -- https://ansible.com
# ==============================================

[defaults]
Expand Down
2 changes: 1 addition & 1 deletion cfgov/agreements/management/commands/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def get_issuer(name):

def save_agreement(agreements_zip, raw_path, filename_encoding,
outfile, upload=False):
uri_hostname = 'http://files.consumerfinance.gov'
uri_hostname = 'https://files.consumerfinance.gov'
s3_prefix = 'a/assets/credit-card-agreements/pdf/'

zipinfo = agreements_zip.getinfo(raw_path)
Expand Down
2 changes: 1 addition & 1 deletion cfgov/agreements/tests/test_legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def agreement_factory(**kwargs):
args = {
'file_name': '',
'size': 0,
'uri': 'http://example.com',
'uri': 'https://example.com',
'description': '',
}

Expand Down
2 changes: 1 addition & 1 deletion cfgov/core/management/commands/inactive_users.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def send_user_warning_email(self, user, warn_period, period):
"information security policies, if you take no action, your " + \
"account will be deactivated after 90 days of inactivity.\n\n" + \
"To keep your account active, please log in at " + \
"http://content.consumerfinance.gov/admin/\n\n" + \
"https://content.consumerfinance.gov/admin/\n\n" + \
"Thank you,\nWagtail system owners"
user.email_user(subject, msg.format(warn_period, period))

Expand Down
2 changes: 1 addition & 1 deletion cfgov/core/static/robots.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Disallow: *form-id=*
Disallow: /?page=
Disallow: /eregulations

sitemap: http://www.consumerfinance.gov/sitemap.xml
sitemap: https://www.consumerfinance.gov/sitemap.xml
2 changes: 1 addition & 1 deletion cfgov/core/tests/test_forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def test_whitelisted_url(self):
self.assertTrue(form.is_valid())

def test_url_not_in_whitelist(self):
data = {'ext_url': 'http://google.com'}
data = {'ext_url': 'https://google.com'}
form = ExternalURLForm(data)

self.assertFalse(form.is_valid())
Expand Down
2 changes: 1 addition & 1 deletion cfgov/data_research/fixtures/mortgage_metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"note": "",
"updated": "2017-10-10",
"name": "download_files",
"json_value": "{\"2017-03\":{\"percent_30_60\":{\"County\":{\"url\":\"http://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/CountyMortgagesPercent-30-89DaysLate-thru-2017-03.csv\",\"slug\":\"CountyMortgagesPercent-30-89DaysLate-thru-2017-03\",\"size\":\"40 KB\"},\"MetroArea\":{\"url\":\"http://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/MetroAreaMortgagesPercent-30-89DaysLate-thru-2017-03.csv\",\"slug\":\"MetroAreaMortgagesPercent-30-89DaysLate-thru-2017-03\",\"size\":\"148 KB\"},\"State\":{\"url\":\"http://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/StateMortgagesPercent-30-89DaysLate-thru-2017-03.csv\",\"slug\":\"StateMortgagesPercent-30-89DaysLate-thru-2017-03\",\"size\":\"25 KB\"}},\"thru_month\":\"March 2017\",\"percent_90\":{\"County\":{\"url\":\"http://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/CountyMortgagesPercent-90-plusDaysLate-thru-2017-03.csv\",\"slug\":\"CountyMortgagesPercent-90-plusDaysLate-thru-2017-03\",\"size\":\"40 KB\"},\"MetroArea\":{\"url\":\"http://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/MetroAreaMortgagesPercent-90-plusDaysLate-thru-2017-03.csv\",\"slug\":\"MetroAreaMortgagesPercent-90-plusDaysLate-thru-2017-03\",\"size\":\"148 KB\"},\"State\":{\"url\":\"http://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/StateMortgagesPercent-90-plusDaysLate-thru-2017-03.csv\",\"slug\":\"StateMortgagesPercent-90-plusDaysLate-thru-2017-03\",\"size\":\"25 KB\"}},\"pub_date\":\"October 2017\"}}"
"json_value": "{\"2017-03\":{\"percent_30_60\":{\"County\":{\"url\":\"https://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/CountyMortgagesPercent-30-89DaysLate-thru-2017-03.csv\",\"slug\":\"CountyMortgagesPercent-30-89DaysLate-thru-2017-03\",\"size\":\"40 KB\"},\"MetroArea\":{\"url\":\"https://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/MetroAreaMortgagesPercent-30-89DaysLate-thru-2017-03.csv\",\"slug\":\"MetroAreaMortgagesPercent-30-89DaysLate-thru-2017-03\",\"size\":\"148 KB\"},\"State\":{\"url\":\"https://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/StateMortgagesPercent-30-89DaysLate-thru-2017-03.csv\",\"slug\":\"StateMortgagesPercent-30-89DaysLate-thru-2017-03\",\"size\":\"25 KB\"}},\"thru_month\":\"March 2017\",\"percent_90\":{\"County\":{\"url\":\"https://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/CountyMortgagesPercent-90-plusDaysLate-thru-2017-03.csv\",\"slug\":\"CountyMortgagesPercent-90-plusDaysLate-thru-2017-03\",\"size\":\"40 KB\"},\"MetroArea\":{\"url\":\"https://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/MetroAreaMortgagesPercent-90-plusDaysLate-thru-2017-03.csv\",\"slug\":\"MetroAreaMortgagesPercent-90-plusDaysLate-thru-2017-03\",\"size\":\"148 KB\"},\"State\":{\"url\":\"https://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/StateMortgagesPercent-90-plusDaysLate-thru-2017-03.csv\",\"slug\":\"StateMortgagesPercent-90-plusDaysLate-thru-2017-03\",\"size\":\"25 KB\"}},\"pub_date\":\"October 2017\"}}"
},
"model": "data_research.mortgagemetadata",
"pk": 22
Expand Down
2 changes: 1 addition & 1 deletion cfgov/data_research/mortgage_utilities/s3_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
S3_SECRET = os.getenv('AWS_S3_SECRET_ACCESS_KEY')
BASE_BUCKET = settings.AWS_STORAGE_BUCKET_NAME
MORTGAGE_SUB_BUCKET = "data/mortgage-performance"
PUBLIC_ACCESS_BASE = 'http://{}.s3.amazonaws.com/{}'.format(
PUBLIC_ACCESS_BASE = 'https://{}.s3.amazonaws.com/{}'.format(
BASE_BUCKET, MORTGAGE_SUB_BUCKET)
S3_MORTGAGE_DOWNLOADS_BASE = '{}/downloads'.format(PUBLIC_ACCESS_BASE)
S3_SOURCE_BUCKET = '{}/source'.format(PUBLIC_ACCESS_BASE)
Expand Down
2 changes: 1 addition & 1 deletion cfgov/data_research/scripts/export_public_csvs.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def export_downloadable_csv(geo_type, late_value):
Each CSV is to start with a National row for comparison.
CSVs are posted at
http://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/ # noqa: E501
https://files.consumerfinance.gov.s3.amazonaws.com/data/mortgage-performance/downloads/ # noqa: E501
The script also stores URLs and file sizes for use in page footnotes.
"""
Expand Down
6 changes: 3 additions & 3 deletions cfgov/jinja2/v1/_includes/ask/_share_links.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<a href="http://www.facebook.com/sharer.php?u={{ request.url }}{% if utm_campaign %}%3Futm_campaign={{ utm_campaign }}{% endif %}" class="share-facebook"><img src="{{ static('nemo/_/img/icon-facebook-retina.png') }}" alt="Share on Facebook" class="icon-20"></a>
<a href="http://twitter.com/share?url={{ request.url|urlencode }}{% if utm_campaign %}%3Futm_campaign={{ utm_campaign }}{% endif %}&text={{ tweet_text if tweet_text else 'CFPB - Obtener Respuestas' }}&via=CFPB&lang=es" class="share-twitter"><img src="{{ static('nemo/_/img/icon-twitter-retina.png') }}" alt="Share on Twitter" class="icon-20"></a>
<a href="http://api.addthis.com/oexchange/0.8/forward/email/offer?url={{ request.url|urlencode }}{% if utm_campaign %}%3Futm_campaign={{ utm_campaign }}{% endif %}&title={{ page.question if page.question else 'CFPB - Obtener Respuestas' }}&pubid=ra-4da354ee346886d2" class="share-email addthis_button_email"><img src="{{ static('nemo/_/img/icon-email-retina.png') }}" alt="Share via email" class="icon-20"></a>
<a href="https://www.facebook.com/sharer.php?u={{ request.url }}{% if utm_campaign %}%3Futm_campaign={{ utm_campaign }}{% endif %}" class="share-facebook"><img src="{{ static('nemo/_/img/icon-facebook-retina.png') }}" alt="Share on Facebook" class="icon-20"></a>
<a href="https://twitter.com/share?url={{ request.url|urlencode }}{% if utm_campaign %}%3Futm_campaign={{ utm_campaign }}{% endif %}&text={{ tweet_text if tweet_text else 'CFPB - Obtener Respuestas' }}&via=CFPB&lang=es" class="share-twitter"><img src="{{ static('nemo/_/img/icon-twitter-retina.png') }}" alt="Share on Twitter" class="icon-20"></a>
<a href="https://api.addthis.com/oexchange/0.8/forward/email/offer?url={{ request.url|urlencode }}{% if utm_campaign %}%3Futm_campaign={{ utm_campaign }}{% endif %}&title={{ page.question if page.question else 'CFPB - Obtener Respuestas' }}&pubid=ra-4da354ee346886d2" class="share-email addthis_button_email"><img src="{{ static('nemo/_/img/icon-email-retina.png') }}" alt="Share via email" class="icon-20"></a>
6 changes: 3 additions & 3 deletions cfgov/jinja2/v1/_includes/ask/share-links-spanish.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<a href="http://www.facebook.com/sharer.php?u={{ request.url }}{% if utm_campaign %}%3Futm_campaign={{ utm_campaign }}{% endif %}" class="share-facebook"><img src="{{ static('nemo/_/img/icon-facebook-retina.png') }}" alt="Share on Facebook" class="icon-20"></a>
<a href="http://twitter.com/share?url={{ request.url|urlencode }}{% if utm_campaign %}%3Futm_campaign={{ utm_campaign }}{% endif %}&text={{ tweet_text if tweet_text else 'CFPB - Obtener Respuestas' }}&via=CFPB&lang=es" class="share-twitter"><img src="{{ static('nemo/_/img/icon-twitter-retina.png') }}" alt="Share on Twitter" class="icon-20"></a>
<a href="http://api.addthis.com/oexchange/0.8/forward/email/offer?url={{ request.url|urlencode }}{% if utm_campaign %}%3Futm_campaign={{ utm_campaign }}{% endif %}&title={{ page.question if page.question else 'CFPB - Obtener Respuestas' }}&pubid=ra-4da354ee346886d2" class="share-email addthis_button_email"><img src="{{ static('nemo/_/img/icon-email-retina.png') }}" alt="Share via email" class="icon-20"></a>
<a href="https://www.facebook.com/sharer.php?u={{ request.url }}{% if utm_campaign %}%3Futm_campaign={{ utm_campaign }}{% endif %}" class="share-facebook"><img src="{{ static('nemo/_/img/icon-facebook-retina.png') }}" alt="Share on Facebook" class="icon-20"></a>
<a href="https://twitter.com/share?url={{ request.url|urlencode }}{% if utm_campaign %}%3Futm_campaign={{ utm_campaign }}{% endif %}&text={{ tweet_text if tweet_text else 'CFPB - Obtener Respuestas' }}&via=CFPB&lang=es" class="share-twitter"><img src="{{ static('nemo/_/img/icon-twitter-retina.png') }}" alt="Share on Twitter" class="icon-20"></a>
<a href="https://api.addthis.com/oexchange/0.8/forward/email/offer?url={{ request.url|urlencode }}{% if utm_campaign %}%3Futm_campaign={{ utm_campaign }}{% endif %}&title={{ page.question if page.question else 'CFPB - Obtener Respuestas' }}&pubid=ra-4da354ee346886d2" class="share-email addthis_button_email"><img src="{{ static('nemo/_/img/icon-email-retina.png') }}" alt="Share via email" class="icon-20"></a>
2 changes: 1 addition & 1 deletion cfgov/jinja2/v1/_includes/molecules/social-media.html
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
========================================================================== #}

{%- macro _share_twitter_url(parsed_url, blurb, options) -%}
{%- set _share_twitter_url = 'http://twitter.com/intent/tweet' -%}
{%- set _share_twitter_url = 'https://twitter.com/intent/tweet' -%}
{%- set _share_twitter_url = _share_twitter_url + '?url=' + parsed_url -%}
{%- set _share_twitter_url = _share_twitter_url + '&via=CFPB' -%}
{%- set _share_twitter_url = _share_twitter_url + '&text=' + blurb + '%20--' -%}
Expand Down
2 changes: 1 addition & 1 deletion cfgov/jinja2/v1/_includes/on-demand/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{#
Script allows Digital Gov to generate our global site search results.
Do not edit, this script comes straight from Digital Gov.
http://search.digitalgov.gov/manual/code.html
https://search.digitalgov.gov/manual/code.html
#}
<script>
//<![CDATA[
Expand Down
4 changes: 2 additions & 2 deletions cfgov/jinja2/v1/_includes/organisms/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,15 @@
<a class="m-list_link
icon-link
icon-link__external-link"
href="http://usa.gov/">
href="https://usa.gov/">
<span class="icon-link_text">USA.gov</span>
</a>
</li>
<li class="m-list_item">
<a class="m-list_link
icon-link
icon-link__external-link"
href="http://www.federalreserve.gov/oig/default.htm">
href="https://www.federalreserve.gov/oig/default.htm">
<span class="icon-link_text">Office of Inspector General</span>
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion cfgov/jinja2/v1/_includes/organisms/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
We’re prototyping new designs.
Things may not work as expected.
Our regular site continues to be at
<a href="http://www.consumerfinance.gov/">www.consumerfinance.gov</a>.
<a href="https://www.consumerfinance.gov/">www.consumerfinance.gov</a>.
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion cfgov/jinja2/v1/_includes/organisms/post-preview.html
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
</time>
{% if event.live_stream_link %}
<img class="o-post-preview_image"
src="http://placehold.it/160x90"
src="https://placehold.it/160x90"
alt="Livestream event">
{% else %}
{% from 'macros/util/format/url.html' import location_image_url as location_image_url %}
Expand Down
4 changes: 2 additions & 2 deletions cfgov/jinja2/v1/_layouts/base-common.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
& Innovation team. We're always looking for a few great designers,
developers, data scientists, and network, infrastructure, privacy and
security pros. Keep an eye on our job opportunities at:
http://www.consumerfinance.gov/jobs/
https://www.consumerfinance.gov/jobs/
Also, you can see more of our code at https://github.com/cfpb
And by the way, there’s another hidden message somewhere on the following
page: http://www.consumerfinance.gov/jobs/technology-innovation-fellows/.
page: https://www.consumerfinance.gov/jobs/technology-innovation-fellows/.
See if you can find it! Hint: picture yourself embedded in our work.
============================================================================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ <h1>Privacy Act statement</h1>
5493
</a>
and
<a href="http://www.gpo.gov/fdsys/granule/USCODE-2011-title12/USCODE-2011-title12-chap53-subchapV-partB-sec5512">
<a href="https://www.gpo.gov/fdsys/granule/USCODE-2011-title12/USCODE-2011-title12-chap53-subchapV-partB-sec5512">
5512
</a>.
</p>
Expand Down
7 changes: 3 additions & 4 deletions cfgov/jinja2/v1/ask-cfpb/answer-page-spanish.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
{%- endblock -%}

{% block og_image %}
<meta property="og:image" content="{{ page.open_graph_image_url if page.open_graph_image_url else 'http://www.consumerfinance.gov/static/nemo/_/img/cfpb-logo-spanish.png' }}">
<meta property="og:image" content="{{ page.open_graph_image_url if page.open_graph_image_url else 'https://www.consumerfinance.gov/static/nemo/_/img/cfpb-logo-spanish.png' }}">
{% endblock %}

{% block babel_content %}

<section class="content row ask-cfpb-page__es">

<div class="primary span8">
Expand Down Expand Up @@ -88,7 +88,7 @@ <h3>Temas relacionados</h3>


</section><!-- .row -->
<div class="analytics-data"
<div class="analytics-data"
data-answer-id="{{ answer_id }}"
data-category-slug="{{ category.slug_es }}"
data-category-name="{{ category.name_es }}">
Expand All @@ -104,4 +104,3 @@ <h3>Temas relacionados</h3>
</span>
</div><!-- .share -->
{% endblock %}

Loading

0 comments on commit 8bf7454

Please sign in to comment.