symposion_app Changeset - 83fae25b6007

Changeset - 83fae25b6007

Parent rev.

Child rev.

[Not reviewed]

Merge

! ! !

James Tauber - 12 years ago 2012-06-04 21:13:48
jtauber@jtauber.com

Merge pull request #9 from pinax/dua

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

39 files changed with 75 insertions and 103 deletions:

docs/Makefile

rename

docs/conf.py

rename

docs/conference.rst

rename

docs/index.rst

rename

docs/sponsorship.rst

rename

fixtures/initial_data.json

rename

manage.py

requirements/base.txt

requirements/docs.txt

rename

requirements/project.txt

rename

symposion/__init__.py

rename

symposion/about/__init__.py

rename

symposion/about/models.py

rename

symposion/about/urls.py

rename

symposion/about/views.py

rename

symposion/conference/__init__.py

rename

symposion/conference/admin.py

symposion/conference/models.py

rename

symposion/settings.py

symposion/sponsorship/__init__.py

rename

symposion/sponsorship/admin.py

symposion/sponsorship/models.py

symposion/sponsorship/templatetags/__init__.py

rename

symposion/sponsorship/templatetags/sponsorship_tags.py

symposion/static/README

rename

symposion/templates/_footer.html

symposion/templates/about/what_next.html

rename

symposion/templates/homepage.html

symposion/templates/site_base.html

symposion/templates/sponsorship/_horizontal_by_level.html

rename

symposion/templates/sponsorship/_sponsor_link.html

rename

symposion/templates/sponsorship/_vertical_by_level.html

rename

symposion/templates/sponsorship/_wall.html

rename

symposion/urls.py

symposion/wsgi.py

rename

symposion_project/apps/sponsorship/templatetags/__init__.py

del

symposion_project/manage.py

symposion_project/templates/_footer.html

symposion_project/urls.py

0 comments (0 inline, 0 general)

docs/Makefile

➞

Show inline comments

file renamed from symposion_project/docs/Makefile to docs/Makefile

docs/conf.py

➞

Show inline comments

file renamed from symposion_project/docs/conf.py to docs/conf.py

docs/conference.rst

➞

Show inline comments

file renamed from symposion_project/docs/conference.rst to docs/conference.rst

docs/index.rst

➞

Show inline comments

file renamed from symposion_project/docs/index.rst to docs/index.rst

docs/sponsorship.rst

➞

Show inline comments

file renamed from symposion_project/docs/sponsorship.rst to docs/sponsorship.rst

fixtures/initial_data.json

➞

Show inline comments

file renamed from symposion_project/fixtures/initial_data.json to fixtures/initial_data.json

manage.py

➞

Show inline comments

 new file 100755
 #!/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

➞

Show inline comments

 file renamed from symposion_project/requirements/base.txt to 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
 -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

requirements/docs.txt

➞

Show inline comments

file renamed from symposion_project/requirements/docs.txt to requirements/docs.txt

requirements/project.txt

➞

Show inline comments

file renamed from symposion_project/requirements/project.txt to requirements/project.txt

symposion/__init__.py

➞

Show inline comments

file renamed from symposion_project/__init__.py to symposion/__init__.py

symposion/about/__init__.py

➞

Show inline comments

file renamed from symposion_project/apps/__init__.py to symposion/about/__init__.py

symposion/about/models.py

➞

Show inline comments

file renamed from symposion_project/apps/about/models.py to symposion/about/models.py

symposion/about/urls.py

➞

Show inline comments

file renamed from symposion_project/apps/about/urls.py to symposion/about/urls.py

symposion/about/views.py

➞

Show inline comments

file renamed from symposion_project/apps/about/views.py to symposion/about/views.py

symposion/conference/__init__.py

➞

Show inline comments

file renamed from symposion_project/apps/about/__init__.py to symposion/conference/__init__.py

symposion/conference/admin.py

➞

Show inline comments

 file renamed from symposion_project/apps/conference/admin.py to symposion/conference/admin.py
 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/conference/models.py

➞

Show inline comments

file renamed from symposion_project/apps/conference/models.py to symposion/conference/models.py

symposion/settings.py

➞

Show inline comments

 file renamed from symposion_project/settings.py to symposion/settings.py
