From 5c04faa8ca1e2664561dc606ce95ccecd83581f5 Mon Sep 17 00:00:00 2001
From: Neil Martinsen-Burrell <neil.martinsen-burrell@gsa.gov>
Date: Wed, 19 Oct 2022 13:30:34 -0500
Subject: [PATCH] Slightly better column layout

---
 src/registrar/forms/application_wizard.py           |  2 +-
 src/registrar/templates/application_form.html       | 13 +++++++++++++
 .../templates/application_organization.html         |  8 +++-----
 .../templates/application_requirements.html         |  6 ++----
 src/registrar/templates/base.html                   |  2 +-
 5 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 src/registrar/templates/application_form.html

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index fe497f319..4127e8c06 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -4,7 +4,7 @@ import logging
 
 from django import forms
 
-from formtools.wizard.views import NamedUrlSessionWizardView
+from formtools.wizard.views import NamedUrlSessionWizardView  # type: ignore
 
 
 logger = logging.getLogger(__name__)
diff --git a/src/registrar/templates/application_form.html b/src/registrar/templates/application_form.html
new file mode 100644
index 000000000..c187dd4b9
--- /dev/null
+++ b/src/registrar/templates/application_form.html
@@ -0,0 +1,13 @@
+{% extends 'base.html' %}
+
+{% block content %}
+<div class="grid-row">
+  <div class="grid-col-3">
+    {% include 'application_sidebar.html' %}
+  </div>
+
+  <div class="grid-col-9">
+    {% block form_content %}{% endblock %}
+  </div>
+</div>
+{% endblock %}
diff --git a/src/registrar/templates/application_organization.html b/src/registrar/templates/application_organization.html
index 3ea8057e1..07cc54c4a 100644
--- a/src/registrar/templates/application_organization.html
+++ b/src/registrar/templates/application_organization.html
@@ -1,11 +1,9 @@
 <!-- Test page -->
-{% extends 'base.html' %}
+{% extends 'application_form.html' %}
 
-{% block title %}Apply for a .gov domain - Requirements{% endblock %}
-{% block content %}
-
-{% include 'application_sidebar.html' %}
+{% block title %}Apply for a .gov domain - About your organization{% endblock %}
 
+{% block form_content %}
 <h1>About your organization</h1>
 
 <h2> What kind of government organization do you represent?</h2>
diff --git a/src/registrar/templates/application_requirements.html b/src/registrar/templates/application_requirements.html
index 1c8909db0..5b9e16598 100644
--- a/src/registrar/templates/application_requirements.html
+++ b/src/registrar/templates/application_requirements.html
@@ -1,11 +1,9 @@
 <!-- Test page -->
-{% extends 'base.html' %}
+{% extends 'application_form.html' %}
 
 {% block title %}Apply for a .gov domain - Requirements{% endblock %}
-{% block content %}
-
-{% include 'application_sidebar.html' %}
 
+{% block form_content %}
 <h1>Requirements</h1>
 
 <p>In order to request and register a .gov domain: </p>
diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index 679fe527f..bf50d7ecc 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -158,7 +158,7 @@
 
     {% block section_nav %}{% endblock %}
 
-    <main id="main-content">
+    <main id="main-content" class="grid-container">
       {% block hero %}{% endblock %}
       {% block content %}{% endblock %}
     </main>