Commit graph

153 commits

Author SHA1 Message Date
James Polley
172602566d Update jquery version to the full version
datatables uses the fade effect
2018-08-02 21:27:51 +10:00
James Polley
5d029c2c06 Restore buttons to review tables
- Switch from dataTable (returns a jquery object) to
  DataTable (returns a DataTables API object)
- Update versions of libraries

Doesn't quite work, needs the full version of jquery rather than the
slim version.
2018-08-02 21:26:11 +10:00
Tobias
494d9a6db0 Remove CfP from the page (again) 2018-08-01 16:54:53 +12:00
Tobias
fcb287d246 Remove CfP from the page 2018-08-01 15:07:59 +12:00
James Polley
0b6d23dc33 Add a container for buttons 2018-08-01 02:33:14 +00:00
James Polley
26520868e0 Restore the missing <script> tag 2018-07-31 13:15:36 +00:00
James Polley
c0577b21b0 Update pinaxcon/templates/symposion/reviews/_review_table.html 2018-07-31 12:54:30 +00:00
James Polley
6d76bdbd64 Update pinaxcon/templates/symposion/reviews/base.html 2018-07-31 12:54:03 +00:00
James Polley
247f7ef62c Add some of the extra bits of Datatables back in 2018-07-31 10:43:12 +00:00
James Polley
29222d99be Add a "Withdrawn?" column to proposal lists 2018-07-31 10:37:19 +00:00
James Polley
df13617f8f Replace label- with badge- for bootstrap4 2018-07-31 10:34:17 +00:00
James Polley
a8091f97b1 Update invite email to make it clear a button needs to be pressed 2018-07-04 03:40:21 +00:00
Tobias Schulmann
99c74f1ccc Spacing tweaks 2018-06-30 16:42:03 +12:00
William Hughes
b64999677a Clean up copresenter stuff a bit 2018-06-30 03:52:18 +00:00
Tobias Schulmann
6e63465fea Basic styling for review section 2018-06-30 03:40:16 +00:00
William Hughes
27ae211e39 Fix co-presenter invites styling 2018-06-30 03:32:18 +00:00
William Hughes
c2524da650 Align styling for team list on dashboard with rest of dashboard page
Fix #91
2018-06-30 03:31:38 +00:00
Tobias Schulmann
499b3b6769 Fix proposal detail and edit pages 2018-06-30 14:03:58 +12:00
Tobias Schulmann
8c28ca0f79 Fixed proposal views in dashboard 2018-06-30 10:56:52 +12:00
James Polley
227df66dba Allow non-managers to submit review feedback 2018-06-27 19:13:00 +10:00
Tobias Schulmann
5256aeeda3 Started dashboard design 2018-06-24 01:07:10 +00:00
Sachi King
ce32fd69b6 Show chair for session on main overview page
Plus keep it a link so opt out is not impossible.
2018-01-24 15:27:37 +11:00
James Polley
28d10ff9fc Remove the personalised bits of session chair display
- The schedule grid page is ridculously database-query heavy and hence
  terribly lacking in perfmantitude.
- Caching can help with this, but the caching implemention at present
  is not user-aware. If one user looks at the page, they'll get a
  "YOU" in all the places they're chair and something else everywhere
  else - and then everyone will see that for the next 600 seconds,
  then YOU will become someone else
- to avoid this, remove the request.user-specific bit of the template
2018-01-17 00:53:53 +11:00
James Polley
55ed2dc319 Display room name on presentation_detail 2018-01-15 06:36:05 +11:00
James Polley
9abea97625 Apply usual styling to session volunteering buttons 2018-01-15 02:05:28 +11:00
James Polley
ffe0f64182 Make narrow-screen schedule details more distinct
In the narrow view, lots of details that aren't in the normal view
appear to compensate for not having clear row/column headers any more.

However, all the detail can look very same-same; this tweak makes rooms and end times more distinct.

Session chair info is made always italic, and a label is added to make
it clear that this person is not the speaker.
2018-01-13 00:26:49 +11:00
James Polley
54f53cd2c6 Add a waffle, for flipping and switching 2018-01-11 03:04:32 +11:00
James Polley
cb1355120a Make the per-day tabs work 2018-01-11 02:04:16 +11:00
Christopher Neugebauer
9a25ca1754 Chrisjrn/session chair (#94)
* Adds session_detail page

* Adds session chairing information to the schedule grid

* Adds session_list.html

* Nicer volunteer text

Conflicts:
	pinaxcon/templates/symposion/schedule/_grid.html

Conflict and migration performed by Sachi King <nakato@nakato.io>
Emoji changed, lca2017_tags to lca2018_tags, remove needless dependency
on django-user-account, use request instead like the remainder of the
calls n the template do anyways.

Remove blocktrans from a number of texts as they break {{ templating }}
and we don't translate anyways.

Modified-by: Sachi King <nakato@nakato.io>
2018-01-10 20:28:22 +11:00
James Polley
79743b711d More consistent color-coding for talk status buttons
- there's no btn-default, switch that to btn-primary
 - consistently use info for standby, primary for undecided, success
   for accept and warn for rejected
2018-01-06 11:38:04 +11:00
James Polley
2465f2645e urlize abstracts
I've looked through the database and I can't find any accepted
proposals that actually contain anything to linkify - but I've had
several requests from people that I think are reasonable, things like
being able to link to their project (we ask them to provide a project
url but we don't use that link)

This seems like a reasonably fast way to let those people add a
link. We still have to manually accept changes to their proposal so we
have a chance to look at the content of the url if we want.

The urlize filter adds rel=nofollow to the link automatically.
2018-01-04 21:31:00 +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
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
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
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
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
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
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
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
e18cfc4704 Rework navbar to have a consistent look with the static site. 2017-10-14 16:47:06 +11:00
James Polley
c9223aeef0 Restore datatables to review lists 2017-10-13 13:07:05 +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
45512e815a Add datatables tools to ticket reports 2017-10-04 20:43:00 +11: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
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
473bc8efed {{ dashboard_url ]} fixup 2017-08-04 14:17:44 +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
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
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
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
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
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
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
88bcd5fe65 Switch to LCA2017 templates
This fixes proposal details.
2017-04-08 20:13:28 +10: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
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)
a07dbe58c1 Sponsor (vertical) area on basic page layout working with graphics. 2017-02-21 10:51:45 +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)
8d68cca01f Many changes, mostly from lca to pyconau. 2017-01-10 15:12:07 +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
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
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
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
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
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
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
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
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
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
Christopher Neugebauer
a160e2b7c3 Fixes messages (#11) 2016-06-18 18:00:08 +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
cad0d00817 Adds score display to the review list 2016-06-18 13:13:31 +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
Jeff Triplett
1f16614fc4 Fixes *_html proposal fields 2016-04-04 18:36:01 -05:00