From 48c28651b85c8a7d47679bba3d87d789f736ca94 Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
Date: Sun, 5 Mar 2017 22:40:39 +1100
Subject: [PATCH] Remove boxes

Boxes takes content directly from the DB and drops it into the django
templates.  This is rather ugly and goes against keeping as much as we
can in static locations.  As such, this is being dropped.
---
 pinaxcon/settings.py                          |  1 -
 pinaxcon/templates/403_csrf.html              |  1 -
 pinaxcon/templates/404.html                   |  1 -
 pinaxcon/templates/_default_sidebar.html      |  8 +++--
 pinaxcon/templates/pinax/boxes/_box.html      |  1 -
 pinaxcon/templates/pinax/boxes/_box_body.html | 33 -------------------
 .../templates/pyconau2017/content_page.html   |  1 -
 .../symposion/conference/user_list.html       |  1 -
 .../symposion/proposals/proposal_submit.html  |  1 -
 .../templates/symposion/reviews/base.html     |  1 -
 .../schedule/schedule_conference.html         |  3 --
 .../symposion/schedule/schedule_detail.html   |  1 -
 .../symposion/speakers/speaker_create.html    |  1 -
 .../symposion/speakers/speaker_edit.html      |  1 -
 .../templates/symposion/sponsorship/add.html  |  1 -
 .../symposion/sponsorship/apply.html          |  8 +++--
 pinaxcon/urls.py                              |  2 --
 requirements.txt                              |  2 --
 18 files changed, 11 insertions(+), 57 deletions(-)
 delete mode 100644 pinaxcon/templates/pinax/boxes/_box.html
 delete mode 100644 pinaxcon/templates/pinax/boxes/_box_body.html

diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index 46177dc6..2587bdf2 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -145,7 +145,6 @@ INSTALLED_APPS = [
     "symposion.speakers",
     "symposion.sponsorship",
     "symposion.teams",
-    "pinax.boxes",
 
     # Registrasion
     "registrasion",
diff --git a/pinaxcon/templates/403_csrf.html b/pinaxcon/templates/403_csrf.html
index 076bb204..787122cd 100644
--- a/pinaxcon/templates/403_csrf.html
+++ b/pinaxcon/templates/403_csrf.html
@@ -2,7 +2,6 @@
 {% load staticfiles %}
 {% load wagtailcore_tags %}
 
-{% load sitetree %}
 {% load i18n %}
 
 {% block body_class %}template-blogpage{% endblock %}
diff --git a/pinaxcon/templates/404.html b/pinaxcon/templates/404.html
index 6a32b141..96abfcfa 100644
--- a/pinaxcon/templates/404.html
+++ b/pinaxcon/templates/404.html
@@ -2,7 +2,6 @@
 {% load staticfiles %}
 {% load wagtailcore_tags %}
 
-{% load sitetree %}
 {% load i18n %}
 
 {% block body_class %}template-blogpage{% endblock %}
diff --git a/pinaxcon/templates/_default_sidebar.html b/pinaxcon/templates/_default_sidebar.html
index 7a4433fe..05aa729d 100644
--- a/pinaxcon/templates/_default_sidebar.html
+++ b/pinaxcon/templates/_default_sidebar.html
@@ -1,17 +1,19 @@
 {% load sponsorship_tags %}
 {% load thumbnail %}
-{% load pinax_boxes_tags %}
 
 {% sponsor_levels as levels %}
 
 <h4>Sponsors</h4>
 
 <div class="sponsor-list">
-    {% box "sponsor-top" %}
+    <div>
+    	<h1>SPONSOR TOP</h1>
+    	<p>Whatever the hell this means, it's locked in a DB</p>
+    	<p>Fill this with sponsor spiel</p>
+    </div>
     {% for level in levels %}
         {% if level.sponsors %}
             <h3 style="margin-top: 3em;">{{ level.name }}</h3>
-\
             {% for sponsor in level.sponsors %}
                 <div style="margin: 10px 0;">
                     <a href="{{ sponsor.external_url }}">
diff --git a/pinaxcon/templates/pinax/boxes/_box.html b/pinaxcon/templates/pinax/boxes/_box.html
deleted file mode 100644
index 8901f69c..00000000
--- a/pinaxcon/templates/pinax/boxes/_box.html
+++ /dev/null
@@ -1 +0,0 @@
-{% include "pinax/boxes/_box_body.html" %}
diff --git a/pinaxcon/templates/pinax/boxes/_box_body.html b/pinaxcon/templates/pinax/boxes/_box_body.html
deleted file mode 100644
index 3dba5ad9..00000000
--- a/pinaxcon/templates/pinax/boxes/_box_body.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% load i18n %}
-
-{% if form %}
-    <div id="edit_{{ label }}" class="modal fade">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <form id="edit_form_{{ label }}" accept-charset="UTF-8" class="modal-form" method="POST" action="{{ form_action }}?next={{ request.path }}">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        <h4 class="modal-title">{% trans "Editing content:" %} {{ label }}</h4>
-                    </div>
-                    <div class="modal-body form-group">
-                        {% csrf_token %}
-                        {{ form.content }}
-                    </div>
-                    <div class="modal-footer">
-                        <button type="submit" class="btn btn-primary">Save changes</button>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-{% endif %}
-
-<div id="content_{{ label }}" class="content-box {% if form %}editable{% endif %}">
-    {% if form %}
-        <a href="#edit_{{ label }}" data-toggle="modal" class="btn btn-default btn-sm edit-toggle">
-            <i class="fa fa-pencil"></i>
-            Edit this content
-        </a>
-    {% endif %}
-    {{ box.content_html|safe }}
-</div>
diff --git a/pinaxcon/templates/pyconau2017/content_page.html b/pinaxcon/templates/pyconau2017/content_page.html
index 0abc1355..a7df8458 100644
--- a/pinaxcon/templates/pyconau2017/content_page.html
+++ b/pinaxcon/templates/pyconau2017/content_page.html
@@ -5,7 +5,6 @@
 {% load pyconau2017_tags %}
 
 
