Commit graph

374 commits

Author SHA1 Message Date
James Polley
348e1c5c82 Javascript hack to make it more clear that postcode is mandatory
On the two pages that display the profile form, add some javascript to
flag the postcode as required whenever the Country is AU
2017-10-01 18:45:29 +11:00
James Polley
38a99f7ae5 And "discount" to EB discount descriptions 2017-10-01 14:50:53 +11:00
James Polley
3f4050d96f Use a YesNo field for T&C/CoC agreement
Using a checkbox doesn't make it obvious that this is required.
2017-10-01 14:48:59 +11:00
James Polley
ac0ef79b73 "Create" an attendee profile 2017-10-01 14:46:50 +11:00
James Polley
7965ac4111 De-dupe discount header/text
The version with the header was better, so let's use that in both
places by moving it inside the template.
2017-10-01 14:44:41 +11:00
James Polley
73964cd820 Update shirt details to match plans 2017-09-30 23:40:46 +10:00
James Polley
68b6fe8f1e Offset polution with correct spelling. 2017-09-30 23:40:16 +10:00
James Polley
e51ad76384 Add a "Back" button to the guided_registration stages
"Next" is green, indicating that it's the default path, the way
forward. "Back" is available but blue.

For extra consistency, the initial "Get ticket" button is now also a btn-success
2017-09-30 18:45:57 +10:00
James Polley
4605ee0d98 Require attendees to agree to Code of Conduct 2017-09-30 18:45:50 +10:00
James Polley
9d7be5f6df Update YesNoField coercion
I am not sure if this is related to a py2/py3 change, or if it's
because django 1.11 changed the way it handles booleans; but either
way, this works.
2017-09-30 18:11:05 +10:00
James Polley
50145c03fe Copy stripe js template into pinaxcon
Shouldnt be neccessary, template loader should be finding the template provided by the installed app.

but it's not, and I want rego to go live today, so here we go.

One day when things are nice this commit can be reverted and I will be crying a little less on the inside.
2017-09-30 10:51:43 +10:00
James Polley
105e6988e5 Merge migrations with upstream
Find urlencode, wherever it may hide

Further work to using latest upstream registrasion
2017-09-30 00:44:21 +10:00
James Polley
5409d4974a The 2018ificiation
I think this removes most references to "hobart", "pycon", and "2017"

There are still some references to some images that we don't have a
replacement for.
2017-09-30 00:44:13 +10:00
James Polley
54fceededa Just one void invoices button is sufficient thanks
And yes, this is changing it back to a button; having it as a link
isn't quite what we want.
2017-09-30 00:44:13 +10:00
James Polley
ed2753d284 Update inventory for 2018 2017-09-24 19:30:40 +10:00
James Polley
bd1031e2cd Neaten "void invoices" button
Only want to show this once - not once per invoice.
It's not something most people will need to use so it doesn't need to
be a button. Restyle it to be a link
2017-09-24 17:53:53 +10:00
James Polley
18047f7549 Show paid/cancelled invoices
An errant ``{% if pending %}`` meant that we were only showing paid
and cancelled invoices - and the ability to buy new products - if
there was currently a pending invoice.

This change remove the errant check and allows for anyone with a paid
invoice to inspect it; or to add products.
2017-09-24 17:53:53 +10:00
James Polley
ba98c36868 Add admin links to review sections that the user can manager 2017-09-22 22:46:21 +10:00
James Polley
1e20731e32 Fix list of teams 2017-09-22 22:46:21 +10:00
James Polley
750902c5c3 Restore messages to site_base template 2017-09-22 22:46:08 +10:00
James Polley
d22f8e8e35 expand proposal admin 2017-09-22 20:13:48 +10:00
James Polley
9b0d830538 Finish adding models/forms/admin for new miniconfs
NB: all the proposal sections for the miniconfs here are set to open
on 2017-11-01. To make them available sooner, visit
/admin/symposion_proposals/proposalsection and change the start date.
2017-09-22 16:45:02 +10:00
James Polley
2a882678db (re)create miniconf proposals
This is a partial revert of  6d864e8ce5
- plucking out the bits we want to re-use
2017-09-22 16:45:02 +10:00
James Polley
7c273cdc3d Fix display of teams on dashboard 2017-09-22 16:19:04 +10:00
James Polley
f058ed7d71 Enable multi-level site-tree
* Remove the outdated compiled javascript once again
* Update the sitetree_header template to use more detail.

