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.
This commit is contained in:
Sachi King 2017-03-05 22:40:39 +11:00
parent 187d900d81
commit 48c28651b8
18 changed files with 11 additions and 57 deletions

View file

@ -145,7 +145,6 @@ INSTALLED_APPS = [
"symposion.speakers", "symposion.speakers",
"symposion.sponsorship", "symposion.sponsorship",
"symposion.teams", "symposion.teams",
"pinax.boxes",
# Registrasion # Registrasion
"registrasion", "registrasion",

View file

@ -2,7 +2,6 @@
{% load staticfiles %} {% load staticfiles %}
{% load wagtailcore_tags %} {% load wagtailcore_tags %}
{% load sitetree %}
{% load i18n %} {% load i18n %}
{% block body_class %}template-blogpage{% endblock %} {% block body_class %}template-blogpage{% endblock %}

View file

@ -2,7 +2,6 @@
{% load staticfiles %} {% load staticfiles %}
{% load wagtailcore_tags %} {% load wagtailcore_tags %}
{% load sitetree %}
{% load i18n %} {% load i18n %}
{% block body_class %}template-blogpage{% endblock %} {% block body_class %}template-blogpage{% endblock %}

View file

@ -1,17 +1,19 @@
{% load sponsorship_tags %} {% load sponsorship_tags %}
{% load thumbnail %} {% load thumbnail %}
{% load pinax_boxes_tags %}
{% sponsor_levels as levels %} {% sponsor_levels as levels %}
<h4>Sponsors</h4> <h4>Sponsors</h4>
<div class="sponsor-list"> <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 %} {% for level in levels %}
{% if level.sponsors %} {% if level.sponsors %}
<h3 style="margin-top: 3em;">{{ level.name }}</h3> <h3 style="margin-top: 3em;">{{ level.name }}</h3>
\
{% for sponsor in level.sponsors %} {% for sponsor in level.sponsors %}
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<a href="{{ sponsor.external_url }}"> <a href="{{ sponsor.external_url }}">

View file

@ -1 +0,0 @@
{% include "pinax/boxes/_box_body.html" %}

View file

@ -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>

View file

@ -5,7 +5,6 @@
{% load pyconau2017_tags %} {% load pyconau2017_tags %}
{% load sitetree %}
{% load i18n %} {% load i18n %}
{% block body_class %}template-content-page{% endblock %} {% block body_class %}template-content-page{% endblock %}

View file

@ -1,7 +1,6 @@
{% extends "site_base.html" %} {% extends "site_base.html" %}
{% load i18n %} {% load i18n %}
{% load sitetree %}
{% block head_title %}User List{% endblock %} {% block head_title %}User List{% endblock %}

View file

@ -1,6 +1,5 @@
{% extends "symposion/proposals/base.html" %} {% extends "symposion/proposals/base.html" %}
{% load pinax_boxes_tags %}
{% load i18n %} {% load i18n %}
{% block head_title %}{% trans "Submit A Proposal" %}{% endblock %} {% block head_title %}{% trans "Submit A Proposal" %}{% endblock %}

View file

@ -2,7 +2,6 @@
{% load staticfiles %} {% load staticfiles %}
{% load i18n %} {% load i18n %}
{% load sitetree %}
{% block extra_style %} {% block extra_style %}
{{ block.super }} {{ block.super }}

View file

@ -1,14 +1,11 @@
{% extends "symposion/schedule/public_base.html" %} {% extends "symposion/schedule/public_base.html" %}
{% load i18n %} {% load i18n %}
{% load pinax_boxes_tags %}
{% load cache %} {% load cache %}
{% load pyconau2017_tags %} {% load pyconau2017_tags %}
{% block head_title %}Conference Schedule{% endblock %} {% block head_title %}Conference Schedule{% endblock %}
{% block header_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 %} {% block body_class %}full{% endblock %}

View file

@ -1,7 +1,6 @@
{% extends "symposion/schedule/public_base.html" %} {% extends "symposion/schedule/public_base.html" %}
{% load i18n %} {% load i18n %}
{% load pinax_boxes_tags %}
{% load cache %} {% load cache %}
{% load pyconau2017_tags %} {% load pyconau2017_tags %}
{% load sitetree %} {% load sitetree %}

View file

@ -2,7 +2,6 @@
{% load bootstrap %} {% load bootstrap %}
{% load i18n %} {% load i18n %}
{% load pinax_boxes_tags %}
{% block head_title %}{% trans "Create Speaker Profile" %}{% endblock %} {% block head_title %}{% trans "Create Speaker Profile" %}{% endblock %}
{% block page_title %}{% trans "Create Speaker Profile" %}{% endblock %} {% block page_title %}{% trans "Create Speaker Profile" %}{% endblock %}

View file

@ -2,7 +2,6 @@
{% load bootstrap %} {% load bootstrap %}
{% load i18n %} {% load i18n %}
{% load pinax_boxes_tags %}
{% block head_title %}{% trans "Edit Speaker Profile" %}{% endblock %} {% block head_title %}{% trans "Edit Speaker Profile" %}{% endblock %}
{% block page_title %}{% trans "Edit Speaker Profile" %}{% endblock %} {% block page_title %}{% trans "Edit Speaker Profile" %}{% endblock %}

View file

@ -2,7 +2,6 @@
{% load bootstrap %} {% load bootstrap %}
{% load i18n %} {% load i18n %}
{% load pinax_boxes_tags %}
{% block head_title %}<div style="color: white;">{% trans "Add a Sponsor" %}</div>{% endblock %} {% block head_title %}<div style="color: white;">{% trans "Add a Sponsor" %}</div>{% endblock %}

View file

@ -2,7 +2,6 @@
{% load bootstrap %} {% load bootstrap %}
{% load i18n %} {% load i18n %}
{% load pinax_boxes_tags %}
{% block head_title %}{% trans "Apply to be a Sponsor" %}{% endblock %} {% block head_title %}{% trans "Apply to be a Sponsor" %}{% endblock %}
@ -10,7 +9,12 @@
{% block body %} {% 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"> <form method="POST" action="" class="form-horizontal">
{% csrf_token %} {% csrf_token %}

View file

@ -26,8 +26,6 @@ urlpatterns = [
url(r"^teams/", include("symposion.teams.urls")), url(r"^teams/", include("symposion.teams.urls")),
url(r"^boxes/", include("pinax.boxes.urls")),
url(r'^cms/', include(wagtailadmin_urls)), url(r'^cms/', include(wagtailadmin_urls)),
# Required by registrasion # Required by registrasion

View file

@ -7,8 +7,6 @@ pinax-eventlog==1.1.1
django-formset-js==0.5.0 django-formset-js==0.5.0
dj-static==0.0.6 dj-static==0.0.6
dj-database-url==0.4.0 dj-database-url==0.4.0
#pinax-pages==0.4.2
pinax-boxes==2.1.2
wagtail==1.6.2 wagtail==1.6.2
pylibmc==1.5.1 pylibmc==1.5.1
raven==5.27.0 raven==5.27.0