diff --git a/package.json b/package.json --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "bootstrap-year-calendar-bs4": "^1.0.0", "clipboard": "^2.0.4", "d3": "^5.9.2", - "datatables.net-bs4": "^1.10.19", + "datatables.net-responsive-bs4": "^2.2.3", "dompurify": "^1.0.10", "elementsfrompoint-polyfill": "^1.0.0", "font-awesome": "^4.7.0", diff --git a/swh/web/assets/src/bundles/admin/origin-save.js b/swh/web/assets/src/bundles/admin/origin-save.js --- a/swh/web/assets/src/bundles/admin/origin-save.js +++ b/swh/web/assets/src/bundles/admin/origin-save.js @@ -91,7 +91,12 @@ columns: columnsData, scrollY: '50vh', scrollCollapse: true, - order: [[0, 'desc']] + order: [[0, 'desc']], + responsive: { + details: { + type: 'none' + } + } }); enableRowSelection('#swh-origin-save-pending-requests'); @@ -102,7 +107,12 @@ columns: columnsData, scrollY: '50vh', scrollCollapse: true, - order: [[0, 'desc']] + order: [[0, 'desc']], + responsive: { + details: { + type: 'none' + } + } }); enableRowSelection('#swh-origin-save-rejected-requests'); @@ -125,7 +135,12 @@ columns: columnsData, scrollY: '50vh', scrollCollapse: true, - order: [[0, 'desc']] + order: [[0, 'desc']], + responsive: { + details: { + type: 'none' + } + } }); enableRowSelection('#swh-origin-save-accepted-requests'); diff --git a/swh/web/assets/src/bundles/browse/origin-save.js b/swh/web/assets/src/bundles/browse/origin-save.js --- a/swh/web/assets/src/bundles/browse/origin-save.js +++ b/swh/web/assets/src/bundles/browse/origin-save.js @@ -86,7 +86,6 @@ { data: 'origin_type', name: 'origin_type' - }, { data: 'origin_url', @@ -120,7 +119,12 @@ ], scrollY: '50vh', scrollCollapse: true, - order: [[0, 'desc']] + order: [[0, 'desc']], + responsive: { + details: { + type: 'none' + } + } }); $('#swh-origin-save-requests-list-tab').on('shown.bs.tab', () => { diff --git a/swh/web/assets/src/bundles/vendors/index.js b/swh/web/assets/src/bundles/vendors/index.js --- a/swh/web/assets/src/bundles/vendors/index.js +++ b/swh/web/assets/src/bundles/vendors/index.js @@ -26,8 +26,9 @@ // jquery datatables import 'datatables.net'; -import 'datatables.net-bs4'; +import 'datatables.net-responsive-bs4'; import 'datatables.net-bs4/css/dataTables.bootstrap4.css'; +import 'datatables.net-responsive-bs4/css/responsive.bootstrap4.css'; import './datatables.css'; // iframe-resizer diff --git a/swh/web/templates/admin/origin-save.html b/swh/web/templates/admin/origin-save.html --- a/swh/web/templates/admin/origin-save.html +++ b/swh/web/templates/admin/origin-save.html @@ -48,9 +48,9 @@ - Request date - Origin type - Origin url + Date + Type + Url @@ -73,10 +73,10 @@ - Request date - Origin type - Origin url - Save task status + Date + Type + Url + Status @@ -93,9 +93,9 @@ - Request date - Origin type - Origin url + Date + Type + Url diff --git a/swh/web/templates/api/endpoints.html b/swh/web/templates/api/endpoints.html --- a/swh/web/templates/api/endpoints.html +++ b/swh/web/templates/api/endpoints.html @@ -45,12 +45,11 @@
- +
- - + {% for route, doc in doc_routes %} @@ -59,22 +58,14 @@ - {% else %} - {% endif %} - - - + + @@ -26,10 +26,10 @@ {{ d.name }} - - {% endfor %} @@ -41,10 +41,10 @@ {{ f.name }} - - diff --git a/yarn.lock b/yarn.lock --- a/yarn.lock +++ b/yarn.lock @@ -2738,7 +2738,7 @@ whatwg-mimetype "^2.2.0" whatwg-url "^7.0.0" -datatables.net-bs4@^1.10.16, datatables.net-bs4@^1.10.19: +datatables.net-bs4@^1.10.15, datatables.net-bs4@^1.10.16: version "1.10.19" resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.10.19.tgz#0608dff22008cf3c7b8a68b1bc702ed255b404fb" integrity sha512-pgeP17w4aPR7HIxIwuJghfqXULjdg1K6xMUUKDyCERJRSNNK4MRToFfELtIsluLNN555YBK4Kx8nihX5/ZT1Fw== @@ -2746,7 +2746,24 @@ datatables.net "1.10.19" jquery ">=1.7" -datatables.net@1.10.19, datatables.net@^1.10.16: +datatables.net-responsive-bs4@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/datatables.net-responsive-bs4/-/datatables.net-responsive-bs4-2.2.3.tgz#639de17c1d31210ebf2b3c25f1c774c13f729e94" + integrity sha512-SQaWI0uLuPcaiBBin9zX+MuQfTSIkK1bYxbXqUV6NLkHCVa6PMQK7Rvftj0ywG4R7uOtjbzY8nSVqxEKvQI0Vg== + dependencies: + datatables.net-bs4 "^1.10.15" + datatables.net-responsive "2.2.3" + jquery ">=1.7" + +datatables.net-responsive@2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/datatables.net-responsive/-/datatables.net-responsive-2.2.3.tgz#50a2b1b4955b16b32f573a3f00f473b0bfbee913" + integrity sha512-8D6VtZcyuH3FG0Hn5A4LPZQEOX3+HrRFM7HjpmsQc/nQDBbdeBLkJX4Sh/o1nzFTSneuT1Wh/lYZHVPpjcN+Sw== + dependencies: + datatables.net "^1.10.15" + jquery ">=1.7" + +datatables.net@1.10.19, datatables.net@^1.10.15, datatables.net@^1.10.16: version "1.10.19" resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.19.tgz#97a1ed41c85e62d61040603481b59790a172dd1f" integrity sha512-+ljXcI6Pj3PTGy5pesp3E5Dr3x3AV45EZe0o1r0gKENN2gafBKXodVnk2ypKwl2tTmivjxbkiqoWnipTefyBTA==
EndpointStatusDescriptionDescription
{% url doc.route_view_name %} - {{ doc.tags|join:', ' }} - {% url doc.route_view_name %} - - available - - + {{ doc.doc_intro | safe_docstring_display | safe }} diff --git a/swh/web/templates/browse/origin-save.html b/swh/web/templates/browse/origin-save.html --- a/swh/web/templates/browse/origin-save.html +++ b/swh/web/templates/browse/origin-save.html @@ -115,11 +115,11 @@ - - - - - + + + + +
Request dateOrigin typeOrigin urlRequest statusSave task statusDateTypeUrlRequestStatus
diff --git a/swh/web/templates/includes/directory-display.html b/swh/web/templates/includes/directory-display.html --- a/swh/web/templates/includes/directory-display.html +++ b/swh/web/templates/includes/directory-display.html @@ -13,8 +13,8 @@
FileModeSizeModeSize
+ {{ d.perms }} +
+ {{ f.perms }} + {{ f.length }}