The extra detail here is taken from the menu_bootstrap3.html template
distributed with django-sitetree
2017-09-17 20:17:45 +10:00
James Polley
b6a7b8b120 Set review-table class to get goodness on notification page
Flagging this as a review table means we get sorting, pagination, and
search. Much awesome, esp when we want to do this like "show me all
the ones that haven't been notified yet"
2017-09-17 13:16:06 +10:00
James Polley
ecd4bc97bc Expand bulk_accept to generic bulk_update
Allows for bulk rejection/undecided/standby in addition to bulk accept.
2017-09-17 13:15:56 +10:00
James Polley
fa18ef68fb Merge branch 'no-history' into 'master'
Remove jquery.history.js reference

See merge request LCA2018/symposion_app!28
2017-09-16 12:27:11 +00:00
James Polley
b89e6e9b56 Merge branch 'remove-stale-js' into 'master'
Fix review buttons by removing stale compiled JS; also some styling

See merge request LCA2018/symposion_app!27
2017-09-16 12:26:47 +00:00
James Polley
6e17b6d13d Remove jquery.history.js reference
* This reference was added in the very distant past
* But jquery.history.js itself has never been in the repo
* pyconau-2017 team resolved the dilemma but dropping
  jquery.history.js into the repo
* But as near as I can tell, this does nothing except in obsolete
  older browsers. The fact that it's been broken ever since it was
  "added" is highly suggestive of it never having ever been used or
  needed
* So, trim the fat. It's possible that this might break an older
  browser that needs the functionality jquery.history.js provides -
  except that such a browser would *already* be broken because
  jquery.history.js has never actually been around to be used.
* If we ever do need this functionality, we can revert this
  change.. and then we'd have to drop in jquery.history.js. In that
  circumstance,
  https://github.com/pyconau2017/symposion/commit/34bc7c0 may be of interest.
2017-09-16 21:21:12 +10:00
James Polley
5a84a57420 Fix review buttons by removing stale compiled JS; also some styling
Essentially cognate with 0673e35 from the pyconau-2017 fork.
2017-09-16 20:55:10 +10:00
James Polley
8962a1f66d Correct list of tags available in notification templates. 2017-09-14 20:50:54 +10:00
James Polley
d0755eadf6 restore extra_script
This fell out of the template at some point, but is needed for some
javascripty things to work.
2017-09-13 23:10:30 +10:00
James Polley
37fb435e18 Add devmode_settings.py for local dev
* Adds an env variable to .env to turn on dev mode
* Uses the inbuilt django auth rather than saml when in dev mode
* For laziness, re-uses the admin login form for the non-admin login

make_dev_container now comes up ready to be logged into by any
user. No non-admin users are preconfigured; but you can add one at
http://localhost:28000/admin/auth/user/add/, log out, and then hit
http://localhost:28000/ to log in as the new user.
2017-08-28 17:12:05 +10:00
Sachi King
ade44d6a1b Merge branch 'fix_speaker_Addittion_Template' into 'master'
{{ dashboard_url ]} fixup

See merge request !19
2017-08-07 01:53:24 +00:00
Sachi King
75c82aad37 Fix miniconf editing - No attribute issue
Editing a miniconf, on save, the code looks in settings for
ADMIN_USERNAMES, and as it does not exist, we stack-trace and 502 to the
user.

Add the attribute to settings.py
2017-08-04 15:19:32 +10:00
James Polley
473bc8efed {{ dashboard_url ]} fixup 2017-08-04 14:17:44 +10:00
Sachi King
e668bf03c2 Merge branch 'addfavicon' into 'master'
Change favicon to an LCA-appropriate favicon.

See merge request !14
2017-07-04 09:13:37 +00:00
Sachi King
7e5fbc27ea Syntax: How'd that get there 2017-07-03 21:29:16 +10:00
Sachi King
b85ab46ed4 Configure a production email server 2017-07-03 21:18:57 +10:00
James Polley
db328d9354 Change favicon to an LCA-appropriate favicon.
This isn't the same one we're using for the static site - but honestly I think this one is probably better.
2017-07-03 17:36:39 +10:00
James Polley
13bed8999c Merge branch 'other-migrations' into 'master'
Other suggested django migrations