@@ ... / @@ -77,9 +77,8 @@ STATICFILES_DIRS = [ @@
+]
 STATICFILES_FINDERS = [
     "staticfiles.finders.FileSystemFinder",
     "staticfiles.finders.AppDirectoriesFinder",
     "staticfiles.finders.LegacyAppDirectoriesFinder",
     "django.contrib.staticfiles.finders.FileSystemFinder",
     "django.contrib.staticfiles.finders.AppDirectoriesFinder",
     "compressor.finders.CompressorFinder",
+]
@@ ... @@
 # 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"),
@@ ... / @@ -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",
     "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 = [
@@ ... / @@ -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",
     "pinax.apps.signup_codes",
     "account",
     # project
     "about",
     "sponsorship",
     "conference",
     "symposion.about",
     "symposion.sponsorship",
     "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 = [
     "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"

symposion/sponsorship/__init__.py

➞

Show inline comments

file renamed from symposion_project/apps/conference/__init__.py to symposion/sponsorship/__init__.py

symposion/sponsorship/admin.py

➞

Show inline comments

 file renamed from symposion_project/apps/sponsorship/admin.py to symposion/sponsorship/admin.py
 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

➞

Show inline comments

 file renamed from symposion_project/apps/sponsorship/models.py to 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/__init__.py

➞

Show inline comments

file renamed from symposion_project/apps/sponsorship/__init__.py to symposion/sponsorship/templatetags/__init__.py

symposion/sponsorship/templatetags/sponsorship_tags.py

➞

Show inline comments

 file renamed from symposion_project/apps/sponsorship/templatetags/sponsorship_tags.py to symposion/sponsorship/templatetags/sponsorship_tags.py
 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()

symposion/static/README

➞

Show inline comments

file renamed from symposion_project/static/README to symposion/static/README

symposion/templates/_footer.html

➞

Show inline comments

 new file 100644
 {% 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>
@@ ... / \ No newline at end of file @@

symposion/templates/about/what_next.html

➞

Show inline comments

file renamed from symposion_project/templates/about/what_next.html to symposion/templates/about/what_next.html

symposion/templates/homepage.html

➞

Show inline comments

 file renamed from symposion_project/templates/homepage.html to symposion/templates/homepage.html
 {% 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 %}
         {% ifsetting ACCOUNT_OPEN_SIGNUP %}
             {% 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>
         {% else %}
             <p>{% blocktrans %}You can <a href="{{ login_url }}" class="btn primary large">Log In</a> to try out the site.{% endblocktrans %}</p>
         {% endifsetting %}
         {% url account_login as login_url %}
         {% url account_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>
     {% endif %}
 {% endblock %}

symposion/templates/site_base.html

➞

Show inline comments

 file renamed from symposion_project/templates/site_base.html to 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/templates/sponsorship/_horizontal_by_level.html

➞

Show inline comments

file renamed from symposion_project/templates/sponsorship/_horizontal_by_level.html to symposion/templates/sponsorship/_horizontal_by_level.html

symposion/templates/sponsorship/_sponsor_link.html

➞

Show inline comments

file renamed from symposion_project/templates/sponsorship/_sponsor_link.html to symposion/templates/sponsorship/_sponsor_link.html

symposion/templates/sponsorship/_vertical_by_level.html

➞

Show inline comments

file renamed from symposion_project/templates/sponsorship/_vertical_by_level.html to symposion/templates/sponsorship/_vertical_by_level.html

symposion/templates/sponsorship/_wall.html

➞

Show inline comments

file renamed from symposion_project/templates/sponsorship/_wall.html to symposion/templates/sponsorship/_wall.html

symposion/urls.py

➞

Show inline comments

 new file 100644
 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)
@@ ... / \ No newline at end of file @@

symposion/wsgi.py

➞

Show inline comments

file renamed from symposion_project/wsgi.py to symposion/wsgi.py

symposion_project/apps/sponsorship/templatetags/__init__.py

➞

Show inline comments

deleted file

symposion_project/manage.py

➞

Show inline comments

deleted file

symposion_project/templates/_footer.html

➞

Show inline comments

deleted file

symposion_project/urls.py

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)