Commit graph

2067 commits

Author SHA1 Message Date
James Polley
b833b7d869 Order slots by room order first
* lca2018 has a situation where we have multiple slots starting at the
  same time, but ending at different times
* The headers of the timetable grid are sorted by room sort order
* In sqlite at least, ordering by start,order seems to implicitly
  resolve duplicate start times by looking at the other sort fields
  first, and will only sort on order if all other fields are identical

* This results in the slot that ends first going in column 1, which
  gets out of sync with the room listed in the header

* I can't figure out how to solve this in the database, so...

* Force the slots to be sorted by room order.
* Then, for each start_time, select out slots starting at that time
  and operate on them
* This both gets the slots in the right order *and* keeps multi-room
  slots with the right colspan. Yay!

* It's possible that this wouldn't be needed on some DBs which might
do the sorting differently.
2017-12-24 19:20:04 +11:00
James Polley
f07246f9d5 Display Room for everything that's not break
Talks, tutorials, plenaries, miniconfs - everythign except breaks please.
2017-12-24 14:50:59 +11:00
James Polley
193ffc76d5 List rooms in slot admin
In many parts of the schedule there are multiple slots with the same
start/end times, and it can be hard to find the one you want to edit.

Make this slightly simpler by listing the room names in the admin list.
2017-12-24 13:54:57 +11:00
James Polley
cabad1c7d5 Change "Apply voucher" button into a link
I can't find the form that should be displayed here, so the simplest
thing I can do at 11pm is to make this a link. That's unsatisfying but
hopefully works.
2017-12-23 23:05:56 +11:00
James Polley
98fe425867 Tidy presentation of discounts list 2017-12-23 21:52:58 +11:00
Sachi King
5511a3d00a str values before bleach
Can't operate on objects, stringing seems fine here, there's a lot else
already randomly str() before bleach.
2017-12-23 04:16:36 +00:00
Sachi King
66224d6834 Make Emoji-capable fields greyscale 2017-12-23 02:27:40 +00:00
James Polley
2aae2af55d Disable client-side validation on credit_note forms
* HTML5 browsers have some clevers to do client-side validation of
  forms
* Django activates this by default for certain field types
* However, in this case, there are three forms on this page. We rely
  on two of them being invalid in order to figure out what processing
  to do.
* So we need to disable the client-side validation.
2017-12-23 13:13:43 +11:00
James Polley
2e07fbeac5 Remove unicode warning
We now support more unicodes so remove the warning
2017-12-23 12:56:33 +11:00
James Polley
3ac31dd55b Include templates in sdist
Adds a MANIFEST.in to ensure that templates are included in the built
package and thus available in systems that install this package.
2017-12-23 12:29:37 +11:00
James Polley
fcfdb10ede Display Condition type in list views
* Whether a Flag is disable-if-false or enable-if-true is a very
  important detail
* But one that's easy to get wrong
* And it's hard to spot problems without inspecting every single flag

This change adds the Condition into the various admin list views, so
that it's easier to scan them all for problems and look for inconsistencies.
2017-12-22 18:43:02 +11:00
James Polley
d19e34280a Enhance proposal fields display
* Display the "withdrawn" status
* Display extra information about exhibitions for art+tech
2017-12-13 12:03:12 +11:00
Joel Addison
21e06deef0 Fix navbar dropdown menu colour and font size 2017-12-10 17:55:41 +10:00
Joel Addison
9f0bb9178f Improved menu styling
Update menu to use same style as static site,
with slight adjustments for Bootstrap 3.
2017-12-10 17:26:38 +10:00
Joel Addison
00ea909d05 Update fonts
Use the same fonts as the static site, as per the LCA2018 branding guide.
Shrink headings on the Dashboard to suit new fonts.
2017-12-10 17:26:38 +10:00
Joel Addison
bd25446f6e JavaScript fixes 2017-12-10 17:26:38 +10:00
Sachi King
cb51a2abd8 Tell django to use MB4 2017-12-10 14:31:48 +11:00
James Polley
a880bc27fb Enhance track admin 2017-12-03 18:11:39 +11:00
James Polley
c7e29b3cb1 Don't try to initialise dataTable twice
Old code was initialising the dataTable twice - once in the parent
block and once in the child. This doesn't actually work and just
caused errors.

