Commit graph

293 commits

Author SHA1 Message Date
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)
a8e6a5b6d9 Set up 'prod' branch and made appropriate changes thereto. 2017-01-12 09:01:49 +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)
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
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
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
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
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
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
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
Scott Bragg
57ed5e546b CFPs that are ready (#68)
* CFPs that are ready

* Updated choices for sysadmin
2016-09-23 21:23:46 +10:00
Christopher Neugebauer
5be0c8be19 Lets us define homepage panels as “compact” (#67)
* Lets us define homepage panels as “compact”

* right-floating-image now only does things in wide screens
2016-09-23 21:23:20 +10:00
Christopher Neugebauer
ff16f71df6 September website changes - Pre-registration (#66)
* Factors rendering of external links into its own template. Automagical!

* Adds wagtail templates for keynotes on the front page

* Migrates to Wagtail 1.6

* Migrates content pages to be a streamfield. Flexibility++.

* Fixes editing of ContentPage bodies

* Adds floating images to content pages

* Fixes the layout of floating images

* Adds anchor links to content pages.

* Adds presentation link to the keynote speaker block model

* LCA-ifies the schedule list

* Refactors cms_pages/content_page into a new base template

* cms_pages/content_page now derives from abstract_content_page

* news_index_page now derives from abstract_content_page

* news_page now derives from abstract_content_page.html

* utility_page now uses the content_page base template

* Factors out _right_floating_image.html

* Themes the presentation detail page

* Themes the speaker profile page.

* Themes the schedule list page.

* Minor work on schedule_conference.html

* Themes schedule_detail.html

* Replaces cradle.svg

* Adds a background image to the schedule pages

* Adds libravatar fallback for speaker profile images

* Adds new background images (must update colophon)

* Adds some magic so that we can have slightly different presentation backgrounds for different pages.

* Adds the sponsor block to the bottom of the page.

* Adds sponsor logos to footer.

* All migrations are now in this tree

* Fixes wagtail migrations

* Adjusts presentation_detail to allow for miniconfs (i.e. no target audience)

* Adds unpublishing to presentation detail

* Adds ScheduleHeaderParagraph, which allows us to add some text to the header of schedule pages.

* Adds NamedHeaderParagraph. It allows us to store header paragraphs in the CMS.

* Date formatting in the schedule

* First step for fixing images

* Allows us to automagically load the colophon

* Adds “publish changes” button.

* Can login with email address
2016-09-18 20:40:55 +10:00
Christopher Neugebauer
7a001e6228 Makes sure BCC is provided to *every* e-mail. (#65)
* Replaces the monkey patch on send_mail, and replaces it with a monkey patch on EmailMessage’s constructor.

* Removes spurious print statements.

* Minimum viable changes to get schedule to display (#64)

* All migrations are now in this tree

* Replaces the monkey patch on send_mail, and replaces it with a monkey patch on EmailMessage’s constructor.

* Removes spurious print statements.
2016-09-18 12:32:10 +10:00
Scott Bragg
fe31b1b7c4 All migrations are now in this tree 2016-09-17 15:50:46 +10:00
Scott Bragg
e2e69bb1cf Minimum viable changes to get schedule to display (#64) 2016-09-03 19:22:47 +10:00
Christopher Neugebauer
59ff38f78b Adds a floatformat to the average 2016-08-16 09:50:17 +10:00
Christopher Neugebauer
09725bede0 Modifications to review_admin.html (#62)
* Modifications to review_admin.html

* Adds “submit & jump to random proposal” button

* If user has a speaker profile, display their speaker profile name alongside their comments instead of their user name.
2016-08-15 14:04:55 +10:00
Scott Bragg
116f8b55e3 Renders comment markdown and adds a gap between vote and username in review comment 2016-08-09 11:23:57 +10:00
Christopher Neugebauer
504cf77574 Allows us to manage additional speakers from the admin (#58)
* Allows us to manage additional speakers from the admin

* Show speaker e-mail addresses. Fixes #57

* Denotes fields as required.
2016-08-04 09:59:50 +10:00
Christopher Neugebauer
a7fe10a8d9 Removes a case where keypress listeners were loaded twice on markdown fields in the old Symposion theme. (#56)
Fixes #55.
2016-07-31 14:52:26 +10:00
Christopher Neugebauer
40a4df3767 Fixes for 20160718 (#54)
* Simple form input fields now use TakeFlight styling

* Styles the form widgets as per the styles in our CSS

* Styling of TextArea now matches the remaining input types

* Adds is_last modifier to navigation dropdown

* Adds admin for talk, tutorial, and miniconf proposals

* Adds an RSS feed

* Adds a link to the RSS page

* Unbreaks the old news index page

* Adds never_cache to the login page, removes the never cache middleware from the settings
2016-07-20 07:31:13 +10:00
Christopher Neugebauer
6eef5efcfb Customises the CSRF failure view so that it uses the LCA2017 style (#53)
* Customises the CSRF failure view so that it uses the LCA2017 style

* If a user is logged in and there is a bad_token failure, let them know.
2016-07-17 17:52:04 +10:00
Christopher Neugebauer
51640e9893 Fix issue in proposals display code (#49)
* Fixes a biography display-related oops

* Fixes translation issue on cancelled proposals
2016-07-17 17:51:50 +10:00
Scott Bragg
6598d9f737 Middleware to add never_cache headers to everything (#51) 2016-07-15 12:18:36 +10:00
Christopher Neugebauer
ce10e021f6 _actually_ lets proposal managers view the assistance fields (#48) 2016-07-10 09:18:08 +10:00
Christopher Neugebauer
ecabf31e54 Assorted fixes (#47)
* Invokes the site tree fix from previous fixes.

* Adds a disclaimer noting that previous years’ accounts have not been carried over.

Fixes #43

* Adds proposal type to the proposal summary page.

Fixes #40

* Adds travel/accommodation assistance to the proposals page, but makes it only visible to speakers in the proposal, or review managers.

Fixes #41.
Fixes #42.

* Reduces a lot of the whitespace in the header and footer.

Fixes #44

* Proposals review page now shows information for every speaker on a proposal.

Fixes #45

* Makes sure that non_field_errors are displayed by forms.

Fixes #37
2016-07-09 23:14:31 +10:00
Christopher Neugebauer
e32942a49d Fixes django-sitetree’s breaking of 500 reporting. (#39) 2016-07-04 22:23:17 +10:00
Christopher Neugebauer
40b2747acd Adds a 404 page. (#38) 2016-07-04 00:00:50 +10:00
Christopher Neugebauer
3118e4c11c Friday fixes (#36)
* Monkey-patches a version of send_email that allows BCCs into the django accounts signup process. wtf, etc.

* Adds alt-text to site header

* Favicon.
2016-07-02 22:56:44 +10:00
Scott Bragg
c2e4b04027 Added analytics script 2016-07-01 10:43:46 +10:00
Christopher Neugebauer
3c41f1083f Fix page title (#33)
* Adds social media links

* Un-ooopses the title of the homepage

* Fixes the page title on homepage once and for all.
2016-07-01 10:41:55 +10:00
Christopher Neugebauer
2d039faedf Adds social media links (#32)
* Adds social media links

* Un-ooopses the title of the homepage
2016-07-01 10:16:48 +10:00
Christopher Neugebauer
02dc082958 Thursday + Takeflight changes (#31)
* Adds Facebook svg button, and adds Facebook link type to models

* CSS work from takeflight, 30 June 2016

* Adds drop-down menus for navigation

* Adds mobile menus for navigation

* Minor tweak to mobile nav headings

* Makes the logo a link back to the homepage

* Updates the footer to the current version, removing sponsor logos for the moment.
2016-06-30 17:25:50 +10:00
Scott Bragg
7c5ca8d399 settings.py allows local_settings.py to extend settings (used for Raven/Sentry config) 2016-06-29 23:22:46 +10:00
Christopher Neugebauer
2cdb554623 Tuesday & Wednesday work (#30)
* Fixes an incorrect link in dashboard

* Disables the symposion sponsors app

* Adds redirect links for login/logout; adds THEME_CONTACT_EMAIL value

* Re-adds colophon/copyright message.

* Adds AceMarkdownEditor widget

* Tidies up the generated HTML

* Tidies up form snippet behaviour

* Proposals forms now use the markdown editor

* Monkey patches the markdown editor into the speaker form.

* Adds missing field to proposal details

* Fixes #10 — adds a link to random unreviewed proposals

* Minor tweaks
2016-06-29 23:17:15 +10:00
Christopher Neugebauer
feed83f517 More dashboard and settings themes (#29)
* Proposals forms now have a header panel

* Adds panels to the speaker forms

* Imports latest pinax accounts templates

* speakers/base and proposals/base now derive from utility_page.html

* Most login forms now derive from take flight themes

* Missed email_confirm

* More accounts bits

* Restructures login form

* Puts submit etc buttons inside fieldset borders
2016-06-28 07:58:06 +10:00
Christopher Neugebauer
eac85a2b92 Chrisjrn/dashboard 2 (#28)
* Dashboard template mk 2

* Better version of dashboard
2016-06-28 07:56:27 +10:00
Christopher Neugebauer
e6c623a69c Refactors all speaker-facing forms and editing pages to use the new theme (#27)
* Themes speaker_edit.html

* speaker_create now uses takeflight theme

* proposal_submit_kind now uses takeflight theme

* fixes bug in form_snippet

* Optimises proposals_submit_kind

* proposal_submit now uses wagtail theme

* Proposal_edit now uses new theme

* More forms

* Proposal details page now loads from take flight theme

* proposal_fields now looks nicer under the take flight theme

* proposal_speaker_manage rethemed
2016-06-27 18:13:38 +10:00
Christopher Neugebauer
6814b290eb Makes dashboard use takeflight theme instead of pinax theme (#24)
* Starts porting dashboard to the wagtail base page

* Dashboard mk 2

* Dashboard mk 3

* Last dashboard work for now
2016-06-27 13:26:26 +10:00
Scott Bragg
e3f41b4b31 Should fix Markdown (#25)
* Markdown editor missing from scripts

* Oops forgot staticfiles on wagtail base
2016-06-27 13:21:24 +10:00
Scott Bragg
df397ffde6 Refactor site_base with new template so most symposion pages work. Added site_base_wagtail.html for CMS pages to extend from. 2016-06-27 10:14:59 +10:00
Christopher Neugebauer
4f106a0cd4 Templates (finished?) (#22)
* Adds inset_illustration as a drop-down of svg data rather than as an uploady thing.

* Adds external link types to the homepage models

* Migrations

* Initial site template with our new shiny templates

* Moves all lca2017-specific assets to lca2017 subdirectory; symlinks from dist

* Reflects changes in site_base

* Deletes most of new assets in dist/

* WIP home page

* Adds external link list support

* Adds white-right panel type to the home page

* Removes an oops

* Adds copyright text to the site.

* Updates the remaining illustrations to be more compact.

* Adds illustration field to content_page, and adds fields into the news page.

* News index page

* News page is done!

* Formats the dates properly

* Commits migrations

* Optimises SVG files

* better logo

* oops

* Removes margin on logo.

* Optimises svgs, and uses tania’s originals

* One more
2016-06-27 08:01:42 +10:00
Scott Bragg
2d7a71a4ef Latest migrations so we're all in sync not creating conflicts (#18) 2016-06-25 12:49:11 +10:00
Christopher Neugebauer
fdfe3c7045 Wagtail integration (#17)
* Adds basic wagtail app to the website

* Renames lca_website to cms_pages for clarity; re-instates pinax-boxes until we remove them from the templates

* OOPS

* Just Enough Wagtail

* Removes the template view homepage from urls.py

* OOPS

* Makes the home page use a stream field

* Removes an irrelevant migration that I accidentally introduced.
2016-06-22 10:07:27 +10:00
Scott Bragg
4c458fd584 Proposal forms to match new tutorial and miniconf models 2016-06-21 21:47:45 +10:00
Christopher Neugebauer
b9b9834f63 Adds “unreviewed by you” to the list of proposal links (#16) 2016-06-21 10:08:53 +10:00
Christopher Neugebauer
9c986111a1 Updates proposal forms and review template (#14)
* Updates the forms and models for Proposal Bases

* Proposal review templates only display fields relevant to LCA

* Display total votes properly
2016-06-21 09:58:27 +10:00
Scott Bragg
8bf549c37f Adds new proposal types for Tutorials and Miniconfs (#9) 2016-06-21 09:42:51 +10:00
Christopher Neugebauer
a160e2b7c3 Fixes messages (#11) 2016-06-18 18:00:08 +10:00
Christopher Neugebauer
d7d36e2c05 Merge pull request #8 from lca2017/chrisjrn/006-display-scores
Adds score display to the review list
2016-06-18 00:09:18 -07:00
Scott Bragg
2c9527bfa5 If there are form errors it will now switch to the appropriate tab 2016-06-18 14:27:47 +10:00
Christopher Neugebauer
cad0d00817 Adds score display to the review list 2016-06-18 13:13:31 +10:00
Scott Bragg
2ab4cf10b8 Disables registrasion app for production deployment. (#7)
* Disable registraison for production environment
Fixes lca2017/symposion#12
2016-06-18 13:00:56 +10:00
Scott Bragg
796e7a6c20 Update template so only managers can post messages to speakers. (#3)
* Template changes so only papers committee manager can send messages to speaker. lca2017/symposion#3

(also manager can accept/reject/etc)
2016-06-14 09:40:29 +10:00
Scott Bragg
4ef9664620 Change templates to use +2/+1/-1/-2 voting scores (#2)
* Change review templates to reflect LCA voting scores

* Change review templates to reflect LCA voting scores
2016-06-13 17:58:55 +10:00
Scott Bragg
6b7618cc54 Able to load local_settings for production environment. 2016-06-10 13:38:24 +10:00
Christopher Neugebauer
e8e20dd6d3 Coverage, Migrations. 2016-04-27 10:33:44 +10:00
Christopher Neugebauer
42c97e6848 Merge remote-tracking branch 'pinaxcon/master' 2016-04-26 19:13:33 +10:00
Christopher Neugebauer
c56c749870 Prepares registrasion-demo to match the 0.1 release of registrasion. 2016-04-26 19:11:06 +10:00
Christopher Neugebauer
6c94eb9e91 Adds Registrasion support to the templates and apps. 2016-04-12 20:15:50 +10:00
Jeff Triplett
1f16614fc4 Fixes *_html proposal fields 2016-04-04 18:36:01 -05:00
Patrick Altman
770e2ca88d Clean up some of the voting status UI 2016-03-17 13:59:46 -05:00
Patrick Altman
430d3dad99 Fix up review nav 2016-03-17 13:45:40 -05:00
Patrick Altman
7dc167f7df Update copyright year 2016-02-27 18:34:46 -06:00
Patrick Altman
60810af13a Fix pinax-boxes modal editors 2016-02-27 18:32:03 -06:00
Patrick Altman
dd8f0ba9c5 Update to latest build system
Closes #3
2016-02-27 17:23:35 -06:00
Patrick Altman
0b1da0e85e Upgrades 2016-02-27 16:55:59 -06:00
Patrick Altman
ad9e5484f3 Add ace editor 2015-10-16 20:09:06 -05:00
Patrick Altman
04f246d850 Initial commit of the PinaxCon demo site 2015-10-16 12:53:02 -05:00