See merge request !12
2017-07-02 12:43:38 +00:00
Jamie Lennox
59207eb0c9 Other suggested django migrations
So django keeps strict synchronization between its code and migrations
so that it can help generating new migrations. These are the additional
suggested migrations. A lot of these are a null effect, some are things
like transforming an unsigned integer to a signed integer. So not super
urgent on a small scale, but worth doing to keep django happy.
2017-07-02 22:38:38 +10:00
Jamie Lennox
10b6358b92 Add release materials check boxes to miniconf proposal
We need to have people who are submitting a miniconf proposal agree to
releasing the material. The easiest way to do this is to just make it a
proposal like the other two types. We don't have audience type for
miniconf, instead of deleting it just have a default - it's easier.

WARNING: This requires a real migration to be performed before use.
2017-07-02 22:31:56 +10:00
Jamie Lennox
4847f13de0 Use Linux Australia for release and not pycon
Update the recording and materials release to say Linux Australia, not
Pycon Australia. This generates a migration because the model text has
change - but also because in the 0001_initial migration it appears that
this help text is stored as a byte string.

This is a bit weird, but realistically running this migration is not
going to cause us any problems so just add it so we don't end up
fighting django along the way.
2017-07-02 22:11:18 +10:00
Sachi King
db3e6bbffe This is why we can't have nice things 2017-06-26 22:46:11 +10:00
Sachi King
e52dbd9c54 Missed an import 2017-06-26 22:43:58 +10:00
Sachi King
22680dd663 dashboard at / 2017-06-26 22:20:20 +10:00
Sachi King
1a54b0f9d6 Collect Static so admin works
Thanks tchaypo and jammielennox

Closes #11
2017-06-26 21:11:15 +10:00
Sachi King
ed81eb3e88 Is a dict 2017-06-24 17:01:25 +10:00
Sachi King
f07b20aebd DATABASE_URL as ENV_VAR 2017-06-24 15:59:46 +10:00
Sachi King
d106efb6ce Fix static content serving
What?  Why did this stop working?
2017-06-10 13:19:40 +10:00
Jamie Lennox
2eb2383b6c Display failure messages when environment variables missing
Running migrate initially as specified from README leads to a cryptic
"CONFIG ERROR" failure message. Print out what variables are actually
missing.
2017-06-10 12:00:31 +10:00
Sachi King
0c73ad13f0 Add our vendor path to our path
I guess this is as good a method as any to get or vendored packages in.
2017-05-27 20:48:24 +10:00
Sachi King
8cf348acb5 Make proposal-detail more friendly to read 2017-05-07 16:15:41 +10:00
Sachi King
c73a7e3ff9 Use monospace font, hack, and not markdown.
Font should be made local and not remote loaded.
2017-05-07 13:18:42 +10:00
Sachi King
781921e022 Use app.css not inlined css
Simpler for us.
2017-05-07 13:11:33 +10:00
Sachi King
f8a9416600 Remove unused "hooks"
This isn't used, drop it.
2017-05-07 13:08:52 +10:00
Sachi King
bb573ebee4 settings - DEBUG hardening
DEBUG is something that should never be turned in on prod.  As such,
lets be extremely specific on what we expect to process.

As we'll be taking this in from the environment, it's ensured we will
get a string.  So we'll always get and only handle this in string
form.  If it's anything else, it's an operational error and we bail.

(Note: bool('0') is truthy, so we make sure we leverge our string -> int
-> bool every time, so corectness can be noticed if it is not)
2017-04-30 12:10:56 +10:00
Sachi King
46b85fa778 settings saml2_contact type is wrong.
We had List[Dict[str, str]], but this was passed without question from
djangosaml2 to pysaml2 no questions asked, which expects Dict[str, str].
2017-04-30 11:38:26 +10:00
Sachi King
55cc3e43a4 Exit with error if we don't have xmlsec1. This is a critical tool 2017-04-29 20:04:32 +10:00
Sachi King
85ee108a1f Use full imports not .
And tox to py3.6
2017-04-29 14:28:48 +10:00
Sachi King
c6c76e98d3 Remove excess CSS and fonts
print wont work for us now.  Will need to be recreated.

