diff --git a/horilla_theme/static/horilla_theme/assets/css/v1_styles.css b/horilla_theme/static/horilla_theme/assets/css/v1_styles.css index 5b5f39eb8..510b6e8f3 100644 --- a/horilla_theme/static/horilla_theme/assets/css/v1_styles.css +++ b/horilla_theme/static/horilla_theme/assets/css/v1_styles.css @@ -303,7 +303,7 @@ border: 1px solid hsl(221, 83%, 53%) !important; } -.oh-input:not([type="file"]){ +.oh-input:not([type="file"]) { border: 1px solid hsl(213, 22%, 84%); } @@ -969,6 +969,7 @@ width: 100%; } } + .oh-btn { display: flex; align-items: center; @@ -1299,17 +1300,17 @@ justify-content: center; } -.oh-btn-group > * { +.oh-btn-group>* { border-radius: 0; border-right: 1px solid hsl(213, 22%, 93%); } -.oh-btn-group > *:first-child { +.oh-btn-group>*:first-child { border-top-left-radius: 0.375rem; border-bottom-left-radius: 0.375rem; } -.oh-btn-group > *:last-child { +.oh-btn-group>*:last-child { border-right: none; border-top-right-radius: 0.375rem; border-bottom-right-radius: 0.375rem; @@ -1738,3 +1739,11 @@ ul.errorlist ul.errorlist li { padding-left: 5px; color: #000000; } + +.d-none { + display: none; +} + +.highlight-selected { + background: #00d6ff1f !important; +} diff --git a/horilla_theme/static/horilla_theme/assets/js/footerScripts.js b/horilla_theme/static/horilla_theme/assets/js/footerScripts.js index 52e1d3972..f581e0159 100644 --- a/horilla_theme/static/horilla_theme/assets/js/footerScripts.js +++ b/horilla_theme/static/horilla_theme/assets/js/footerScripts.js @@ -578,20 +578,6 @@ function switchTab(e) { } } - function toggleHighlight(ids) { - $.each(ids, function (indexInArray, id) { - setTimeout(() => { - $(`#${id}`) - .closest(".oh-sticky-table__tr") - .removeClass("highlight-selected"); - if ($(`#${id}`).is(":checked")) { - $(`#${id}`) - .closest(".oh-sticky-table__tr") - .addClass("highlight-selected"); - } - }, 1); - }); - } $(document).on('htmx:afterSettle', function (event) { diff --git a/horilla_theme/templates/generic/horilla_list_table.html b/horilla_theme/templates/generic/horilla_list_table.html index 3482aaeb3..32c5f7a47 100644 --- a/horilla_theme/templates/generic/horilla_list_table.html +++ b/horilla_theme/templates/generic/horilla_list_table.html @@ -263,4 +263,79 @@ {% endif %} + + {% if bulk_select_option %} + + {% endif %} + + + + diff --git a/horilla_theme/templates/generic/import_block.html b/horilla_theme/templates/generic/import_block.html index 53eac169f..e1998cb87 100644 --- a/horilla_theme/templates/generic/import_block.html +++ b/horilla_theme/templates/generic/import_block.html @@ -58,7 +58,7 @@ diff --git a/static/index/index.js b/static/index/index.js index 6b56a9d21..ccfaeb550 100644 --- a/static/index/index.js +++ b/static/index/index.js @@ -238,43 +238,6 @@ function toggleReimbursmentType(element) { } } -function reloadSelectedCount(targetElement, storeKey = "selectedInstances") { - var count = JSON.parse($(`#${storeKey}`).attr("data-ids") || "[]").length; - id = targetElement.attr("id"); - if (id) { - id = id.split("count_")[1]; - } - if (count) { - targetElement.html(count); - targetElement.parent().removeClass("d-none"); - $(`#unselect_${id}, #export_${id}, #bulk_udate_${id}`).removeClass( - "d-none" - ); - } else { - targetElement.parent().addClass("d-none"); - $(`#unselect_${id}, #export_${id}, #bulk_udate_${id}`).addClass( - "d-none" - ); - } -} - -function removeHighlight() { - setTimeout(function () { - $(".toggle-highlight").removeClass("toggle-highlight"); - }, 200); -} - -function removeId(element, storeKey = "selectedInstances") { - id = element.val(); - viewId = element.attr("data-view-id"); - ids = JSON.parse($(`#${storeKey}`).attr("data-ids") || "[]"); - let elementToRemove = 5; - if (ids[ids.length - 1] === id) { - ids.pop(); - } - ids = JSON.stringify(ids); - $(`#${storeKey}`).attr("data-ids", ids); -} function bulkStageUpdate(canIds, stageId, preStageId) { $.ajax({ type: "POST",