Commit graph

71 commits

Author SHA1 Message Date
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
Christopher Neugebauer
5abf9ad3ab Merge pull request #34 from faulteh/master
Added analytics script
2016-07-01 10:45:40 +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
d3a8b39a7b Adds 2em to the bottom of the illustration div in compact panels (#26) 2016-06-27 18:05:57 +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
Christopher Neugebauer
08c8f23344 Merge pull request #23 from faulteh/master
site_base.html refactor
2016-06-27 11:28:06 +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
Christopher Neugebauer
ca329c1c90 wagtail after templates (#19)
* 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
2016-06-26 11:49:14 +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
fbcfd05b02 Merge pull request #1 from faulteh/master
Changes to get website deployable in production.
2016-06-11 12:09:06 +10:00
Scott Bragg
56cad69f8f Git Ignore local_settings so we don't accidentally publish the secret! 2016-06-10 13:47:51 +10:00
Scott Bragg
6b7618cc54 Able to load local_settings for production environment. 2016-06-10 13:38:24 +10:00
Scott Bragg
bfcfb54d1b Update requirements on lca2017 branch so pip doesn't get confused with
different Django and Symposion versions
2016-06-10 11:25:46 +10:00
Christopher Neugebauer
ec882bdbdd Update requirements.txt
To point at registrasion 0.1.1 (which has a working Wheel file)
2016-05-10 11:41:44 -07:00
Christopher Neugebauer
2d4f0a4acd Update readme.rst 2016-05-10 11:40:56 -07:00
Christopher Neugebauer
998ae6e6be Points requirements.txt at the lca2017 fork of symposion 2016-05-10 11:00:13 -07:00
Christopher Neugebauer
e8e20dd6d3 Coverage, Migrations. 2016-04-27 10:33:44 +10:00
Christopher Neugebauer
7116eeb294 Merge remote-tracking branch 'pinaxcon/master' 2016-04-26 19:19:54 +10:00
James Tauber
c33c15d314 added MIT license 2016-04-26 17:18:28 +08: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