Fonts, I don't even know where they came from, so I can't keep them
2017-04-26 22:14:11 +10:00
Sachi King
e562b61521 Template cleanup of base dir templates 2017-04-25 15:59:35 +10:00
Sachi King
8e8f46276f _styles.html is not loaded anywhere
Not in use, remove it.

Hym, might be able to remove this CSS now too.
2017-04-25 15:39:10 +10:00
Sachi King
3ffbc9855f cleanup sym/sched/base.html 2017-04-25 15:38:24 +10:00
Sachi King
61d1416b06 Convert to bootstrap tab configuration
This was broken due to being something not bootstrap for tabs.

Convert to tab layout, just like reviewers page already is.
2017-04-25 15:32:02 +10:00
Sachi King
a0d0750b88 Reformat proposal_detail.html 2017-04-25 15:13:47 +10:00
Sachi King
4adbf0ee46 This script isn't loaded - remove it
This isn't loaded, doesn't seem to be for 2017 or PyCon, so I'll chuck
it.
2017-04-25 14:54:37 +10:00
Sachi King
9babbd0c43 We don't run modernizer.js
Remove the "no-js" class, that could be expected to change to "js" if
one doesn't know we don't have javascript that does that running.
2017-04-25 10:24:29 +10:00
Sachi King
8c60dd206d We don't maintain this manifest, drop it
We don't use this currently.  Removal.
2017-04-25 10:24:28 +10:00
Sachi King
10cc96b726 Remove metron
Not used - old/depricated name
2017-04-25 01:31:08 +10:00
Sachi King
f0e7a58226 Asset cleanup
Remove in-app stale resources and their branching of different cons.
Remove dist and move everyting into static/src.
Remove unused stale resouces such as less and hbs, etc.
2017-04-25 01:31:01 +10:00
Sachi King
8d77023aec Remove AceEditor
I cannot find the benifit to this over the base editor.

Tabs work, but that's pretty minimal.  And tabs don't work on GitLab or
GitHub, so I don't feel not having that is substantual to functionality.
2017-04-25 01:27:04 +10:00
Sachi King
8fa8fc4012 Add ' *' required markers back
The bootstrap renderer did not do anything to signify required rows.  We
can do this by adding a class for CSS to work on, and add this field in
a more simplified manner.

label-required == append ' *'
2017-04-25 01:27:04 +10:00
Sachi King
b3ac11a66b Simplify django form rendering
Remove my hack to get bootstrap forms.

Remove the insane render-row-at-a-time forms that then only render
default django forms.
2017-04-25 01:26:59 +10:00
Sachi King
7b74d3829f Disable SAML debug
We don't need this and it prints a lot of information.
2017-04-25 01:25:54 +10:00
Sachi King
b0b9ea89f7 Environtment the settings
And finally, dev settings converge with commited settings.
2017-04-25 01:25:54 +10:00
Sachi King
2d7a5aa35a Useless comment 2017-04-25 01:25:54 +10:00
Sachi King
895cab2c1c Signal rejections and standby talks.
Go green for Accepted

Go Red for Rejected

Go yellow for Standby
2017-04-25 01:25:47 +10:00
Sachi King
dfd1da01be Remove unicode(), we're all unicode
Py3
2017-04-23 18:32:52 +10:00
Sachi King
b9510fed67 Remove state select box
I'm not against putting this back, however, it doesn't work quite as one
would expect, so I'm removing it as its functionality is more confusing
that working.

Is this really the best way to address this?

If you unselect AU, then it never comes back.  It leaves its value in
the textbox pre-filled if it ever got a value, leaving the field
pre-filled with an Aus state even if the person is New Zealand.

Most of our attendees are from but a few countries, we should make these
equal effort to fill in.
2017-04-23 17:32:38 +10:00
Sachi King
18fcfddad6 Errors should be big red boxes 2017-04-23 17:21:19 +10:00
Sachi King
079f87b1d2 Use a selectbox for of_legal_age
To me, this registeres to a user as a required field better than a
radio-button.

As well, we now signal it as "required = True"
2017-04-23 17:19:38 +10:00
Sachi King
1886323d74 Bootstrapification
Boot custom CSS, and put some base, standard css in its place.
Shame I did not start with fresh Bootstrap4, but oh well.

Some more templates could be made to make this less messy, which would
be good.
2017-04-16 16:30:45 +10:00
Sachi King
6d864e8ce5 Cleanout conf-specific proposals.
We don't have these mini-confs (yet).
We don't want these files.
We're not going to rename the release in 0010 and drop all the extra
tables in 0011, we're going to toss them on the cutting room floor and
call it good.

