From 012bb1e7e4d5f59f06f1d7a13a310de5e0768995 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Fri, 20 Oct 2023 16:48:21 +1100
Subject: [PATCH] Allow "outercontent" template block to use full page width

This allows us to create full-width layouts for specific campaigns.
---
 www/conservancy/static/activities/index.html                  | 2 +-
 www/conservancy/templates/assignment/assignment_form.html     | 3 ++-
 www/conservancy/templates/assignment/thanks.html              | 2 ++
 www/conservancy/templates/base_about.html                     | 2 +-
 www/conservancy/templates/base_blog.html                      | 2 +-
 www/conservancy/templates/base_compliance.html                | 2 +-
 www/conservancy/templates/base_conservancy.html               | 4 ++--
 www/conservancy/templates/base_learn.html                     | 2 +-
 www/conservancy/templates/base_press.html                     | 2 +-
 www/conservancy/templates/base_projects.html                  | 2 +-
 www/conservancy/templates/base_standard.html                  | 2 ++
 www/conservancy/templates/base_vizio.html                     | 2 +-
 www/conservancy/templates/ccs_upload/upload.html              | 2 ++
 .../templates/fossy/community_track_proposal_form.html        | 2 ++
 www/conservancy/templates/fossy/thanks.html                   | 4 +++-
 www/conservancy/templates/news/pressrelease_list.html         | 2 +-
 16 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/www/conservancy/static/activities/index.html b/www/conservancy/static/activities/index.html
index 1a60da35..8e2a9ecf 100644
--- a/www/conservancy/static/activities/index.html
+++ b/www/conservancy/static/activities/index.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block outercontent %}
-<div class="content-with-donate-sidebar">
+<div class="content-with-donate-sidebar mw8 center ph2 ph3">
     <div id="container">
          <div id="mainContent">
            {% block content %}
diff --git a/www/conservancy/templates/assignment/assignment_form.html b/www/conservancy/templates/assignment/assignment_form.html
index 5ef74338..20309e50 100644
--- a/www/conservancy/templates/assignment/assignment_form.html
+++ b/www/conservancy/templates/assignment/assignment_form.html
@@ -1,6 +1,7 @@
 {% extends "assignment/base_assignment.html" %}
 {% block category %}Copyright Assignment{% endblock %}
 {% block outercontent %}
+  <div class="mw8 center ph2 ph3">
   <h1>Copyright Assignment</h1>
 
   <div class="mw7 mb5">
@@ -25,7 +26,7 @@
       <p><button type="submit" class="ph3 pv2">Submit</button></p>
     </form>
   </div>
-
+  </div>
   <script>
    'use strict';
 
diff --git a/www/conservancy/templates/assignment/thanks.html b/www/conservancy/templates/assignment/thanks.html
index 04a916a5..3c07bd2b 100644
--- a/www/conservancy/templates/assignment/thanks.html
+++ b/www/conservancy/templates/assignment/thanks.html
@@ -2,6 +2,7 @@
 {% load static %}
 {% block category %}Copyright Assignment{% endblock %}
 {% block outercontent %}
+  <div class="mw8 center ph2 ph3">
   <h1>Thanks! <svg style="color: #ff41b4; width: 30px; height: 30px; vertical-align: middle;"><use href="{% static 'img/font_awesome.svg' %}#heart"></use></svg></h1>
 
   <div class="mw7 mb5">
@@ -12,4 +13,5 @@
       {{ form.as_p }}
     </form>
   </div>
+  </div>
 {% endblock %}
diff --git a/www/conservancy/templates/base_about.html b/www/conservancy/templates/base_about.html
index c84f838a..fcef5d5d 100644
--- a/www/conservancy/templates/base_about.html
+++ b/www/conservancy/templates/base_about.html
@@ -1,7 +1,7 @@
 {% extends "base_conservancy.html" %}
 {% block category %}WhoWeAre{% endblock %}
 {% block outercontent %}
-    <div id="container">
+    <div id="container" class="mw8 center ph2 ph3">
          <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>Who We Are</h2>