-{% load sitetree %}
 {% load i18n %}
 
 {% block body_class %}template-content-page{% endblock %}
diff --git a/pinaxcon/templates/symposion/conference/user_list.html b/pinaxcon/templates/symposion/conference/user_list.html
index 502698f5..c59587e7 100644
--- a/pinaxcon/templates/symposion/conference/user_list.html
+++ b/pinaxcon/templates/symposion/conference/user_list.html
@@ -1,7 +1,6 @@
 {% extends "site_base.html" %}
 
 {% load i18n %}
-{% load sitetree %}
 
 {% block head_title %}User List{% endblock %}
 
diff --git a/pinaxcon/templates/symposion/proposals/proposal_submit.html b/pinaxcon/templates/symposion/proposals/proposal_submit.html
index 590b2ce6..bd8253d5 100644
--- a/pinaxcon/templates/symposion/proposals/proposal_submit.html
+++ b/pinaxcon/templates/symposion/proposals/proposal_submit.html
@@ -1,6 +1,5 @@
 {% extends "symposion/proposals/base.html" %}
 
-{% load pinax_boxes_tags %}
 {% load i18n %}
 
 {% block head_title %}{% trans "Submit A Proposal" %}{% endblock %}
diff --git a/pinaxcon/templates/symposion/reviews/base.html b/pinaxcon/templates/symposion/reviews/base.html
index 25310b1e..77054449 100644
--- a/pinaxcon/templates/symposion/reviews/base.html
+++ b/pinaxcon/templates/symposion/reviews/base.html
@@ -2,7 +2,6 @@
 {% load staticfiles %}
 
 {% load i18n %}
-{% load sitetree %}
 
 {% block extra_style %}
 {{ block.super }}
diff --git a/pinaxcon/templates/symposion/schedule/schedule_conference.html b/pinaxcon/templates/symposion/schedule/schedule_conference.html
index bc29e69c..ee075e76 100644
--- a/pinaxcon/templates/symposion/schedule/schedule_conference.html
+++ b/pinaxcon/templates/symposion/schedule/schedule_conference.html
@@ -1,14 +1,11 @@
 {% extends "symposion/schedule/public_base.html" %}
 
 {% load i18n %}
-{% load pinax_boxes_tags %}
 {% load cache %}
 {% load pyconau2017_tags %}
 
 {% block head_title %}Conference Schedule{% endblock %}
 {% block header_title %}Conference Schedule{% endblock %}
-{% block header_paragraph %}{% header_paragraph "conference_schedule" %}{% endblock %}
-{% block header_inset_image %}{% illustration "cradle.svg" %}{% endblock %}
 
 {% block body_class %}full{% endblock %}
 
