Commit graph

184 commits

Author SHA1 Message Date
Nick Seidenman (N6)
5f7e5ee1bd Merge branch 'master' into prod
Conflicts:
	fixtures/conference.json
	fixtures/sites.json
2017-01-17 12:03:16 +11:00
Nick Seidenman (N6)
448aa72558 Added favicon and special events pdf to bring this up to look/feel of wooden site.
Removed additional (and completely superfluous) styling in app.css that was otherwise making
our site look gluggy.

Mod'd fixtures (and updated db) to reflect PyCon rather than PinaxCon.
2017-01-17 11:42:13 +11:00
Nick Seidenman (N6)
1759a07630 A few mods to be able to use the runserver site for debugging. We'll back these out once the real
(via apache) site is up and running.
2017-01-16 18:24:21 +11:00
Nick Seidenman (N6)
bd4b61003a Merge branch 'master' into prod
Conflicts:
	pinaxcon/settings.py
	pinaxcon/urls.py
2017-01-16 16:26:17 +11:00
Nick Seidenman (N6)
646839fffa Disabled the splash page. Content is now being servied via CMS. 2017-01-16 16:22:14 +11:00
Nick Seidenman (N6)
fb7ffbc68e Finally have CMS-based homepage looking identical to the dummy spalsh page. 2017-01-16 15:55:42 +11:00
Nick Seidenman (N6)
6121ce79cc Getting the splash homepage to work via CMS.
Nearly there.  Much rubbish / cruft ripped out of  site_base.html and content_page.html.
Had to modify cms_pages/models.py to accommodate a "simple" layout option in the homepage
editor.
Still some stuff to do.  Styling not quite there yet, but want to checkpoint this.
2017-01-16 14:28:24 +11:00
Nick Seidenman (N6)
b1929bf4f9 Merge branch 'master' into prod 2017-01-12 09:03:01 +11:00
Nick Seidenman (N6)
a8e6a5b6d9 Set up 'prod' branch and made appropriate changes thereto. 2017-01-12 09:01:49 +11:00
Nick Seidenman
fad9c76d8f Update README.rst 2017-01-12 07:59:04 +11:00
Nick Seidenman (N6)
3100047760 Changed 2017 Melbourne to Melbourne 2017, per req from Chris N. 2017-01-12 07:31:22 +11:00
Nick Seidenman (N6)
011b2590aa The rest of the static stuff is now sorted. (Needed a couple more Alias directives in
the apache2/mod_wsgi config to do this.)

