diff options
-rw-r--r-- | AUTHORS | 6 | ||||
-rw-r--r-- | CHANGES | 27 | ||||
-rw-r--r-- | TODO | 13 | ||||
-rw-r--r-- | project.db | bin | 115712 -> 0 bytes | |||
-rw-r--r-- | project/scipycon/__init__.py (renamed from project/kiwipycon/__init__.py) | 0 | ||||
-rw-r--r-- | project/scipycon/context_processors.py (renamed from project/kiwipycon/context_processors.py) | 0 | ||||
-rw-r--r-- | project/scipycon/proceedings/__init__.py (renamed from project/kiwipycon/proceedings/__init__.py) | 0 | ||||
-rw-r--r-- | project/scipycon/proceedings/admin.py (renamed from project/kiwipycon/proceedings/admin.py) | 0 | ||||
-rw-r--r-- | project/scipycon/proceedings/booklet/__init__.py (renamed from project/kiwipycon/proceedings/booklet/__init__.py) | 0 | ||||
-rw-r--r-- | project/scipycon/proceedings/booklet/mk_booklet.py (renamed from project/kiwipycon/proceedings/booklet/mk_booklet.py) | 0 | ||||
-rw-r--r-- | project/scipycon/proceedings/booklet/mk_scipy_paper.py (renamed from project/kiwipycon/proceedings/booklet/mk_scipy_paper.py) | 0 | ||||
-rw-r--r-- | project/scipycon/proceedings/forms.py (renamed from project/kiwipycon/proceedings/forms.py) | 0 | ||||
-rw-r--r-- | project/scipycon/proceedings/migrations/0001_initial.py (renamed from project/kiwipycon/proceedings/migrations/0001_initial.py) | 0 | ||||
-rw-r--r-- | project/scipycon/proceedings/migrations/__init__.py (renamed from project/kiwipycon/proceedings/migrations/__init__.py) | 0 | ||||
-rw-r--r-- | project/scipycon/proceedings/models.py (renamed from project/kiwipycon/proceedings/models.py) | 0 | ||||
-rw-r--r-- | project/scipycon/proceedings/views.py (renamed from project/kiwipycon/proceedings/views.py) | 0 | ||||
-rw-r--r-- | project/scipycon/registration/__init__.py (renamed from project/kiwipycon/registration/__init__.py) | 0 | ||||
-rw-r--r-- | project/scipycon/registration/admin.py (renamed from project/kiwipycon/registration/admin.py) | 0 | ||||
-rw-r--r-- | project/scipycon/registration/forms.py (renamed from project/kiwipycon/registration/forms.py) | 0 | ||||
-rw-r--r-- | project/scipycon/registration/labels.py (renamed from project/kiwipycon/registration/labels.py) | 0 | ||||
-rw-r--r-- | project/scipycon/registration/migrations/0001_initial.py (renamed from project/kiwipycon/registration/migrations/0001_initial.py) | 0 | ||||
-rw-r--r-- | project/scipycon/registration/migrations/0002_create_wifi.py (renamed from project/kiwipycon/registration/migrations/0002_create_wifi.py) | 0 | ||||
-rw-r--r-- | project/scipycon/registration/migrations/__init__.py (renamed from project/kiwipycon/registration/migrations/__init__.py) | 0 | ||||
-rw-r--r-- | project/scipycon/registration/models.py (renamed from project/kiwipycon/registration/models.py) | 0 | ||||
-rw-r--r-- | project/scipycon/registration/pdf.py (renamed from project/kiwipycon/registration/pdf.py) | 0 | ||||
-rw-r--r-- | project/scipycon/registration/tests.py (renamed from project/kiwipycon/registration/tests.py) | 0 | ||||
-rw-r--r-- | project/scipycon/registration/utils.py (renamed from project/kiwipycon/registration/utils.py) | 0 | ||||
-rw-r--r-- | project/scipycon/registration/views.py (renamed from project/kiwipycon/registration/views.py) | 0 | ||||
-rw-r--r-- | project/scipycon/sponsor/__init__.py (renamed from project/kiwipycon/sponsor/__init__.py) | 0 | ||||
-rw-r--r-- | project/scipycon/sponsor/admin.py (renamed from project/kiwipycon/sponsor/admin.py) | 0 | ||||
-rw-r--r-- | project/scipycon/sponsor/migrations/0001_initial.py (renamed from project/kiwipycon/sponsor/migrations/0001_initial.py) | 0 | ||||
-rw-r--r-- | project/scipycon/sponsor/migrations/__init__.py (renamed from project/kiwipycon/sponsor/migrations/__init__.py) | 0 | ||||
-rw-r--r-- | project/scipycon/sponsor/models.py (renamed from project/kiwipycon/sponsor/models.py) | 0 | ||||
-rw-r--r-- | project/scipycon/sponsor/views.py (renamed from project/kiwipycon/sponsor/views.py) | 0 | ||||
-rw-r--r-- | project/scipycon/talk/__init__.py (renamed from project/kiwipycon/talk/__init__.py) | 0 | ||||
-rw-r--r-- | project/scipycon/talk/admin.py (renamed from project/kiwipycon/talk/admin.py) | 0 | ||||
-rw-r--r-- | project/scipycon/talk/forms.py (renamed from project/kiwipycon/talk/forms.py) | 0 | ||||
-rw-r--r-- | project/scipycon/talk/migrations/0001_initial.py (renamed from project/kiwipycon/talk/migrations/0001_initial.py) | 0 | ||||
-rw-r--r-- | project/scipycon/talk/migrations/__init__.py (renamed from project/kiwipycon/talk/migrations/__init__.py) | 0 | ||||
-rw-r--r-- | project/scipycon/talk/models.py (renamed from project/kiwipycon/talk/models.py) | 0 | ||||
-rw-r--r-- | project/scipycon/talk/templatetags/__init__.py (renamed from project/kiwipycon/talk/templatetags/__init__.py) | 0 | ||||
-rw-r--r-- | project/scipycon/talk/templatetags/talk_extras.py (renamed from project/kiwipycon/talk/templatetags/talk_extras.py) | 0 | ||||
-rw-r--r-- | project/scipycon/talk/views.py (renamed from project/kiwipycon/talk/views.py) | 0 | ||||
-rw-r--r-- | project/scipycon/user/__init__.py (renamed from project/kiwipycon/user/__init__.py) | 0 | ||||
-rw-r--r-- | project/scipycon/user/admin.py (renamed from project/kiwipycon/user/admin.py) | 0 | ||||
-rw-r--r-- | project/scipycon/user/forms.py (renamed from project/kiwipycon/user/forms.py) | 0 | ||||
-rw-r--r-- | project/scipycon/user/migrations/0001_initial.py (renamed from project/kiwipycon/user/migrations/0001_initial.py) | 0 | ||||
-rw-r--r-- | project/scipycon/user/migrations/__init__.py (renamed from project/kiwipycon/user/migrations/__init__.py) | 0 | ||||
-rw-r--r-- | project/scipycon/user/models.py (renamed from project/kiwipycon/user/models.py) | 0 | ||||
-rw-r--r-- | project/scipycon/user/utils.py (renamed from project/kiwipycon/user/utils.py) | 0 | ||||
-rw-r--r-- | project/scipycon/user/views.py (renamed from project/kiwipycon/user/views.py) | 0 | ||||
-rw-r--r-- | project/scipycon/utils.py (renamed from project/kiwipycon/utils.py) | 0 | ||||
-rw-r--r-- | project/settings.py | 2 | ||||
-rw-r--r-- | project/setup.py | 2 | ||||
-rw-r--r-- | project/urls.py | 68 | ||||
-rw-r--r-- | sponsor.sql | 14 |
56 files changed, 41 insertions, 91 deletions
@@ -1,3 +1,9 @@ +Madhusudan.C.S <madhusudancs@fossee.in> + +-- Took the base code and idea from kiwipycon app and making modifications +-- to it to take up to the level of a new customized app. Courtesy to the +-- authors of kiwipycon app below. + Marek Kuziel <marek@kuziel.info> - provided the start up of the project and fixes to Darryl's code. diff --git a/CHANGES b/CHANGES deleted file mode 100644 index 33b5147..0000000 --- a/CHANGES +++ /dev/null @@ -1,27 +0,0 @@ -6 September 2009 ----------------- - -- added sponsor table, prepopulate from sponsor.sql - (need to manually add number of guests allowed per sponsor) -- sponsor logo and credits sourced from sponsor table -- new schwag sponsor page (generated from sponsor table) - (please delete current static page which this replaces) -- added fields to registration: - party - pre-conference party - discount - student/benefits - sponsor - a guest of sponsor - postcode -- prefixed invoice number with NZPYCON2009_**** -- added confirmation email for sponsor guests (no invoice number) -- added payment confirmation email when admin confirms payment for - registrant. (Using save() hook on Registration model - PDF invoice will be attached to this email. -- link and icon to twitter account -- removed 'submit-talk' links -- decided that a mechanism to email all speakers or all attendees to be - overkill. - -- added list and singleton views for talks -- set up south migrations for apps - -- added further functionality to registrations to deal with price scale. @@ -1,13 +0,0 @@ -TODO -==== -- Fix blog CSS - -STAGE2 -====== -- kiwipycon/conference (don't add until we release site with call for papers) - - models (Resistration) - - the nzpug incorporated soc a/c - -PERPETUAL -========= -- Unittests diff --git a/project.db b/project.db Binary files differdeleted file mode 100644 index 964f126..0000000 --- a/project.db +++ /dev/null diff --git a/project/kiwipycon/__init__.py b/project/scipycon/__init__.py index e69de29..e69de29 100644 --- a/project/kiwipycon/__init__.py +++ b/project/scipycon/__init__.py diff --git a/project/kiwipycon/context_processors.py b/project/scipycon/context_processors.py index 2aebf5f..2aebf5f 100644 --- a/project/kiwipycon/context_processors.py +++ b/project/scipycon/context_processors.py diff --git a/project/kiwipycon/proceedings/__init__.py b/project/scipycon/proceedings/__init__.py index e69de29..e69de29 100644 --- a/project/kiwipycon/proceedings/__init__.py +++ b/project/scipycon/proceedings/__init__.py diff --git a/project/kiwipycon/proceedings/admin.py b/project/scipycon/proceedings/admin.py index 830fcdb..830fcdb 100644 --- a/project/kiwipycon/proceedings/admin.py +++ b/project/scipycon/proceedings/admin.py diff --git a/project/kiwipycon/proceedings/booklet/__init__.py b/project/scipycon/proceedings/booklet/__init__.py index e69de29..e69de29 100644 --- a/project/kiwipycon/proceedings/booklet/__init__.py +++ b/project/scipycon/proceedings/booklet/__init__.py diff --git a/project/kiwipycon/proceedings/booklet/mk_booklet.py b/project/scipycon/proceedings/booklet/mk_booklet.py index c27ddf7..c27ddf7 100644 --- a/project/kiwipycon/proceedings/booklet/mk_booklet.py +++ b/project/scipycon/proceedings/booklet/mk_booklet.py diff --git a/project/kiwipycon/proceedings/booklet/mk_scipy_paper.py b/project/scipycon/proceedings/booklet/mk_scipy_paper.py index 90e2fa4..90e2fa4 100644 --- a/project/kiwipycon/proceedings/booklet/mk_scipy_paper.py +++ b/project/scipycon/proceedings/booklet/mk_scipy_paper.py diff --git a/project/kiwipycon/proceedings/forms.py b/project/scipycon/proceedings/forms.py index ddff13c..ddff13c 100644 --- a/project/kiwipycon/proceedings/forms.py +++ b/project/scipycon/proceedings/forms.py diff --git a/project/kiwipycon/proceedings/migrations/0001_initial.py b/project/scipycon/proceedings/migrations/0001_initial.py index 5323cf7..5323cf7 100644 --- a/project/kiwipycon/proceedings/migrations/0001_initial.py +++ b/project/scipycon/proceedings/migrations/0001_initial.py diff --git a/project/kiwipycon/proceedings/migrations/__init__.py b/project/scipycon/proceedings/migrations/__init__.py index e69de29..e69de29 100644 --- a/project/kiwipycon/proceedings/migrations/__init__.py +++ b/project/scipycon/proceedings/migrations/__init__.py diff --git a/project/kiwipycon/proceedings/models.py b/project/scipycon/proceedings/models.py index 5a76503..5a76503 100644 --- a/project/kiwipycon/proceedings/models.py +++ b/project/scipycon/proceedings/models.py diff --git a/project/kiwipycon/proceedings/views.py b/project/scipycon/proceedings/views.py index 6a21691..6a21691 100644 --- a/project/kiwipycon/proceedings/views.py +++ b/project/scipycon/proceedings/views.py diff --git a/project/kiwipycon/registration/__init__.py b/project/scipycon/registration/__init__.py index e69de29..e69de29 100644 --- a/project/kiwipycon/registration/__init__.py +++ b/project/scipycon/registration/__init__.py diff --git a/project/kiwipycon/registration/admin.py b/project/scipycon/registration/admin.py index 50acd43..50acd43 100644 --- a/project/kiwipycon/registration/admin.py +++ b/project/scipycon/registration/admin.py diff --git a/project/kiwipycon/registration/forms.py b/project/scipycon/registration/forms.py index 8d366c6..8d366c6 100644 --- a/project/kiwipycon/registration/forms.py +++ b/project/scipycon/registration/forms.py diff --git a/project/kiwipycon/registration/labels.py b/project/scipycon/registration/labels.py index c465f2c..c465f2c 100644 --- a/project/kiwipycon/registration/labels.py +++ b/project/scipycon/registration/labels.py diff --git a/project/kiwipycon/registration/migrations/0001_initial.py b/project/scipycon/registration/migrations/0001_initial.py index 5393708..5393708 100644 --- a/project/kiwipycon/registration/migrations/0001_initial.py +++ b/project/scipycon/registration/migrations/0001_initial.py diff --git a/project/kiwipycon/registration/migrations/0002_create_wifi.py b/project/scipycon/registration/migrations/0002_create_wifi.py index 55e5a17..55e5a17 100644 --- a/project/kiwipycon/registration/migrations/0002_create_wifi.py +++ b/project/scipycon/registration/migrations/0002_create_wifi.py diff --git a/project/kiwipycon/registration/migrations/__init__.py b/project/scipycon/registration/migrations/__init__.py index e69de29..e69de29 100644 --- a/project/kiwipycon/registration/migrations/__init__.py +++ b/project/scipycon/registration/migrations/__init__.py diff --git a/project/kiwipycon/registration/models.py b/project/scipycon/registration/models.py index 4ef5356..4ef5356 100644 --- a/project/kiwipycon/registration/models.py +++ b/project/scipycon/registration/models.py diff --git a/project/kiwipycon/registration/pdf.py b/project/scipycon/registration/pdf.py index 7fec07a..7fec07a 100644 --- a/project/kiwipycon/registration/pdf.py +++ b/project/scipycon/registration/pdf.py diff --git a/project/kiwipycon/registration/tests.py b/project/scipycon/registration/tests.py index 0ea28b2..0ea28b2 100644 --- a/project/kiwipycon/registration/tests.py +++ b/project/scipycon/registration/tests.py diff --git a/project/kiwipycon/registration/utils.py b/project/scipycon/registration/utils.py index dac9d6f..dac9d6f 100644 --- a/project/kiwipycon/registration/utils.py +++ b/project/scipycon/registration/utils.py diff --git a/project/kiwipycon/registration/views.py b/project/scipycon/registration/views.py index 754dc15..754dc15 100644 --- a/project/kiwipycon/registration/views.py +++ b/project/scipycon/registration/views.py diff --git a/project/kiwipycon/sponsor/__init__.py b/project/scipycon/sponsor/__init__.py index e69de29..e69de29 100644 --- a/project/kiwipycon/sponsor/__init__.py +++ b/project/scipycon/sponsor/__init__.py diff --git a/project/kiwipycon/sponsor/admin.py b/project/scipycon/sponsor/admin.py index 95735d9..95735d9 100644 --- a/project/kiwipycon/sponsor/admin.py +++ b/project/scipycon/sponsor/admin.py diff --git a/project/kiwipycon/sponsor/migrations/0001_initial.py b/project/scipycon/sponsor/migrations/0001_initial.py index 2512f1a..2512f1a 100644 --- a/project/kiwipycon/sponsor/migrations/0001_initial.py +++ b/project/scipycon/sponsor/migrations/0001_initial.py diff --git a/project/kiwipycon/sponsor/migrations/__init__.py b/project/scipycon/sponsor/migrations/__init__.py index e69de29..e69de29 100644 --- a/project/kiwipycon/sponsor/migrations/__init__.py +++ b/project/scipycon/sponsor/migrations/__init__.py diff --git a/project/kiwipycon/sponsor/models.py b/project/scipycon/sponsor/models.py index 68d8b5b..68d8b5b 100644 --- a/project/kiwipycon/sponsor/models.py +++ b/project/scipycon/sponsor/models.py diff --git a/project/kiwipycon/sponsor/views.py b/project/scipycon/sponsor/views.py index a6f5ad2..a6f5ad2 100644 --- a/project/kiwipycon/sponsor/views.py +++ b/project/scipycon/sponsor/views.py diff --git a/project/kiwipycon/talk/__init__.py b/project/scipycon/talk/__init__.py index e69de29..e69de29 100644 --- a/project/kiwipycon/talk/__init__.py +++ b/project/scipycon/talk/__init__.py diff --git a/project/kiwipycon/talk/admin.py b/project/scipycon/talk/admin.py index 73c8d6a..73c8d6a 100644 --- a/project/kiwipycon/talk/admin.py +++ b/project/scipycon/talk/admin.py diff --git a/project/kiwipycon/talk/forms.py b/project/scipycon/talk/forms.py index 49e12d7..49e12d7 100644 --- a/project/kiwipycon/talk/forms.py +++ b/project/scipycon/talk/forms.py diff --git a/project/kiwipycon/talk/migrations/0001_initial.py b/project/scipycon/talk/migrations/0001_initial.py index 6eec7f7..6eec7f7 100644 --- a/project/kiwipycon/talk/migrations/0001_initial.py +++ b/project/scipycon/talk/migrations/0001_initial.py diff --git a/project/kiwipycon/talk/migrations/__init__.py b/project/scipycon/talk/migrations/__init__.py index e69de29..e69de29 100644 --- a/project/kiwipycon/talk/migrations/__init__.py +++ b/project/scipycon/talk/migrations/__init__.py diff --git a/project/kiwipycon/talk/models.py b/project/scipycon/talk/models.py index de0b11f..de0b11f 100644 --- a/project/kiwipycon/talk/models.py +++ b/project/scipycon/talk/models.py diff --git a/project/kiwipycon/talk/templatetags/__init__.py b/project/scipycon/talk/templatetags/__init__.py index 792d600..792d600 100644 --- a/project/kiwipycon/talk/templatetags/__init__.py +++ b/project/scipycon/talk/templatetags/__init__.py diff --git a/project/kiwipycon/talk/templatetags/talk_extras.py b/project/scipycon/talk/templatetags/talk_extras.py index e28f2bf..e28f2bf 100644 --- a/project/kiwipycon/talk/templatetags/talk_extras.py +++ b/project/scipycon/talk/templatetags/talk_extras.py diff --git a/project/kiwipycon/talk/views.py b/project/scipycon/talk/views.py index 017bcd3..017bcd3 100644 --- a/project/kiwipycon/talk/views.py +++ b/project/scipycon/talk/views.py diff --git a/project/kiwipycon/user/__init__.py b/project/scipycon/user/__init__.py index e69de29..e69de29 100644 --- a/project/kiwipycon/user/__init__.py +++ b/project/scipycon/user/__init__.py diff --git a/project/kiwipycon/user/admin.py b/project/scipycon/user/admin.py index c72a5b5..c72a5b5 100644 --- a/project/kiwipycon/user/admin.py +++ b/project/scipycon/user/admin.py diff --git a/project/kiwipycon/user/forms.py b/project/scipycon/user/forms.py index 46ad2f6..46ad2f6 100644 --- a/project/kiwipycon/user/forms.py +++ b/project/scipycon/user/forms.py diff --git a/project/kiwipycon/user/migrations/0001_initial.py b/project/scipycon/user/migrations/0001_initial.py index 8cb8788..8cb8788 100644 --- a/project/kiwipycon/user/migrations/0001_initial.py +++ b/project/scipycon/user/migrations/0001_initial.py diff --git a/project/kiwipycon/user/migrations/__init__.py b/project/scipycon/user/migrations/__init__.py index e69de29..e69de29 100644 --- a/project/kiwipycon/user/migrations/__init__.py +++ b/project/scipycon/user/migrations/__init__.py diff --git a/project/kiwipycon/user/models.py b/project/scipycon/user/models.py index 85cf762..85cf762 100644 --- a/project/kiwipycon/user/models.py +++ b/project/scipycon/user/models.py diff --git a/project/kiwipycon/user/utils.py b/project/scipycon/user/utils.py index ad492a4..ad492a4 100644 --- a/project/kiwipycon/user/utils.py +++ b/project/scipycon/user/utils.py diff --git a/project/kiwipycon/user/views.py b/project/scipycon/user/views.py index 8b890c1..8b890c1 100644 --- a/project/kiwipycon/user/views.py +++ b/project/scipycon/user/views.py diff --git a/project/kiwipycon/utils.py b/project/scipycon/utils.py index 611dc62..611dc62 100644 --- a/project/kiwipycon/utils.py +++ b/project/scipycon/utils.py diff --git a/project/settings.py b/project/settings.py index 0719814..3c5c064 100644 --- a/project/settings.py +++ b/project/settings.py @@ -73,7 +73,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.debug', 'django.core.context_processors.i18n', 'django.core.context_processors.media', - 'project.kiwipycon.context_processors.sponsors') + 'project.scipycon.context_processors.sponsors') DEFAULT_FROM_EMAIL = 'admin@scipy.in' diff --git a/project/setup.py b/project/setup.py index 7b35714..37ca1f6 100644 --- a/project/setup.py +++ b/project/setup.py @@ -4,7 +4,7 @@ from setuptools import setup setup( name='project', version='1.0', - description="KiwiPyCon django website", + description="SciPy.in Conference django website", entry_points={ "console_scripts": [ 'initdb = scripts.initdb:main', diff --git a/project/urls.py b/project/urls.py index 9f3d998..2db1513 100644 --- a/project/urls.py +++ b/project/urls.py @@ -25,75 +25,73 @@ urlpatterns = patterns( ) # Talks, etc. -urlpatterns += patterns('project.kiwipycon.talk.views', - url(r'^talks/$', 'list_talks', name='list_talks'), - url(r'^talks/talk/(?P<id>\d+)/$', 'talk', name='talk_detail'), - url(r'^submit-talk/$', 'submit_talk', name='kiwipycon_submit_talk'), - url(r'^edit-talk/(?P<id>\d+)/$', 'edit_talk', name='kiwipycon_edit_talk'), - url(r'^talks-cfp/list-talks/(?P<id>\d+)/$', 'list_talks', - name='kiwipycon_list_talk'), +urlpatterns += patterns('project.scipycon.talk.views', + url(r'^talks/$', 'list_talks', name='list_talks'), + url(r'^talks/talk/(?P<id>\d+)/$', 'talk', name='talk_detail'), + url(r'^submit-talk/$', 'submit_talk', name='scipycon_submit_talk'), + url(r'^edit-talk/(?P<id>\d+)/$', 'edit_talk', name='scipycon_edit_talk'), + url(r'^talks-cfp/list-talks/(?P<id>\d+)/$', 'list_talks', + name='scipycon_list_talk'), ) # Registration -urlpatterns += patterns('project.kiwipycon.registration.views', - url(r'^invoice/$', 'invoice', name='kiwipycon_invoice'), - url(r'^pdf_invoice/$', 'pdf_invoice', name='kiwipycon_pdf_invoice'), - url(r'^registrations/$', 'registrations', name='kiwipycon_registrations'), - url(r'^submit-registration/$', 'submit_registration', name='kiwipycon_submit_registration'), - url(r'^edit-registration/(?P<id>\d+)/$', 'edit_registration', - name='kiwipycon_edit_registration'), +urlpatterns += patterns('project.scipycon.registration.views', + url(r'^registrations/$', 'registrations', name='scipycon_registrations'), + url(r'^submit-registration/$', 'submit_registration', name='scipycon_submit_registration'), + url(r'^edit-registration/(?P<id>\d+)/$', 'edit_registration', + name='scipycon_edit_registration'), url(r'^download_csv/', 'download_csv', name="download_csv"), ) # Authentication and Profile -urlpatterns += patterns('project.kiwipycon.user.views', - url(r'^login/$', 'login', name='kiwipycon_login'), - url(r'^logout/$', 'logout', name='kiwipycon_logout'), - url(r'^account/$', 'account', name='kiwipycon_account'), - url(r'^password/$', 'password', name='kiwipycon_password'), # change pwd - url(r'^username/$', 'username', name='kiwipycon_username'), # change uname - url(r'^edit-profile/$', 'edit_profile', name='kiwipycon_edit_profile'), - url(r'^get-usernames/$', 'get_usernames', name='kiwipycon_get_usernames'), +urlpatterns += patterns('project.scipycon.user.views', + url(r'^login/$', 'login', name='scipycon_login'), + url(r'^logout/$', 'logout', name='scipycon_logout'), + url(r'^account/$', 'account', name='scipycon_account'), + url(r'^password/$', 'password', name='scipycon_password'), # change pwd + url(r'^username/$', 'username', name='scipycon_username'), # change uname + url(r'^edit-profile/$', 'edit_profile', name='scipycon_edit_profile'), + url(r'^get-usernames/$', 'get_usernames', name='scipycon_get_usernames'), ) # Proceedings -urlpatterns += patterns('project.kiwipycon.proceedings.views', +urlpatterns += patterns('project.scipycon.proceedings.views', url(r'^proceedings/submit/$', 'submit', - name='kiwipycon_submit_proceedings'), + name='scipycon_submit_proceedings'), url(r'^proceedings/submit/(?P<id>\d+)/$', 'submit', - name='kiwipycon_submit_proceedings'), + name='scipycon_submit_proceedings'), url(r'^proceedings/show_paper/(?P<id>\d+)/$', 'show_paper', - name='kiwipycon_show_paper'), + name='scipycon_show_paper'), ) # About pages and all other static html pages urlpatterns += patterns('', url(r'^about/accommodation/$', direct_to_template, {"template": "about/accommodation.html"}, - name='accommodation'), + name='scipycon_accommodation'), url(r'^about/food/$', - direct_to_template, {"template": "about/food.html"}, name='food'), + direct_to_template, {"template": "about/food.html"}, name='scipycon_food'), url(r'^about/venue/$', - direct_to_template, {"template": "about/venue.html"}, name='venue'), + direct_to_template, {"template": "about/venue.html"}, name='scipycon_venue'), url(r'^about/reaching/$', direct_to_template, {"template": "about/reaching.html"}, - name='reaching'), + name='scipycon_reaching'), url(r'^talks-cfp/$', direct_to_template, {"template": "talk/talks-cfp.html"}, - name='talks-cfp'), + name='scipycon_talks_cfp'), url(r'^talks-cfp/schedule/$', direct_to_template, {"template": "talk/schedule.html"}, - name='schedule'), + name='scipycon_schedule'), url(r'^talks-cfp/tutorial/$', direct_to_template, {"template": "talk/tutorial-schedule.html"}, - name='tutorial-schedule'), + name='scipycon_tutorial_schedule'), url(r'^talks-cfp/sprint/$', direct_to_template, {"template": "talk/sprint-schedule.html"}, - name='sprint-schedule'), + name='scipycon_sprint_schedule'), url(r'^talks-cfp/speakers/$', direct_to_template, {"template": "talk/speakers.html"}, - name='speakers'), + name='scipycon_speakers'), (r'^accounts/', include('registration.urls')), ) diff --git a/sponsor.sql b/sponsor.sql deleted file mode 100644 index 469389d..0000000 --- a/sponsor.sql +++ /dev/null @@ -1,14 +0,0 @@ -INSERT INTO "sponsor_sponsor" VALUES(1,'canonical','Canonical Limited','gold','http://www.canonical.com/','*','*','*','canonical.png',5); -INSERT INTO "sponsor_sponsor" VALUES(2,'catalyst','Catalyst IT Liimited','gold','http://catalyst.net.nz/','*','*','*','catalyst.png',5); -INSERT INTO "sponsor_sponsor" VALUES(3,'weta-digital','Weta Digital Limited','gold','http://www.wetafx.co.nz/','*','*','*','weta.jpg',5); -INSERT INTO "sponsor_sponsor" VALUES(4,'psf','Python Software Foundation','gold','http://www.python.org/psf/','*','*','*','psf.png',5); -INSERT INTO "sponsor_sponsor" VALUES(5,'unfold','Unfold Limited','gold','http://www.unfold.co.nz/','*','*','*','unfold.png',5); -INSERT INTO "sponsor_sponsor" VALUES(6,'tait','Tait Radio Communications','gold','http://www.tait.co.nz/','*','*','*','tait.png',5); -INSERT INTO "sponsor_sponsor" VALUES(7,'encode','Encode Limited','silver','http://encode.net.nz/','*','*','*','encode.png',2); -INSERT INTO "sponsor_sponsor" VALUES(8,'powerhouse-ventures','powerHouse Ventures Limited','silver','http://www.powerhouse-ventures.co.nz/','*','*','*','powerhouse.png',2); -INSERT INTO "sponsor_sponsor" VALUES(9,'pretaweb','PretaWeb','silver','http://www.pretaweb.com/','*','*','*','pretaweb.png',2); -INSERT INTO "sponsor_sponsor" VALUES(10,'vortexdna','VortexDNA','silver','http://www.vortexdna.com/','*','*','*','vortex.png',2); -INSERT INTO "sponsor_sponsor" VALUES(11,'apress','Apress','schwag','http://apress.com/','*','*','*','apress.png',0); -INSERT INTO "sponsor_sponsor" VALUES(12,'oreilly','O''Reilly','schwag','http://www.oreilly.com/','*','*','*','oreilly.png',0); -INSERT INTO "sponsor_sponsor" VALUES(13,'webstock','Webstock','schwag','http://www.webstock.org.nz/','*','*','*','webstock.png',0); -INSERT INTO "sponsor_sponsor" VALUES(14,'packt','Packt Publishing','schwag','http://www.packtpub.com/','*','*','*','packt.png',0); |