diff --git a/pinaxcon/templates/symposion/schedule/schedule_detail.html b/pinaxcon/templates/symposion/schedule/schedule_detail.html
index cd13ae1a..0b83d66e 100644
--- a/pinaxcon/templates/symposion/schedule/schedule_detail.html
+++ b/pinaxcon/templates/symposion/schedule/schedule_detail.html
@@ -1,7 +1,6 @@
 {% extends "symposion/schedule/public_base.html" %}
 
 {% load i18n %}
-{% load pinax_boxes_tags %}
 {% load cache %}
 {% load pyconau2017_tags %}
 {% load sitetree %}
diff --git a/pinaxcon/templates/symposion/speakers/speaker_create.html b/pinaxcon/templates/symposion/speakers/speaker_create.html
index 63ac9ae3..baeb6773 100644
--- a/pinaxcon/templates/symposion/speakers/speaker_create.html
+++ b/pinaxcon/templates/symposion/speakers/speaker_create.html
@@ -2,7 +2,6 @@
 
 {% load bootstrap %}
 {% load i18n %}
-{% load pinax_boxes_tags %}
 
 {% block head_title %}{% trans "Create Speaker Profile" %}{% endblock %}
 {% block page_title %}{% trans "Create Speaker Profile" %}{% endblock %}
diff --git a/pinaxcon/templates/symposion/speakers/speaker_edit.html b/pinaxcon/templates/symposion/speakers/speaker_edit.html
index b4f84df8..ac01471c 100644
--- a/pinaxcon/templates/symposion/speakers/speaker_edit.html
+++ b/pinaxcon/templates/symposion/speakers/speaker_edit.html
@@ -2,7 +2,6 @@
 
 {% load bootstrap %}
 {% load i18n %}
-{% load pinax_boxes_tags %}
 
 {% block head_title %}{% trans "Edit Speaker Profile" %}{% endblock %}
 {% block page_title %}{% trans "Edit Speaker Profile" %}{% endblock %}
diff --git a/pinaxcon/templates/symposion/sponsorship/add.html b/pinaxcon/templates/symposion/sponsorship/add.html
index 3815fa97..9bc23727 100644
--- a/pinaxcon/templates/symposion/sponsorship/add.html
+++ b/pinaxcon/templates/symposion/sponsorship/add.html
@@ -2,7 +2,6 @@
 
 {% load bootstrap %}
 {% load i18n %}
-{% load pinax_boxes_tags %}
 
 
 {% block head_title %}<div style="color: white;">{% trans "Add a Sponsor" %}</div>{% endblock %}
diff --git a/pinaxcon/templates/symposion/sponsorship/apply.html b/pinaxcon/templates/symposion/sponsorship/apply.html
index 6a1a186d..592d2448 100644
--- a/pinaxcon/templates/symposion/sponsorship/apply.html
+++ b/pinaxcon/templates/symposion/sponsorship/apply.html
@@ -2,7 +2,6 @@
 
 {% load bootstrap %}
 {% load i18n %}
-{% load pinax_boxes_tags %}
 
 {% block head_title %}{% trans "Apply to be a Sponsor" %}{% endblock %}
 
@@ -10,7 +9,12 @@
 
 {% block body %}
 
-    {% box "sponsorship-apply" %}
+    <div class="details">
+        <h1>FIXME</h1>
+        <p>Fill content out at templates/sym/spon/apply.html</p>
+        <p>This was previously a database object<br/>
+        Because a CMS that pulls data from a DB isn't enough, need another thing that pulls data directly from the database...</p>
+    </div>
 
     <form method="POST" action="" class="form-horizontal">
         {% csrf_token %}
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 756d97f5..49dbc342 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -26,8 +26,6 @@ urlpatterns = [
 
     url(r"^teams/", include("symposion.teams.urls")),
 
-    url(r"^boxes/", include("pinax.boxes.urls")),
-
     url(r'^cms/', include(wagtailadmin_urls)),
 
     # Required by registrasion
diff --git a/requirements.txt b/requirements.txt
index 9ab54894..809207ec 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,8 +7,6 @@ pinax-eventlog==1.1.1
 django-formset-js==0.5.0
 dj-static==0.0.6
 dj-database-url==0.4.0
-#pinax-pages==0.4.2
-pinax-boxes==2.1.2
 wagtail==1.6.2
 pylibmc==1.5.1
 raven==5.27.0