Commit graph

2150 commits

Author SHA1 Message Date
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
087307e7cd Merge pull request #25 from faulteh/lca2017
Adds bcc to emails sent from server
2016-07-01 10:14:27 +10:00
Scott Bragg
073174e617 Adds bcc to emails sent from server 2016-07-01 10:10:23 +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
Scott Bragg
7225dcd660 Merge pull request #22 from lca2017/chrisjrn/21-chairs-can-see-own-proposals
Lets programme chairs see their own proposals.
2016-06-29 22:26:46 +10:00
Scott Bragg
c23f2b5753 Merge pull request #24 from lca2017/chrisjrn/16-random-proposal-link
#16 adds view for jumping to a random proposal
2016-06-29 22:25:13 +10:00
Christopher Neugebauer
d4230feab0 #16 adds view for jumping to a random proposal 2016-06-29 16:00:07 +10:00
Christopher Neugebauer
d43d42bbc3 Fixes #21 — the check_speaker argument to proposals_generator is *false* for section chairs. 2016-06-29 15:16:24 +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
f56ce51459 Merge pull request #18 from lca2017/chrisjrn/017-cfp-models-and-forms
CFP models and forms
2016-06-21 09:57:56 +10:00
Scott Bragg
c8c25718bc Merge pull request #20 from lca2017/chrisjrn/019-track-abstains-properly
Abstains are no longer tracked as "votes"
2016-06-21 09:43:17 +10:00
Scott Bragg
8bf549c37f Adds new proposal types for Tutorials and Miniconfs (#9) 2016-06-21 09:42:51 +10:00
Christopher Neugebauer
7f3ed91dae vote_count now only counts non-abstaining votes. Fixes #19 2016-06-19 18:39:07 +10:00
Christopher Neugebauer
14dea7eafa Fixes deletion of reviews 2016-06-19 18:38:14 +10:00
Christopher Neugebauer
57acd04852 Removes a block of egregious stupidity from update_vote and replaces with something that actually works 2016-06-19 18:37:54 +10:00
Christopher Neugebauer
388c722ed6 Makes sure accessibility requirements are parsed 2016-06-19 14:07:43 +10:00
Christopher Neugebauer
c0e9b90476 Requires acceptance of the code of conduct and T&Cs 2016-06-19 14:00:17 +10:00
Christopher Neugebauer
782e5c9ea2 Tidies up some of the proposal fields 2016-06-19 13:30:10 +10:00
Christopher Neugebauer
aa56ac00c3 Updates speaker model to include information that LCA typically asks for 2016-06-19 13:19:32 +10:00
Christopher Neugebauer
0ce99678c3 Updates ProposalBase to include information that LCA typically asks for 2016-06-19 12:39:28 +10:00
Scott Bragg
08698e5326 Merge pull request #15 from lca2017/chrisjrn/002-abstain
Fixes two bugs in abstain voting
2016-06-18 18:12:19 +10:00
Christopher Neugebauer
a160e2b7c3 Fixes messages (#11) 2016-06-18 18:00:08 +10:00
Scott Bragg
ee1c352571 Merge pull request #14 from lca2017/chrisjrn/011-travel-requirements
Adds extra fields to the speaker profile
2016-06-18 17:38: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
Christopher Neugebauer
d305cd8c13 Requires comments for non-abstain votes only 2016-06-18 17:07:21 +10:00
Christopher Neugebauer
6e133970d9 Removes div-by-zero error if the first vote is an abstention 2016-06-18 17:01:56 +10:00
Christopher Neugebauer
b2af1d0c06 oops 2016-06-18 16:51:28 +10:00
Christopher Neugebauer
f64a7573d3 - Adds defaults to the speaker profile
- Removes “experience”, as this is listed in “other notes” on a per-proposal basis.
2016-06-18 16:50:11 +10:00
Scott Bragg
a22b4bc2f8 Merge pull request #13 from lca2017/chrisjrn/002-abstain
Adds abstensions to the vote model
2016-06-18 14:38:35 +10: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
217f2f32c1 Adds extra fields to the speaker profile model 2016-06-18 13:53:02 +10:00
Christopher Neugebauer
149fbb4ac6 Adds .DS_Store to .gitignore 2016-06-18 13:33:06 +10:00