diff --git a/www/conservancy/templates/base_blog.html b/www/conservancy/templates/base_blog.html
index 71d90a40..60a23331 100644
--- a/www/conservancy/templates/base_blog.html
+++ b/www/conservancy/templates/base_blog.html
@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block outercontent %}
- <div id="container">
+ <div id="container" class="mw8 center ph2 ph3">
      <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 {% if all_year_list %}
diff --git a/www/conservancy/templates/base_compliance.html b/www/conservancy/templates/base_compliance.html
index c120bb9e..ae2e61c3 100644
--- a/www/conservancy/templates/base_compliance.html
+++ b/www/conservancy/templates/base_compliance.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block outercontent %}
-<div class="content-with-donate-sidebar">
+<div class="content-with-donate-sidebar mw8 center ph2 ph3">
     <div id="container">
          <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index 533e44fc..1e35be96 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/www/conservancy/templates/base_conservancy.html
@@ -85,8 +85,8 @@
   {% include "fundgoal/fundraiser_goal_banner_partial.html" %}
 {% endif %}
 
-    <div class="mw8 center ph2 ph3">
-      {% block outercontent %}<div id="mainContent"> {% block content %}{% endblock %}</div>{% endblock %}
+    <div>
+      {% block outercontent %}<div id="mainContent" class="mw8 center ph2 ph3"> {% block content %}{% endblock %}</div>{% endblock %}
     </div>
 
     <div id="conservancyfooter" class="mt4-ns pt3 ph3 bg-light-gray">
diff --git a/www/conservancy/templates/base_learn.html b/www/conservancy/templates/base_learn.html
index d4d2a2d6..64ee906d 100644
--- a/www/conservancy/templates/base_learn.html
+++ b/www/conservancy/templates/base_learn.html
@@ -1,7 +1,7 @@
 {% extends "base_conservancy.html" %}
 {% block category %}Learn{% endblock %}
 {% block outercontent %}
-    <div id="container">
+    <div id="container" class="mw8 center ph2 ph3">
          <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>Learn</h2>
diff --git a/www/conservancy/templates/base_press.html b/www/conservancy/templates/base_press.html
index f2f47107..2be7edf4 100644
--- a/www/conservancy/templates/base_press.html
+++ b/www/conservancy/templates/base_press.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block outercontent %}
-<div class="content-with-donate-sidebar">
+<div class="content-with-donate-sidebar mw8 center ph2 ph3">
     <div id="container">
          <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
diff --git a/www/conservancy/templates/base_projects.html b/www/conservancy/templates/base_projects.html
index bc366a75..21a6a223 100644
--- a/www/conservancy/templates/base_projects.html
+++ b/www/conservancy/templates/base_projects.html
@@ -1,6 +1,6 @@
 {% extends "base_conservancy.html" %}
 {% block outercontent %}
-    <div id="container">
+    <div id="container" class="mw8 center ph2 ph3">
          <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
             <h2>What We Do</h2>
diff --git a/www/conservancy/templates/base_standard.html b/www/conservancy/templates/base_standard.html
index 6d75ff34..ec00f645 100644
--- a/www/conservancy/templates/base_standard.html
+++ b/www/conservancy/templates/base_standard.html
@@ -1,9 +1,11 @@
 {% extends "base_conservancy.html" %}
 
 {% block outercontent %}
+<div class="mw8 center ph2 ph3">
 <div class="internalNavigate">
 {% block internal_navigate %}{% endblock %}
 </div>
 
 <div class="singleColumn">{% block content %}{% endblock %}</div>
+</div>
 {% endblock %}
diff --git a/www/conservancy/templates/base_vizio.html b/www/conservancy/templates/base_vizio.html
index c0dfbedb..36a7ba70 100644
--- a/www/conservancy/templates/base_vizio.html
+++ b/www/conservancy/templates/base_vizio.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block outercontent %}
-<div class="content-with-donate-sidebar">
+<div class="content-with-donate-sidebar mw8 center ph2 ph3">
     <div id="container">
          <div id="mainContent">{% block content %}{% endblock %}</div>
          <div id="sidebar" class="VizioTopBar {% block submenuselection %}{% endblock %}">
