Commit graph

180 commits

Author SHA1 Message Date
Henrik Levkowetz 9cb8f65c8e Updated templates to use the static template tag for static files.
- Legacy-Id: 9945
2015-08-01 14:53:59 +00:00
Henrik Levkowetz 9c80868187 Placed stock bootstrap (which we don't use, but bower pulls in as a dependency) and our customized bootstrap in different directories, to avoid confusion.
- Legacy-Id: 9905
2015-07-28 09:54:47 +00:00
Henrik Levkowetz 6605c03f83 Moved our generated bootstrap and bootstrap-theme css files to the CDN area.
- Legacy-Id: 9903
2015-07-27 20:34:25 +00:00
Henrik Levkowetz 54aac4e12a Updated templates to use the 'static' template tag to dynamically point to the correct static files location.
- Legacy-Id: 9889
2015-07-26 18:15:24 +00:00
Henrik Levkowetz 6865732b4f Fixed newly introduced html errors in agenda.html.
- Legacy-Id: 9834
2015-07-21 09:28:55 +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
Henrik Levkowetz 25f2ee5067 Merged in [9803] from lars@netapp.com:
Convert a few more URLs from http to https.
 - Legacy-Id: 9819
Note: SVN reference [9803] has been migrated to Git commit 73d876f9127ccd224edc06c49f4f99258445885c
2015-07-19 19:46:42 +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 0168083804 Added session anchors and a necessary style class to group names in the meeting materials page, to permit linking to specific WG names. Fixes issue #1743.
- Legacy-Id: 9708
2015-07-09 13:13:14 +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
Henrik Levkowetz 89445e2301 Merged in [9668] from rjsparks@nostrum.com:
Draw the right number of days in the secretariats room view.
 - Legacy-Id: 9681
Note: SVN reference [9668] has been migrated to Git commit 7f194c917d3e2a837296354003e68af4e83c999a
2015-06-23 18:48:37 +00:00
Henrik Levkowetz b77811386b Merged in [9653] from rjsparks@nostrum.com:
Capture \'art\' colors in two more places.
 - Legacy-Id: 9676
Note: SVN reference [9653] has been migrated to Git commit 3a5f14425cd0982e7740aad55e579ee0543500ac
2015-06-22 19:50:28 +00:00
Henrik Levkowetz b49a452595 Merged in [9651] from rjsparks@nostrum.com:
Adds a graphical overview of each day by room for the secretariat to assist with scheduling additional meetings.
 - Legacy-Id: 9674
Note: SVN reference [9651] has been migrated to Git commit 06a0e2b6481fe909f6620ed951353eaf437321ec
2015-06-22 19:33:15 +00:00
Robert Sparks 17b928b94b checkpoint: added room functional description, backfilled ietf92 meeting data, repaired session material views, added tests
- Legacy-Id: 9596
2015-05-01 22:31:30 +00:00
Robert Sparks 72b85fc1c7 checkpoint: views by type working
- Legacy-Id: 9592
2015-04-30 21:44:45 +00:00
Robert Sparks 1e30120710 checkpoint. Model changes done and UI tweaked to match.
- Legacy-Id: 9588
2015-04-30 15:57:48 +00:00
Robert Sparks 65f0fed7a7 checkpointing some css/html noodling before tearing into models
- Legacy-Id: 9587
2015-04-29 14:39:17 +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
Robert Sparks 8f0b8a9225 Checkpoint for demonstration/discussion in Dallas. More development expected afterwards.
- Legacy-Id: 9250
2015-03-19 18:41:02 +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
Ole Laursen eccd8d27c4 Make new branch from trunk (r9007) and merge facelift-r8876 into it, fixing a few merge conflicts
- Legacy-Id: 9014
2015-02-06 14:08:34 +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 a0ff3cfefb Summary: Move some of the morecss statements to ietf.css, as per
instructions in the README
 - Legacy-Id: 8996
2015-02-05 15:49:34 +00:00
Ole Laursen ea33e0e3b7 Summary: Fix a missing hide_menu in agenda edit, also delete some now
unused blocks
 - Legacy-Id: 8995
2015-02-05 15:48:17 +00:00
Ole Laursen e78637b9fc Remove non-facelift static assets, and move the facelift assets one step up
- Legacy-Id: 8971
2015-02-04 17:03:43 +00:00
Ole Laursen 8e4f2c95f8 Summary: Fix paths in agenda weekview to work with the facelifted
code, inline agenda2.js dependency which isn't used anywhere else
 - Legacy-Id: 8951
2015-02-02 17:11:43 +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 504fef98a4 Add two changes missing from previous commit
- Legacy-Id: 8947
2015-01-29 17:55:25 +00:00
Ole Laursen 756a972113 Move meeting agenda editing over to new facelifted base template, although without actually facelifting the contents
- Legacy-Id: 8946
2015-01-29 17:53:56 +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
Ole Laursen d0999c8b5e Merge facelift-r8510 branch with trunk. The IPR tool still has some non-facelifted parts and ideosyncracies. Fix a couple of minor bugs (including infamous empty licensing choice) in the IPR code, and port the IPR views to use the render shortcut.
- Legacy-Id: 8896
2015-01-22 17:38:05 +00:00
Robert Sparks 65804be683 This is the second step towards ADs out of GroupInfo into Role.
The use of group.ad has been scrubbed from the code and templates.
  - Those places that set group.ad have been directly manipulate Role objects instead
  - Most places that read group.ad now use a new group.ad_role() that returns a Role object, simplifing some views.

Related to #1555 and #1557.

Commit ready for merge.
 - Legacy-Id: 8854
2015-01-09 18:52:06 +00:00
Robert Sparks b7d8ed8491 add missing templates
- Legacy-Id: 8590
2014-11-05 21:49:44 +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
Robert Sparks fc512680d8 From mcr@sandelman.ca:
Refactor to remove dajaxice.
  Modified the URLs that address schedules:
    - urls now always start with /agenda, removing the mix of /agenda and /schedule prefixes
    - urls to a given schedule include the schedule owner (by email address)
  Corrected issue that prevented deleting sessions.
  Changed comment mechanism in timeslot_edit.js
  Migration to change the email address for (System)

  Fixes bug #1426

Commit ready to merge
 - Legacy-Id: 8229
2014-07-31 22:13:01 +00:00
Cong Liu d458ca2f8d Changed the template to highlight groups from different areas instead of the same area. Fixes ticket #1368. Commit ready for merge.
- Legacy-Id: 8114
2014-07-19 14:59:13 +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
Henrik Levkowetz 6e3bb37ecb Merged in [7935] from liudapeng@chinamobile.com:
Add brief_display function in Constraint class to display both WG conflict and person conflict. Fixes issue #1384.
 - Legacy-Id: 7938
Note: SVN reference [7935] has been migrated to Git commit 425f88cad70f7a473c6f5bf58bbde581a85ccb39
2014-06-26 19:56:34 +00:00