They're in git, we can look at this commit and past ones on how to
recreate these for new proposal additions going forward.
2017-04-16 16:30:45 +10:00
Sachi King
1ba1a97c45 move templates out of vendor specific locations
Lets not kid ourselves.  The whole apps templates are client specific.
Lets just remove that and not think it isn't.
2017-04-16 16:30:45 +10:00
Sachi King
0aa48837cf Template simplication: remove site_base_wagtail.html 2017-04-16 16:30:45 +10:00
Sachi King
2642c03115 Sneak 2017 into the list of previous years 2017-04-16 16:30:45 +10:00
Sachi King
e86a811f38 Bootstrapification: SiteTree Nav Bar
Make sitetree a bootstrap navbar.

Remove mobile menu, bootstrap provides this.
2017-04-16 16:29:19 +10:00
Sachi King
4dedd88225 Remove the blue header and clean up padding 2017-04-09 17:14:50 +10:00
Sachi King
8698e416fa Remove DJDT template view
This causes template rendering to blow out of proportion on certain
views.  I don't care enough about this feature to spend time fixing it.
It has not provided me any value to this point.

One such view is ^/tickets/profile$ however there are others where I saw
this, yet do not remember which ones they were.
2017-04-09 15:58:29 +10:00
Sachi King
88bcd5fe65 Switch to LCA2017 templates
This fixes proposal details.
2017-04-08 20:13:28 +10:00
Sachi King
81272d5310 Update requirements for Django 1.11
This has long enough support to reach post conf + a fair bit.
2017-04-08 20:13:22 +10:00
Sachi King
cfa9a60f11 Move secrets values to the top
Probably not the best way to do it, but it'll do.

We should add some logic to bail if certain values are unset.
Logic in settings, *gross*, I know.
2017-03-31 15:30:40 +11:00
Sachi King
dc532cc4f8 Use env vars for GCS_BUCKET 2017-03-31 12:09:41 +11:00
Sachi King
a0ee642cc3 Cleanup templates
Unused tags
Unused templates
Leftovers pinax-pages templates
2017-03-31 11:54:47 +11:00
Sachi King
6557e2983b Support Django 1.10
Few minor changes to support Django 1.10
2017-03-31 11:54:47 +11:00
Sachi King
823f89a0ed Remove sponsorship for now
Simplify for CFP.

Sponsorship needs some thought.
2017-03-31 11:54:47 +11:00
Sachi King
2fe3bbfbdd Ask file provider for URL
Don't reason the URL from implmentation specific magic.
2017-03-31 11:54:47 +11:00
Sachi King
8db0e47107 Cleanup pages for readability
This removes images, and giant headers, and makes the text - not white.
The next layer down in CSS is blue, so that's it for now.

This helps understand what's on the page visually, so this, at the
least, make testing easier for now.
2017-03-31 11:54:46 +11:00
Sachi King
d658f8fb74 Store user files in GCS - Ephemeral Disks
Issue #2
2017-03-31 11:54:46 +11:00
Sachi King
0fddbf9f9b flake8 again 2017-03-31 11:54:46 +11:00
Sachi King
37a9b37499 Bind in djangosaml2
Our authn is provided via shibboleth
2017-03-31 11:54:46 +11:00
Sachi King
c37ed61036 Remove wagtail
This should eradicate wagtail from the project.

While wagtail may be nice, our goals are to keep all things public, and
having things locked behidn a DB is congruent to that plan.

All in all, the django project only leveraged a single wagtail feature,
"richtext" which has been hacikly removed and will result in bad display
of however it comes up.  But this is on homepage.html, which will be
removed and covered up with a static website, which means we should be
able remove homepage entirely from this project.

This reduction hopefully makes the monolith easier to understand,
maintain, and wield.
2017-03-31 11:54:46 +11:00
Sachi King
f9c406e5f7 Remove 500 patch. 1.7.0 upgrade.
While 1.7.0 exhibits a similar issue, we would need to re-verify and
re-patch this library with a new 1.7.0 monkeypatch.

