Merge branch 'master' of github.com:cfpb/retirement

cfpb · Jul 8, 2015 · d24f1c1 · d24f1c1
2 parents 759141e + 48e15fc
commit d24f1c1
Show file tree

Hide file tree

Showing 97 changed files with 15 additions and 16 deletions.
diff --git a/retirement_api/static/admin/css/base.css → ..._api/static/retirement/admin/css/base.css b/retirement_api/static/admin/css/base.css → ..._api/static/retirement/admin/css/base.css
diff --git a/...ment_api/static/admin/css/changelists.css → ...atic/retirement/admin/css/changelists.css b/...ment_api/static/admin/css/changelists.css → ...atic/retirement/admin/css/changelists.css
diff --git a/...rement_api/static/admin/css/dashboard.css → ...static/retirement/admin/css/dashboard.css b/...rement_api/static/admin/css/dashboard.css → ...static/retirement/admin/css/dashboard.css
diff --git a/retirement_api/static/admin/css/forms.css → ...api/static/retirement/admin/css/forms.css b/retirement_api/static/admin/css/forms.css → ...api/static/retirement/admin/css/forms.css
diff --git a/retirement_api/static/admin/css/ie.css → ...nt_api/static/retirement/admin/css/ie.css b/retirement_api/static/admin/css/ie.css → ...nt_api/static/retirement/admin/css/ie.css
diff --git a/retirement_api/static/admin/css/login.css → ...api/static/retirement/admin/css/login.css b/retirement_api/static/admin/css/login.css → ...api/static/retirement/admin/css/login.css
diff --git a/retirement_api/static/admin/css/rtl.css → ...t_api/static/retirement/admin/css/rtl.css b/retirement_api/static/admin/css/rtl.css → ...t_api/static/retirement/admin/css/rtl.css
diff --git a/retirement_api/static/admin/css/widgets.css → ...i/static/retirement/admin/css/widgets.css b/retirement_api/static/admin/css/widgets.css → ...i/static/retirement/admin/css/widgets.css
diff --git a/...nt_api/static/admin/img/changelist-bg.gif → ...ic/retirement/admin/img/changelist-bg.gif b/...nt_api/static/admin/img/changelist-bg.gif → ...ic/retirement/admin/img/changelist-bg.gif
diff --git a/...pi/static/admin/img/changelist-bg_rtl.gif → ...etirement/admin/img/changelist-bg_rtl.gif b/...pi/static/admin/img/changelist-bg_rtl.gif → ...etirement/admin/img/changelist-bg_rtl.gif
diff --git a/...ement_api/static/admin/img/chooser-bg.gif → ...tatic/retirement/admin/img/chooser-bg.gif b/...ement_api/static/admin/img/chooser-bg.gif → ...tatic/retirement/admin/img/chooser-bg.gif
diff --git a/...i/static/admin/img/chooser_stacked-bg.gif → ...tirement/admin/img/chooser_stacked-bg.gif b/...i/static/admin/img/chooser_stacked-bg.gif → ...tirement/admin/img/chooser_stacked-bg.gif
diff --git a/...i/static/admin/img/default-bg-reverse.gif → ...tirement/admin/img/default-bg-reverse.gif b/...i/static/admin/img/default-bg-reverse.gif → ...tirement/admin/img/default-bg-reverse.gif
diff --git a/...ement_api/static/admin/img/default-bg.gif → ...tatic/retirement/admin/img/default-bg.gif b/...ement_api/static/admin/img/default-bg.gif → ...tatic/retirement/admin/img/default-bg.gif
diff --git a/..._api/static/admin/img/deleted-overlay.gif → .../retirement/admin/img/deleted-overlay.gif b/..._api/static/admin/img/deleted-overlay.gif → .../retirement/admin/img/deleted-overlay.gif
diff --git a/.../static/admin/img/gis/move_vertex_off.png → ...irement/admin/img/gis/move_vertex_off.png b/.../static/admin/img/gis/move_vertex_off.png → ...irement/admin/img/gis/move_vertex_off.png
diff --git a/...i/static/admin/img/gis/move_vertex_on.png → ...tirement/admin/img/gis/move_vertex_on.png b/...i/static/admin/img/gis/move_vertex_on.png → ...tirement/admin/img/gis/move_vertex_on.png
diff --git a/retirement_api/static/admin/img/icon-no.gif → ...i/static/retirement/admin/img/icon-no.gif b/retirement_api/static/admin/img/icon-no.gif → ...i/static/retirement/admin/img/icon-no.gif
diff --git a/...ent_api/static/admin/img/icon-unknown.gif → ...tic/retirement/admin/img/icon-unknown.gif b/...ent_api/static/admin/img/icon-unknown.gif → ...tic/retirement/admin/img/icon-unknown.gif
diff --git a/retirement_api/static/admin/img/icon-yes.gif → .../static/retirement/admin/img/icon-yes.gif b/retirement_api/static/admin/img/icon-yes.gif → .../static/retirement/admin/img/icon-yes.gif
diff --git a/...ent_api/static/admin/img/icon_addlink.gif → ...tic/retirement/admin/img/icon_addlink.gif b/...ent_api/static/admin/img/icon_addlink.gif → ...tic/retirement/admin/img/icon_addlink.gif
diff --git a/...ement_api/static/admin/img/icon_alert.gif → ...tatic/retirement/admin/img/icon_alert.gif b/...ement_api/static/admin/img/icon_alert.gif → ...tatic/retirement/admin/img/icon_alert.gif
diff --git a/...nt_api/static/admin/img/icon_calendar.gif → ...ic/retirement/admin/img/icon_calendar.gif b/...nt_api/static/admin/img/icon_calendar.gif → ...ic/retirement/admin/img/icon_calendar.gif
diff --git a/..._api/static/admin/img/icon_changelink.gif → .../retirement/admin/img/icon_changelink.gif b/..._api/static/admin/img/icon_changelink.gif → .../retirement/admin/img/icon_changelink.gif
diff --git a/...ement_api/static/admin/img/icon_clock.gif → ...tatic/retirement/admin/img/icon_clock.gif b/...ement_api/static/admin/img/icon_clock.gif → ...tatic/retirement/admin/img/icon_clock.gif
diff --git a/..._api/static/admin/img/icon_deletelink.gif → .../retirement/admin/img/icon_deletelink.gif b/..._api/static/admin/img/icon_deletelink.gif → .../retirement/admin/img/icon_deletelink.gif
diff --git a/...ement_api/static/admin/img/icon_error.gif → ...tatic/retirement/admin/img/icon_error.gif b/...ement_api/static/admin/img/icon_error.gif → ...tatic/retirement/admin/img/icon_error.gif
diff --git a/...t_api/static/admin/img/icon_searchbox.png → ...c/retirement/admin/img/icon_searchbox.png b/...t_api/static/admin/img/icon_searchbox.png → ...c/retirement/admin/img/icon_searchbox.png
diff --git a/...ent_api/static/admin/img/icon_success.gif → ...tic/retirement/admin/img/icon_success.gif b/...ent_api/static/admin/img/icon_success.gif → ...tic/retirement/admin/img/icon_success.gif
diff --git a/...i/static/admin/img/inline-delete-8bit.png → ...tirement/admin/img/inline-delete-8bit.png b/...i/static/admin/img/inline-delete-8bit.png → ...tirement/admin/img/inline-delete-8bit.png
diff --git a/...nt_api/static/admin/img/inline-delete.png → ...ic/retirement/admin/img/inline-delete.png b/...nt_api/static/admin/img/inline-delete.png → ...ic/retirement/admin/img/inline-delete.png
diff --git a/.../static/admin/img/inline-restore-8bit.png → ...irement/admin/img/inline-restore-8bit.png b/.../static/admin/img/inline-restore-8bit.png → ...irement/admin/img/inline-restore-8bit.png
diff --git a/...t_api/static/admin/img/inline-restore.png → ...c/retirement/admin/img/inline-restore.png b/...t_api/static/admin/img/inline-restore.png → ...c/retirement/admin/img/inline-restore.png
diff --git a/...i/static/admin/img/inline-splitter-bg.gif → ...tirement/admin/img/inline-splitter-bg.gif b/...i/static/admin/img/inline-splitter-bg.gif → ...tirement/admin/img/inline-splitter-bg.gif
diff --git a/...t_api/static/admin/img/nav-bg-grabber.gif → ...c/retirement/admin/img/nav-bg-grabber.gif b/...t_api/static/admin/img/nav-bg-grabber.gif → ...c/retirement/admin/img/nav-bg-grabber.gif
diff --git a/...t_api/static/admin/img/nav-bg-reverse.gif → ...c/retirement/admin/img/nav-bg-reverse.gif b/...t_api/static/admin/img/nav-bg-reverse.gif → ...c/retirement/admin/img/nav-bg-reverse.gif
diff --git a/..._api/static/admin/img/nav-bg-selected.gif → .../retirement/admin/img/nav-bg-selected.gif b/..._api/static/admin/img/nav-bg-selected.gif → .../retirement/admin/img/nav-bg-selected.gif
diff --git a/retirement_api/static/admin/img/nav-bg.gif → ...pi/static/retirement/admin/img/nav-bg.gif b/retirement_api/static/admin/img/nav-bg.gif → ...pi/static/retirement/admin/img/nav-bg.gif
diff --git a/...t_api/static/admin/img/selector-icons.gif → ...c/retirement/admin/img/selector-icons.gif b/...t_api/static/admin/img/selector-icons.gif → ...c/retirement/admin/img/selector-icons.gif
diff --git a/..._api/static/admin/img/selector-search.gif → .../retirement/admin/img/selector-search.gif b/..._api/static/admin/img/selector-search.gif → .../retirement/admin/img/selector-search.gif
diff --git a/...nt_api/static/admin/img/sorting-icons.gif → ...ic/retirement/admin/img/sorting-icons.gif b/...nt_api/static/admin/img/sorting-icons.gif → ...ic/retirement/admin/img/sorting-icons.gif
diff --git a/...rement_api/static/admin/img/tool-left.gif → ...static/retirement/admin/img/tool-left.gif b/...rement_api/static/admin/img/tool-left.gif → ...static/retirement/admin/img/tool-left.gif
diff --git a/...t_api/static/admin/img/tool-left_over.gif → ...c/retirement/admin/img/tool-left_over.gif b/...t_api/static/admin/img/tool-left_over.gif → ...c/retirement/admin/img/tool-left_over.gif
diff --git a/...ement_api/static/admin/img/tool-right.gif → ...tatic/retirement/admin/img/tool-right.gif b/...ement_api/static/admin/img/tool-right.gif → ...tatic/retirement/admin/img/tool-right.gif
diff --git a/..._api/static/admin/img/tool-right_over.gif → .../retirement/admin/img/tool-right_over.gif b/..._api/static/admin/img/tool-right_over.gif → .../retirement/admin/img/tool-right_over.gif
diff --git a/...ment_api/static/admin/img/tooltag-add.gif → ...atic/retirement/admin/img/tooltag-add.gif b/...ment_api/static/admin/img/tooltag-add.gif → ...atic/retirement/admin/img/tooltag-add.gif
diff --git a/...api/static/admin/img/tooltag-add_over.gif → ...retirement/admin/img/tooltag-add_over.gif b/...api/static/admin/img/tooltag-add_over.gif → ...retirement/admin/img/tooltag-add_over.gif
diff --git a/...i/static/admin/img/tooltag-arrowright.gif → ...tirement/admin/img/tooltag-arrowright.gif b/...i/static/admin/img/tooltag-arrowright.gif → ...tirement/admin/img/tooltag-arrowright.gif
diff --git a/...tic/admin/img/tooltag-arrowright_over.gif → ...ent/admin/img/tooltag-arrowright_over.gif b/...tic/admin/img/tooltag-arrowright_over.gif → ...ent/admin/img/tooltag-arrowright_over.gif
diff --git a/...nt_api/static/admin/js/LICENSE-JQUERY.txt → ...ic/retirement/admin/js/LICENSE-JQUERY.txt b/...nt_api/static/admin/js/LICENSE-JQUERY.txt → ...ic/retirement/admin/js/LICENSE-JQUERY.txt
diff --git a/retirement_api/static/admin/js/SelectBox.js → ...i/static/retirement/admin/js/SelectBox.js b/retirement_api/static/admin/js/SelectBox.js → ...i/static/retirement/admin/js/SelectBox.js
diff --git a/...ment_api/static/admin/js/SelectFilter2.js → ...atic/retirement/admin/js/SelectFilter2.js b/...ment_api/static/admin/js/SelectFilter2.js → ...atic/retirement/admin/js/SelectFilter2.js
diff --git a/retirement_api/static/admin/js/actions.js → ...api/static/retirement/admin/js/actions.js b/retirement_api/static/admin/js/actions.js → ...api/static/retirement/admin/js/actions.js
diff --git a/...rement_api/static/admin/js/actions.min.js → ...static/retirement/admin/js/actions.min.js b/...rement_api/static/admin/js/actions.min.js → ...static/retirement/admin/js/actions.min.js
diff --git a/...tatic/admin/js/admin/DateTimeShortcuts.js → ...ement/admin/js/admin/DateTimeShortcuts.js b/...tatic/admin/js/admin/DateTimeShortcuts.js → ...ement/admin/js/admin/DateTimeShortcuts.js
diff --git a/...ic/admin/js/admin/RelatedObjectLookups.js → ...nt/admin/js/admin/RelatedObjectLookups.js b/...ic/admin/js/admin/RelatedObjectLookups.js → ...nt/admin/js/admin/RelatedObjectLookups.js
diff --git a/retirement_api/static/admin/js/calendar.js → ...pi/static/retirement/admin/js/calendar.js b/retirement_api/static/admin/js/calendar.js → ...pi/static/retirement/admin/js/calendar.js
diff --git a/retirement_api/static/admin/js/collapse.js → ...pi/static/retirement/admin/js/collapse.js b/retirement_api/static/admin/js/collapse.js → ...pi/static/retirement/admin/js/collapse.js
diff --git a/...ement_api/static/admin/js/collapse.min.js → ...tatic/retirement/admin/js/collapse.min.js b/...ement_api/static/admin/js/collapse.min.js → ...tatic/retirement/admin/js/collapse.min.js
diff --git a/retirement_api/static/admin/js/core.js → ...nt_api/static/retirement/admin/js/core.js b/retirement_api/static/admin/js/core.js → ...nt_api/static/retirement/admin/js/core.js
diff --git a/retirement_api/static/admin/js/inlines.js → ...api/static/retirement/admin/js/inlines.js b/retirement_api/static/admin/js/inlines.js → ...api/static/retirement/admin/js/inlines.js
diff --git a/...rement_api/static/admin/js/inlines.min.js → ...static/retirement/admin/js/inlines.min.js b/...rement_api/static/admin/js/inlines.min.js → ...static/retirement/admin/js/inlines.min.js
diff --git a/...rement_api/static/admin/js/jquery.init.js → ...static/retirement/admin/js/jquery.init.js b/...rement_api/static/admin/js/jquery.init.js → ...static/retirement/admin/js/jquery.init.js
diff --git a/retirement_api/static/admin/js/jquery.js → ..._api/static/retirement/admin/js/jquery.js b/retirement_api/static/admin/js/jquery.js → ..._api/static/retirement/admin/js/jquery.js
diff --git a/retirement_api/static/admin/js/jquery.min.js → .../static/retirement/admin/js/jquery.min.js b/retirement_api/static/admin/js/jquery.min.js → .../static/retirement/admin/js/jquery.min.js
diff --git a/...rement_api/static/admin/js/prepopulate.js → ...static/retirement/admin/js/prepopulate.js b/...rement_api/static/admin/js/prepopulate.js → ...static/retirement/admin/js/prepopulate.js
diff --git a/...nt_api/static/admin/js/prepopulate.min.js → ...ic/retirement/admin/js/prepopulate.min.js b/...nt_api/static/admin/js/prepopulate.min.js → ...ic/retirement/admin/js/prepopulate.min.js
diff --git a/retirement_api/static/admin/js/timeparse.js → ...i/static/retirement/admin/js/timeparse.js b/retirement_api/static/admin/js/timeparse.js → ...i/static/retirement/admin/js/timeparse.js
diff --git a/retirement_api/static/admin/js/urlify.js → ..._api/static/retirement/admin/js/urlify.js b/retirement_api/static/admin/js/urlify.js → ..._api/static/retirement/admin/js/urlify.js
diff --git a/retirement_api/static/claimingss-hero.png → ...api/static/retirement/claimingss-hero.png b/retirement_api/static/claimingss-hero.png → ...api/static/retirement/claimingss-hero.png
diff --git a/retirement_api/static/css/claiming.css → ...nt_api/static/retirement/css/claiming.css b/retirement_api/static/css/claiming.css → ...nt_api/static/retirement/css/claiming.css
@@ -444,7 +444,7 @@ form {
 #claiming-social-security .step-three .selector-container {
   overflow: hidden;
   position: relative;
-  background: #ffffff url('/retirement/static/images/select.png') no-repeat right 0;
+  background: #ffffff url('/static/retirement/images/select.png') no-repeat right 0;
   border: solid 1px #d0d0ce;
   height: 32px;
   font-family: "AvenirNextLTW01-Medium", Arial, sans-serif;

diff --git a/retirement_api/static/css/main.css → ...rement_api/static/retirement/css/main.css b/retirement_api/static/css/main.css → ...rement_api/static/retirement/css/main.css
diff --git a/retirement_api/static/fonts/cf-icons.eot → ..._api/static/retirement/fonts/cf-icons.eot b/retirement_api/static/fonts/cf-icons.eot → ..._api/static/retirement/fonts/cf-icons.eot
diff --git a/retirement_api/static/fonts/cf-icons.svg → ..._api/static/retirement/fonts/cf-icons.svg b/retirement_api/static/fonts/cf-icons.svg → ..._api/static/retirement/fonts/cf-icons.svg
diff --git a/retirement_api/static/fonts/cf-icons.ttf → ..._api/static/retirement/fonts/cf-icons.ttf b/retirement_api/static/fonts/cf-icons.ttf → ..._api/static/retirement/fonts/cf-icons.ttf
diff --git a/retirement_api/static/fonts/cf-icons.woff → ...api/static/retirement/fonts/cf-icons.woff b/retirement_api/static/fonts/cf-icons.woff → ...api/static/retirement/fonts/cf-icons.woff
diff --git a/retirement_api/static/graph-background.jpg → ...pi/static/retirement/graph-background.jpg b/retirement_api/static/graph-background.jpg → ...pi/static/retirement/graph-background.jpg
diff --git a/retirement_api/static/graph-background.png → ...pi/static/retirement/graph-background.png b/retirement_api/static/graph-background.png → ...pi/static/retirement/graph-background.png
diff --git a/...ent_api/static/images/claimingss-hero.png → ...tic/retirement/images/claimingss-hero.png b/...ent_api/static/images/claimingss-hero.png → ...tic/retirement/images/claimingss-hero.png
diff --git a/...nt_api/static/images/graph-background.jpg → ...ic/retirement/images/graph-background.jpg b/...nt_api/static/images/graph-background.jpg → ...ic/retirement/images/graph-background.jpg
diff --git a/...nt_api/static/images/graph-background.png → ...ic/retirement/images/graph-background.png b/...nt_api/static/images/graph-background.png → ...ic/retirement/images/graph-background.png
diff --git a/..._api/static/images/lifestyle-expenses.png → .../retirement/images/lifestyle-expenses.png b/..._api/static/images/lifestyle-expenses.png → .../retirement/images/lifestyle-expenses.png
diff --git a/...nt_api/static/images/lifestyle-income.png → ...ic/retirement/images/lifestyle-income.png b/...nt_api/static/images/lifestyle-income.png → ...ic/retirement/images/lifestyle-income.png
diff --git a/...api/static/images/lifestyle-longevity.png → ...retirement/images/lifestyle-longevity.png b/...api/static/images/lifestyle-longevity.png → ...retirement/images/lifestyle-longevity.png
diff --git a/...t_api/static/images/lifestyle-married.png → ...c/retirement/images/lifestyle-married.png b/...t_api/static/images/lifestyle-married.png → ...c/retirement/images/lifestyle-married.png
diff --git a/...t_api/static/images/lifestyle-working.png → ...c/retirement/images/lifestyle-working.png b/...t_api/static/images/lifestyle-working.png → ...c/retirement/images/lifestyle-working.png
diff --git a/...ent_api/static/images/retirement-hero.png → ...tic/retirement/images/retirement-hero.png b/...ent_api/static/images/retirement-hero.png → ...tic/retirement/images/retirement-hero.png
diff --git a/retirement_api/static/images/select.png → ...t_api/static/retirement/images/select.png b/retirement_api/static/images/select.png → ...t_api/static/retirement/images/select.png
diff --git a/retirement_api/static/images/step_1.png → ...t_api/static/retirement/images/step_1.png b/retirement_api/static/images/step_1.png → ...t_api/static/retirement/images/step_1.png
diff --git a/retirement_api/static/images/step_2.png → ...t_api/static/retirement/images/step_2.png b/retirement_api/static/images/step_2.png → ...t_api/static/retirement/images/step_2.png
diff --git a/retirement_api/static/images/step_3.png → ...t_api/static/retirement/images/step_3.png b/retirement_api/static/images/step_3.png → ...t_api/static/retirement/images/step_3.png
diff --git a/...api/static/js/claiming-social-security.js → ...retirement/js/claiming-social-security.js b/...api/static/js/claiming-social-security.js → ...retirement/js/claiming-social-security.js
diff --git a/retirement_api/static/js/nemo.js → retirement_api/static/retirement/js/nemo.js b/retirement_api/static/js/nemo.js → retirement_api/static/retirement/js/nemo.js
diff --git a/retirement_api/static/js/raphael-min.js → ...t_api/static/retirement/js/raphael-min.js b/retirement_api/static/js/raphael-min.js → ...t_api/static/retirement/js/raphael-min.js
diff --git a/retirement_api/templates/base.html b/retirement_api/templates/base.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 {% load i18n %}
+{% load staticfiles %}
 {% trans page.title as TITLE %}
 {% trans "Yes" as YES %}
 {% trans "No" as NO %}
@@ -73,10 +74,9 @@
     <link rel="stylesheet" href="/wp-content/themes/cfpb_nemo/_/c/styles.css?ver=v4.2.10v4.2.24">
 
 
-
+<!--     <link rel="stylesheet" href="{% static "retirement/static/landing/css/landing.css" %}"> -->
+
 
-
-    <link rel="stylesheet" href="/retirement/static/landing/css/landing.css">
     <link rel='stylesheet' id='cfpb_icon_font-css'  href="/wp-content/themes/cfpb_nemo/_/cfpb-icon-font/css/icons.css?ver=all" type="text/css" media="all">
     <!--[if IE 7]>
     <link rel="stylesheet" id="cfpb_icon_font_ie7-css"  href="/wp-content/themes/cfpb_nemo/_/cfpb-icon-font/css/icons-ie7.css?ver=all" type="text/css" media="all" />
@@ -87,10 +87,10 @@
     <link rel="alternate" type="application/rss+xml" title="Consumer Financial Protection Bureau &raquo; Feed" href="/feed/" />
     <link rel="alternate" type="application/rss+xml" title="Consumer Financial Protection Bureau &raquo; Comments Feed" href="/comments/feed/" />
 
-    <link rel="stylesheet" href="/retirement/static/css/main.css">
-    <link rel="stylesheet" href="/retirement/static/css/claiming.css">
-    <script src="/retirement/static/js/raphael-min.js"></script>
-    <script src="/retirement/static/js/claiming-social-security.js"></script>
+    <link rel="stylesheet" href="{% static "retirement/css/main.css" %}">
+    <link rel="stylesheet" href="{% static "retirement/css/claiming.css" %}">
+    <script src="{% static "retirement/js/raphael-min.js" %}"></script>
+    <script src="{% static "retirement/js/claiming-social-security.js" %}"></script>
 
     <script src="/static/js/analytics.js?ver=v4.2.10v4.2.24"></script>
 
@@ -177,7 +177,7 @@
     <script type="text/javascript" src="/static/agreements/js/chosen.jquery.js?ver=v4.2.10v4.2.24"></script>
 
     <!-- Responsive menu JS -->
-    <script src="/retirement/static/js/nemo.js"></script>
+    <script src="{% static "retirement/js/nemo.js" %}"></script>
 
 
 {% block foot_js %}{% endblock %}

diff --git a/retirement_api/templates/claiming.html b/retirement_api/templates/claiming.html
@@ -1,6 +1,6 @@
 {% extends base_template %}
 {% load i18n %}
-{% load static %}
+{% load staticfiles %}
 {% block content %}
 <script>
   if(document.getElementsByTagName("body")) {
@@ -201,7 +201,7 @@ <h2><strong>{{STEP}} 2: </strong>{% trans page.step2.title %}</h2>
       <p class="question h3">{% trans page.step2.instructions %}</p>
     </div>
     <div class="content-l_col content-l_col-1-3 question question-married">
-      <img src="/retirement/static/images/lifestyle-married.png" class="lifestyle-img">
+      <img src="{% static "retirement/images/lifestyle-married.png" %}" class="lifestyle-img">
       <div class="lifestyle-question_container">
         <hr>
         <h3 class="lifestyle-question">{% trans questions.marriage.question %}</h3>
@@ -223,7 +223,7 @@ <h4>{% trans questions.marriage.answer_unsure_a_subhed|safe %}</h4>
       </div>
     </div>
     <div class="content-l_col content-l_col-1-3 question question-working age-split">
-      <img src="/retirement/static/images/lifestyle-working.png" class="lifestyle-img">
+      <img src="{% static "retirement/images/lifestyle-working.png" %}" class="lifestyle-img">
       <div class="lifestyle-question_container">
         <hr>
         <h3 class="lifestyle-question">{% trans questions.sixties.question %}</h3>
@@ -272,7 +272,7 @@ <h4>{% trans questions.sixties.answer_unsure_b_subhed|safe %}</h4>
   </div>
   <div class="content-l step-two">
     <div class="content-l_col content-l_col-1-3 question question-expenses age-split">
-      <img src="/retirement/static/images/lifestyle-expenses.png" class="lifestyle-img">
+      <img src="{% static "retirement/images/lifestyle-expenses.png" %}" class="lifestyle-img">
       <div class="lifestyle-question_container">
         <hr>
         <h3 class="lifestyle-question">{% trans questions.expenses.question %}</h3>
@@ -306,7 +306,7 @@ <h4>{% trans questions.expenses.answer_unsure_b_subhed|safe %}</h4>
       </div>
     </div>
     <div class="content-l_col content-l_col-1-3 question question-income age-split">
-      <img src="/retirement/static/images/lifestyle-income.png" class="lifestyle-img">
+      <img src="{% static "retirement/images/lifestyle-income.png" %}" class="lifestyle-img">
       <div class="lifestyle-question_container">
         <hr>
         <h3 class="lifestyle-question">{% trans questions.income.question %}</h3>
@@ -361,7 +361,7 @@ <h4>{% trans questions.income.answer_unsure_b_subhed|safe %}</h4>
       </div>
     </div>
     <div class="content-l_col content-l_col-1-3 question question-longevity">
-      <img src="/retirement/static/images/lifestyle-longevity.png" class="lifestyle-img">
+      <img src="{% static "retirement/images/lifestyle-longevity.png" %}" class="lifestyle-img">
       <div class="lifestyle-question_container">
         <hr>
         <h3 class="lifestyle-question">{% trans questions.longlife.question %}</h3>

diff --git a/retirement_api/urls.py b/retirement_api/urls.py
@@ -13,7 +13,6 @@
     url(r'^retirement-api/get-retirement-age/(?P<birth_year>\d+)/$', 'retirement_api.views.get_full_retirement_age', name='get_full_retirement_age'),
     url(r'^claiming-social-security/$', 'retirement_api.views.claiming', name='claiming'),
     url(r'^claiming-social-security/es/$', 'retirement_api.views.claiming', {'es': True}),
-    url(r'^retirement/static\/(?P<path>.*)/$', 'django.contrib.staticfiles.views.serve')
 )
 
 urlpatterns += staticfiles_urlpatterns()