Commit graph

231 commits

Author SHA1 Message Date
Henrik Levkowetz fb66c1856f Merged in [9669] from olau@iola.dk:
Summary: Make the meeting agenda code use the historic info available
for groups. In the process, added some select_related/prefetch_related
code to cut the number of database queries in the agenda down from
4000-5000 to about 50. Rewritten agenda CSV code to use Python arrays
rather than a template for improved readability/reuse. Rewritten week
view to assemble its data in Python. Plus a few other minor cleanups,
e.g. lame_description is now gone.
Fixes #1088. Branch
 - Legacy-Id: 10005
Note: SVN reference [9669] has been migrated to Git commit acda84208d
2015-08-10 19:46:11 +00:00
Henrik Levkowetz e8d8ada124 Tweaked the agenda page header look a bit.
- Legacy-Id: 9833
2015-07-20 17:53:59 +00:00
Henrik Levkowetz 29db4a64a7 Tweaked the top alternative format links on the agenda page.
- Legacy-Id: 9832
2015-07-20 15:15:23 +00:00
Henrik Levkowetz 83bef1d160 Merged in [9813] from rjsparks@nostrum.com:
Add navigation to the new secretariat agenda tools. Change the buttons at the top of the agenda.html page to links.
 - Legacy-Id: 9825
Note: SVN reference [9813] has been migrated to Git commit 2b7f7dec52
2015-07-20 13:13:09 +00:00
Robert Sparks 2b7f7dec52 Add navigation to the new secretariat agenda tools. Change the buttons at the top of the agenda.html page to links. Commit ready to merge.
- Legacy-Id: 9813
2015-07-19 08:02:09 +00:00
Henrik Levkowetz eb522faa25 Merged in [9789] from lars@netapp.com:
HTML agendas need to be valid HTML5 document.
 - Legacy-Id: 9811
Note: SVN reference [9789] has been migrated to Git commit d633fdc924a0130da98a7dc79768886d95002938
2015-07-18 16:35:32 +00:00
Henrik Levkowetz 23bcde63dc Merged in [9738] from lars@netapp.com:
Fix more HTML bugs.
 - Legacy-Id: 9777
Note: SVN reference [9738] has been migrated to Git commit cbf4cc7469f9d3b517ac50231d2e1da88c54e4ff
2015-07-18 11:08:23 +00:00
Henrik Levkowetz c41a079d4f Merged in [9735] from lars@netapp.com:
More HTML fixes identified by test-crawl --vnu.
 - Legacy-Id: 9767
Note: SVN reference [9735] has been migrated to Git commit 08d958e7cd9cf4949a688e20046bd61855e00361
2015-07-18 09:18:54 +00:00
Henrik Levkowetz f6561645b5 Changed the html agenda template so it again shows BOFs in italics in the agenda customization. Fixes issue #1742.
- Legacy-Id: 9705
2015-07-09 12:53:37 +00:00
Henrik Levkowetz 46d4a29e69 Merged in [9672] from rjsparks@nostrum.com:
Restore the hash to the customized ical link. Fixes #1732.
 - Legacy-Id: 9683
Note: SVN reference [9672] has been migrated to Git commit 5da3910fc68936afadb37e71f7bfbe4b0773a448
2015-06-23 19:16:47 +00:00
Ole Laursen acda84208d Summary: Make the meeting agenda code use the historic info available
for groups. In the process, added some select_related/prefetch_related
code to cut the number of database queries in the agenda down from
4000-5000 to about 50. Rewritten agenda CSV code to use Python arrays
rather than a template for improved readability/reuse. Rewritten week
view to assemble its data in Python. Plus a few other minor cleanups,
e.g. lame_description is now gone.

Fixes #1088. Branch ready for merge.
 - Legacy-Id: 9669
