Merge pull request #9 from pinax/dua

upgrade to latest Django, Pinax and django-user-accounts

manage.py

@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+import os, sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "symposion.settings")
+    
+    from django.core.management import execute_from_command_line
+    
+    execute_from_command_line(sys.argv)

requirements/base.txt

@@ -7,20 +7,19 @@
 --extra-index-url=http://dist.pinaxproject.com/alpha/
 --extra-index-url=http://dist.pinaxproject.com/fresh-start/
 
-Django==1.3.1
+Django==1.4
-Pinax
+pinax-theme-bootstrap==2.0.3
-
+metron==0.1 # 0.2.dev3
+pinax-utils==1.0b1.dev3
 django-debug-toolbar==0.9.1
-django-staticfiles==1.1.2
-django_compressor==1.0.1
-
 django-mailer==0.2a1
-django-email-confirmation==0.2
 django-timezones==0.2
 pytz==2011n
 django-openid==0.3a1
 python-openid==2.2.5
-metron==0.1
+django_compressor==1.2a1
+
+-e git+git://github.com/pinax/pinax-theme-bootstrap-account.git@70c0be0279d61bd2d0f949698f94b8f938918277#egg=pinax-theme-bootstrap-account
+-e git+git://github.com/pinax/django-user-accounts.git@3676d2c7ea0e9a5c3f8510ac8e6f8d58175e6b5f#egg=django-user-accounts
 
-pinax-theme-bootstrap==2.0.3
 django-forms-bootstrap==2.0.3.post1

symposion/conference/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from conference.models import Conference, Section
+from symposion.conference.models import Conference, Section
 
 
 admin.site.register(Conference, list_display=("title", "start_date", "end_date"))

symposion/settings.py

@@ -77,9 +77,8 @@ STATICFILES_DIRS = [
 ]
 
 STATICFILES_FINDERS = [
-    "staticfiles.finders.FileSystemFinder",
+    "django.contrib.staticfiles.finders.FileSystemFinder",
-    "staticfiles.finders.AppDirectoriesFinder",
+    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
-    "staticfiles.finders.LegacyAppDirectoriesFinder",
     "compressor.finders.CompressorFinder",
 ]
 
