Move ftlconf call directly after load ftl command, remove unnecessary code from views

maxxcrawford · maxxcrawford · commit 6fcfd9665124 · 2021-05-28T10:31:02.000-05:00
diff --git a/privaterelay/templates/faq.html b/privaterelay/templates/faq.html
@@ -2,11 +2,9 @@
 {% load static %}
 {% load socialaccount %}
 {% load ftl %}
-
-
+{% ftlconf bundle='privaterelay.ftl_bundles.main' %}
 
 {% block content %}
-{% ftlconf bundle='privaterelay.ftl_bundles.main' %}
   <main class="flx flx-col container faqs-wrapper">
     <h1 class="faqs-headline">{% ftlmsg 'faq-headline' %}</h1>
     <div class="faqs flx flx-row spc-btwn">
diff --git a/privaterelay/templates/home.html b/privaterelay/templates/home.html
@@ -1,14 +1,14 @@
 {% extends "base.html" %}
 
 {% load ftl %}
+{% ftlconf bundle='privaterelay.ftl_bundles.main' %}
+
 {% load socialaccount %}
 
 {% block content %}
 
 {% include "includes/messages.html" %}
 
-{% ftlconf bundle='privaterelay.ftl_bundles.main' %}
-
 <main data-landing-page="" class="flx row-full-width home-hero">
 	<div class="flx flx-row hero-content">
 		<div class="hero-left flx flx-col">
diff --git a/privaterelay/templates/includes/landing_ctas.html b/privaterelay/templates/includes/landing_ctas.html
@@ -1,7 +1,6 @@
 {% load static %}
 {% load socialaccount %}
 {% load ftl %}
-
 {% ftlconf bundle='privaterelay.ftl_bundles.main' %}
 
 <div class="hero-sign-up-bg bg-fx-gradient fx-gradient-btn">
diff --git a/privaterelay/templates/includes/login.html b/privaterelay/templates/includes/login.html
@@ -1,10 +1,9 @@
 {% load socialaccount %}
 {% load relay_tags %}
 {% load ftl %}
-
-{% block content %}
 {% ftlconf bundle='privaterelay.ftl_bundles.main' %}
 
+{% block content %}
 
 <div class="user-area flx flx-row al-cntr">
 	<firefox-apps></firefox-apps>
diff --git a/privaterelay/templates/profile.html b/privaterelay/templates/profile.html
@@ -4,11 +4,10 @@
 {% load static %}
 {% load relay_tags %}
 {% load ftl %}
+{% ftlconf bundle='privaterelay.ftl_bundles.main' %}
 
 {% block content %}
 
-{% ftlconf bundle='privaterelay.ftl_bundles.main' %}
-
 {% get_social_accounts request.user as accounts %}
 
 {% include "includes/messages.html" with messages=messages %}
diff --git a/privaterelay/views.py b/privaterelay/views.py
@@ -56,9 +56,7 @@
 def home(request):
     if (request.user and not request.user.is_anonymous):
         return redirect(reverse('profile'))
-    return render(request, 'home.html', {
-        'ftl_bundle': main_bundle,
-    })
+    return render(request, 'home.html')
 
 
 def faq(request):