diff --git a/www/conservancy/templates/ccs_upload/upload.html b/www/conservancy/templates/ccs_upload/upload.html
index 57c9bf1d..0d5a21c6 100644
--- a/www/conservancy/templates/ccs_upload/upload.html
+++ b/www/conservancy/templates/ccs_upload/upload.html
@@ -11,6 +11,7 @@
      border: 1px solid #D0DD98;
    }
   </style>
+  <div class="mw8 center ph2 ph3">
   <h1>CCS Candidate Upload</h1>
 
   <div class="mw7 mb4">
@@ -31,4 +32,5 @@
       <p><button type="submit" class="ph3 pv2">Next</button></p>
     </form>
   </div>
+  </div>
 {% endblock %}
diff --git a/www/conservancy/templates/fossy/community_track_proposal_form.html b/www/conservancy/templates/fossy/community_track_proposal_form.html
index 0c8b1fe5..fece9ee0 100644
--- a/www/conservancy/templates/fossy/community_track_proposal_form.html
+++ b/www/conservancy/templates/fossy/community_track_proposal_form.html
@@ -1,5 +1,6 @@
 {% extends 'fossy/base.html' %}
 {% block outercontent %}
+  <div class="mw8 center ph2 ph3">
   <h1><abbr title="Free and Open Source Software Yearly">FOSSY</abbr>: Propose a Commmunity Track!</h1>
   <div class="mw7 mb5">
     <p>SFC will be hosting a community oriented conference this coming summer July 13-16, 2023 in Portland, Oregon in the United States. Focused on the creation and impact of free and open source software, uplifting contributors of all experience. As this is the first year we are running a conference of this scale, we plan to have 8 tracks of talks over 4 days. We plan to dedicate a substantial portion of these track to community run tracks, similar to the DevRooms at FOSDEM or the miniconfs at LinuxConfAU. We'd like to invite you to run a track based on a topic you're passionate about. If selected, you will be responsible for inviting speakers, selecting talks and organising the schedule for your track. If that sounds good to you, please fill in the form to tell us more about your idea. If you have any questions please don't hesitate to email us at <a href="mailto:conference@sfconservancy.org">conference@sfconservancy.org</a>.</p>
@@ -22,4 +23,5 @@
       <p><button type="submit" class="ph3 pv2">Submit</button></p>
     </form>
   </div>
+  </div>
 {% endblock %}
diff --git a/www/conservancy/templates/fossy/thanks.html b/www/conservancy/templates/fossy/thanks.html
index 0277500c..530db49c 100644
--- a/www/conservancy/templates/fossy/thanks.html
+++ b/www/conservancy/templates/fossy/thanks.html
@@ -12,9 +12,10 @@
      display: none !important;
    }
   </style>
-  
+
 {% endblock %}
 {% block outercontent %}
+  <div class="mw8 center ph2 ph3">
   <h1>Thanks! <svg style="color: #ff41b4; width: 30px; height: 30px; vertical-align: middle;"><use href="{% static 'img/font_awesome.svg' %}#heart"></use></svg></h1>
 
   <div class="mw7 mb5">
@@ -23,4 +24,5 @@
       {{ form.as_p }}
     </form>
   </div>
+  </div>
 {% endblock %}
diff --git a/www/conservancy/templates/news/pressrelease_list.html b/www/conservancy/templates/news/pressrelease_list.html
index 7b0bac8b..e97ab213 100644
--- a/www/conservancy/templates/news/pressrelease_list.html
+++ b/www/conservancy/templates/news/pressrelease_list.html
@@ -2,7 +2,7 @@
 {% block subtitle %}News - {% endblock %}
 
 {% block outercontent %}
-    <div id="container">
+    <div id="container" class="mw8 center ph2 ph3">
          <div id="mainContent">
            <div class="breadcrumbs">
              <p><a href="/">Home</a> / <a href="/news/">News</a></p>