diff --git a/examples b/examples index fe2dd5288..7eed76f27 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit fe2dd5288f2fb475c6e0985372dc47c644a7b8f2 +Subproject commit 7eed76f2748aa05dceace56c70200efa74e2f9de diff --git a/src/extensions/uv-seadragon-extension/config/en-GB.json b/src/extensions/uv-seadragon-extension/config/en-GB.json index bb5fe0d80..3ab2ea438 100644 --- a/src/extensions/uv-seadragon-extension/config/en-GB.json +++ b/src/extensions/uv-seadragon-extension/config/en-GB.json @@ -33,7 +33,7 @@ "saveUserSettings": false, "clickToZoomEnabled": true, "searchWithinEnabled": true, - "termsOfUseEnabled": false, + "termsOfUseEnabled": true, "theme": "uv-en-GB-theme", "tokenStorage": "session", "useArrowKeysToNavigate": false, diff --git a/src/modules/uv-shared-module/CenterPanel.ts b/src/modules/uv-shared-module/CenterPanel.ts index 80338b325..f5b722638 100644 --- a/src/modules/uv-shared-module/CenterPanel.ts +++ b/src/modules/uv-shared-module/CenterPanel.ts @@ -70,12 +70,14 @@ export class CenterPanel extends BaseView { const $license = this.$attribution.find('.license'); const $logo = this.$attribution.find('.logo'); - $attribution.html(UVUtils.sanitize(attribution)); + const sanitized: string = UVUtils.sanitize(attribution); - $attribution.find('img').one("load", () => { + $attribution.html(sanitized); + + $attribution.find('img').one('load', () => { this.resize(); }).each(function() { - if(this.complete) $(this).load(); + if (this.complete) $(this).load(); }); $attribution.targetBlank(); diff --git a/src/modules/uv-shared-module/css/overlays.less b/src/modules/uv-shared-module/css/overlays.less index 70bc9f55c..01bfb6cda 100644 --- a/src/modules/uv-shared-module/css/overlays.less +++ b/src/modules/uv-shared-module/css/overlays.less @@ -33,12 +33,12 @@ overflow: hidden; .buttons { - padding: @padding-medium-vertical; - float: right; + padding: @padding-medium-vertical; + float: right; - .btn { - margin: 0 0 0 @margin-medium-horizontal; - } + .btn { + margin: 0 0 0 @margin-medium-horizontal; + } } .content { @@ -47,6 +47,7 @@ padding-left: @padding-medium-horizontal; overflow: auto; + text-overflow: ellipsis; h1 { color: @headings-color; @@ -67,9 +68,13 @@ p { margin: 0; padding: @padding-medium-vertical 0 @padding-medium-vertical 0; + overflow: hidden; + text-overflow: ellipsis; p { padding-top: 0; + overflow: hidden; + text-overflow: ellipsis; } }