From 09aa60777ffef0cfe01eaded2cf739f3dfab7134 Mon Sep 17 00:00:00 2001 From: James Tauber Date: Tue, 29 May 2012 14:53:04 -0400 Subject: [PATCH 01/12] updated project layout for 1.4 (without content changes) --- {symposion_project/docs => docs}/Makefile | 0 {symposion_project/docs => docs}/conf.py | 0 {symposion_project/docs => docs}/conference.rst | 0 {symposion_project/docs => docs}/index.rst | 0 {symposion_project/docs => docs}/sponsorship.rst | 0 {symposion_project/fixtures => fixtures}/initial_data.json | 0 symposion_project/manage.py => manage.py | 0 {symposion_project/requirements => requirements}/base.txt | 0 {symposion_project/requirements => requirements}/docs.txt | 0 {symposion_project/requirements => requirements}/project.txt | 0 {symposion_project => symposion}/__init__.py | 0 {symposion_project/apps => symposion/about}/__init__.py | 0 {symposion_project/apps => symposion}/about/models.py | 0 {symposion_project/apps => symposion}/about/urls.py | 0 {symposion_project/apps => symposion}/about/views.py | 0 .../apps/about => symposion/conference}/__init__.py | 0 {symposion_project/apps => symposion}/conference/admin.py | 0 {symposion_project/apps => symposion}/conference/models.py | 0 {symposion_project => symposion}/settings.py | 0 .../apps/conference => symposion/sponsorship}/__init__.py | 0 {symposion_project/apps => symposion}/sponsorship/admin.py | 0 {symposion_project/apps => symposion}/sponsorship/models.py | 0 .../sponsorship/templatetags}/__init__.py | 0 .../sponsorship/templatetags/sponsorship_tags.py | 0 {symposion_project => symposion}/static/README | 0 {symposion_project => symposion}/templates/_footer.html | 0 {symposion_project => symposion}/templates/about/what_next.html | 0 {symposion_project => symposion}/templates/homepage.html | 0 {symposion_project => symposion}/templates/site_base.html | 0 .../templates/sponsorship/_horizontal_by_level.html | 0 .../templates/sponsorship/_sponsor_link.html | 0 .../templates/sponsorship/_vertical_by_level.html | 0 {symposion_project => symposion}/templates/sponsorship/_wall.html | 0 {symposion_project => symposion}/urls.py | 0 {symposion_project => symposion}/wsgi.py | 0 symposion_project/apps/sponsorship/templatetags/__init__.py | 0 36 files changed, 0 insertions(+), 0 deletions(-) rename {symposion_project/docs => docs}/Makefile (100%) rename {symposion_project/docs => docs}/conf.py (100%) rename {symposion_project/docs => docs}/conference.rst (100%) rename {symposion_project/docs => docs}/index.rst (100%) rename {symposion_project/docs => docs}/sponsorship.rst (100%) rename {symposion_project/fixtures => fixtures}/initial_data.json (100%) rename symposion_project/manage.py => manage.py (100%) rename {symposion_project/requirements => requirements}/base.txt (100%) rename {symposion_project/requirements => requirements}/docs.txt (100%) rename {symposion_project/requirements => requirements}/project.txt (100%) rename {symposion_project => symposion}/__init__.py (100%) rename {symposion_project/apps => symposion/about}/__init__.py (100%) rename {symposion_project/apps => symposion}/about/models.py (100%) rename {symposion_project/apps => symposion}/about/urls.py (100%) rename {symposion_project/apps => symposion}/about/views.py (100%) rename {symposion_project/apps/about => symposion/conference}/__init__.py (100%) rename {symposion_project/apps => symposion}/conference/admin.py (100%) rename {symposion_project/apps => symposion}/conference/models.py (100%) rename {symposion_project => symposion}/settings.py (100%) rename {symposion_project/apps/conference => symposion/sponsorship}/__init__.py (100%) rename {symposion_project/apps => symposion}/sponsorship/admin.py (100%) rename {symposion_project/apps => symposion}/sponsorship/models.py (100%) rename {symposion_project/apps/sponsorship => symposion/sponsorship/templatetags}/__init__.py (100%) rename {symposion_project/apps => symposion}/sponsorship/templatetags/sponsorship_tags.py (100%) rename {symposion_project => symposion}/static/README (100%) rename {symposion_project => symposion}/templates/_footer.html (100%) rename {symposion_project => symposion}/templates/about/what_next.html (100%) rename {symposion_project => symposion}/templates/homepage.html (100%) rename {symposion_project => symposion}/templates/site_base.html (100%) rename {symposion_project => symposion}/templates/sponsorship/_horizontal_by_level.html (100%) rename {symposion_project => symposion}/templates/sponsorship/_sponsor_link.html (100%) rename {symposion_project => symposion}/templates/sponsorship/_vertical_by_level.html (100%) rename {symposion_project => symposion}/templates/sponsorship/_wall.html (100%) rename {symposion_project => symposion}/urls.py (100%) rename {symposion_project => symposion}/wsgi.py (100%) delete mode 100644 symposion_project/apps/sponsorship/templatetags/__init__.py diff --git a/symposion_project/docs/Makefile b/docs/Makefile similarity index 100% rename from symposion_project/docs/Makefile rename to docs/Makefile diff --git a/symposion_project/docs/conf.py b/docs/conf.py similarity index 100% rename from symposion_project/docs/conf.py rename to docs/conf.py diff --git a/symposion_project/docs/conference.rst b/docs/conference.rst similarity index 100% rename from symposion_project/docs/conference.rst rename to docs/conference.rst diff --git a/symposion_project/docs/index.rst b/docs/index.rst similarity index 100% rename from symposion_project/docs/index.rst rename to docs/index.rst diff --git a/symposion_project/docs/sponsorship.rst b/docs/sponsorship.rst similarity index 100% rename from symposion_project/docs/sponsorship.rst rename to docs/sponsorship.rst diff --git a/symposion_project/fixtures/initial_data.json b/fixtures/initial_data.json similarity index 100% rename from symposion_project/fixtures/initial_data.json rename to fixtures/initial_data.json diff --git a/symposion_project/manage.py b/manage.py similarity index 100% rename from symposion_project/manage.py rename to manage.py diff --git a/symposion_project/requirements/base.txt b/requirements/base.txt similarity index 100% rename from symposion_project/requirements/base.txt rename to requirements/base.txt diff --git a/symposion_project/requirements/docs.txt b/requirements/docs.txt similarity index 100% rename from symposion_project/requirements/docs.txt rename to requirements/docs.txt diff --git a/symposion_project/requirements/project.txt b/requirements/project.txt similarity index 100% rename from symposion_project/requirements/project.txt rename to requirements/project.txt diff --git a/symposion_project/__init__.py b/symposion/__init__.py similarity index 100% rename from symposion_project/__init__.py rename to symposion/__init__.py diff --git a/symposion_project/apps/__init__.py b/symposion/about/__init__.py similarity index 100% rename from symposion_project/apps/__init__.py rename to symposion/about/__init__.py diff --git a/symposion_project/apps/about/models.py b/symposion/about/models.py similarity index 100% rename from symposion_project/apps/about/models.py rename to symposion/about/models.py diff --git a/symposion_project/apps/about/urls.py b/symposion/about/urls.py similarity index 100% rename from symposion_project/apps/about/urls.py rename to symposion/about/urls.py diff --git a/symposion_project/apps/about/views.py b/symposion/about/views.py similarity index 100% rename from symposion_project/apps/about/views.py rename to symposion/about/views.py diff --git a/symposion_project/apps/about/__init__.py b/symposion/conference/__init__.py similarity index 100% rename from symposion_project/apps/about/__init__.py rename to symposion/conference/__init__.py diff --git a/symposion_project/apps/conference/admin.py b/symposion/conference/admin.py similarity index 100% rename from symposion_project/apps/conference/admin.py rename to symposion/conference/admin.py diff --git a/symposion_project/apps/conference/models.py b/symposion/conference/models.py similarity index 100% rename from symposion_project/apps/conference/models.py rename to symposion/conference/models.py diff --git a/symposion_project/settings.py b/symposion/settings.py similarity index 100% rename from symposion_project/settings.py rename to symposion/settings.py diff --git a/symposion_project/apps/conference/__init__.py b/symposion/sponsorship/__init__.py similarity index 100% rename from symposion_project/apps/conference/__init__.py rename to symposion/sponsorship/__init__.py diff --git a/symposion_project/apps/sponsorship/admin.py b/symposion/sponsorship/admin.py similarity index 100% rename from symposion_project/apps/sponsorship/admin.py rename to symposion/sponsorship/admin.py diff --git a/symposion_project/apps/sponsorship/models.py b/symposion/sponsorship/models.py similarity index 100% rename from symposion_project/apps/sponsorship/models.py rename to symposion/sponsorship/models.py diff --git a/symposion_project/apps/sponsorship/__init__.py b/symposion/sponsorship/templatetags/__init__.py similarity index 100% rename from symposion_project/apps/sponsorship/__init__.py rename to symposion/sponsorship/templatetags/__init__.py diff --git a/symposion_project/apps/sponsorship/templatetags/sponsorship_tags.py b/symposion/sponsorship/templatetags/sponsorship_tags.py similarity index 100% rename from symposion_project/apps/sponsorship/templatetags/sponsorship_tags.py rename to symposion/sponsorship/templatetags/sponsorship_tags.py diff --git a/symposion_project/static/README b/symposion/static/README similarity index 100% rename from symposion_project/static/README rename to symposion/static/README diff --git a/symposion_project/templates/_footer.html b/symposion/templates/_footer.html similarity index 100% rename from symposion_project/templates/_footer.html rename to symposion/templates/_footer.html diff --git a/symposion_project/templates/about/what_next.html b/symposion/templates/about/what_next.html similarity index 100% rename from symposion_project/templates/about/what_next.html rename to symposion/templates/about/what_next.html diff --git a/symposion_project/templates/homepage.html b/symposion/templates/homepage.html similarity index 100% rename from symposion_project/templates/homepage.html rename to symposion/templates/homepage.html diff --git a/symposion_project/templates/site_base.html b/symposion/templates/site_base.html similarity index 100% rename from symposion_project/templates/site_base.html rename to symposion/templates/site_base.html diff --git a/symposion_project/templates/sponsorship/_horizontal_by_level.html b/symposion/templates/sponsorship/_horizontal_by_level.html similarity index 100% rename from symposion_project/templates/sponsorship/_horizontal_by_level.html rename to symposion/templates/sponsorship/_horizontal_by_level.html diff --git a/symposion_project/templates/sponsorship/_sponsor_link.html b/symposion/templates/sponsorship/_sponsor_link.html similarity index 100% rename from symposion_project/templates/sponsorship/_sponsor_link.html rename to symposion/templates/sponsorship/_sponsor_link.html diff --git a/symposion_project/templates/sponsorship/_vertical_by_level.html b/symposion/templates/sponsorship/_vertical_by_level.html similarity index 100% rename from symposion_project/templates/sponsorship/_vertical_by_level.html rename to symposion/templates/sponsorship/_vertical_by_level.html diff --git a/symposion_project/templates/sponsorship/_wall.html b/symposion/templates/sponsorship/_wall.html similarity index 100% rename from symposion_project/templates/sponsorship/_wall.html rename to symposion/templates/sponsorship/_wall.html diff --git a/symposion_project/urls.py b/symposion/urls.py similarity index 100% rename from symposion_project/urls.py rename to symposion/urls.py diff --git a/symposion_project/wsgi.py b/symposion/wsgi.py similarity index 100% rename from symposion_project/wsgi.py rename to symposion/wsgi.py diff --git a/symposion_project/apps/sponsorship/templatetags/__init__.py b/symposion_project/apps/sponsorship/templatetags/__init__.py deleted file mode 100644 index e69de29b..00000000 From e96fe0bd5e77d92ab25c1df5f01dbdfcc98a2eae Mon Sep 17 00:00:00 2001 From: James Tauber Date: Tue, 29 May 2012 15:00:14 -0400 Subject: [PATCH 02/12] updated requirements to 1.4 / DUA and latest versions --- requirements/base.txt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 4074a6c2..343f6f0b 100644 --- a/requirements/base.txt +++ b/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 -Pinax - +Django==1.4 +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 -pinax-theme-bootstrap==2.0.3 -django-forms-bootstrap==2.0.3.post1 +-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 + +# django-forms-bootstrap==2.0.3.post1 From e3c79c056cbc62ef01e3c587ca4e83c3759603c5 Mon Sep 17 00:00:00 2001 From: James Tauber Date: Tue, 29 May 2012 15:00:42 -0400 Subject: [PATCH 03/12] updated manage.py --- manage.py | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/manage.py b/manage.py index 378e3b0b..2587018b 100755 --- a/manage.py +++ b/manage.py @@ -1,20 +1,9 @@ #!/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__) - +import os, sys if __name__ == "__main__": - execute_from_command_line() + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "symposion.settings") + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) From fc69aa85e8455c1a3252bdcd47312e1d7b42f638 Mon Sep 17 00:00:00 2001 From: James Tauber Date: Tue, 29 May 2012 15:06:24 -0400 Subject: [PATCH 04/12] updated settings --- symposion/settings.py | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/symposion/settings.py b/symposion/settings.py index 0544bf0f..cb53d6d9 100644 --- a/symposion/settings.py +++ b/symposion/settings.py @@ -79,7 +79,6 @@ STATICFILES_DIRS = [ STATICFILES_FINDERS = [ "staticfiles.finders.FileSystemFinder", "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.app_directories.load_template_source", + "django.template.loaders.filesystem.Loader", + "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"), @@ -125,12 +122,8 @@ TEMPLATE_CONTEXT_PROCESSORS = [ "django.core.context_processors.media", "django.core.context_processors.request", "django.contrib.messages.context_processors.messages", - - "staticfiles.context_processors.static", - - "pinax.core.context_processors.pinax_settings", - - "pinax.apps.account.context_processors.account", + "pinax_utils.context_processors.settings", + "account.context_processors.account", ] INSTALLED_APPS = [ @@ -143,31 +136,27 @@ INSTALLED_APPS = [ "django.contrib.messages", "django.contrib.humanize", - "pinax.templatetags", - # theme + "pinax_theme_bootstrap_account", "pinax_theme_bootstrap", - "django_forms_bootstrap", + # "django_forms_bootstrap", # external - "staticfiles", "compressor", "debug_toolbar", "mailer", "django_openid", "timezones", - "emailconfirmation", "metron", "easy_thumbnails", # Pinax - "pinax.apps.account", - "pinax.apps.signup_codes", + "account", # project - "about", - "sponsorship", - "conference", + "symposion.about", + "symposion.sponsorship", + "symposion.conference", ] FIXTURE_DIRS = [ @@ -185,9 +174,9 @@ ACCOUNT_EMAIL_VERIFICATION = False ACCOUNT_EMAIL_AUTHENTICATION = False ACCOUNT_UNIQUE_EMAIL = EMAIL_CONFIRMATION_UNIQUE_EMAIL = False -AUTHENTICATION_BACKENDS = [ - "pinax.apps.account.auth_backends.AuthenticationBackend", -] +# AUTHENTICATION_BACKENDS = [ +# "pinax.apps.account.auth_backends.AuthenticationBackend", +# ] LOGIN_URL = "/account/login/" # @@@ any way this can be a url name? LOGIN_REDIRECT_URLNAME = "what_next" From c9e600e42cba114fda828b65b62ad3eb237d6e0e Mon Sep 17 00:00:00 2001 From: James Tauber Date: Tue, 29 May 2012 15:08:05 -0400 Subject: [PATCH 05/12] updated imports to reflect new layout --- symposion/sponsorship/admin.py | 2 +- symposion/sponsorship/models.py | 2 +- symposion/sponsorship/templatetags/sponsorship_tags.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/symposion/sponsorship/admin.py b/symposion/sponsorship/admin.py index 6814c4da..a26b0a96 100644 --- a/symposion/sponsorship/admin.py +++ b/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) diff --git a/symposion/sponsorship/models.py b/symposion/sponsorship/models.py index 07d0cb30..a902c0be 100644 --- a/symposion/sponsorship/models.py +++ b/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): diff --git a/symposion/sponsorship/templatetags/sponsorship_tags.py b/symposion/sponsorship/templatetags/sponsorship_tags.py index 00fb8139..cd1f33ba 100644 --- a/symposion/sponsorship/templatetags/sponsorship_tags.py +++ b/symposion/sponsorship/templatetags/sponsorship_tags.py @@ -1,7 +1,7 @@ from django import template -from conference.models import current_conference -from sponsorship.models import Sponsor, SponsorLevel +from symposion.conference.models import current_conference +from symposion.sponsorship.models import Sponsor, SponsorLevel register = template.Library() From 4b87c512510d7a00a198642ffd83cd4fd2dd3cd5 Mon Sep 17 00:00:00 2001 From: James Tauber Date: Tue, 29 May 2012 15:08:05 -0400 Subject: [PATCH 06/12] updated imports to reflect new layout --- symposion/conference/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/symposion/conference/admin.py b/symposion/conference/admin.py index e385acdf..3d2bccaa 100644 --- a/symposion/conference/admin.py +++ b/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")) From 303877add6149366fa322705f96d4443c732035d Mon Sep 17 00:00:00 2001 From: James Tauber Date: Tue, 29 May 2012 15:12:22 -0400 Subject: [PATCH 07/12] updated templates --- symposion/templates/_footer.html | 6 +++++- symposion/templates/site_base.html | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/symposion/templates/_footer.html b/symposion/templates/_footer.html index 79a20fd5..4f334c9b 100644 --- a/symposion/templates/_footer.html +++ b/symposion/templates/_footer.html @@ -1,4 +1,8 @@ {% load i18n %}
- {% trans "© 2012 <your company here>" %} + symposion: + a Pinax project sponsored by + Eldarion + and the + Python Software Foundation.
\ No newline at end of file diff --git a/symposion/templates/site_base.html b/symposion/templates/site_base.html index 6c811b81..65953f86 100644 --- a/symposion/templates/site_base.html +++ b/symposion/templates/site_base.html @@ -8,9 +8,7 @@ {% endblock %} {% block footer %} -
{% include "_footer.html" %} -
{% endblock %} {% block extra_body_base %} From 02319e51c86580aecac797df75635de5e701a463 Mon Sep 17 00:00:00 2001 From: James Tauber Date: Tue, 29 May 2012 15:16:41 -0400 Subject: [PATCH 08/12] updated urls --- symposion/urls.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/symposion/urls.py b/symposion/urls.py index e8feb4b1..645d558f 100644 --- a/symposion/urls.py +++ b/symposion/urls.py @@ -1,29 +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 - - -handler500 = "pinax.views.server_error" +# from pinax.apps.account.openid_consumer import PinaxConsumer 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)), + url(r"^about/", include("symposion.about.urls")), + url(r"^account/", include("account.urls")), + # url(r"^openid/", include(PinaxConsumer().urls)), ) -if settings.SERVE_MEDIA: - urlpatterns += patterns("", - url(r"", include("staticfiles.urls")), - ) +urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file From 6160ede722710859ca7e6c3e9b567464315834e6 Mon Sep 17 00:00:00 2001 From: James Tauber Date: Tue, 29 May 2012 15:17:08 -0400 Subject: [PATCH 09/12] removed homepage use of ifsetting_tag --- symposion/templates/homepage.html | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/symposion/templates/homepage.html b/symposion/templates/homepage.html index 962af389..ba995260 100644 --- a/symposion/templates/homepage.html +++ b/symposion/templates/homepage.html @@ -1,7 +1,6 @@ {% extends "banner_base.html" %} {% load i18n %} -{% load ifsetting_tag %} {% block head_title %}{% trans "Welcome" %}{% endblock %} @@ -34,11 +33,7 @@