2015-06-17 13:37:16 +00:00
Robert Sparks b0ce25aa44 clean merge forward
- Legacy-Id: 9584
2015-04-27 20:24:40 +00:00
Henrik Levkowetz 0d08fff0ac Updated a bunch of links from http: to https: based on a patch from lars@netapp.com.
- Legacy-Id: 9555
2015-04-24 21:45:04 +00:00
Henrik Levkowetz ec0321e0da Added copyright lines and template origin to the html templates. Fixed a number of instances of html that didn't validate.
- Legacy-Id: 9551
2015-04-24 20:40:01 +00:00
Henrik Levkowetz d4bd6c3775 Renamed the base template file from 'ietf.html' to 'base.html'.
- Legacy-Id: 9427
2015-04-08 19:16:48 +00:00
Ole Laursen a589115ff4 Summary: Reindent all HTML files to follow the previous convention (no
tabs) and kill the scripts block in favour of just using a js block with
a script tag (which is easier to understand for context-sensitive
modes such as web-mode in Emacs). Also fix a couple of details, e.g.
missing semicolons in JS snippets.
 - Legacy-Id: 9096
2015-02-17 18:01:04 +00:00
Ole Laursen c72d465438 Summary: Insert anchor-target hack to try to alleviate the problem of
the top menu covering the anchor target, also increase the width at
which content navigation menus disappear
 - Legacy-Id: 9093
2015-02-17 15:17:05 +00:00
Ole Laursen eda5eed791 Summary: Don't crash if timeslots with show_location = True don't have
a location
 - Legacy-Id: 9079
2015-02-12 16:08:39 +00:00
Robert Sparks 9421ea9b93 Unbroke week-view, but only by compromising on whether to show things like the terminal room
- Legacy-Id: 9004
2015-02-05 21:16:56 +00:00
Ole Laursen 8de3bc1ac3 Summary: Add a couple of hidden-xs/visible-xs classes to the agenda
table to make it work on a smart phone, this seem to cover most of the
intended goal with m_agenda.html, so delete it instead of facelifting it
 - Legacy-Id: 8950
2015-02-02 16:19:27 +00:00
Ole Laursen a2a7e29625 Summary: Fix meeting agenda crash with groups with no parent (was
using group.parent rather than the ScheduledSession.area hack)
 - Legacy-Id: 8943
2015-01-28 15:19:05 +00:00
Ole Laursen e6238aa721 Facelift the relatively trivial meeting pages
- Legacy-Id: 8942
2015-01-28 14:28:46 +00:00
Lars Eggert a4daf2630c Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift
Conflicts:
	ietf/doc/templatetags/ietf_filters.py
	ietf/doc/views_charter.py
	ietf/templates/doc/charter/edit_notify.html
	ietf/templates/doc/charter/edit_telechat_date.html
	ietf/templates/doc/document_ballot_content.html
	ietf/templates/doc/document_history.html
	ietf/templates/doc/edit_notify.html
	ietf/templates/doc/edit_telechat_date.html
	ietf/templates/doc/notify.html
	ietf/templates/group/concluded_groups.html
 - Legacy-Id: 8429
2014-10-14 11:48:57 +00:00
Henrik Levkowetz 7d84a88013 Don't show dash after timeslot names in the ietf agenda if there's no associated location.
- Legacy-Id: 7973
2014-06-29 16:07:02 +00:00
Ole Laursen 81e032b9e4 Remove unnecessary escapes from another bunch of templates
- Legacy-Id: 6989
2013-12-18 16:10:47 +00:00
Ole Laursen 36dd439027 Rewrite ifequal/endifequal template tags to if tags with ==/!=
- Legacy-Id: 6961
2013-12-17 10:42:34 +00:00
Ole Laursen 7a86afe1ab Port templates to new {% url %} syntax with quotes around the first parameter
- Legacy-Id: 6877
2013-12-11 16:33:40 +00:00
Henrik Levkowetz 951670e9df New view code and templates for agenda pages, updating all agenda templates
to take schedule-specific information so that they will work with arbitrary
schedules, not just the official schedule for a meeting.
 - Legacy-Id: 6537
2013-10-29 22:44:13 +00:00
Henrik Levkowetz 16ae35ae19 Rewrote html and text agenda templates to take schedule as data.
- Legacy-Id: 6495
2013-10-27 12:16:37 +00:00
Henrik Levkowetz a7838d8765 Cleanup action: replaced screaming html id with non-screaming version;
replaced the noTable block construct with start/end table_content blocks
in order to not have to open and close tables in different blocks, and
not have empty tables lying about.
 - Legacy-Id: 6439