Not sure if this complies with Best Practice.  Will check this out ASAP.
2017-01-12 07:20:46 +11:00
Nick Seidenman (N6)
42ebbd06a1 Website is working behind apache2 / mod_wsgi in daemon mode.
Only the homepage loads correctly at the moment.  Need to get the
static files thing sorted, still.
2017-01-11 22:58:09 +11:00
Nick Seidenman (N6)
4e87b63c60 Pycon AU 2017 dummy site now working. (Identical to the one at the 2017.pycon-au.org URL now.) 2017-01-10 18:40:54 +11:00
Nick Seidenman (N6)
8d68cca01f Many changes, mostly from lca to pyconau. 2017-01-10 15:12:07 +11:00
Nick Seidenman (N6)
ce8e6b159e Mods to settins.py making this less lca, more pycon.
More to come.  Many more ...
2017-01-06 15:32:19 +11:00
Nick Seidenman (N6)
c42159468e Started setting up static areas.
- copied lca2017 stuff
- added pyconau2016 files / dirs.
2017-01-05 13:59:20 +11:00
Nick Seidenman
12e936d08d Update requirements.txt
Added symposion to requirements.txt
2017-01-05 13:21:19 +11:00
Nick Seidenman
247fbfca75 Update README.rst 2017-01-05 13:20:00 +11:00
Christopher Neugebauer
d6cf16cedb Tracks which page of the schedule is loaded at any given time (#90)
* Adds schedule fragment script

* removes spurious logging

* Displays the right tab on DOM load.

* Load today’s schedule if we’re during the conference.

* remove TODO
2017-01-02 21:58:24 +11:00
Scott Bragg
c52682c57a Minor CSS fix for schedule 2016-12-31 15:19:00 +11:00
Scott Bragg
0eda616345 Rooms have optional track names, access schedule by day via URL (#87)
* Optional track name with room name on schedule, access schedule by day eg /schedule/?day=Monday

* Changed to using a Track model rather than a char field
2016-12-26 12:10:42 +11:00
Scott Bragg
fccf547e9f Migration for open hardware CFP (#86)
* Form for Open Hardware CFP

* Oops forgot the migration
2016-12-23 17:44:16 +11:00
Scott Bragg
b66db0a4a8 Form for Open Hardware CFP (#85) 2016-12-23 17:29:23 +11:00
Scott Bragg
8bf3948956 Loosen permissions on wiki editing. (#84) 2016-12-20 19:22:03 +11:00
Christopher Neugebauer
e57a1e875e Chrisjrn/sponsor logos (#83)
* adds sponsor logos

* add sitkcermule

* Add wargaming

* Add TPAC
2016-12-19 19:55:25 +11:00
Christopher Neugebauer
7924781c71 adds sponsor logos (#82)
* adds sponsor logos

* add sitkcermule
2016-12-19 14:24:24 +11:00
Christopher Neugebauer
fa9bb1a9f9 Adds mobile-friendly schedule view and paged schedule view (#81)
* Adds responsive mobile CSS for schedule timetable

* Adds by-day schedule view

* Displays content_override in schedule

* Adds twitter/homepage links for speakers.
2016-12-10 17:11:40 +11:00
Christopher Neugebauer
9a21d2c781 Schedule tweaks etc (#80) 2016-12-08 19:56:43 +11:00
Christopher Neugebauer
1ba1cf1a24 Adds nag_unpaid template and credit_note template (#79) 2016-12-07 22:11:01 +11:00
Christopher Neugebauer
3a686ab1a8 Wiki with styling (#78)
* Adds Django wiki and integrates our template

* Makes the wiki use lca2017 styling (to a point, anyway)
2016-11-23 17:08:00 +11:00
Christopher Neugebauer
1df509cfbb Merge pull request #77 from faulteh/master
Additional styles to make the schedule timetable look better with our…
2016-11-23 11:30:48 +11:00
Scott Bragg
31322b6cb9 Additional styles to make the schedule timetable look better with our theme 2016-11-13 17:20:26 +11:00
Christopher Neugebauer
4fa9903998 Merge pull request #76 from faulteh/schedule_edit_fix
Style fixes to make the proposal selection modal display.
2016-11-04 11:25:28 +11:00
Scott Bragg
857e8623d9 Style fixes to make the proposal selection modal display. 2016-11-03 23:46:03 +11:00
Scott Bragg
ebfd7aa192 Add ACE editor for reviews 2016-10-31 22:21:30 +11:00
Christopher Neugebauer
0cd7d47805 Template fixer-upper 2016-10-10 08:52:51 -07:00
Christopher Neugebauer
833eebc46d Fixes presentation of the 18+ question 2016-10-06 13:10:39 -07:00
Christopher Neugebauer
99ba4c1770 1) Fixes list display
2) Lets us put links in category descriptions
2016-10-05 10:25:44 -07:00
Christopher Neugebauer
42892ea3c8 Fixes payment behaviour. 2016-10-03 16:43:04 -07:00
Christopher Neugebauer
dba220d678 Fixes list alignment inside fieldsets 2016-10-03 11:51:37 -07:00
Christopher Neugebauer
a3474fd9cd Adds registration to the website (#69)
* Updates settings and requirements

* First pass at attendee profile

* Imports the registration templates; defines attendee profile models etc.

* First pass at themeing the registration form.

* First page of the registration form: done!

* Makes form validation nicer

* Adds populate_inventory

* Improves the additional items page

* Allows for rendering of formsets.

* Adds support for formset extending.

* Removes formset delete buttons

* Review page is LCA-ified

* Fixes some formset behaviour

* Fixes urls.py

* LCA-ifies product_category.html

* Invoices

* Credit card payments

* s/register/tickets/

* Show registration features only whilst products are available (think about this better, later)

* Updates the attendee profile form page

* Form tidy-up

* Makes it so that address info is copied from attendee profile to the address details are autofilled in Stripe.

* Adds feature to offer Australians a dropdown list of states rather than free text.

* Allow toggling of void invoices.

* Adds backgrounds to the headers in the registration process

* Improves the review page

* Adds “Linux Australia” to invoice details.

* Do not show balance due on void/refunded invoices.

* More thumbing

* Adds a link back to reports on each report.

* Tokenisation language.

* Another bug in credit card processing.

* Adds stripe refunds to options

* Removes spurious dashboard button.

* Tidies up the presentation of discounts.

* Tidies up presentation of voucher form.

* Fixes sponsor logo appearance with adblock.

* Front page tweaks

* Lets us specify alternative URLs in homepage panels

* more

* Updates discount amounts.

* More website fixes

* Changes language on pay invoice button

* Adds contact details to the invoice template.

* Updates the currency message in the invoice template.

* Explicitly includes e-mail address, because theme_contact_email doesn’t propagate

* Changes payment text.

* s/registration/selections/

* Removes final face palm

* Fixes lack of speaker dinner tickets for actual presenters.

* Adjusts wording in invoice e-mails

* Invoice wording.

* (FIX)

* Fixes margins on lists and tables

* Improvements arising from those CSS fixes.

* Changes description tags.
2016-09-30 20:46:05 +10:00
Scott Bragg
882902d7a3 Add ADMIN_USERNAMES setting for selective proposal change notification 2016-09-27 19:18:40 +10:00
Scott Bragg
35bb710250 More cfps (#75)
* Law, Testing and Knowledge Miniconf CFP

* Admin registration for latest CFPs
2016-09-27 18:10:41 +10:00
Scott Bragg
52d443790f Last minute fixes to get miniconf cfp going (form fields missing) 2016-09-27 07:47:31 +10:00
Christopher Neugebauer
25c6dd666f Makes lists look less awful 2016-09-26 11:07:05 +10:00
Scott Bragg
2e2333ed70 Forgot to add games to admin 2016-09-25 16:21:08 +10:00
Scott Bragg
9dc93ea49a Fixed import (#72)
* Games Miniconf CFP

* Fixed CFPs using the wrong base class

* Forgot to import the model
2016-09-25 16:02:14 +10:00
Scott Bragg
7115ced57c Fixed CFPs using wrong base class (#71)
* Games Miniconf CFP

* Fixed CFPs using the wrong base class
2016-09-25 15:56:33 +10:00
Scott Bragg
df808d52f3 Games Miniconf CFP (#70) 2016-09-25 15:38:15 +10:00