-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #114 from DDMAL/tooltip
Enhance Accessibility and Tooltip Functionality
- Loading branch information
Showing
6 changed files
with
145 additions
and
178 deletions.
There are no files selected for viewing
145 changes: 61 additions & 84 deletions
145
web-app/django/VIM/apps/instruments/static/instruments/js/DisplaySettings.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,117 +1,94 @@ | ||
| const masonryBtn = document.getElementById("masonry-btn"); | ||
| const stdBtn = document.getElementById("std-btn"); | ||
|
|
||
| const masonryView = document.getElementById('masonry-view'); | ||
| const stdView = document.getElementById('std-view'); | ||
| const masonryView = document.getElementById("masonry-view"); | ||
| const stdView = document.getElementById("std-view"); | ||
|
|
||
| updateDisplayMode(); | ||
|
|
||
| function setDisplayMode(displayMode) { | ||
| localStorage.setItem('displayMode', displayMode); | ||
| localStorage.setItem("displayMode", displayMode); | ||
| } | ||
|
|
||
| function getDisplayMode() { | ||
| return localStorage.getItem('displayMode'); | ||
| return localStorage.getItem("displayMode"); | ||
| } | ||
|
|
||
| function updateDisplayMode() { | ||
| const currentDisplayMode = getDisplayMode() || 'masonry'; | ||
| switch (currentDisplayMode) { | ||
| case 'masonry': | ||
| setMasonryView(); | ||
| masonryView.style.display = ""; | ||
| stdView.style.display = "none"; | ||
| masonryBtn.classList.toggle("highlighted-btn"); | ||
| stdBtn.classList.remove("highlighted-btn"); | ||
| break; | ||
| case 'standard': | ||
| masonryView.style.display = "none"; | ||
| stdView.style.display = ""; | ||
| stdBtn.classList.toggle("highlighted-btn"); | ||
| masonryBtn.classList.remove("highlighted-btn"); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| const currentDisplayMode = getDisplayMode() || "masonry"; | ||
| switch (currentDisplayMode) { | ||
| case "masonry": | ||
| setMasonryView(); | ||
| masonryView.style.display = ""; | ||
| stdView.style.display = "none"; | ||
| masonryBtn.classList.toggle("highlighted-btn"); | ||
| stdBtn.classList.remove("highlighted-btn"); | ||
| break; | ||
| case "standard": | ||
| masonryView.style.display = "none"; | ||
| stdView.style.display = ""; | ||
| stdBtn.classList.toggle("highlighted-btn"); | ||
| masonryBtn.classList.remove("highlighted-btn"); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| // Switch to the next mode | ||
| masonryBtn.addEventListener("click", () => { | ||
| if (getDisplayMode() !== 'masonry') { | ||
| setDisplayMode('masonry'); | ||
| updateDisplayMode(); | ||
| } | ||
| if (getDisplayMode() !== "masonry") { | ||
| setDisplayMode("masonry"); | ||
| updateDisplayMode(); | ||
| } | ||
| }); | ||
|
|
||
| stdBtn.addEventListener("click", () => { | ||
| if (getDisplayMode() !== 'standard') { | ||
| setDisplayMode('standard'); | ||
| updateDisplayMode(); | ||
| } | ||
| if (getDisplayMode() !== "standard") { | ||
| setDisplayMode("standard"); | ||
| updateDisplayMode(); | ||
| } | ||
| }); | ||
|
|
||
|
|
||
| function setMasonryView() { | ||
| // Initialize Masonry | ||
| var masonryGrid = document.getElementById("masonry-view"); | ||
| var masonry = new Masonry(masonryGrid, { | ||
| percentPosition: true, | ||
| }); | ||
|
|
||
| // Initialize ImagesLoaded | ||
| var imgLoad = imagesLoaded(masonryGrid); | ||
|
|
||
| // When all images are loaded, relayout Masonry | ||
| imgLoad.on("always", function () { | ||
| masonry.layout(); | ||
| }); | ||
| // Initialize Masonry | ||
| var masonryGrid = document.getElementById("masonry-view"); | ||
| var masonry = new Masonry(masonryGrid, { | ||
| percentPosition: true, | ||
| }); | ||
|
|
||
| // Initialize ImagesLoaded | ||
| var imgLoad = imagesLoaded(masonryGrid); | ||
|
|
||
| // When all images are loaded, relayout Masonry | ||
| imgLoad.on("always", function () { | ||
| masonry.layout(); | ||
| }); | ||
| } | ||
|
|
||
| // // Instrument badge settings | ||
| // const instrumentLanguage = document.querySelector("#instrument-language-element"); | ||
| // const instrumentBadge = document.querySelector("#instrument-language-badge"); | ||
|
|
||
| // updateInstrumentBadge(); | ||
|
|
||
| // function updateInstrumentBadge() { | ||
| // const hideInstrumentBadge = localStorage.getItem('hideInstrumentBadge') || false; | ||
| // if (hideInstrumentBadge) { | ||
| // instrumentBadge.style.display = "none"; | ||
| // } else { | ||
| // instrumentBadge.style.display = ""; | ||
| // } | ||
| // } | ||
|
|
||
| // instrumentLanguage.addEventListener("click", function () { | ||
| // localStorage.setItem("hideInstrumentBadge", true); | ||
| // updateInstrumentBadge(); | ||
| // }); | ||
|
|
||
|
|
||
| // HBS facet settings | ||
| const items = document.querySelectorAll('.list-group-item'); | ||
| const items = document.querySelectorAll(".list-group-item"); | ||
|
|
||
| updateHbsFacet(); | ||
|
|
||
| function updateHbsFacet() { | ||
| const url = new URL(window.location.href); | ||
| const selectedHbsFacet = url.searchParams.get("hbs_facet") || ''; | ||
| localStorage.setItem('selectedHbsFacet', selectedHbsFacet); | ||
| items.forEach(item => { | ||
| current_item = item.getAttribute('current-value'); | ||
| if (current_item === selectedHbsFacet) { | ||
| item.classList.add('selected'); | ||
| } else { | ||
| item.classList.remove('selected'); | ||
| } | ||
| }); | ||
| const url = new URL(window.location.href); | ||
| const selectedHbsFacet = url.searchParams.get("hbs_facet") || ""; | ||
| localStorage.setItem("selectedHbsFacet", selectedHbsFacet); | ||
| items.forEach((item) => { | ||
| current_item = item.getAttribute("current-value"); | ||
| if (current_item === selectedHbsFacet) { | ||
| item.classList.add("selected"); | ||
| } else { | ||
| item.classList.remove("selected"); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| items.forEach(item => { | ||
| item.addEventListener('click', function () { | ||
| current_item = item.getAttribute('current-value'); | ||
| localStorage.setItem('selectedHbsFacet', current_item); | ||
| updateHbsFacet(); | ||
| }); | ||
| items.forEach((item) => { | ||
| item.addEventListener("click", function () { | ||
| current_item = item.getAttribute("current-value"); | ||
| localStorage.setItem("selectedHbsFacet", current_item); | ||
| updateHbsFacet(); | ||
| }); | ||
| }); | ||
|
|
32 changes: 32 additions & 0 deletions
32
web-app/django/VIM/apps/instruments/templates/instruments/includes/paginationOptions.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <div | ||
| class="me-2 mb-1 d-flex align-items-center justify-content-end view-per-page" | ||
| > | ||
| <span class="text-start">View</span> | ||
| <input | ||
| type="radio" | ||
| class="btn-check option-radio" | ||
| name="options-group2" | ||
| id="20" | ||
| autocomplete="off" | ||
| /> | ||
| <label class="btn" title="View 20 entries per page" for="20">20</label> | ||
| <label class="col-form-label mb-1">|</label> | ||
| <input | ||
| type="radio" | ||
| class="btn-check option-radio" | ||
| name="options-group2" | ||
| id="50" | ||
| autocomplete="off" | ||
| /> | ||
| <label class="btn" title="View 50 entries per page" for="50">50</label> | ||
| <label class="col-form-label mb-1">|</label> | ||
| <input | ||
| type="radio" | ||
| class="btn-check option-radio" | ||
| name="options-group2" | ||
| id="100" | ||
| autocomplete="off" | ||
| /> | ||
| <label class="btn" title="View 100 entries per page" for="100">100</label> | ||
| <span class="text-end">per page</span> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.