Skip to content

Terms of Use Overlay Improvements #1366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crhallberg wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

Terms of Use Overlay Improvements #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29f845f
terms: default to requiredStatement, make license a link.
crhallberg Apr 11, 2025
f56db28
terms: improve styling of prose and width of terms overlay.
crhallberg Apr 11, 2025
220cf4a
Commit from GitHub Actions (Lint code)
github-actions[bot] Apr 11, 2025
f839658
merge and simplify
crhallberg May 27, 2025
9b6fd8c
overlays(less): fix and restore less diffs.
crhallberg May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/content-handlers/iiif/modules/uv-dialogues-module/DownloadDialogue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export class DownloadDialogue extends Dialogue<
);
this.$footer.append(this.$termsOfUseButton);

this.$termsOfUseButton.onPressed(() => {
this.onAccessibleClick(this.$termsOfUseButton, () => {
this.extensionHost.publish(IIIFEvents.SHOW_TERMS_OF_USE);
});

Expand Down
16 changes: 9 additions & 7 deletions src/content-handlers/iiif/modules/uv-shared-module/BaseExtension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,15 +423,17 @@ export class BaseExtension<T extends BaseConfig> implements IExtension {
});

this.extensionHost.subscribe(IIIFEvents.SHOW_TERMS_OF_USE, () => {
let terms: string | null = this.helper.getLicense();
let terms: string | null = null;

if (!terms) {
const requiredStatement: ILabelValuePair | null =
this.helper.getRequiredStatement();
const requiredStatement: ILabelValuePair | null =
this.helper.getRequiredStatement();
if (requiredStatement?.value) {
terms = requiredStatement.value;
}

if (requiredStatement && requiredStatement.value) {
terms = requiredStatement.value;
}
if (!terms) {
const license = this.helper.getLicense();
Copy link
Contributor

@demiankatz demiankatz May 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that getLicense can potentially return a null value, so we should only construct the link below if we have a non-null license.

terms = `<a href="${license}">${license}</a>`;
}

if (terms) {
Expand Down
4 changes: 3 additions & 1 deletion src/content-handlers/iiif/modules/uv-shared-module/css/overlays.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@
}

&.genericDialogue {
width: 250px;
width: fit-content;
min-width: 250px;
max-width: 400px;

.bottom {
background: none;
Expand Down