@@ -96,8 +95,8 @@ SECRET_KEY = "8*br)9@fs!4nzg-imfrsst&oa2udy6z-fqtdk0*e5c1=wn)(t3"
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = [
-    "django.template.loaders.filesystem.load_template_source",
+    "django.template.loaders.filesystem.Loader",
-    "django.template.loaders.app_directories.load_template_source",
+    "django.template.loaders.app_directories.Loader",
 ]
 
 MIDDLEWARE_CLASSES = [
@@ -107,12 +106,10 @@ MIDDLEWARE_CLASSES = [
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django_openid.consumer.SessionConsumer",
     "django.contrib.messages.middleware.MessageMiddleware",
-    "pinax.apps.account.middleware.LocaleMiddleware",
-    "pinax.middleware.security.HideSensistiveFieldsMiddleware",
     "debug_toolbar.middleware.DebugToolbarMiddleware",
 ]
 
-ROOT_URLCONF = "symposion_project.urls"
+ROOT_URLCONF = "symposion.urls"
 
 TEMPLATE_DIRS = [
     os.path.join(PROJECT_ROOT, "templates"),
@@ -123,14 +120,12 @@ TEMPLATE_CONTEXT_PROCESSORS = [
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
     "django.core.context_processors.media",
+    "django.core.context_processors.static",
+    "django.core.context_processors.tz",
     "django.core.context_processors.request",
     "django.contrib.messages.context_processors.messages",
-    
+    "pinax_utils.context_processors.settings",
-    "staticfiles.context_processors.static",
+    "account.context_processors.account",
-    
-    "pinax.core.context_processors.pinax_settings",
-    
-    "pinax.apps.account.context_processors.account",
 ]
 
 INSTALLED_APPS = [
@@ -141,33 +136,30 @@ INSTALLED_APPS = [
     "django.contrib.sessions",
     "django.contrib.sites",
     "django.contrib.messages",
+    "django.contrib.staticfiles",
     "django.contrib.humanize",
     
-    "pinax.templatetags",
-    
     # theme
+    "pinax_theme_bootstrap_account",
     "pinax_theme_bootstrap",
     "django_forms_bootstrap",
     
     # external
-    "staticfiles",
     "compressor",
     "debug_toolbar",
     "mailer",
     "django_openid",
     "timezones",
-    "emailconfirmation",
     "metron",
     "easy_thumbnails",
     
     # Pinax
-    "pinax.apps.account",
+    "account",
-    "pinax.apps.signup_codes",
     
     # project
-    "about",
+    "symposion.about",
-    "sponsorship",
+    "symposion.sponsorship",
-    "conference",
+    "symposion.conference",
 ]
 
 FIXTURE_DIRS = [
@@ -185,9 +177,9 @@ ACCOUNT_EMAIL_VERIFICATION = False
 ACCOUNT_EMAIL_AUTHENTICATION = False
 ACCOUNT_UNIQUE_EMAIL = EMAIL_CONFIRMATION_UNIQUE_EMAIL = False
 
-AUTHENTICATION_BACKENDS = [
+# AUTHENTICATION_BACKENDS = [
-    "pinax.apps.account.auth_backends.AuthenticationBackend",
+#     "pinax.apps.account.auth_backends.AuthenticationBackend",
-]
+# ]
 
 LOGIN_URL = "/account/login/" # @@@ any way this can be a url name?
 LOGIN_REDIRECT_URLNAME = "what_next"

symposion/sponsorship/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from sponsorship.models import SponsorLevel, Sponsor
+from symposion.sponsorship.models import SponsorLevel, Sponsor
 
 
 admin.site.register(SponsorLevel)

symposion/sponsorship/models.py

@@ -3,7 +3,7 @@ import datetime
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-from conference.models import Conference
+from symposion.conference.models import Conference
 
 
 class SponsorLevel(models.Model):

symposion/sponsorship/templatetags/sponsorship_tags.py

@@ -1,7 +1,7 @@
 from django import template
 
-from conference.models import current_conference
+from symposion.conference.models import current_conference
-from sponsorship.models import Sponsor, SponsorLevel
+from symposion.sponsorship.models import Sponsor, SponsorLevel
 
 
 register = template.Library()

symposion/templates/_footer.html

@@ -0,0 +1,8 @@
+{% load i18n %}
+<div class="legal">
+    <a href="http://pinax.github.com/symposion/"><b>symposion</b></a>:
+    a Pinax project sponsored by
+    <a href="http://eldarion.com/">Eldarion</a>
+    and the
+    <a href="http://www.python.org/psf/">Python Software Foundation</a>.
+</div>

symposion/templates/homepage.html

@@ -1,7 +1,6 @@
 {% extends "banner_base.html" %}
 
 {% load i18n %}
-{% load ifsetting_tag %}
 
 {% block head_title %}{% trans "Welcome" %}{% endblock %}
 
@@ -33,12 +32,8 @@
         {% url what_next as what_next_url %}
         <p class="what_next">{% blocktrans %}Wondering <a href="{{ what_next_url }}" class="btn primary large">What Next</a>?{% endblocktrans %}</p>
     {% else %}
-        {% url acct_login as login_url %}
+        {% url account_login as login_url %}
-        {% ifsetting ACCOUNT_OPEN_SIGNUP %}
+        {% url account_signup as signup_url %}
-            {% url acct_signup as signup_url %}
+        <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn">Log In</a> or <a href="{{ signup_url }}" class="btn primary">Sign Up</a> to try out the site.{% endblocktrans %}</p>
-            <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn">Log In</a> or <a href="{{ signup_url }}" class="btn primary">Sign Up</a> to try out the site.{% endblocktrans %}</p>
-        {% else %}
-            <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn primary large">Log In</a> to try out the site.{% endblocktrans %}</p>
-        {% endifsetting %}
     {% endif %}
 {% endblock %}

symposion/templates/site_base.html

@@ -8,9 +8,7 @@
 {% endblock %}
 
 {% block footer %}
-<div class="legal">
     {% include "_footer.html" %}
-</div>
 {% endblock %}
 
 {% block extra_body_base %}

symposion/urls.py

@@ -0,0 +1,24 @@
+from django.conf import settings
+from django.conf.urls.defaults import *
+from django.conf.urls.static import static
+
+from django.views.generic.simple import direct_to_template
+
+from django.contrib import admin
+admin.autodiscover()
+
+# from pinax.apps.account.openid_consumer import PinaxConsumer
+
+
+urlpatterns = patterns("",
+    url(r"^$", direct_to_template, {
+        "template": "homepage.html",
+    }, name="home"),
+    url(r"^admin/", include(admin.site.urls)),
+    url(r"^about/", include("symposion.about.urls")),
+    url(r"^account/", include("account.urls")),
+    # url(r"^openid/", include(PinaxConsumer().urls)),
+)
+
+
+urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

symposion_project/manage.py

@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-import sys
-
-try:
-    import pinax
-except ImportError:
-    sys.stderr.write("Error: Can't import Pinax. Make sure you are in a "
-        "virtual environment that has\nPinax installed.\n")
-    sys.exit(1)
-else:
-    import pinax.env
-
-from django.core.management import execute_from_command_line
-
-
-pinax.env.setup_environ(__file__)
-
-
-if __name__ == "__main__":
-    execute_from_command_line()

symposion_project/templates/_footer.html

@@ -1,4 +0,0 @@
-{% load i18n %}
-<div class="legal">
-    {% trans "&copy; 2012 &lt;your company here&gt;" %}
-</div>

symposion_project/urls.py

@@ -1,29 +0,0 @@
-from django.conf import settings
-from django.conf.urls.defaults import *
-from django.views.generic.simple import direct_to_template
-
-from django.contrib import admin
-admin.autodiscover()
-
-from pinax.apps.account.openid_consumer import PinaxConsumer
-
-
-handler500 = "pinax.views.server_error"
-
-
-urlpatterns = patterns("",
-    url(r"^$", direct_to_template, {
-        "template": "homepage.html",
-    }, name="home"),
-    url(r"^admin/invite_user/$", "pinax.apps.signup_codes.views.admin_invite_user", name="admin_invite_user"),
-    url(r"^admin/", include(admin.site.urls)),
-    url(r"^about/", include("about.urls")),
-    url(r"^account/", include("pinax.apps.account.urls")),
-    url(r"^openid/", include(PinaxConsumer().urls)),
-)
-
-
-if settings.SERVE_MEDIA:
-    urlpatterns += patterns("",
-        url(r"", include("staticfiles.urls")),
-    )