Updated to work with latest symposion code

project_name/apps.py

@@ -1,5 +1,5 @@
 from django.apps import AppConfig as BaseAppConfig
-from django.utils.importlib import import_module
+from importlib import import_module
 
 
 class AppConfig(BaseAppConfig):

project_name/proposals/migrations/0001_initial.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('symposion_proposals', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TalkProposal',
+            fields=[
+                ('proposalbase_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='symposion_proposals.ProposalBase')),
+                ('audience_level', models.IntegerField(choices=[(1, b'Novice'), (3, b'Intermediate'), (2, b'Experienced')])),
+                ('recording_release', models.BooleanField(default=True, help_text=b'By submitting your proposal, you agree to give permission to the conference organizers to record, edit, and release audio and/or video of your presentation. If you do not agree to this, please uncheck this box.')),
+            ],
+            options={
+                'verbose_name': 'talk proposal',
+            },
+            bases=('symposion_proposals.proposalbase',),
+        ),
+        migrations.CreateModel(
+            name='TutorialProposal',
+            fields=[
+                ('proposalbase_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='symposion_proposals.ProposalBase')),
+                ('audience_level', models.IntegerField(choices=[(1, b'Novice'), (3, b'Intermediate'), (2, b'Experienced')])),
+                ('recording_release', models.BooleanField(default=True, help_text=b'By submitting your proposal, you agree to give permission to the conference organizers to record, edit, and release audio and/or video of your presentation. If you do not agree to this, please uncheck this box.')),
+            ],
+            options={
+                'verbose_name': 'tutorial proposal',
+            },
+            bases=('symposion_proposals.proposalbase',),
+        ),
+    ]

project_name/settings.py

@@ -138,6 +138,7 @@
 
     # external
     "account",
+    "pinax.boxes",
     "easy_thumbnails",
     "eventlog",
     "markitup",
@@ -149,8 +150,7 @@
 
     # symposion
     "symposion",
-    "symposion.boxes",
-    "symposion.cms",
+    # "symposion.cms",
     "symposion.conference",
     "symposion.proposals",
     "symposion.reviews",
@@ -209,6 +209,8 @@
 ACCOUNT_USER_DISPLAY = lambda user: user.email
 
 AUTHENTICATION_BACKENDS = [
+    "django.contrib.auth.backends.ModelBackend",
+
     # Permissions Backends
     "symposion.teams.backends.TeamPermissionsBackend",
 

project_name/templates/_default_sidebar.html

@@ -1,6 +1,6 @@
 {% load sponsorship_tags %}
 {% load thumbnail %}
-{% load boxes_tags %}
+{% load pinax_boxes_tags %}
 
 {% sponsor_levels as levels %}
 

project_name/templates/homepage.html

@@ -1,7 +1,7 @@
 {% extends "site_base.html" %}
 
 {% load i18n %}
-{% load boxes_tags %}
+{% load pinax_boxes_tags %}
 
 {% block head_title %}{% trans "Welcome" %}{% endblock %}
 

project_name/templates/pinax/boxes/_box.html

@@ -0,0 +1,33 @@
+{% 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>

project_name/urls.py

@@ -5,6 +5,7 @@
 
 from django.contrib import admin
 
+import account.views
 import symposion.views
 
 
@@ -16,21 +17,21 @@
     url(r"^$", TemplateView.as_view(template_name="homepage.html"), name="home"),
     url(r"^admin/", include(admin.site.urls)),
 
-    url(r"^account/signup/$", symposion.views.SignupView.as_view(), name="account_signup"),
-    url(r"^account/login/$", symposion.views.LoginView.as_view(), name="account_login"),
+    url(r"^account/signup/$", account.views.SignupView.as_view(), name="account_signup"),
+    url(r"^account/login/$", account.views.LoginView.as_view(), name="account_login"),
     url(r"^account/", include("account.urls")),
+    url(r"^boxes/", include("pinax.boxes.urls")),
 
     url(r"^dashboard/", symposion.views.dashboard, name="dashboard"),
     url(r"^speaker/", include("symposion.speakers.urls")),
     url(r"^proposals/", include("symposion.proposals.urls")),
     url(r"^sponsors/", include("symposion.sponsorship.urls")),
-    url(r"^boxes/", include("symposion.boxes.urls")),
     url(r"^teams/", include("symposion.teams.urls")),
     url(r"^reviews/", include("symposion.reviews.urls")),
     url(r"^schedule/", include("symposion.schedule.urls")),
     url(r"^markitup/", include("markitup.urls")),
 
-    url(r"^", include("symposion.cms.urls")),
+    # url(r"^", include("symposion.cms.urls")),
 )
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

requirements.txt

@@ -1,20 +1,27 @@
-Django==1.7.1
+## symposion @46a10b9 has the following requirements
+# Django==1.8.5
+# django-appconf==1.0.1
+# django-model-utils==2.3.1
+# django-reversion==1.9.3
+# django-sitetree==1.4.0
+# django-taggit==0.17.1
+# django-timezone-field==1.3
+# django-user-accounts==1.2.0
+# easy-thumbnails==2.2
+# html5lib==0.9999999
+# Markdown==2.6.2
+# Pillow==3.1.0
+# pytz==2015.6
+# six==1.10.0
+
+# additional requirements
 pinax-theme-bootstrap==5.6.0
-django-user-accounts==1.0
 metron==1.3.5
 eventlog==0.8.0
 django-jsonfield==0.9.13
 django-timezones==0.2
-pytz==2014.10
-django-model-utils==2.2
-django-taggit==0.12.2
-django-reversion==1.8.5
 django-markitup==2.2.2
-markdown==2.5.2
-django-sitetree==1.2.1
-Pillow==2.6.1
-easy-thumbnails==2.2
-html5lib==0.95
+git+https://github.com/pinax/pinax-boxes.git
 
 # @@@ Pin this once we get to stable release
-git+git://github.com/pinax/symposion.git#egg=symposion
+-e git+https://github.com/pinax/symposion.git@46a10b9e3ae6b1f6cc7d1648d6529fbab3201e9b#egg=symposion-master