This is ultimately only an annoyance.  It only occours when we've
already 500'd, and this just means we get a second 500.  As such it's
not critical.
2017-03-31 11:54:46 +11:00
Sachi King
9e851c31fa Remove dj-user-accounts
That's a nice macro, but we don't need it.
dj-user-accounts stands in the way of using more generic AUTN_METHODS
2017-03-31 11:54:46 +11:00
Sachi King
48c28651b8 Remove boxes
Boxes takes content directly from the DB and drops it into the django
templates.  This is rather ugly and goes against keeping as much as we
can in static locations.  As such, this is being dropped.
2017-03-31 11:54:46 +11:00
Sachi King
187d900d81 This seems to make it work. NFI
Works in prod mode, dies in dev with a warning/error

Doco seems to suggest that mixing these directories together is an
error as it means user uploads mingle with site files.
2017-03-31 11:54:46 +11:00
Sachi King
befa544bec Use outbound mail provider for admin BCC
We can use our outbound provider to BCC any required administive
retention that is required.
2017-03-31 11:54:46 +11:00
Sachi King
39b556b7ac Mass style-check update
Seems okay.
2017-03-31 11:54:46 +11:00
Sachi King
a239d12e2d Config file cleanup
- remove a whole bunch of comments, they're useless

 - Update TimeZone to Sydney

 - Don't colocate MEDIA (user uploads), with STATIC in fact,
   how is this set, Django has a safety check for this and bails.

 - Do not store a default SECRET_KEY in git.
   We'll set a random one by default, so things "just work"
   It would also be acceptable to not set it and let DJ bail

 - We dont want to log to a file.  Our disks are ephemeral.

 - We likely will not overlay a production settings.py over this one.
   We need to implement something that is more container friendly in the
   future.  This will be env-vars or a config file.
2017-03-31 11:54:39 +11:00
Sachi King
cae05aeebc Drop the wiki
Whatever wiki is used, will be run as a standalone application that is
not part of the primary application.

Closes #4
2017-03-30 23:53:24 +11:00
Sachi King
cfbf547dd9 Revert "Switched to using posgresql for db."
Add MySQL deps
2017-03-30 23:53:24 +11:00
Nick Seidenman
01c5292653 Better styling for dashboard now working. 2017-03-05 15:19:48 +11:00
Nick Seidenman (N6)
bc07865ac0 Starting to get Teams and Proposals (and Sponsors -- more ) working. 2017-03-05 15:18:01 +11:00
Nick Seidenman (N6)
5347a7efae News pages working.
Sponsorship ... getting there.
2017-03-05 15:17:47 +11:00
Nick Seidenman (N6)
e4679c7cb8 Merge branch 'develop'
Conflicts:
	2017.pycon-au.org.conf
2017-02-21 10:57:30 +11:00
Nick Seidenman (N6)
a07dbe58c1 Sponsor (vertical) area on basic page layout working with graphics. 2017-02-21 10:51:45 +11:00
Nick Seidenman (N6)
901c636a6b Made Intro field in content page optional. 2017-02-17 19:17:03 +11:00
Nick Seidenman (N6)
ac7228ec50 Default content page and sponsor list is working, mostly.
TODO: get sponsor logos to show up instead of the names (text).
2017-02-17 18:36:58 +11:00
Nick Seidenman (N6)
aa359400a2 Menu bar looking better. 2017-02-16 21:37:37 +11:00
Nick Seidenman (N6)
0aec9bd27c Switched to using posgresql for db. 2017-02-14 16:43:19 +11:00
Nick Seidenman (N6)
2f43a3b9e6 Merge branch 'develop' 2017-02-05 09:49:50 +11:00
Nick Seidenman (N6)
6fa996f183 Starting to mod pages for other content (e.g. proposals, calendar) 2017-02-05 09:48:38 +11:00
Nick Seidenman (N6)
a00fc7845e Added some css to make text visible on 404 and 404 pages.
Removed references to non-existent content—page-header-panel.html.
2017-02-05 09:45:12 +11:00
Nick Seidenman (N6)
8cf2714496 Merge branch 'prod' of github.com:pyconau2017/website into prod
Conflicts:
	pinaxcon/urls.py
2017-01-18 14:54:02 +11:00
Nick Seidenman (N6)
dd3110e125 Merge branch 'master' into prod
Conflicts:
	pinaxcon/settings.py
	pinaxcon/urls.py
2017-01-18 14:52:34 +11:00
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)
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