Switch to only initializing it once. Unfortunately this creates
copy-pasta :(
2017-12-03 17:30:43 +11:00
James Polley
3239bbe29a Don't duplicate existing rooms when importing schedule CSV
* Old implementation needs to see exactly the same rooms in exactly
  the same order every time it loads new data, otherwise it will
  create a duplicate entry for the room that differs only in display
  order.
* New implementation ignores the display order when checking to see
  if the room already exists.
2017-12-03 16:15:19 +11:00
James Polley
cfc19f309f If there are no track names for today, don't show the row
If there are track names today, show the row for track names. If there aren't, don't show an empty row.
2017-12-03 15:36:06 +11:00
James Polley
bc3edb80d9 Point static urls to the build dir rather than src dir 2017-12-03 14:49:37 +11:00
James Polley
233818c33b Set width to avoid Firefox rending icons very large 2017-12-01 16:14:59 +11:00
James Polley
4f37556db0 Only copy visible columns on attendee reports
Also, add the ability to choose which columns are visible.
2017-12-01 12:22:42 +11:00
James Polley
a0610972fc Improve display of abstract and presenter bio
Relocate buttons to be beside the presenter's name.

Format abstract and bio in monospace hack as intended.
2017-11-22 18:26:06 +11:00
James Polley
ad2dd4c560 Ensure twitter/link buttons get displayed 2017-11-22 17:35:25 +11:00
James Polley
a96207fcdf Restore buttons referenced in current templates
Partial revert of 271d9e05 - these are two of the many files removed then. Looks like these are the only two still used.
2017-11-22 16:53:46 +11:00
James Polley
c762b52ea9 Improve mobile view of schedule
Don't show the table header in mobile view
2017-11-12 15:10:46 +11:00
James Polley
8d15a6cbeb Make talk audience and format visible to reviewers
* Audience is visible on review details, but not the list. Perhaps
  useful for cases where reviwer wishes to only review for a
  particular audience. This change adds audience to the list view.

* Format is not visible anywhere. This changes adds it to list and
  detail views for the reviewers.

This change also adds some buttons to control visibility of the new
columns.
2017-11-12 14:05:43 +11:00
James Polley
79d3270a32 Rough hack at app.css for issue #28 2017-10-31 05:55:56 +00:00
James Polley
2af7eaea7f Supply a default value for target_audience for the ART+TECH miniconf
* The base model requires a value here
* But we aren't using one; so there's none on the form
* This change supplies a custom enumeration that's specific for this
  particular model, which has one value, which is a default value,
  which simply says that the field is N/A
* This does mean that when viewing or reviewing the proposal one sees
  the Target Audience field, but it will say N/A.

* Testing has shown that this does not affect the other types which
  descend from the base Proposal class; they still use the default
  enumeration.
2017-10-23 21:18:17 +11:00
James Polley
c133f88832 Add the page title into the well 2017-10-16 21:59:19 +11:00
James Polley
bfa94b8c5e Enable flatpages 2017-10-16 21:53:18 +11:00
James Polley
79310913ad rename symposion-fixtures->symposion-tools 2017-10-16 20:05:30 +11:00
James Polley
6bf3d71bff Require login for proposal submit
- This has the effect of bouncing people to the login page if they're
  unauthenticated, rather than returning a 502 because 'home' doesn't
  exist.

- If they're authenticated but don't have a speaker profile, send them
  to the speaker profile create page rather than just to the
  dashboard.

Closes #26
2017-10-16 15:07:36 +11:00
James Polley
bb42d098fd Update fields for arttech miniconf 2017-10-15 22:42:27 +11:00
James Polley
4570eb1665 Test sphinx generation on every commit
Produces a downloadable artifact
2017-10-15 16:20:36 +10:00
James Polley
1eb28f2c80 Enhance Schedule list display 2017-10-15 15:58:43 +10:00
James Polley
fab25ad0f5 Room needs dunder-str as well as dunder-unicode 2017-10-15 15:33:56 +10:00
James Polley
df1fe7a9f5 Fix duplicate room-slot in sample data 2017-10-15 15:31:20 +10:00
James Polley
18e338c2c1 Enhance docs about schedule creation
Add clearer notes about the preconditions for using a csv to populate
the schedule.

Update the sample data to one that makes it clear which date format
must be used.
2017-10-15 15:25:45 +10:00
James Polley
e48c8c171a Display (editably) the exclusvity of the slot in the admin
(Also add filtering so that we can easily find eg all plenaries which
are not yet flagged as exclusive)
2017-10-15 15:14:55 +10:00
James Polley
6b17e021ca Add a __unicode__ method to the Room model
Closes #25
2017-10-15 15:07:56 +10:00
James Polley
b154d90eed Wrap input CSV in an TextIOWrapper
Closes #24
2017-10-15 14:59:57 +10:00
James Polley
8ded9ff4fc Remove reference to analytics.html
Don't know what it was, but it currently doesn't exist.
2017-10-15 14:29:33 +10:00
James Polley
493306bfff update favico 2017-10-14 16:47:17 +11:00
James Polley
e18cfc4704 Rework navbar to have a consistent look with the static site. 2017-10-14 16:47:06 +11:00
James Polley
cd4c640c1b Allow filter of team memberships by state 2017-10-14 14:31:57 +11:00
James Polley
f460e88850 Merge branch 'ticket-testing' into 'master'
Final preparations for miniconf CFP golive

See merge request LCA2018/symposion_app!65
2017-10-13 23:56:38 +00:00
James Polley
06eae1df07 Add environment labels for deploy jobs 2017-10-14 10:32:46 +11:00