From d6a15656d8c4e2ce810b8ca97500e94b35d021e0 Mon Sep 17 00:00:00 2001 From: "kush.varade.19" Date: Sun, 10 May 2026 23:55:54 +0530 Subject: [PATCH 01/10] Page naviagtion is handled --- core/static/core/js/search-results.js | 11 ++++++++ core/static/core/scss/base/general.scss | 2 +- .../core/scss/components/search-result.scss | 27 ++++++++++++------- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/core/static/core/js/search-results.js b/core/static/core/js/search-results.js index b575a90e..c10cf817 100644 --- a/core/static/core/js/search-results.js +++ b/core/static/core/js/search-results.js @@ -302,6 +302,17 @@ function reset_form(form) { } $(function () { + // Keep sticky table header anchored just below the navigation bar. + const siteHeader = document.querySelector('.site-header'); + if (siteHeader) { + const updateNavHeight = () => { + document.documentElement.style.setProperty('--nav-height', siteHeader.offsetHeight + 'px'); + }; + updateNavHeight(); + window.addEventListener('resize', updateNavHeight); + window.addEventListener('load', updateNavHeight); + } + emlojs.selectable_service.setup_all() setup_merge_btn(); setup_fieldset_toggle(); diff --git a/core/static/core/scss/base/general.scss b/core/static/core/scss/base/general.scss index d55c479a..32639c09 100644 --- a/core/static/core/scss/base/general.scss +++ b/core/static/core/scss/base/general.scss @@ -104,7 +104,7 @@ thead tr { th { font-weight: 700; position: sticky; - top: 100px; + top: var(--nav-height, 100px); z-index: 99; border-bottom: 1px solid $black; background-color: $white; diff --git a/core/static/core/scss/components/search-result.scss b/core/static/core/scss/components/search-result.scss index 2647053e..371dad1a 100644 --- a/core/static/core/scss/components/search-result.scss +++ b/core/static/core/scss/components/search-result.scss @@ -119,15 +119,17 @@ td.text-heavy { width: max-content; /* expand to fit columns so wrapper can scroll */ max-width: none; /* do not clamp the intrinsic width */ - /* Table visuals */ - border-collapse: collapse; /* Keep auto layout for natural column sizing */ + /* border-collapse must stay 'separate' (inherited from the global table rule) — + position:sticky on thead cells is broken when border-collapse:collapse is set */ } #results_table th { - top: 0px; + top: 0; /* sticky at top of .results-scroll scroll viewport, which itself sticks below the nav */ background-color: $light-grey; - border: 1px solid $mid-grey; + /* Use directional borders only to avoid doubled borders with border-collapse:separate */ + border-right: 1px solid $mid-grey; + border-bottom: 2px solid $mid-grey; } #results_table th, @@ -173,15 +175,20 @@ td.text-heavy { // hyphens: auto; //} -/* New scroll container placed above/wrapping the table. This holds the scrollbars - so the page itself doesn't move. The table element remains unchanged. */ +/* Scroll container for the results table. + position:sticky makes the entire container lock below the nav bar as the page scrolls. + overflow:auto enables both horizontal (for wide tables) and vertical (for many rows) scroll. + The thead th elements use top:0 to stick at the top of this container's viewport, + which — because the container itself is stuck below the nav — places them right below the nav. */ .results-scroll { - height: 70vh; /* match viewport height and adapt on resize */ + position: sticky; + top: var(--nav-height, 100px); + height: 70vh; max-height: 70vh; width: 100%; - overflow: auto; /* both vertical and horizontal scrolling inside */ - -webkit-overflow-scrolling: touch; /* smooth scrolling on iOS */ - overscroll-behavior: contain; /* prevent scroll chaining to the page */ + overflow: auto; + -webkit-overflow-scrolling: touch; + overscroll-behavior: contain; border: 1px solid $light-grey; } From fc1158452d58202d268b4960c47aecce74307fd7 Mon Sep 17 00:00:00 2001 From: "kush.varade.19" Date: Mon, 1 Jun 2026 10:29:42 +0530 Subject: [PATCH 02/10] Expand-collapse the table scroll removed --- core/static/core/js/search-results.js | 30 +++++++++++++++++++ .../core/scss/components/search-result.scss | 17 ++++------- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/core/static/core/js/search-results.js b/core/static/core/js/search-results.js index c10cf817..d891b600 100644 --- a/core/static/core/js/search-results.js +++ b/core/static/core/js/search-results.js @@ -301,6 +301,35 @@ function reset_form(form) { location.href = url; } +function setupStickyTableHeader() { + const tableWrap = document.querySelector('.results-scroll'); + const table = document.getElementById('results_table'); + if (!tableWrap || !table) return; + + const headerRow = table.querySelector('thead tr:last-child'); + if (!headerRow) return; + + function syncHeader() { + const navHeight = parseFloat( + getComputedStyle(document.documentElement).getPropertyValue('--nav-height') + ) || 100; + const rect = tableWrap.getBoundingClientRect(); + const headerHeight = headerRow.offsetHeight || 40; + + if (rect.top < navHeight && rect.bottom > navHeight + headerHeight) { + headerRow.style.transform = `translateY(${navHeight - rect.top}px)`; + headerRow.style.position = 'relative'; + headerRow.style.zIndex = '100'; + } else { + headerRow.style.transform = ''; + headerRow.style.position = ''; + headerRow.style.zIndex = ''; + } + } + + window.addEventListener('scroll', syncHeader, { passive: true }); +} + $(function () { // Keep sticky table header anchored just below the navigation bar. const siteHeader = document.querySelector('.site-header'); @@ -326,6 +355,7 @@ $(function () { if ($('#results_table thead').length) { add_hide_buttons_to_columns(); + setupStickyTableHeader(); } if (recref_mode == '1') { diff --git a/core/static/core/scss/components/search-result.scss b/core/static/core/scss/components/search-result.scss index 371dad1a..f1775603 100644 --- a/core/static/core/scss/components/search-result.scss +++ b/core/static/core/scss/components/search-result.scss @@ -125,7 +125,7 @@ td.text-heavy { } #results_table th { - top: 0; /* sticky at top of .results-scroll scroll viewport, which itself sticks below the nav */ + top: 0; background-color: $light-grey; /* Use directional borders only to avoid doubled borders with border-collapse:separate */ border-right: 1px solid $mid-grey; @@ -175,20 +175,13 @@ td.text-heavy { // hyphens: auto; //} -/* Scroll container for the results table. - position:sticky makes the entire container lock below the nav bar as the page scrolls. - overflow:auto enables both horizontal (for wide tables) and vertical (for many rows) scroll. - The thead th elements use top:0 to stick at the top of this container's viewport, - which — because the container itself is stuck below the nav — places them right below the nav. */ +/* Wrapper for the results table. + overflow-x:auto handles wide tables that exceed the container width. + No fixed height — the table expands naturally and the page scroll handles vertical navigation. */ .results-scroll { - position: sticky; - top: var(--nav-height, 100px); - height: 70vh; - max-height: 70vh; width: 100%; - overflow: auto; + overflow-x: auto; -webkit-overflow-scrolling: touch; - overscroll-behavior: contain; border: 1px solid $light-grey; } From 30b21d5d7ccd1b4bdb9bad89e877450b5d00588b Mon Sep 17 00:00:00 2001 From: "kush.varade.19" Date: Mon, 1 Jun 2026 10:51:13 +0530 Subject: [PATCH 03/10] Sticky header handled properly --- core/static/core/js/search-results.js | 30 ------------------- .../core/scss/components/search-result.scss | 14 +++------ 2 files changed, 4 insertions(+), 40 deletions(-) diff --git a/core/static/core/js/search-results.js b/core/static/core/js/search-results.js index d891b600..c10cf817 100644 --- a/core/static/core/js/search-results.js +++ b/core/static/core/js/search-results.js @@ -301,35 +301,6 @@ function reset_form(form) { location.href = url; } -function setupStickyTableHeader() { - const tableWrap = document.querySelector('.results-scroll'); - const table = document.getElementById('results_table'); - if (!tableWrap || !table) return; - - const headerRow = table.querySelector('thead tr:last-child'); - if (!headerRow) return; - - function syncHeader() { - const navHeight = parseFloat( - getComputedStyle(document.documentElement).getPropertyValue('--nav-height') - ) || 100; - const rect = tableWrap.getBoundingClientRect(); - const headerHeight = headerRow.offsetHeight || 40; - - if (rect.top < navHeight && rect.bottom > navHeight + headerHeight) { - headerRow.style.transform = `translateY(${navHeight - rect.top}px)`; - headerRow.style.position = 'relative'; - headerRow.style.zIndex = '100'; - } else { - headerRow.style.transform = ''; - headerRow.style.position = ''; - headerRow.style.zIndex = ''; - } - } - - window.addEventListener('scroll', syncHeader, { passive: true }); -} - $(function () { // Keep sticky table header anchored just below the navigation bar. const siteHeader = document.querySelector('.site-header'); @@ -355,7 +326,6 @@ $(function () { if ($('#results_table thead').length) { add_hide_buttons_to_columns(); - setupStickyTableHeader(); } if (recref_mode == '1') { diff --git a/core/static/core/scss/components/search-result.scss b/core/static/core/scss/components/search-result.scss index f1775603..da6fabda 100644 --- a/core/static/core/scss/components/search-result.scss +++ b/core/static/core/scss/components/search-result.scss @@ -114,18 +114,14 @@ td.text-heavy { } #results_table { - /* Size behavior: allow table to be wider than the viewport/container */ - min-width: 100%; /* ensure at least full width */ - width: max-content; /* expand to fit columns so wrapper can scroll */ - max-width: none; /* do not clamp the intrinsic width */ + width: 100%; - /* Keep auto layout for natural column sizing */ /* border-collapse must stay 'separate' (inherited from the global table rule) — position:sticky on thead cells is broken when border-collapse:collapse is set */ } #results_table th { - top: 0; + top: var(--nav-height, 100px); background-color: $light-grey; /* Use directional borders only to avoid doubled borders with border-collapse:separate */ border-right: 1px solid $mid-grey; @@ -176,12 +172,10 @@ td.text-heavy { //} /* Wrapper for the results table. - overflow-x:auto handles wide tables that exceed the container width. - No fixed height — the table expands naturally and the page scroll handles vertical navigation. */ + No overflow set — keeping this free of any overflow value lets CSS position:sticky + on the thead cells anchor correctly to the page scroll. */ .results-scroll { width: 100%; - overflow-x: auto; - -webkit-overflow-scrolling: touch; border: 1px solid $light-grey; } From 365445c6a5553f51ee05f4d1f96679421c4d4039 Mon Sep 17 00:00:00 2001 From: "kush.varade.19" Date: Mon, 1 Jun 2026 10:52:56 +0530 Subject: [PATCH 04/10] Toggle renamed with Search options --- core/templates/core/basic_search_page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/templates/core/basic_search_page.html b/core/templates/core/basic_search_page.html index 81a322cf..d264c208 100644 --- a/core/templates/core/basic_search_page.html +++ b/core/templates/core/basic_search_page.html @@ -113,7 +113,7 @@

No results

{% if query_fieldset_list and paginator.count %} {% endif %} {% if merge_page_url %} From f6bb4d8c70db2141ae845925422e46248fc685fd Mon Sep 17 00:00:00 2001 From: Anusha Ranganathan Date: Thu, 18 Jun 2026 10:32:02 +0530 Subject: [PATCH 05/10] Would like to keep toggle --- core/templates/core/basic_search_page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/templates/core/basic_search_page.html b/core/templates/core/basic_search_page.html index d264c208..01b81200 100644 --- a/core/templates/core/basic_search_page.html +++ b/core/templates/core/basic_search_page.html @@ -113,7 +113,7 @@

No results

{% if query_fieldset_list and paginator.count %} {% endif %} {% if merge_page_url %} @@ -195,4 +195,4 @@

No results

-{% endblock %} \ No newline at end of file +{% endblock %} From 2263a40f5e2298232b8b108b4d6e945cc02668cb Mon Sep 17 00:00:00 2001 From: "kush.varade.19" Date: Mon, 29 Jun 2026 11:23:38 +0530 Subject: [PATCH 06/10] vertical scroll is been fixed --- .../core/scss/components/search-result.scss | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/core/static/core/scss/components/search-result.scss b/core/static/core/scss/components/search-result.scss index 44385927..7b950072 100644 --- a/core/static/core/scss/components/search-result.scss +++ b/core/static/core/scss/components/search-result.scss @@ -228,6 +228,27 @@ td.text-heavy { border: 1px solid $light-grey; } +/* On result pages the table can be wider than the viewport, causing the page to scroll + horizontally. The sticky nav (position:sticky) then scrolls with the content and its + background no longer covers the full viewport — white space appears on the right. + Fix: use position:fixed for the nav so it is always anchored to the viewport and is + never affected by horizontal scroll. padding-top on the body compensates for the fixed + element being removed from the document flow. + Scoped via :has(.results-scroll) so only result pages are affected. */ +html:has(.results-scroll) .site-header { + position: fixed; + top: 0; + left: 0; + right: 0; + margin: 0; + width: 100%; + z-index: 150; +} + +html:has(.results-scroll) body { + padding-top: var(--nav-height, 100px); +} + .img-thumbnail { width: 60px; } From 39bb91aa99ee132d71d5601ae68a6bb739656e04 Mon Sep 17 00:00:00 2001 From: "kush.varade.19" Date: Mon, 6 Jul 2026 12:30:08 +0530 Subject: [PATCH 07/10] Pagination changes made --- .../core/scss/components/pagination.scss | 130 ++++++++++++++++-- .../scss/components/search-components.scss | 29 +--- core/templates/core/basic_search_page.html | 19 ++- .../core/component/hidden_columns_panel.html | 38 +++++ core/templates/core/component/pagination.html | 16 +-- .../core/form/search_components.html | 33 ----- work/templates/work/basic_form.html | 3 +- 7 files changed, 180 insertions(+), 88 deletions(-) create mode 100644 core/templates/core/component/hidden_columns_panel.html diff --git a/core/static/core/scss/components/pagination.scss b/core/static/core/scss/components/pagination.scss index da5bc16f..455dfa78 100644 --- a/core/static/core/scss/components/pagination.scss +++ b/core/static/core/scss/components/pagination.scss @@ -1,7 +1,51 @@ .pagination { - padding: $space-sm $space-unit $space-sm 0; + padding: $space-sm 0; clear: both; + flex: 1 1 auto; + min-width: 0; +} + +.pagination-nav ul { + display: flex; + flex-wrap: wrap; + justify-content: center; + align-items: center; + list-style: none; + margin: 0; + padding: 0; + gap: $space-sm $space-md; +} + +// Extra breathing room between the first/previous nav links and the +// numbered pages, and again between the numbered pages and next/last. +.page-item--nav + .page-item:not(.page-item--nav), +.page-item:not(.page-item--nav) + .page-item--nav { + margin-left: $space-sm; +} + +// Toolbar row combining the search-options toggle, pagination and +// columns-visibility control on a single line. Wraps to stacked rows +// when the table column is narrower (e.g. search sidebar left open). +.pagination-toolbar { + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + gap: $space-sm $space-lg; + padding: $space-sm 0; +} + +.pagination-toolbar__left, +.pagination-toolbar__right { + display: flex; + align-items: center; + flex: 0 0 auto; +} + +.pagination-toolbar__center { + flex: 1 1 auto; + min-width: 0; } #hidden_columns span { @@ -22,23 +66,85 @@ } +// "Columns visibility" control, styled to sit in the pagination toolbar +// as a compact pill/button matching the other toolbar controls. +.hidden-columns-toggle { + display: flex; + flex-direction: column; + align-items: flex-end; +} + +.hidden-columns-toggle__label { + display: inline-flex; + align-items: center; + gap: 0.4em; + padding: $space-xxs $space-xs; + border: 1px solid $light-grey; + border-radius: $space-xxs; + white-space: nowrap; +} + +.hidden-columns-toggle #hidden-columns-fieldset { + margin-top: $space-xxs; + text-align: left; +} + +// Border/padding live on the link itself (like .btn does on a {% endif %}
- + +
+ {% include 'core/component/pagination.html' %} +
+ +
+ {% include 'core/component/hidden_columns_panel.html' %} +
+
{{ results_renderer | safe }} diff --git a/core/templates/core/component/hidden_columns_panel.html b/core/templates/core/component/hidden_columns_panel.html new file mode 100644 index 00000000..58fa26d6 --- /dev/null +++ b/core/templates/core/component/hidden_columns_panel.html @@ -0,0 +1,38 @@ +
+ + + Columns visibility + + +
+

No columns are hidden

+
+
+
+ diff --git a/core/templates/core/component/pagination.html b/core/templates/core/component/pagination.html index bb18e6d7..262a6a26 100644 --- a/core/templates/core/component/pagination.html +++ b/core/templates/core/component/pagination.html @@ -2,11 +2,11 @@ {% if page_obj.paginator.num_pages > 1 or page_obj.has_other_pages %} - + {% endif %} diff --git a/core/templates/core/form/search_components.html b/core/templates/core/form/search_components.html index 82be5964..8e47a0e0 100644 --- a/core/templates/core/form/search_components.html +++ b/core/templates/core/form/search_components.html @@ -52,37 +52,4 @@ {{ form.page }} - -
-{# Hidden columns#} -

No columns are hidden

-
-
- diff --git a/work/templates/work/basic_form.html b/work/templates/work/basic_form.html index b4c66c08..865d6310 100644 --- a/work/templates/work/basic_form.html +++ b/work/templates/work/basic_form.html @@ -1,9 +1,10 @@ {% extends "core/emlo_common_form.html" %} {% load static %} +{% load sass_tags %} {% block head %} {{ block.super }} - + From b0387b2b27d3de61bcc4b9c92af6b08eab7de965 Mon Sep 17 00:00:00 2001 From: "kush.varade.19" Date: Mon, 6 Jul 2026 12:35:57 +0530 Subject: [PATCH 08/10] Button size restored for column visibilty --- .../core/scss/components/pagination.scss | 52 +++++++++++-------- .../core/component/hidden_columns_panel.html | 5 +- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/core/static/core/scss/components/pagination.scss b/core/static/core/scss/components/pagination.scss index 455dfa78..b5f47e94 100644 --- a/core/static/core/scss/components/pagination.scss +++ b/core/static/core/scss/components/pagination.scss @@ -24,14 +24,16 @@ margin-left: $space-sm; } -// Toolbar row combining the search-options toggle, pagination and -// columns-visibility control on a single line. Wraps to stacked rows -// when the table column is narrower (e.g. search sidebar left open). +// Toolbar row combining the search-options toggle (plus any future +// left-hand buttons), pagination and columns-visibility control on a +// single line. Left/right columns share the leftover space equally so +// the pagination in the middle stays centred between them, however +// wide either side ends up being. Wraps to stacked rows when the table +// column is narrower (e.g. search sidebar left open). .pagination-toolbar { - display: flex; - flex-wrap: wrap; + display: grid; + grid-template-columns: 1fr auto 1fr; align-items: center; - justify-content: space-between; gap: $space-sm $space-lg; padding: $space-sm 0; } @@ -40,11 +42,18 @@ .pagination-toolbar__right { display: flex; align-items: center; - flex: 0 0 auto; +} + +.pagination-toolbar__left { + justify-self: start; +} + +.pagination-toolbar__right { + justify-self: end; } .pagination-toolbar__center { - flex: 1 1 auto; + justify-self: center; min-width: 0; } @@ -66,24 +75,15 @@ } -// "Columns visibility" control, styled to sit in the pagination toolbar -// as a compact pill/button matching the other toolbar controls. +// "Columns visibility" control: the button itself is a plain +// .search-form-btn (same as Toggle/Select/Merge), this just stacks the +// hidden-columns list underneath it. .hidden-columns-toggle { display: flex; flex-direction: column; align-items: flex-end; } -.hidden-columns-toggle__label { - display: inline-flex; - align-items: center; - gap: 0.4em; - padding: $space-xxs $space-xs; - border: 1px solid $light-grey; - border-radius: $space-xxs; - white-space: nowrap; -} - .hidden-columns-toggle #hidden-columns-fieldset { margin-top: $space-xxs; text-align: left; @@ -133,15 +133,21 @@ } // Half view: search sidebar is open and the results column is narrower. -// Tighten spacing so the toolbar and page numbers still fit comfortably. +// Stack the three sections instead of trying to fit them on one line. @media (max-width: $mborder-mid) { .pagination-toolbar { - justify-content: center; + grid-template-columns: 1fr; + justify-items: center; + } + + .pagination-toolbar__left, + .pagination-toolbar__right, + .pagination-toolbar__center { + justify-self: center; } .pagination-toolbar__center { order: 3; - flex: 1 1 100%; } .hidden-columns-toggle { diff --git a/core/templates/core/component/hidden_columns_panel.html b/core/templates/core/component/hidden_columns_panel.html index 58fa26d6..05fa05b5 100644 --- a/core/templates/core/component/hidden_columns_panel.html +++ b/core/templates/core/component/hidden_columns_panel.html @@ -1,8 +1,7 @@
- - +

No columns are hidden

From 759d6b25732256de1ac32dccd29716f286aac68d Mon Sep 17 00:00:00 2001 From: "kush.varade.19" Date: Mon, 6 Jul 2026 13:12:58 +0530 Subject: [PATCH 09/10] pagination style is changed --- core/static/core/js/search-results.js | 7 +- .../core/scss/components/pagination.scss | 71 ++++--------------- .../scss/components/search-components.scss | 29 +++++++- core/templates/core/basic_search_page.html | 6 +- .../core/component/hidden_columns_panel.html | 37 ---------- .../core/form/search_components.html | 33 +++++++++ 6 files changed, 78 insertions(+), 105 deletions(-) delete mode 100644 core/templates/core/component/hidden_columns_panel.html diff --git a/core/static/core/js/search-results.js b/core/static/core/js/search-results.js index c10cf817..dd2ff1d3 100644 --- a/core/static/core/js/search-results.js +++ b/core/static/core/js/search-results.js @@ -1,10 +1,11 @@ let num_records = $('#num_records').val(); -// If there are records and the fieldset has been toggled to be closed, keep it closed. +// The search fieldset is closed (full view) by default. If there are records +// and the user hasn't explicitly toggled it open, keep it closed. // otherwise, if there are no results, we have to show the search bar to allow the user to search again. -if (num_records > 0 && localStorage.getItem('fieldset-toggle') === 'false') { +if (num_records > 0 && localStorage.getItem('fieldset-toggle') !== 'true') { $('#query-fieldset').toggle(); $('#query-result').toggleClass('col--3of4'); } @@ -206,7 +207,7 @@ function setup_fieldset_toggle() { } }); - if (localStorage.getItem('fieldset-toggle') === 'false') { + if (localStorage.getItem('fieldset-toggle') !== 'true') { $('footer').hide(); } } diff --git a/core/static/core/scss/components/pagination.scss b/core/static/core/scss/components/pagination.scss index b5f47e94..7f251bc6 100644 --- a/core/static/core/scss/components/pagination.scss +++ b/core/static/core/scss/components/pagination.scss @@ -25,33 +25,23 @@ } // Toolbar row combining the search-options toggle (plus any future -// left-hand buttons), pagination and columns-visibility control on a -// single line. Left/right columns share the leftover space equally so -// the pagination in the middle stays centred between them, however -// wide either side ends up being. Wraps to stacked rows when the table -// column is narrower (e.g. search sidebar left open). +// left-hand buttons) with the pagination. The pagination column takes +// the remaining space and centres itself within it. Wraps to stacked +// rows when the table column is narrower (e.g. search sidebar left open). .pagination-toolbar { display: grid; - grid-template-columns: 1fr auto 1fr; + grid-template-columns: auto 1fr; align-items: center; gap: $space-sm $space-lg; padding: $space-sm 0; } -.pagination-toolbar__left, -.pagination-toolbar__right { +.pagination-toolbar__left { display: flex; align-items: center; -} - -.pagination-toolbar__left { justify-self: start; } -.pagination-toolbar__right { - justify-self: end; -} - .pagination-toolbar__center { justify-self: center; min-width: 0; @@ -75,24 +65,10 @@ } -// "Columns visibility" control: the button itself is a plain -// .search-form-btn (same as Toggle/Select/Merge), this just stacks the -// hidden-columns list underneath it. -.hidden-columns-toggle { - display: flex; - flex-direction: column; - align-items: flex-end; -} - -.hidden-columns-toggle #hidden-columns-fieldset { - margin-top: $space-xxs; - text-align: left; -} - -// Border/padding live on the link itself (like .btn does on a - -
-

No columns are hidden

-
-
-
- diff --git a/core/templates/core/form/search_components.html b/core/templates/core/form/search_components.html index 8e47a0e0..82be5964 100644 --- a/core/templates/core/form/search_components.html +++ b/core/templates/core/form/search_components.html @@ -52,4 +52,37 @@ {{ form.page }} + +
+{# Hidden columns#} +

No columns are hidden

+
+
+ From abe815ddb72694b3b60f66b74be6b1ea94cdea54 Mon Sep 17 00:00:00 2001 From: "kush.varade.19" Date: Tue, 7 Jul 2026 11:25:12 +0530 Subject: [PATCH 10/10] Pagination correction on search page --- core/static/core/js/search-results.js | 4 ++-- core/static/core/scss/components/pagination.scss | 3 ++- core/templates/core/basic_search_page.html | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/static/core/js/search-results.js b/core/static/core/js/search-results.js index dd2ff1d3..eaa200e3 100644 --- a/core/static/core/js/search-results.js +++ b/core/static/core/js/search-results.js @@ -6,8 +6,8 @@ let num_records = $('#num_records').val(); // otherwise, if there are no results, we have to show the search bar to allow the user to search again. if (num_records > 0 && localStorage.getItem('fieldset-toggle') !== 'true') { - $('#query-fieldset').toggle(); - $('#query-result').toggleClass('col--3of4'); + $('#query-fieldset').hide(); + $('#query-result').removeClass('col--3of4'); } function toggle_advanced_search_controls() { diff --git a/core/static/core/scss/components/pagination.scss b/core/static/core/scss/components/pagination.scss index 7f251bc6..9f49eddd 100644 --- a/core/static/core/scss/components/pagination.scss +++ b/core/static/core/scss/components/pagination.scss @@ -33,7 +33,8 @@ grid-template-columns: auto 1fr; align-items: center; gap: $space-sm $space-lg; - padding: $space-sm 0; + padding: 0; + font-size: 16px; } .pagination-toolbar__left { diff --git a/core/templates/core/basic_search_page.html b/core/templates/core/basic_search_page.html index c4c8ec66..91f4a358 100644 --- a/core/templates/core/basic_search_page.html +++ b/core/templates/core/basic_search_page.html @@ -106,7 +106,7 @@

No results

{% else %} -
+
{% if query_fieldset_list and paginator.count %}