From 7a83380778afcfeb63d47729a0e740b804c80146 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 1 Mar 2025 23:04:07 -0600 Subject: [PATCH 1/5] Fixes issue_#1196 --- .../static/css/delta_url_list.css | 62 ++++++++++++++++++- 1 file changed, 59 insertions(+), 3 deletions(-) diff --git a/sde_indexing_helper/static/css/delta_url_list.css b/sde_indexing_helper/static/css/delta_url_list.css index 06689207..8b4350df 100644 --- a/sde_indexing_helper/static/css/delta_url_list.css +++ b/sde_indexing_helper/static/css/delta_url_list.css @@ -211,8 +211,6 @@ } .modalFooter { - position: sticky; - bottom: 0; position: sticky; bottom: 0; padding: 10px 0; @@ -440,7 +438,6 @@ div.dt-buttons .btn.processing:after { } -/* pagination position */ div.dt-container div.dt-paging ul.pagination { position: absolute; right: 60px; @@ -451,3 +448,62 @@ div.dt-container div.dt-paging ul.pagination { max-width: 100%; min-width: 100%; } + +.dt-container { + position: relative; +} + +.dt-container div.dt-buttons { + display: flex !important; + gap: 10px !important; + align-items: center !important; + justify-content: flex-end; + position: absolute; + right: 0; + top: 0; +} + +.buttons-csv, +.customizeColumns, +.addPattern { + border-style: solid !important; + border-color: #A7BACD !important; + border-width: 1px !important; + color: #A7BACD !important; + border-radius: 5px !important; + padding: 11px 15px !important; + margin: 0 !important; + height: 43px !important; + display: flex !important; + align-items: center !important; +} + +#exclude_patterns_table_wrapper, +#include_patterns_table_wrapper, +#document_type_patterns_table_wrapper, +#title_patterns_table_wrapper { + margin-top: 15px !important; +} + +#exclude_patterns_table_wrapper table, +#include_patterns_table_wrapper table, +#document_type_patterns_table_wrapper table, +#title_patterns_table_wrapper table { + margin-top: 15px !important; +} + +#exclude_patterns_table_wrapper .addPattern, +#include_patterns_table_wrapper .addPattern, +#document_type_patterns_table_wrapper .addPattern, +#title_patterns_table_wrapper .addPattern, +#exclude_patterns_table_wrapper .customizeColumns, +#include_patterns_table_wrapper .customizeColumns, +#document_type_patterns_table_wrapper .customizeColumns, +#title_patterns_table_wrapper .customizeColumns { + margin-top: -10px !important; +} + +#delta_urls_table_wrapper .dt-buttons, +#curated_urls_table_wrapper .dt-buttons { + gap: 3px !important; +} From 9d68d85f48b6da604abb093769f1897b2a701917 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 6 Mar 2025 19:47:34 -0600 Subject: [PATCH 2/5] Remove old styling after updating new styling --- sde_indexing_helper/static/css/delta_url_list.css | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/sde_indexing_helper/static/css/delta_url_list.css b/sde_indexing_helper/static/css/delta_url_list.css index 8b4350df..2288a9d7 100644 --- a/sde_indexing_helper/static/css/delta_url_list.css +++ b/sde_indexing_helper/static/css/delta_url_list.css @@ -253,20 +253,6 @@ font-weight: 500; } - - -.custom-select, -.buttons-csv, -.customizeColumns, -.addPattern { - border-style: solid !important; - border-color: #A7BACD !important; - border-width: 1px !important; - color: #A7BACD !important; - border-radius: 5px !important; - padding: 11px 15px; -} - .addPattern { background-color: #0066CA !important; border-color: #0066CA !important; @@ -463,6 +449,7 @@ div.dt-container div.dt-paging ul.pagination { top: 0; } +.custom-select, .buttons-csv, .customizeColumns, .addPattern { From 65cf30d6ef1a71e593f47d78252853e5663ef4f0 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 6 Mar 2025 21:28:19 -0600 Subject: [PATCH 3/5] Updated Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95eecc92..9f8938ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -106,3 +106,9 @@ For each PR made, an entry should be added to this changelog. It should contain - Changes: - Added `escapeHtml` function in the `delta_url_list.js` file to handle special character escaping correctly. - Called this function while retrieving the titles in `getGeneratedTitleColumn()` and `getCuratedGeneratedTitleColumn()` functions. + +- 1196-arrange-the-show-100-csv-customize-columns-boxes-to-be-in-one-line-on-the-delta-urls-page + changelog-update-Issue-1001 + - Description: Formatting the buttons - 'Show 100','CSV' and 'Customize Columns' to be on a single line for an optimal use of space. + - Changes: + - Updated delta_url_list.css with necessary modifications From a48c9a7a6bedae3b80579c1a63ee6838c2fec455 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 7 Mar 2025 22:46:09 -0600 Subject: [PATCH 4/5] Latest Updated Changes --- CHANGELOG.md | 2 +- .../static/css/delta_url_list.css | 86 +++++++------------ .../static/js/delta_url_list.js | 10 ++- 3 files changed, 40 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8972734d..2acad22f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -118,4 +118,4 @@ For each PR made, an entry should be added to this changelog. It should contain changelog-update-Issue-1001 - Description: Formatting the buttons - 'Show 100','CSV' and 'Customize Columns' to be on a single line for an optimal use of space. - Changes: - - Updated delta_url_list.css with necessary modifications + - Updated delta_url_list.css and delta_url_list.js files with necessary modifications diff --git a/sde_indexing_helper/static/css/delta_url_list.css b/sde_indexing_helper/static/css/delta_url_list.css index 2288a9d7..591bc070 100644 --- a/sde_indexing_helper/static/css/delta_url_list.css +++ b/sde_indexing_helper/static/css/delta_url_list.css @@ -253,6 +253,18 @@ font-weight: 500; } +.custom-select, +.buttons-csv, +.customizeColumns, +.addPattern { + border-style: solid !important; + border-color: #A7BACD !important; + border-width: 1px !important; + color: #A7BACD !important; + border-radius: 5px !important; + padding: 11px 15px; +} + .addPattern { background-color: #0066CA !important; border-color: #0066CA !important; @@ -435,62 +447,30 @@ div.dt-container div.dt-paging ul.pagination { min-width: 100%; } -.dt-container { +#delta_urls_table_wrapper .col-md { + display: flex; + justify-content: space-between; + align-items: center; + grid-auto-flow: row; position: relative; -} -.dt-container div.dt-buttons { - display: flex !important; - gap: 10px !important; - align-items: center !important; - justify-content: flex-end; - position: absolute; - right: 0; - top: 0; + .dt-info { + position:absolute; + left: 130px; + top: 5px; + } } -.custom-select, -.buttons-csv, -.customizeColumns, -.addPattern { - border-style: solid !important; - border-color: #A7BACD !important; - border-width: 1px !important; - color: #A7BACD !important; - border-radius: 5px !important; - padding: 11px 15px !important; - margin: 0 !important; - height: 43px !important; - display: flex !important; - align-items: center !important; -} - -#exclude_patterns_table_wrapper, -#include_patterns_table_wrapper, -#document_type_patterns_table_wrapper, -#title_patterns_table_wrapper { - margin-top: 15px !important; -} - -#exclude_patterns_table_wrapper table, -#include_patterns_table_wrapper table, -#document_type_patterns_table_wrapper table, -#title_patterns_table_wrapper table { - margin-top: 15px !important; -} - -#exclude_patterns_table_wrapper .addPattern, -#include_patterns_table_wrapper .addPattern, -#document_type_patterns_table_wrapper .addPattern, -#title_patterns_table_wrapper .addPattern, -#exclude_patterns_table_wrapper .customizeColumns, -#include_patterns_table_wrapper .customizeColumns, -#document_type_patterns_table_wrapper .customizeColumns, -#title_patterns_table_wrapper .customizeColumns { - margin-top: -10px !important; -} +#curated_urls_table_wrapper .col-md { + display: flex; + justify-content: space-between; + align-items: center; + grid-auto-flow: row; + position: relative; -#delta_urls_table_wrapper .dt-buttons, -#curated_urls_table_wrapper .dt-buttons { - gap: 3px !important; + .dt-info { + position:absolute; + left: 130px; + top: 5px; + } } diff --git a/sde_indexing_helper/static/js/delta_url_list.js b/sde_indexing_helper/static/js/delta_url_list.js index 2341b1e9..3147a9e8 100644 --- a/sde_indexing_helper/static/js/delta_url_list.js +++ b/sde_indexing_helper/static/js/delta_url_list.js @@ -114,14 +114,15 @@ function initializeDataTable() { layout: { bottomEnd: "inputPaging", topEnd: null, - topStart: { - info: true, + topStart: null, + top: { pageLength: { menu: [ [25, 50, 100, 500], ["Show 25", "Show 50", "Show 100", "Show 500"], ], }, + info:true, buttons: [ { extend: "csv", @@ -332,14 +333,15 @@ function initializeDataTable() { layout: { bottomEnd: "inputPaging", topEnd: null, - topStart: { - info: true, + topStart: null, + top: { pageLength: { menu: [ [25, 50, 100, 500], ["Show 25", "Show 50", "Show 100", "Show 500"], ], }, + info:true, buttons: [ { extend: "csv", From f47aba80ca1cf3130eae54116a0574dda56f9956 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 8 Mar 2025 04:48:10 +0000 Subject: [PATCH 5/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20a958ff..7e321e5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -125,4 +125,3 @@ For each PR made, an entry should be added to this changelog. It should contain - Changes: - Added a JavaScript validation check on form submission to ensure the document type (stored in a hidden input) is not empty. - Display an error message and prevent form submission if the field is empty. -