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 @@ -65,11 +65,13 @@ return date.toLocaleString(); } return data; - } + }, + responsivePriority: 3 }, { data: 'origin_type', - name: 'origin_type' + name: 'origin_type', + responsivePriority: 4 }, { data: 'origin_url', @@ -80,7 +82,8 @@ return `${sanitizedURL}`; } return data; - } + }, + responsivePriority: 1 } ]; @@ -91,7 +94,8 @@ columns: columnsData, scrollY: '50vh', scrollCollapse: true, - order: [[0, 'desc']] + order: [[0, 'desc']], + responsive: true }); enableRowSelection('#swh-origin-save-pending-requests'); @@ -102,7 +106,8 @@ columns: columnsData, scrollY: '50vh', scrollCollapse: true, - order: [[0, 'desc']] + order: [[0, 'desc']], + responsive: true }); enableRowSelection('#swh-origin-save-rejected-requests'); @@ -115,7 +120,8 @@ return `${data}`; } return data; - } + }, + responsivePriority: 2 }); acceptedSaveRequestsTable = $('#swh-origin-save-accepted-requests').DataTable({ @@ -125,7 +131,8 @@ columns: columnsData, scrollY: '50vh', scrollCollapse: true, - order: [[0, 'desc']] + order: [[0, 'desc']], + responsive: true }); enableRowSelection('#swh-origin-save-accepted-requests'); diff --git a/swh/web/assets/src/bundles/browse/browse.css b/swh/web/assets/src/bundles/browse/browse.css --- a/swh/web/assets/src/bundles/browse/browse.css +++ b/swh/web/assets/src/bundles/browse/browse.css @@ -131,6 +131,13 @@ min-width: 250px; } +.div-item { + border-top: 1px solid lightgrey; + display: block; + overflow-wrap: break-word; + padding: 15px 10px 15px 20px; +} + @media screen and (max-width: 600px) { .swh-corner-ribbon { line-height: 30px; 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 @@ -81,12 +81,13 @@ return date.toLocaleString(); } return data; - } + }, + responsivePriority: 3 }, { data: 'origin_type', - name: 'origin_type' - + name: 'origin_type', + responsivePriority: 4 }, { data: 'origin_url', @@ -97,11 +98,13 @@ return `${sanitizedURL}`; } return data; - } + }, + responsivePriority: 1 }, { data: 'save_request_status', - name: 'status' + name: 'status', + responsivePriority: 5 }, { data: 'save_task_status', @@ -115,12 +118,14 @@ return `${data}`; } return data; - } + }, + responsivePriority: 2 } ], scrollY: '50vh', scrollCollapse: true, - order: [[0, 'desc']] + order: [[0, 'desc']], + responsive: true }); $('#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,7 +26,7 @@ // jquery datatables import 'datatables.net'; -import 'datatables.net-bs4'; +import 'datatables.net-responsive-bs4'; import 'datatables.net-bs4/css/dataTables.bootstrap4.css'; import './datatables.css'; 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 @@ -50,7 +50,7 @@ Endpoint Status - Description + Description {% for route, doc in doc_routes %} @@ -74,7 +74,7 @@ {% endif %} - + {{ doc.doc_intro | safe_docstring_display | safe }} 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,7 +13,7 @@ File - Mode + Mode Size @@ -26,7 +26,7 @@ {{ d.name }} - + {{ d.perms }} @@ -41,7 +41,7 @@ {{ f.name }} - + {{ f.perms }} 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==