Merge pull request #59 from sephcoster/template-shim

Template shim
cfpb · Aug 14, 2017 · ac0132e · ac0132e
2 parents 51fa031 + 4fc958b
commit ac0132e
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 24 deletions.
diff --git a/ccdb5_ui/static/ccdb5.min.js b/ccdb5_ui/static/ccdb5.min.js
diff --git a/ccdb5_ui/static/ccdb5.min.js.map b/ccdb5_ui/static/ccdb5.min.js.map
diff --git a/ccdb5_ui/templates/ccdb-main.html b/ccdb5_ui/templates/ccdb-main.html
@@ -1,4 +1,4 @@
-{% extends ccdb5_base_template|default:'front/base_nonresponsive.html' %}
+{% extends 'ccdb_base_responsive.html' %}
 
 {% load static %}
 
@@ -8,7 +8,9 @@
 {% block title %}Search the Consumer Complaint Database{% endblock %}
 
 {% block content %}
-<div id="root"></div>
+<div class="wrapper wrapper__match-content">
+  <div class="content_full" id="root"></div>
+</div>
 {% endblock %}
 
 {% block page_js %}
@@ -22,4 +24,4 @@
 {% endblock %}
 
 {% block app_js %}
-{% endblock %}
+{% endblock %}
diff --git a/ccdb5_ui/templates/ccdb_base_responsive.html b/ccdb5_ui/templates/ccdb_base_responsive.html
@@ -0,0 +1,28 @@
+{% extends ccdb5_base_template %}
+{% load staticfiles %}
+<!--  Based on https://github.com/cfpb/complaint/blob/master/complaint_common/templates/base_responsive.html -->
+{% block nemo_styles %}
+
+{% endblock %}
+
+
+{% block page_css %}
+
+{% endblock %}
+
+{% block page_viewport %}
+<meta name="viewport" content="width=device-width, initial-scale=1">
+{% endblock %}
+
+{% block responsive_nav %}
+<a class="toggle-menu" href="#"><i class="cf-icon cf-icon-menu"></i><span class="u-visually-hidden">Menu</span></a>
+{% endblock %}
+
+{% block nemo_js %}
+{% endblock %}
+
+{% block page_js %}
+{% endblock page_js %}
+
+{% block app_js %}
+{% endblock app_js %}
diff --git a/ccdb5_ui/templates/base.html → ccdb5_ui/templates/standalone_base.html b/ccdb5_ui/templates/base.html → ccdb5_ui/templates/standalone_base.html
@@ -27,4 +27,4 @@
 {% block page_js %}
 {% endblock page_js %}
 </body>
-</html>
+</html>
diff --git a/ccdb5_ui/views.py b/ccdb5_ui/views.py
@@ -8,9 +8,9 @@
 
 
 if STANDALONE:
-    BASE_TEMPLATE = 'base.html'
+    BASE_TEMPLATE = 'standalone_base.html'
 else:  # pragma: no cover
-    BASE_TEMPLATE = 'front/base_nonresponsive.html'
+    BASE_TEMPLATE = 'front/base_update.html'
 
 
 class CCDB5MainView(TemplateView):

diff --git a/public/index.html b/public/index.html
@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Development Harness</title>
-    <link rel="stylesheet" href="https://cfpb.github.io/capital-framework/dist/static/css/main.min.css">    
-    <script src="https://cfpb.github.io/capital-framework/dist/static/js/main.min.js"></script>    
+    <link rel="stylesheet" href="https://cfpb.github.io/capital-framework/dist/static/css/main.min.css">
+    <script src="https://cfpb.github.io/capital-framework/dist/static/js/main.min.js"></script>
   </head>
   <body>
     <div id="root"></div>

diff --git a/src/App.less b/src/App.less
@@ -106,7 +106,7 @@
         border: 0;
 
         &:after {
-            border-left: 0;            
+            border-left: 0;
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,4 +27,4 @@ @@
     {% block page_js %}
     {% endblock page_js %}
     </body>
-    </html>
+    </html>