2013-10-13 21:09:32 +00:00
Henrik Levkowetz d3983b668a Reverted html agenda templates to release 4.72 state, except for a jquery
version change and moving inline weekview javascript to a separate file.
 - Legacy-Id: 6435
2013-10-13 17:52:09 +00:00
Henrik Levkowetz 212ff26fad Reverted a mistake in agenda.html.
- Legacy-Id: 6351
2013-10-03 14:22:29 +00:00
Henrik Levkowetz cc8817846a Applied the same patch to other templates which use the same approach. Fixed 2 typos.
- Legacy-Id: 6347
2013-10-03 05:40:41 +00:00
Henrik Levkowetz 08e90fd63f Enabling jquery again in template base.html. Moving library pack jquery-1.8.2 from /static/js/ to /static/js/lib/. Replacing jquery-1.5.1 with 1.8.2 in some places; the incompatibilities listed on the jquery pages seem to be small, and on a cursory inspection not present in the current usage.
- Legacy-Id: 6342
2013-10-02 15:44:50 +00:00
Henrik Levkowetz 6154b9922d This commit isn't tested. It captures the state after merging in branch/ssw/agenda/v4.70.
- Legacy-Id: 6273
2013-09-26 19:56:17 +00:00
Henrik Levkowetz 96ad6a653e Merged [5514] from adam@nostrum.com:
Fixed agenda oscillation problem (removed scrollbars from iframe)

-This line, and those below, will be ignored--

M    ietf/templates/meeting/agenda.html
 - Legacy-Id: 5517
Note: SVN reference [5514] has been migrated to Git commit ab5b610ce5
2013-03-09 18:33:27 +00:00
Henrik Levkowetz 4795fa590e Tweaked agenda pages -- can't use the inheritance approach as-is due to caching.
- Legacy-Id: 5515
2013-03-09 17:20:29 +00:00
Adam Roach ab5b610ce5 Fixed agenda oscillation problem (removed scrollbars from iframe)
-This line, and those below, will be ignored--

M    ietf/templates/meeting/agenda.html
 - Legacy-Id: 5514
2013-03-09 17:18:33 +00:00
Henrik Levkowetz fc369a6e30 Provide html agendas with local and UTC timezone indications.
- Legacy-Id: 5484
2013-03-05 22:46:16 +00:00
Henrik Levkowetz 2f2c79b9e7 Tweaked the html agenda a little bit by adding a day indication for each timeslot, to make it easier to see which day you're actually seeing when the day separator is outside the window.
- Legacy-Id: 5020
2012-11-07 13:19:06 +00:00
Adam Roach ca1ff2fa0c Implementation of ticket 893
- Legacy-Id: 5003
2012-11-03 21:01:40 +00:00
Adam Roach 5e384591fd Fixing time column wrapping problem that exhibits in (at least) Safari.
- Legacy-Id: 4991
2012-11-03 14:05:17 +00:00
Henrik Levkowetz 61ad24dde5 Tweaked the placement and look of the just introduced Meeting.agenda_note field on the html agenda.
- Legacy-Id: 4948
2012-10-23 12:31:28 +00:00
Henrik Levkowetz 09f89a0852 Added an 'agenda_note' field to meeting.models.Meeting, and added display of content (if any) in html and txt agendas. Added a migration, but the production system has already been patched and migrated.
- Legacy-Id: 4947
2012-10-22 21:05:19 +00:00
Adam Roach 39aa3eb5a3 Adding slides to agenda page
- Legacy-Id: 4746
2012-08-02 18:10:22 +00:00
Henrik Levkowetz 75365a9181 Template tweaks.
- Legacy-Id: 4644
2012-07-27 22:16:47 +00:00
Henrik Levkowetz 6e1c2e6a86 Tweaked meeting materials list to avoid duplicate rows for WGs with more than one slot, as long as the materials list is the same (which is the only thing supported by other parts of the system at this time).
- Legacy-Id: 4632
2012-07-27 20:17:06 +00:00
Henrik Levkowetz cddec8fc48 Merged in [4604] from adam@nostrum.com, which fixes problems with the html agenda code related to the schema transition.
- Legacy-Id: 4611
Note: SVN reference [4604] has been migrated to Git commit 3e5e16371f2c0319d1c0bb738860a1f793038365
2012-07-10 09:55:34 +00:00
Henrik Levkowetz dac11633ff Revert a URL schema change made by olau@iola.dk in [4046] for a reason I can't quite see. This change breaks old URLs.
- Legacy-Id: 4299
Note: SVN reference [4046] has been migrated to Git commit d6baa38fe5
2012-04-22 15:15:38 +00:00
Adam Roach c113bd0588 Migrated HTML agenda to new data model. This has several improvements, as well, such as clearer marking of BOFs.
- Legacy-Id: 4265
2012-04-05 19:30:36 +00:00
Ole Laursen d6baa38fe5 Fix problem with reading agenda files, generate it from the actual
agenda document rather than trying various combinations of extensions
and upper/lower case
 - Legacy-Id: 4046