{% blocktrans %}Wondering What Next?{% endblocktrans %}

{% else %} {% url acct_login as login_url %} - {% ifsetting ACCOUNT_OPEN_SIGNUP %} - {% url acct_signup as signup_url %} -

{% blocktrans %}You can Log In or Sign Up to try out the site.{% endblocktrans %}

- {% else %} -

{% blocktrans %}You can Log In to try out the site.{% endblocktrans %}

- {% endifsetting %} + {% url acct_signup as signup_url %} +

{% blocktrans %}You can Log In or Sign Up to try out the site.{% endblocktrans %}

{% endif %} {% endblock %} From 9477c92abfc4a198ed93a3d983e0f99a8b629346 Mon Sep 17 00:00:00 2001 From: James Tauber Date: Tue, 29 May 2012 15:30:35 -0400 Subject: [PATCH 10/12] fixed staticfiles settings --- symposion/settings.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/symposion/settings.py b/symposion/settings.py index cb53d6d9..f4344a05 100644 --- a/symposion/settings.py +++ b/symposion/settings.py @@ -77,8 +77,8 @@ STATICFILES_DIRS = [ ] STATICFILES_FINDERS = [ - "staticfiles.finders.FileSystemFinder", - "staticfiles.finders.AppDirectoriesFinder", + "django.contrib.staticfiles.finders.FileSystemFinder", + "django.contrib.staticfiles.finders.AppDirectoriesFinder", "compressor.finders.CompressorFinder", ] @@ -120,6 +120,8 @@ 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", @@ -134,6 +136,7 @@ INSTALLED_APPS = [ "django.contrib.sessions", "django.contrib.sites", "django.contrib.messages", + "django.contrib.staticfiles", "django.contrib.humanize", # theme From 44fb5325f197c2ddb74e13ecb53be64593c773a7 Mon Sep 17 00:00:00 2001 From: James Tauber Date: Tue, 29 May 2012 15:34:14 -0400 Subject: [PATCH 11/12] fixed account links on homepage --- symposion/templates/homepage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/symposion/templates/homepage.html b/symposion/templates/homepage.html index ba995260..2365f67a 100644 --- a/symposion/templates/homepage.html +++ b/symposion/templates/homepage.html @@ -32,8 +32,8 @@ {% url what_next as what_next_url %}

{% blocktrans %}Wondering What Next?{% endblocktrans %}

{% else %} - {% url acct_login as login_url %} - {% url acct_signup as signup_url %} + {% url account_login as login_url %} + {% url account_signup as signup_url %}

{% blocktrans %}You can Log In or Sign Up to try out the site.{% endblocktrans %}

{% endif %} {% endblock %} From 1191608a8adbdea1c56b91d949d5e08f0e69b3db Mon Sep 17 00:00:00 2001 From: James Tauber Date: Tue, 29 May 2012 21:50:46 -0400 Subject: [PATCH 12/12] use django-forms-bootstrap --- requirements/base.txt | 2 +- symposion/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 343f6f0b..f2e779bb 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -22,4 +22,4 @@ 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 -# django-forms-bootstrap==2.0.3.post1 +django-forms-bootstrap==2.0.3.post1 diff --git a/symposion/settings.py b/symposion/settings.py index f4344a05..b9433d77 100644 --- a/symposion/settings.py +++ b/symposion/settings.py @@ -142,7 +142,7 @@ INSTALLED_APPS = [ # theme "pinax_theme_bootstrap_account", "pinax_theme_bootstrap", - # "django_forms_bootstrap", + "django_forms_bootstrap", # external "compressor",