diff --git a/.eslintrc.js b/.eslintrc.js index d213e9b85..41defa8f6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -6,7 +6,8 @@ module.exports = { "no-multiple-empty-lines": ["error", { max: 2, maxEOF: 0 }], "quote-props": ["error", "as-needed"], "brace-style": ["error", "1tbs", { allowSingleLine: true }], - "semi": ["error", "always"], + semi: ["error", "always"], + "newline-per-chained-call": ["error"] }, env: { browser: true, diff --git a/ietf/static/css/datatables.scss b/ietf/static/css/datatables.scss deleted file mode 100644 index ac34cc1ed..000000000 --- a/ietf/static/css/datatables.scss +++ /dev/null @@ -1 +0,0 @@ -@import "../../../node_modules/datatables.net-bs5/css/dataTables.bootstrap5"; \ No newline at end of file diff --git a/ietf/static/css/ietf.scss b/ietf/static/css/ietf.scss index d018877b9..7efedc11b 100644 --- a/ietf/static/css/ietf.scss +++ b/ietf/static/css/ietf.scss @@ -61,10 +61,6 @@ $bootstrap-icons-font-src: url("~node_modules/bootstrap-icons/font/fonts/bootstr url("~node_modules/bootstrap-icons/font/fonts/bootstrap-icons.woff?a97b3594ad416896e15824f6787370e0") format("woff") !default; @import "../../../node_modules/bootstrap-icons/font/bootstrap-icons"; -// Install the datatables.net bootstrap5 styles. -// FIXME: Including this with ~ fails for some odd reason? -@import "../../../node_modules/datatables.net-bs5/css/dataTables.bootstrap5"; - // Leave room for fixed-top navbar. body { padding-top: 60px; diff --git a/ietf/static/js/datatables.js b/ietf/static/js/datatables.js deleted file mode 100644 index 891ea9ed2..000000000 --- a/ietf/static/js/datatables.js +++ /dev/null @@ -1,14 +0,0 @@ -require('datatables.net')(window, $); -require('datatables.net-bs5')(window, $); - -// Disable datatable paging by default. -$.extend($.fn.dataTable.defaults, { - info : false, - paging : false, - order: [], - "search": { - "caseInsensitive": true - } -}); - -$(document).ready(function() { $(".tablesorter").DataTable(); }); \ No newline at end of file diff --git a/ietf/static/js/list.js b/ietf/static/js/list.js new file mode 100644 index 000000000..dd49e96b7 --- /dev/null +++ b/ietf/static/js/list.js @@ -0,0 +1,78 @@ +import * as List from "list.js"; + +$(document) + .ready(function () { + $("table.tablesorter") + .each(function () { + var searcher = $.parseHTML(` +
Check boxes below to select individual sessions.
{% endif %} -
- {# The anchor here needs to be in a div, not in the th, in order for the anchor-target margin hack to work #}
-
- {{ item.timeslot.time|date:"l, F j, Y" }}
- |
+
---|
+ | + | + | + | + | ||||||
---|---|---|---|---|---|---|---|---|---|---|
+ {# The anchor here needs to be in a div, not in the th, in order for the anchor-target margin hack to work #}
+
+ {{ item.timeslot.time|date:"l, F j, Y" }}
+ |
+ ||||||||||
+ {% if item.session_keyword %} + + {% endif %} + | - {% if item|is_special_agenda_item %} -||||||||||
- {% if item.session_keyword %} - + | + {% include "meeting/timeslot_start_end.html" %} + | +
+ {% location_anchor item.timeslot %}
+ {{ item.timeslot.get_html_location }}
+ {% end_location_anchor %}
+ {% if item.timeslot.show_location and item.timeslot.get_html_location %}
+ {% with item.timeslot.location.floorplan as floor %}
+ {% if item.timeslot.location.floorplan %}
+
+ {{floor.short}}
+
+ {% endif %}
+ {% endwith %}
+ {% endif %}
+ |
+
+ {% agenda_anchor item.session %}
+ {% assignment_display_name item %}
+ {% end_agenda_anchor %}
+
+ {% if item.session.current_status == 'canceled' %}
+ CANCELLED
+ {% else %}
+
+ {% if item.slot_type.slug == 'other' %}
+ {% if item.session.agenda or item.session.remote_instructions or item.session.agenda_note %}
+ {% include "meeting/session_buttons_include.html" with show_agenda=True item=item schedule=schedule %}
+ {% else %}
+ {% for slide in item.session.slides %}
+ {{ slide.title|clean_whitespace }}
+ + {% endfor %} + {% endif %} {% endif %} - |
-
- - {% include "meeting/timeslot_start_end.html" %} - | -
- {% location_anchor item.timeslot %}
- {{ item.timeslot.get_html_location }}
- {% end_location_anchor %}
- {% if item.timeslot.show_location and item.timeslot.get_html_location %}
- {% with item.timeslot.location.floorplan as floor %}
- {% if item.timeslot.location.floorplan %}
-
- {{floor.short}}
-
- {% endif %}
- {% endwith %}
- {% endif %}
- |
-
- {% agenda_anchor item.session %}
- {% assignment_display_name item %}
- {% end_agenda_anchor %}
-
- {% if item.session.current_status == 'canceled' %}
- CANCELLED
- {% else %}
-
- {% if item.slot_type.slug == 'other' %}
- {% if item.session.agenda or item.session.remote_instructions or item.session.agenda_note %}
- {% include "meeting/session_buttons_include.html" with show_agenda=True item=item schedule=schedule %}
- {% else %}
- {% for slide in item.session.slides %}
- {{ slide.title|clean_whitespace }}
-
{% endif %}
-
- {% endif %}
- - {% endfor %} - {% endif %} + |
- ||||
- | + | {% include "meeting/timeslot_start_end.html" %} - - | + + | {{ item.timeslot.time|date:"l"}} {{item.timeslot.name|capfirst_allcaps}} - + | + | {% include "meeting/timeslot_start_end.html" %} - - | + | +{% location_anchor item.timeslot %} {{item.timeslot.get_html_location}} {% end_location_anchor %} @@ -252,15 +262,15 @@ {% endif %} {% endwith %} | -+ | {% location_anchor item.timeslot %} {{item.timeslot.get_html_location}} {% end_location_anchor %} | -{{item.session.historic_group.historic_parent.acronym}} |
+ {{item.session.historic_group.historic_parent.acronym}} |
- + | {% if item.session.historic_group %} {{item.session.historic_group.acronym}} {% else %} @@ -269,7 +279,7 @@ | {% endif %} -+ |
{% agenda_anchor item.session %}
{% assignment_display_name item %}
{% end_agenda_anchor %}
@@ -291,7 +301,7 @@
RESCHEDULED
{% if item.session.rescheduled_to %}
TO
-
+
{% if "-utc" in request.path %}
{{ item.session.rescheduled_to.utc_start_time|date:"l G:i"|upper }}-{{ item.session.rescheduled_to.utc_end_time|date:"G:i" }}
{% else %}
@@ -309,9 +319,11 @@
{% endif %}
|
+
{% endif %}
{% endif %}
{% endfor %}
+