2012-03-06 20:36:14 +00:00
Ole Laursen 58c3c4fd6a Fix two (old) bugs in the HTML, doesn't appear to have had an effect
on the rendering, but nevertheless
 - Legacy-Id: 4001
2012-02-28 19:36:01 +00:00
Henrik Levkowetz 97218e3d4e Fix a bug where the plenary entries in the html agenda didn't have links to the room map.
- Legacy-Id: 3264
2011-07-27 16:43:11 +00:00
Henrik Levkowetz 93ef4b1ea4 Fix hardcoded meeting number in the meeting agenda template ...
- Legacy-Id: 2991
2011-03-28 16:21:28 +00:00
Henrik Levkowetz 97b48252b1 Merged [2946] from adam@nostrum.com:
Added ical-format agenda (http://trac.tools.ietf.org/tools/ietfdb/ticket/601)
 - Legacy-Id: 2954
Note: SVN reference [2946] has been migrated to Git commit fe3189ba04734ac21d8c18fba99b289abc0bd358
2011-03-26 14:33:51 +00:00
Henrik Levkowetz d968a0bcac Merged [2679] from adam@nostrum.com:
Added week-at-a-time view to agenda page when viewing selected areas and/or
groups. If no groups are selected, the week view is hidden, leaving the
base-level functionality unchanged.
 - Legacy-Id: 2682
Note: SVN reference [2679] has been migrated to Git commit b1b23b60a5fc1b110e969871a0e3c78327b87648
2010-11-11 02:46:33 +00:00
Henrik Levkowetz 3ac5bd3154 Merged [2621] from adam@nostrum.com: Add tarfile and pdf-composite links and functionality to download working group documents from the agenda page. Fixes #539
- Legacy-Id: 2627
Note: SVN reference [2621] has been migrated to Git commit 276d13ca2ddef96a11b86cbc31210a057c20a415
2010-11-06 09:00:36 +00:00
Henrik Levkowetz 5d33dfe33f IETF 78 code from Adam Roach: Make the selectable WG agenda feature of the datatracker IETF Agenda even less resource intensive.
- Legacy-Id: 2449
2010-07-28 14:10:20 +00:00
Henrik Levkowetz 4fd27d1455 IETF 78 code from Adam Roach: Make the selectable WG agenda feature of the datatracker IETF Agenda less resource intensive by only loading WG agendas when we know they are used in the page.
- Legacy-Id: 2444
2010-07-28 12:57:34 +00:00
Henrik Levkowetz ade0bd69eb Don't use a button to show/hide the WG selection table. Replaced with triangle and link-like text. Also show something appropriate when there's no session agenda available.
- Legacy-Id: 2424
2010-07-26 16:23:33 +00:00
Henrik Levkowetz faf8eb31b8 IETF 78 Sprint code from Adam Roach: Make the IETF agenda page view user-modifiable, providing a custom bookmarkable agenda view for each user.
- Legacy-Id: 2422
2010-07-26 14:18:14 +00:00
Henrik Levkowetz 266b7820d0 Merged from log:branch/2.00@2363: Current release branch head to trunk.
- Legacy-Id: 2365
2010-07-21 12:48:05 +00:00
Henrik Levkowetz 644f7fac25 Adding copyright notices to all templates
- Legacy-Id: 717
2007-06-27 21:24:29 +00:00
Michael Lee c362d82532 Fix a missing piece in agenda.html template
- Legacy-Id: 678
2007-06-27 01:41:54 +00:00
Michael Lee 76b254f3d8 Fix agenda.html
- Legacy-Id: 654
2007-06-26 17:40:29 +00:00
Michael Lee 00de9c519c Resove ticket 136, getting correct last update date from db
- Legacy-Id: 562
2007-06-20 20:37:40 +00:00
Michael Lee 271e7ff6a5 Fix meeting agenda
- Legacy-Id: 551
2007-06-20 06:18:39 +00:00
Henrik Levkowetz acd5129359 A tweak to the html format agenda. Plenary agendas and break information before the plenaries still missing.
- Legacy-Id: 549
2007-06-20 01:54:28 +00:00
Michael Lee 81ed8b20db Fix buildbot errors, 28, 29, 30
- Legacy-Id: 534
2007-06-19 17:54:09 +00:00
Bill Fenner 94373f2915 Use humanize for the "th" suffix for the IETF meeting number.
Capitalize day names.

Don't repeat the month unless necessary and the year at all of
the meeting dates.

Still missing: group type (e.g., "WG" or "BOF")
 - Legacy-Id: 522
2007-06-18 22:54:15 +00:00
Michael Lee 1c9bf9b1ca meeting_agenda_html.cgi porting has been completed.
* Add a new method, affiliation to idtracker/models.py, in class PersonOrOrgInfo
 * Agenda for the Plenaries should be stored in /home/master-site/proceedings directory to be displayed.
 * Bug found in listing ADs at the end of the agenda. An agenda always lists the current IESG instead of the IESG at each meeting. Bug is fixed in the ported tool.
 * meeting_agenda_text.cgi was obsolete, but ported anyway in case someone still has it bookmarked.
 - Legacy-Id: 182
2007-05-30 13:47:09 +00:00
Michael Lee 959274e048 * Add links to WG charters and agenda files
* Add special note
 * Need to display combined sessions
 - Legacy-Id: 167
2007-05-25 04:12:17 +00:00
Henrik Levkowetz d4d3b47ad1 Template formatting changes, to more easily see what's going on. And sorting on area within the timeslot.
- Legacy-Id: 154
2007-05-22 22:31:32 +00:00
Henrik Levkowetz 65f15c77bf Reverting to revision [151] -- committed way too much by mistake
- Legacy-Id: 153
Note: SVN reference [151] has been migrated to Git commit fca8b30b51
2007-05-22 22:29:28 +00:00
Henrik Levkowetz d981d5a617 Template formatting changes, to more easily see what's going on. And sorting on area within the timeslot.
- Legacy-Id: 152
2007-05-22 22:15:13 +00:00
Michael Lee b2f8368971 Need to order WG sessions by area
- Legacy-Id: 150
2007-05-22 20:27:36 +00:00
Michael Lee 68970cb597 Two new methods have been added to proceedings/models.py to display meeting dates
- Legacy-Id: 141
2007-05-21 15:35:15 +00:00
Michael Lee 8b2e90f212 * Display more session data
* Add 'area' to class ResolveAcronym
 * MeetingTime.session returns WgMeetingSession objects, BUT STILL NEED TO FIGURE OUT WHICH sched_room_id[1|2|3] TO USE
 - Legacy-Id: 137
2007-05-17 04:43:21 +00:00
Michael Lee 9e5d36c1d1 * Roll back WgMeetingSession.group_acronym_id per Bill
* add a method, acronym_name to ResolveAcronym
 * Sunday sessions displaying is done
 * Need to figure out how to increment date by one day in a template
 - Legacy-Id: 135
2007-05-16 04:32:17 +00:00
Michael Lee 1e1a2bb989 Display Meeting Agenda for Sunday
- Legacy-Id: 132
2007-05-15 05:02:03 +00:00
Vidyut Luther 783ffb713d - Legacy-Id: 111 2007-05-09 21:05:20 +00:00