Commit graph

237 commits

Author SHA1 Message Date
James Polley
c9223aeef0 Restore datatables to review lists 2017-10-13 13:07:05 +11:00
James Polley
3334469d30 Tweak invoice templates so that header text is hidden on print 2017-10-11 21:57:04 +11:00
James Polley
d0f4b1c455 Update datatables libraries
This fixes some display issues and adds functionality.
2017-10-08 16:14:28 +11:00
James Polley
8aa1148f7a Make datatable work for each table on the page, not just the first 2017-10-05 00:55:30 +11:00
James Polley
f6b629bd60 Remove debugging line left on profile form. 2017-10-04 23:49:16 +11:00
James Polley
45512e815a Add datatables tools to ticket reports 2017-10-04 20:43:00 +11:00
James Polley
3c6c98021d Clarify function of buttons on profile form
* "return to dashboard" throws away changes, so change the label to
  "cancel" to make this more clear.
* "Save profile" is probably the button you're looking for, so flag it
  as btn-success to make this clear.
2017-10-04 18:06:23 +11:00
James Polley
dd5f789ef3 speakers_dinner_ticket requires acceptance of T&Cs 2017-10-02 09:13:05 +11:00
James Polley
ec71df90c8 Enable adding voucher from the review screen 2017-10-02 00:44:01 +11:00
James Polley
abe4f5ad7a Fix some rules that were overly generous 2017-10-02 00:05:21 +11:00
James Polley
b0de856255 Clarify wording about complimentary products 2017-10-01 22:56:20 +11:00
James Polley
b8dcbd89b7 Draw more attention to the need to select complimentary items
A big complaint from 2017 was that people overlooked things like
shirts and dinner tickets as those are complimentary, so they assumed
they didn't need to choose them.

This change adds some labels and some explanatory text to try to make
this more clear.
2017-10-01 20:02:58 +11:00
James Polley
e325454fab Move agreement to terms to a Category
- Remove field from attendee model
 - Create the category instead
 - Add a product as well
2017-10-01 20:02:45 +11:00
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