Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Talk proposal descriptions #36

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
337 commits
Select commit Hold shift + click to select a range
b647661
Updates sponsorship levels.
eloraburns Apr 28, 2013
c37e6b9
Updating GA tracking code a bit
wolever Apr 29, 2013
bca8a18
Updated to fitted favicon -- Note the alpha channel is still a bit wr…
kayzhu Apr 29, 2013
777b092
Updated favicon, pixel-fitted
kayzhu Apr 30, 2013
55d7d93
added Gustlist to front page
kayzhu Apr 30, 2013
85cdc45
Changed to new design: home page now half-working
kayzhu May 2, 2013
a16cc65
Fixing static links for images
kayzhu May 2, 2013
f64a202
Remove side bar for home page
kayzhu May 2, 2013
4ebc1af
Fixing footer
kayzhu May 2, 2013
c4d133a
add back Guestlist form to home page
kayzhu May 2, 2013
d4a635b
Fixing @pycon link
kayzhu May 2, 2013
af4100b
removed unused facebook link
kayzhu May 2, 2013
9b0839a
Fix some links in front page and footer
kayzhu May 2, 2013
8607da5
Fix home page layout
kayzhu May 2, 2013
7c7525f
Removes old sidebar base and original symposion styling.
eloraburns May 4, 2013
5176bf0
Imports new style and css and images, and updates site_base.html into…
eloraburns May 4, 2013
6f3a659
Removes facebook icon from the page. We don't have one.
eloraburns May 4, 2013
5cfc2cd
Montréal has an accent.
eloraburns May 4, 2013
f9093c0
Add block extra_head.
eloraburns May 4, 2013
51370c8
Moves homepage content to the homepage.
eloraburns May 4, 2013
fcc689d
whitespace
eloraburns May 4, 2013
7440119
Fixing links
eloraburns May 4, 2013
e9f8abe
Extract block excerpt for site_base usage.
eloraburns May 4, 2013
07c2a71
Reformat about for new style.
eloraburns May 4, 2013
661ab33
Adds extra address styling (left margin).
eloraburns May 4, 2013
843a30e
Removes unused template tag.
eloraburns May 4, 2013
fcbb18b
Updates venue for the new skin.
eloraburns May 4, 2013
32c1487
"Merge" to use taavi-new-layout branch in favour of the work already …
eloraburns May 4, 2013
7d055da
Fixing buy ticket button
kayzhu May 4, 2013
f64f7cc
Makes the login form not hurt the eyes.
eloraburns May 4, 2013
a78f665
Loads url from future in site_base.
eloraburns May 4, 2013
30c7b34
Ah, {% load url from future %} needs slightly different syntax.
eloraburns May 4, 2013
c13e50a
fixed language selector -- design not entirely match yet
kayzhu May 4, 2013
2af2721
Implements the body_outer block, so that more of symposion works.
eloraburns May 4, 2013
6d40799
Pulls large chunks of the homepage out of site_base, so that we have …
eloraburns May 4, 2013
dc33fa7
Added back analytics
kayzhu May 4, 2013
55eba34
remove redundant guestlistapp include
kayzhu May 4, 2013
d6e644b
Add Home link to social bar, and make the social bar show up on all p…
eloraburns May 4, 2013
dbb7967
fixed effective buy button range
kayzhu May 4, 2013
0644d89
Adds logo credit. Fixes #21.
eloraburns May 4, 2013
35dac85
Adds sponsors to front page.
eloraburns May 4, 2013
1f7775b
Adds a Learn page.
eloraburns May 4, 2013
679cf90
Updated formatting on the contact page.
eloraburns May 4, 2013
18ab1ed
Fix broken twitter widget on the contact page.
eloraburns May 4, 2013
b5180a4
Fixes some styling on the sponsorship list page
eloraburns May 4, 2013
b1cd764
Fixes some styling on the schedule page.
eloraburns May 4, 2013
ec655b4
Remove cms link.
eloraburns May 4, 2013
f5fe699
Add link to Admin for staff for sponsorships.
eloraburns May 4, 2013
66967b9
Fixing ugly button-links
eloraburns May 4, 2013
d471870
Removes CMS boxes.
eloraburns May 4, 2013
fda6957
reformatting site_base
kayzhu May 4, 2013
524eda8
Adds extra copyright notice for the background.
eloraburns May 4, 2013
2094ab8
Add login/logout links at the top of the page. Fixes #24.
eloraburns May 4, 2013
3172925
Symposion uses a lot of <legend> tags, so we'll force their formattin…
eloraburns May 4, 2013
aa84c5d
Fix about page headers
eloraburns May 4, 2013
d2be3b7
Move <h2> tag into the excerpt itself, so that it can dissappear enti…
eloraburns May 4, 2013
14f2c2c
Updated twitter widget to catch @pyconca mentions.
eloraburns May 4, 2013
a61959c
Fixes email addresses in the footer.
eloraburns May 4, 2013
963b3cb
Translate "Buy a ticket" and update translations.
eloraburns May 4, 2013
66697b2
Add the sponsor spread on every page. Make it full-width (by accident…
eloraburns May 4, 2013
e2635a3
Don't need that &nbsp; apparently.
eloraburns May 4, 2013
1f542f7
Better responsivity on the copyright.
eloraburns May 4, 2013
605b759
Merge branch 'pyconca2013' of github.com:pyconca/2013-web into pyconc…
kayzhu May 4, 2013
c9c7957
Merge branch 'pyconca2013' of github.com:pyconca/2013-web into pyconc…
kayzhu May 4, 2013
60e3354
Makes the top navbar more responsive.
eloraburns May 4, 2013
72dac51
Updating transit text.
eloraburns May 4, 2013
51fc826
Partially updates hotel info, refs #26.
eloraburns May 5, 2013
e365ed5
Link "Interested in a sponsorship opportunity?" text to the prospectu…
eloraburns May 5, 2013
e0f26ea
Updated CoC mention of current board members, in en and fr.
eloraburns May 5, 2013
115f728
Removes mention of 2012 in the about page.
eloraburns May 5, 2013
76015a7
Styling fix for site_base
kayzhu May 5, 2013
db161a6
restore favicon
kayzhu May 5, 2013
e1348bb
Refactor footer into _footer.html
kayzhu May 5, 2013
97d7192
Rewrite inheritance so that homepage no longer interfare with content
kayzhu May 5, 2013
56fb10d
Change volunteer email from board@pycon to volunteer@pycon. Fixed issue
kayzhu May 5, 2013
4bb670d
Added content base template used for content pages. Also added sponsor
kayzhu May 5, 2013
0ff4cb7
Fixing the VENUE page: added sidebar
kayzhu May 5, 2013
fe1dc53
Fixing issue #33 : code of conduct page layout
kayzhu May 5, 2013
93a70a7
Fixing layout in about and conduct page
kayzhu May 5, 2013
76b29ea
Fixed layout in LEARN and CONTACT pages: added back sponsor sidebar
kayzhu May 5, 2013
105c224
Fixed the layout of the schedule page
kayzhu May 5, 2013
54f82a1
Adds bronze sponsorship benefits.
eloraburns May 6, 2013
cb9ea60
Makes _sponsor_bar.html dynamic, so it shows the actual list of spons…
eloraburns May 6, 2013
4c6d6cd
Fixed sponsorship page layouts
kayzhu May 6, 2013
bd7f0f7
Added page name to content
kayzhu May 6, 2013
d44437b
make learn page name appear as section title
kayzhu May 6, 2013
fa5df94
improved the layout of dashboard and proposal submission process
kayzhu May 6, 2013
9f7bd2a
Improved layout of user profile editing page
kayzhu May 6, 2013
cb58b22
Adjust the pyconca fixture data for proposal submission deadlines.
eloraburns May 6, 2013
a1ca8db
Stubs out the schedule_conference until we have some actual data to d…
eloraburns May 6, 2013
5121ef4
Puts the submission deadline on the front page and dashboard. See #20.
eloraburns May 6, 2013
985ba32
Fix layout of logout page
kayzhu May 6, 2013
a85730e
Fix layout of log in page
kayzhu May 6, 2013
17fe604
Fix page title of logout page
kayzhu May 6, 2013
1e37960
Fix csrf field in logout page
kayzhu May 6, 2013
5824d17
Added signup page template, which fixes the layout of the signup page
kayzhu May 6, 2013
96a0899
Make 'Toronto' standout (yellow), rid of the confusion if the locatio…
kayzhu May 6, 2013
e91e908
Sets proposal deadline to June 21st. Closes #20.
May 6, 2013
61524d8
Makes form fields wider,
eloraburns May 6, 2013
8e56a59
Changes the table row highlight colour so it leaves text legible.
eloraburns May 6, 2013
bb6a544
Marks the VENUE_FOOD string as TBA.
eloraburns May 6, 2013
9da8a82
Adds our brand back onto the content pages
eloraburns May 7, 2013
5a7c7a7
Add home icon to nav bar -- currently using the 32x32 favicon as the
kayzhu May 7, 2013
7d92331
Locks short talk description length to 300 characters.
eloraburns May 7, 2013
aa2cfce
Adds a separate, informational "speak" page instead of the dashboard.
eloraburns May 7, 2013
cd9374c
Fix height of nav
kayzhu May 7, 2013
15cc816
Changes to homepage copy.
eloraburns May 7, 2013
1c82c78
Updates example local_settings to include a default "From" address.
eloraburns May 7, 2013
82c6deb
Don't be smart about the submission deadline; hardcode it.
eloraburns May 7, 2013
402dc91
add messages/flashcard, fixes Issue #37
kayzhu May 8, 2013
4424758
Make the speak page tell you what to do.
eloraburns May 8, 2013
21b7eb1
Fixes django domain.
eloraburns May 8, 2013
c7b2774
Adds translation tags for the homepage.
eloraburns May 8, 2013
35a910e
Adds more translation strings to the homepage.
eloraburns May 8, 2013
3213d14
fix signup page re: Issue #48
kayzhu May 8, 2013
dc34669
Left-behind i18n changes.
eloraburns May 8, 2013
968af00
Once more to make sure.
eloraburns May 8, 2013
e8d1419
Added password_reset template to fix the layout of password reset page
kayzhu May 8, 2013
903f424
Hardcode contact email for when password reset form doesn't work
kayzhu May 8, 2013
0aa91f1
Un-break the i18n files.
eloraburns May 8, 2013
94977a1
Update django-reversion to match this version of django.
eloraburns May 8, 2013
2831c79
Added password_reset_sent template -- fixes the layout of password re…
kayzhu May 8, 2013
ca02fc7
Adds lightning talk proposals. Closes #44.
eloraburns May 8, 2013
ab5cdfe
Adds dashboard quick-link to the top bar (next to "Log Out") when log…
eloraburns May 8, 2013
ac2e6a7
Adds a note about even speaker paying for a ticket to PyCon. Closes #49.
eloraburns May 8, 2013
8ce1538
Adds hotel booking details. Closes #26.
eloraburns May 8, 2013
f6d574b
log button immediately logs out, also add settings link
kayzhu May 8, 2013
d344090
Added settings template for account, fixes layout for account setting…
kayzhu May 8, 2013
eb0a03c
Adds some translations from last year.
eloraburns May 8, 2013
4632b73
Small homepage trans tag fixup.
eloraburns May 8, 2013
a0ad376
update translation and the corresponding translation
mlhamel May 8, 2013
5351a4c
Fix section title size in proposal edit and cancel pages
kayzhu May 9, 2013
edcaff2
Add title and bigger font for talk type selection page
kayzhu May 9, 2013
05d4414
Improve the layout of proposal speaker manager page: make 'edit propo…
kayzhu May 9, 2013
b52ab4c
Make 'manage speakers' a button in proposal_edit page
kayzhu May 9, 2013
412d7e6
Add a little user icon to the 'manage speaker' button
kayzhu May 9, 2013
6db9f83
Add a pencil icon to the edit button in 'proposal_speaker_manage' page
kayzhu May 9, 2013
eb25980
add more icons for proposal detail page
kayzhu May 9, 2013
910a569
remove license in conduct page, make 'Code of Con..' the section title
kayzhu May 9, 2013
c683e8c
Make <strong> less strong but with blue color
kayzhu May 9, 2013
af3c28d
Make links font smaller
kayzhu May 9, 2013
234e52a
Remove icons in dashboard page
kayzhu May 9, 2013
86bcd46
Make 'edit your speaker profile' and 'submit a new proposal' buttons …
kayzhu May 9, 2013
7a161ef
Make dashboard section title correctly aligned, change font size, dis…
kayzhu May 9, 2013
b67eeaf
Fixing reviewer feedback message number badge
kayzhu May 9, 2013
c37a84a
CSS hacks to make proposal_detail page nicer
kayzhu May 9, 2013
5670c19
more CSS hacks to make the nav tab high enough to not have scroll bar…
kayzhu May 9, 2013
a1e875c
Prettify 'Supporting documents, Reviewer feedback'
kayzhu May 9, 2013
d9fb24a
make the color of supporting documents table black
kayzhu May 9, 2013
915dd47
Fixing the main section of reviews, related Issue #9
kayzhu May 9, 2013
57a6e1e
Fixing the sidebar, now minimal but functional, closing Issue #9
kayzhu May 9, 2013
0d301ca
Added sponsorship prospectus PDF and add a link to it in sponsors/pro…
kayzhu May 9, 2013
af581cf
Add "| PyCon Canada" to page title
kayzhu May 9, 2013
e0c96e5
Add page title for sponsor prospectus page
kayzhu May 9, 2013
b75bb5b
"About our sponsors" -> "Our Sponsors"
kayzhu May 9, 2013
ff9b56d
Add head title to proposal speaker manage page and symposion speaker
kayzhu May 9, 2013
55c5611
Updated locales for head title
kayzhu May 9, 2013
481447b
more locale changes
kayzhu May 9, 2013
aa47427
Add "reviews" to head title
kayzhu May 9, 2013
eaa7234
Remove unused sponsors/terms page
kayzhu May 10, 2013
77d6ff6
Updates recording release statement to refer to CC-BY-SA. Fixes #52.
eloraburns May 10, 2013
79f96e7
Fixes minor typo on sponsorship copy.
eloraburns May 10, 2013
e276647
Adjusts venue copy. Closes #55.
eloraburns May 10, 2013
6093b39
Add Jesse's 'everybody pays' link to dashboard, fixes Issue #56
kayzhu May 10, 2013
af0e1b8
Fix misalignment of sponsor logos in sponsors/ page
kayzhu May 10, 2013
4619b34
Add 404 and 500 pages to overwrite the default bootstrap theme ones: …
kayzhu May 10, 2013
d293365
Change default language code to 'en' from 'en-us'
wolever May 11, 2013
96e1c1b
Adds emaling of stack traces to admins.
eloraburns May 11, 2013
9d025f3
Adds configuration to keep SSL on SSL, despite us being behind an NGI…
eloraburns May 11, 2013
fa90bbf
Updates makefile for new supervisord settings.
eloraburns May 11, 2013
5ff80d8
Update 404 and 500 page
kayzhu May 13, 2013
31757dd
Snakeskin background for the sponsors page. Closes #54.
eloraburns May 14, 2013
8ed4493
Only displays a sponsor description if they actually have one to show…
eloraburns May 14, 2013
98417f7
Merge https://github.com/pyconca/2013-web into pyconca2013
mlhamel May 14, 2013
c41ce90
added doc
mlhamel May 14, 2013
e866817
fixed translation files
mlhamel May 14, 2013
28e1d19
Makes the sponsor level an h3, so it stands out more on the sponsorsh…
eloraburns May 14, 2013
6edd140
Fixes template-code indentaton on the sponsorship list page.
eloraburns May 14, 2013
dfc0afe
Adds a little extra space after each category of sponsor, so the head…
eloraburns May 14, 2013
fb20838
Moves the br into the level conditional.
eloraburns May 14, 2013
964a888
Fix Learn link in home page
kayzhu May 14, 2013
8f75a3f
Adding dev sprints to schedule page.
felixc May 15, 2013
716a7b8
Merge https://github.com/pyconca/2013-web into pyconca2013
mlhamel May 15, 2013
c2f711c
Merge pull request #64 from felixc/add-sprints-to-schedule
kayzhu May 15, 2013
bb4f025
half done the translation
mlhamel May 15, 2013
d65b49f
Make i18n for the schedule conference info on sprints
kayzhu May 15, 2013
a766888
Make the nav li width a percentage of row width, so that the French n…
kayzhu May 15, 2013
83a6d34
hmm, not a good fix. Revert it back until better solution
kayzhu May 15, 2013
becdb32
Spaces out the sponsors on the sponsor list page some more.
eloraburns May 15, 2013
aa0341d
Increase the size of sponsor logos.
eloraburns May 15, 2013
d79a1ad
The hotel reservation code does not have a space in it. Also updates …
eloraburns May 15, 2013
a4b11d2
Provides more descriptive error when you provide more than the specif…
eloraburns May 16, 2013
d99f8f9
why not put the getting started stuff in the README in the root direc…
May 16, 2013
febe153
add readme step to go back to project root directory
May 17, 2013
b34ff2a
shell expansion lulz
May 17, 2013
42c1ac8
Merge pull request #66 from pyconca/readme-update
eloraburns May 17, 2013
a34a5bd
adding design credit to Ritchie Cheung to footer
May 18, 2013
1bcb887
start adding featured speakers
dianaclarke May 19, 2013
3ca86ce
fixing the last <p> of the code of conduct
dianaclarke May 19, 2013
6ebed0a
Adding deploy instructions to README
wolever May 19, 2013
2ea465f
Resizing picture of Karen
wolever May 19, 2013
83be2b4
s/jpp/jpg
wolever May 19, 2013
6709424
Resizing Jacob's picture
wolever May 19, 2013
ed04801
minor readme formatting fix for the 'deploying' code block
May 20, 2013
4a7bd39
Added french translation
jpcaissy May 21, 2013
bc7d9d7
Merge pull request #70 from jpcaissy/pyconca2013
eloraburns May 21, 2013
8e7f438
Merge pull request #68 from pyconca/copy
eloraburns May 21, 2013
6e8dafe
Merge pull request #69 from pyconca/readme-update
eloraburns May 21, 2013
0c1ce4a
Recompiles symposion_project/fr/django.mo.
eloraburns May 21, 2013
6512075
Adds French translation for "Design by".
eloraburns May 21, 2013
d08bae0
Fixes some very minor (mechanical) typos in the French translation.
eloraburns May 21, 2013
bfdcd89
Adds some text about lightning talks.
eloraburns May 21, 2013
fde66f4
Merge https://github.com/pyconca/2013-web into pyconca2013
mlhamel May 21, 2013
31cba70
Marks strings in speak.html for translation.
eloraburns May 21, 2013
ac18516
Finished french translation for symposiom app
jpcaissy May 22, 2013
a77dab1
Adding lightning talk description
wolever May 22, 2013
3663a5b
Merge with origin/master
wolever May 22, 2013
c8be253
Fixes broken entities on the speak page.
eloraburns May 22, 2013
3258365
Merge remote-tracking branch 'mtlpy/pyconca2013' into pyconca2013
eloraburns May 22, 2013
1369a96
Recompiles symposion fr django.mo.
eloraburns May 22, 2013
06912ac
Fixes two minor typos in the symposion French translation.
eloraburns May 22, 2013
d6ca107
Updates symposion_project po files.
eloraburns May 22, 2013
a89e5b5
Fixes a typo in the fr symposion translation.
eloraburns May 22, 2013
8df73ab
Removes dead code from dashboard.html
eloraburns May 22, 2013
597453a
Applies translation tags to the rest of the dashboard.html content.
eloraburns May 23, 2013
cfdfd45
Adds translation tags to _proposal_row.html.
eloraburns May 23, 2013
0db66c9
Removes redundant README section.
eloraburns May 23, 2013
95028e8
Puts the sponsor name and description into a hover-activated popover.…
eloraburns May 23, 2013
27f3c1b
Adds "Powered By Symposion" to the footer. Closes #72.
eloraburns May 23, 2013
3d08ff1
Re-adds <p> tags to <li> items, so the formatting looks better.
eloraburns May 23, 2013
001e492
Makes nav width dynamic, until a media query tells it to become fixed…
eloraburns May 23, 2013
1dbe8a0
Adds spaceless tag to homepage sponsors so the links don't cause a tr…
eloraburns May 23, 2013
a0b8c53
Downscale diamond sponsor 10%. Upscale non-diamond sponsors 10%.
eloraburns May 25, 2013
ff5ea84
Adds extra padding between sponsor logos on the homepage.
eloraburns May 25, 2013
105e865
Increase sponsor name size on sponsors page.
eloraburns May 25, 2013
739f31c
Makes division between popover title and body smaller.
eloraburns May 25, 2013
037a086
Bumps non-diamond sponsor logos on the home page up to 20% of original.
eloraburns May 25, 2013
b450089
Adds closing </p> tags to keynotes.
eloraburns May 25, 2013
8175c68
Adds another keynote.
eloraburns May 25, 2013
2d6e9e9
Adds fragment identifiers for keynotes.
eloraburns May 27, 2013
b2f8ddc
Adds Brett Cannon as a featured speaker.
May 27, 2013
017cbbc
Update learn.html
eloraburns May 27, 2013
0346f13
Adding Hilary's twitter account.
eloraburns May 28, 2013
1d8e901
Adds text about diversity grants on the About page.
eloraburns May 28, 2013
71e118a
Adds some anchors to the About page headers.
eloraburns May 28, 2013
2920ae3
Links to a google docs form for diversity grant applications.
eloraburns May 28, 2013
1609871
Merge pull request #74 from pyconca/diversity-grants
eloraburns May 28, 2013
691824a
Adds twitter links for Jacob and Karen.
eloraburns May 28, 2013
f43157c
Adds Alex Gaynor.
eloraburns May 29, 2013
a4bacf4
Display name and author of talk in admin.
MichaelDiBernardo Jun 2, 2013
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
_build
*.pyc
dev.db
site_media
.*.s?p
.*-makeplaceholder
.DS_Store
.env
hacking/
tags
db.sqlite3
local_settings.py
symposion.egg-info/
48 changes: 48 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
all: i18n docs static_css reset

.requirements-docs.txt-makeplaceholder: requirements-docs.txt
pip install -r $?
touch $@

_docs: .requirements-docs.txt-makeplaceholder
make -C docs/ html
open docs/_build/html/index.html

docs: _docs

i18n:
cd symposion/; django-admin.py makemessages -a
cd symposion/; django-admin.py compilemessages
cd symposion_project/; django-admin.py makemessages -a
cd symposion_project/; django-admin.py compilemessages

static_css:
make -C symposion_project/static build

.requirements.txt-makeplaceholder: requirements.txt
pip install -r $?
touch $@

reset: .requirements.txt-makeplaceholder
rm -r hacking || true
mkdir hacking
./manage.py syncdb --noinput
./manage.py loaddata fixtures/pyconca2013/*.json
./manage.py createsuperuser --username=admin [email protected] --noinput
echo \
'\nfrom django.contrib.auth.models import User\n'\
'\nfor u in User.objects.all(): u.set_password("asdf"); u.save()\n'\
| ./manage.py shell
echo "-----------------------------------------\n"\
"\rUser '[email protected]' created with password 'asdf'\n"\
"\r-----------------------------------------"

hacking/dev.db:
make reset

run: hacking/dev.db
./manage.py runserver 127.0.0.1:6544

restart_prod:
./manage.py collectstatic --noinput
sudo supervisorctl restart gunicorn-2013.pycon.ca
76 changes: 72 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,76 @@ Built with the generous support of the Python Software Foundation.

See http://eldarion.com/symposion/ for commercial support, customization and hosting

## Quickstart
## Getting started

- `pip install -r requirements.txt`
- `python manage.py syncdb`
- `python manage.py loaddata fixtures/*`
Get your environment set up:

$ virtualenv pycona-2013-web-env
$ . pyconca-2013-web-env/bin/activate
$ git clone git://github.com/pyconca/2013-web.git pyconca-2013-web
$ cd pyconca-2013-web

If you're using XCode 4 on Snow Leopard:

export ARCHFLAGS="-arch i386 -arch x86_64"

If you're still using Python 2.6 (stop that, use 2.7!):

$ pip install importlib

Install requirements and reset the development environment:

$ make reset
...
-----------------------------------------
User '[email protected]' created with password 'asdf'
-----------------------------------------

Start the server! Go to `http://localhost:6544/`; you can log in with
`[email protected]`/`asdf`.

$ make run
./manage.py runserver 127.0.0.1:6544
Validating models...

0 errors found
Django version 1.4.3, using settings 'symposion_project.settings'
Development server is running at http://127.0.0.1:6544/
Quit the server with CONTROL-C.

## Translation

For internationalization/i18n, either do:

$ make i18n

...or the good old way:

# change the symposion_project directory
$ cd symposion_project
$ django-admin.py makemessages -a

# now make changes to generated .po files ...
$ django-admin.py compilemessages

# go back to project root directory
$ cd "$(git rev-parse --show-toplevel)"

# also need to change symposion directory
$ cd symposion
$ django-admin.py makemessages -a

# now make changes to generated .po files ...
$ django-admin.py compilemessages

To build documentation::

$ make docs

## Deploying

$ ssh pycon.ca
$ cd /data/web/2013.pycon.ca/pyconca
$ . /data/virtualenvs/2013.pycon.ca/bin/activate
$ git pull # Note the hash, I usually push a deploy tag from my local repo pointed at this hash
$ make restart_prod
1 change: 1 addition & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Apps:
.. toctree::
:maxdepth: 2

getting_started
conference
sponsorship
speakers
Expand Down
45 changes: 45 additions & 0 deletions fixtures/pyconca2013/conference.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
[
{
"pk": 1,
"model": "conference.conference",
"fields": {
"timezone": "America/Toronto",
"start_date": "2013-08-09",
"end_date": "2013-08-13",
"title": "PyCon Canada"
}
},
{
"pk": 1,
"model": "conference.section",
"fields": {
"conference": 1,
"start_date": "2013-08-10",
"name": "Tutorials",
"end_date": "2013-08-11",
"slug": "tutorials"
}
},
{
"pk": 2,
"model": "conference.section",
"fields": {
"conference": 1,
"start_date": "2013-08-10",
"name": "Talks",
"end_date": "2013-08-11",
"slug": "talks"
}
},
{
"pk": 3,
"model": "conference.section",
"fields": {
"conference": 1,
"start_date": "2013-08-10",
"name": "Lightning Talks",
"end_date": "2013-08-11",
"slug": "lightning"
}
}
]
10 changes: 10 additions & 0 deletions fixtures/pyconca2013/initial_data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"pk": 1,
"model": "sites.site",
"fields": {
"domain": "2013.pycon.ca",
"name": "PyCon Canada"
}
}
]
62 changes: 62 additions & 0 deletions fixtures/pyconca2013/proposal_base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
[
{
"pk": 1,
"model": "proposals.proposalsection",
"fields": {
"start": "2013-03-30",
"section": 1,
"end": "2013-06-21",
"closed": false,
"published": null
}
},
{
"pk": 2,
"model": "proposals.proposalsection",
"fields": {
"start": "2013-03-30",
"section": 2,
"end": "2013-06-21",
"closed": false,
"published": null
}
},
{
"pk": 3,
"model": "proposals.proposalsection",
"fields": {
"start": "2013-03-30",
"section": 3,
"end": "2013-06-21",
"closed": false,
"published": null
}
},
{
"pk": 1,
"model": "proposals.proposalkind",
"fields": {
"section": 1,
"name": "Tutorial",
"slug": "tutorial"
}
},
{
"pk": 2,
"model": "proposals.proposalkind",
"fields": {
"section": 2,
"name": "Talk",
"slug": "talk"
}
},
{
"pk": 3,
"model": "proposals.proposalkind",
"fields": {
"section": 3,
"name": "Lightning talk",
"slug": "lightning"
}
}
]
115 changes: 115 additions & 0 deletions fixtures/pyconca2013/schedule_base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
[
{
"pk": 1,
"model": "schedule.schedule",
"fields": {
"section": 1,
"published": true,
"hidden": false
}
},
{
"pk": 2,
"model": "schedule.schedule",
"fields": {
"section": 2,
"published": true,
"hidden": false
}
},
{
"pk": 3,
"model": "schedule.schedule",
"fields": {
"section": 3,
"published": true,
"hidden": false
}
},
{
"pk": 1,
"model": "schedule.day",
"fields": {
"schedule": 1,
"date": "2013-08-10"
}
},
{
"pk": 2,
"model": "schedule.day",
"fields": {
"schedule": 1,
"date": "2013-08-11"
}
},
{
"pk": 3,
"model": "schedule.day",
"fields": {
"schedule": 2,
"date": "2013-08-10"
}
},
{
"pk": 4,
"model": "schedule.day",
"fields": {
"schedule": 2,
"date": "2013-08-11"
}
},
{
"pk": 1,
"model": "schedule.room",
"fields": {
"schedule": 2,
"name": "Colony Ballroom",
"order": 1
}
},
{
"pk": 2,
"model": "schedule.room",
"fields": {
"schedule": 2,
"name": "Giovanni Room",
"order": 2
}
},
{
"pk": 1,
"model": "schedule.slotkind",
"fields": {
"schedule": 2,
"label": "25 Minute Talk"
}
},
{
"pk": 2,
"model": "schedule.slotkind",
"fields": {
"schedule": 2,
"label": "Lunch"
}
},
{
"pk": 1,
"model": "schedule.slot",
"fields": {
"day": 1,
"kind": 1,
"start": "10:00",
"end": "10:25"
}
},
{
"pk": 2,
"model": "schedule.slot",
"fields": {
"day": 1,
"kind": 2,
"start": "12:00",
"end": "13:00"
}
}
]
Loading