Skip to content

Commit d03f8cd

Browse files
d22d22
authored
Merge pull request #53 from HSG-Library/develop
v2025.03.21-01
2 parents 214fa01 + 9ec6473 commit d03f8cd

File tree

8 files changed

+112
-165
lines changed

8 files changed

+112
-165
lines changed

‎css/00-central-package.css‎

Lines changed: 18 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,6 +1410,7 @@ md-checkbox .md-icon {
14101410
.available-facets .section-content .md-chips .md-chip .md-button:before {
14111411
background-color: #ffffff;
14121412
}
1413+
14131414
/*320 Top Bar*/
14141415

14151416
#mainResults>prm-search-result-tool-bar>div>md-toolbar>div.search-toolbar-title.hide-xs.layout-row>prm-add-query-to-saved-searches>.md-button:hover:not([disabled]) {
@@ -1479,6 +1480,7 @@ prm-search-result-tool-bar .main-checkbox.animate-enter-leave-scale-bounce.stagg
14791480
prm-add-query-to-saved-searches button {
14801481
border-radius: 5px !important;
14811482
}
1483+
14821484
/*Mobiles*/
14831485

14841486
.mobile-page-range span.text.tiny-uppercase-text {
@@ -2855,7 +2857,7 @@ label[translate="email.note"] {
28552857
/*Info box*/
28562858

28572859
prm-alma-other-members .info-text {
2858-
margin: 0 10px 20px 81px;
2860+
margin: 10px 10px 20px 81px;
28592861
border: 1px solid #222;
28602862
border-radius: 3px;
28612863
padding: 20px 10px;
@@ -2871,10 +2873,12 @@ prm-alma-other-members .info-text {
28712873

28722874
/*Info box temporary hidden*/
28732875

2874-
.info-text {
2876+
/* .info-text {
28752877
display: none;
28762878
}
28772879
2880+
*/
2881+
28782882

28792883
/*Hide "Online Access"*/
28802884

@@ -4068,6 +4072,7 @@ div#actionsList prm-action-list prm-action-container,
40684072
.favorites-action-list prm-action-list prm-action-container {
40694073
order: 3;
40704074
}
4075+
40714076
/*950 Alma viewer*/
40724077

40734078
/*Hide OTB logo in alma viewer*/
@@ -4216,12 +4221,12 @@ prm-location-items md-list prm-service-button .md-button.button-as-link,
42164221
prm-service-physical-best-offer .get_it_btn_physical,
42174222
md-input-container:after,
42184223
.slsp-citation-select-radio.md-active .md-on {
4219-
background-color: #4E4A99 !important;
4224+
background-color: #3BBFAD !important;
42204225
}
42214226

42224227
@media only screen and (max-width: 599px) {
42234228
prm-topbar .top-nav-bar {
4224-
border-color: #4E4A99 !important;
4229+
border-color: #3BBFAD !important;
42254230
}
42264231
}
42274232

@@ -4240,7 +4245,7 @@ button.switch-to-simple:hover,
42404245
#rapidoOffer prm-service-physical-best-offer .get_it_btn_digital:hover,
42414246
prm-service-physical-best-offer .get_it_btn_physical:hover,
42424247
prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-ripple:hover {
4243-
background-color: #393765 !important;
4248+
background-color: #83dcd0 !important;
42444249
}
42454250

42464251
/*font color of the primary color*/
@@ -4272,12 +4277,12 @@ button#get_it_btn_digital,
42724277
prm-service-button>button>span,
42734278
prm-resource-type-filter-bar .container .box div,
42744279
prm-resource-type-filter-bar prm-icon {
4275-
color: #fff !important;
4280+
color: #14413c !important;
42764281
}
42774282

42784283
button.switch-to-advanced.zero-margin.button-with-icon.md-button.md-primoExplore-theme.md-ink-ripple,
42794284
prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-ripple:hover {
4280-
border-color: #fff !important;
4285+
border-color: #14413c !important;
42814286
}
42824287

42834288

@@ -4304,13 +4309,13 @@ prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-rippl
43044309
.prm-alert-bg,
43054310
#rapidoOffer prm-rapido-no-offer-message .main_tile,
43064311
.diamond {
4307-
background-color: #99d0d0 !important;
4312+
background-color: #8dd8d8 !important;
43084313
}
43094314

43104315
.text-highlight,
43114316
mark,
43124317
prm-location-items>md-list>md-list-item>div>div>div>div>prm-service-button>button {
4313-
box-shadow: inset 0 -0.15em 0 0 #99d0d0;
4318+
box-shadow: inset 0 -0.15em 0 0 #8dd8d8;
43144319
}
43154320

43164321

@@ -4320,7 +4325,7 @@ prm-location-items>md-list>md-list-item>div>div>div>div>prm-service-button>butto
43204325

43214326
div.alert-bar .md-button:hover:not([disabled]),
43224327
slsp-edit-personal-details-component a.bar.alert-bar:hover {
4323-
background-color: #b6fafa !important;
4328+
background-color: #aff7f7 !important;
43244329
}
43254330

43264331

@@ -4352,7 +4357,7 @@ prm-resource-type-filter-bar button.selectedResourceTypeOption prm-icon {
43524357
/*****************************************************************************/
43534358

43544359

4355-
/*******************************03 Other local code***************************/
4360+
/*******************************03 Other local code for the NZ***************************/
43564361

43574362

43584363
/*****************************************************************************/
@@ -4361,60 +4366,13 @@ prm-resource-type-filter-bar button.selectedResourceTypeOption prm-icon {
43614366

43624367
/*Display "Open Knowledge Maps" link fully (facet group and okm link)*/
43634368
.okm-full {
4364-
display: block;
4369+
display: none;
43654370
}
43664371

43674372
/*Display the "Open Knowledge Maps" link in the facet group*/
43684373
eth-okm-link-component {
4369-
display: block;
4370-
}
4371-
4372-
/************Temporary alert box**************/
4373-
4374-
.iheid-alert::after,
4375-
.iheid-alert::before {
4376-
content: "";
4377-
display: table;
4378-
clear: both;
4379-
}
4380-
4381-
.iheid-alert:hover {
4382-
color: #000 !important;
4383-
background-color: #99d0d0 !important;
4384-
}
4385-
4386-
.iheid-alert {
4387-
background-color: #99d0d0 !important;
4388-
color: black;
4389-
box-shadow: 2px 1px 3px 0px rgb(0 0 0 / 8%), 0 2px 5px 0 rgb(0 0 0 / 8%);
4390-
margin: 8px 8px 4px 8px;
4391-
padding: 10px;
4392-
position: relative;
4393-
opacity: 1;
4394-
border-radius: 3px;
4395-
}
4396-
4397-
.iheid-alert a {
4398-
color: #000;
4399-
text-decoration: underline !important;
4400-
}
4401-
4402-
/*Alert box close button*/
4403-
4404-
.iheid-alert-close {
4405-
margin-left: 15px;
4406-
color: #000;
4407-
float: right;
4408-
cursor: pointer;
4409-
}
4410-
4411-
.iheid-alert-close:hover {
4412-
color: #00802F;
4374+
display: none;
44134375
}
4414-
4415-
a:hover#alert {
4416-
background-color: rgba(47, 47, 47, 0.1) !important;
4417-
}
44184376

44194377
/*****************************************************************************/
44204378

‎js/modules/prm-alma-other-members-after/slsp-icon-label-other-members/slsp-icon-label-other-members.controller.js‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,28 @@ export class slspIconLabelOtherMembersController {
99
$onInit() {
1010
this.$timeout(() => {
1111
this.parentCtrl = this.afterCtrl.parentCtrl;
12-
1312
if (this.parentCtrl.availabilityType == "E") {
1413
this.iconLabelOtherMembersE = iconLabelOtherMembersE;
1514
let iconLabelOtherMembersE = document.querySelectorAll(`prm-alma-other-members[ng-if="$ctrl.ifShowOther('E')"] md-tab-content._md.md-active.md-no-scroll div md-content._md.md-primoExplore-theme md-list.md-primoExplore-theme`);
1615
let htmlOtherMembersE = `
17-
<div class="icnWrp">
18-
<div class="iconDiv">
19-
<svg xmlns="http://www.w3.org/2000/svg" id="Ebene_2" width="100%" height="100%" viewBox="0 0 185 185"><g id="System_icons"><g><rect width="185" height="185" fill="none" opacity=".2"/><g id="Outline_Icons"><g><path d="M155.98,92.26c0,35.19-28.5,63.72-63.66,63.72-35.16,0-63.3-29.68-63.3-64.87S55.9,30.44,89.77,29.08c.92-.04,1.83-.06,2.76-.06,35.16,0,63.45,28.05,63.45,63.24Z" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="6"/><path d="M89.77,29.08c-33.12,35.88-33.12,82.69,0,126.85" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="6"/><path d="M95.29,29.08c33.12,35.88,33.12,82.67,0,126.83" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="6"/><line x1="39.43" y1="56.62" x2="145.06" y2="56.62" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="6"/><line x1="29.04" y1="89.74" x2="155.98" y2="89.74" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="6"/><line x1="37.22" y1="122.86" x2="148.17" y2="122.86" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="6"/></g></g></g></g></svg>
20-
</div>
21-
<div class="iconLabel" translate="customized.viewit_other.icon"></div>
22-
</div>
23-
<div class="info-text" translate="customized.viewit_other.bar"></div>`;
24-
16+
<div class="icnWrp">
17+
<div class="iconDiv">
18+
<svg xmlns="http://www.w3.org/2000/svg" id="Ebene_2" width="100%" height="100%" viewBox="0 0 185 185"><g id="System_icons"><g><rect width="185" height="185" fill="none" opacity=".2"/><g id="Outline_Icons"><g><path d="M155.98,92.26c0,35.19-28.5,63.72-63.66,63.72-35.16,0-63.3-29.68-63.3-64.87S55.9,30.44,89.77,29.08c.92-.04,1.83-.06,2.76-.06,35.16,0,63.45,28.05,63.45,63.24Z" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="6"/><path d="M89.77,29.08c-33.12,35.88-33.12,82.69,0,126.85" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="6"/><path d="M95.29,29.08c33.12,35.88,33.12,82.67,0,126.83" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="6"/><line x1="39.43" y1="56.62" x2="145.06" y2="56.62" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="6"/><line x1="29.04" y1="89.74" x2="155.98" y2="89.74" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="6"/><line x1="37.22" y1="122.86" x2="148.17" y2="122.86" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="6"/></g></g></g></g></svg>
19+
</div>
20+
<div class="iconLabel" translate="customized.viewit_other.icon"></div>
21+
</div>`;
2522
angular.element(iconLabelOtherMembersE).prepend(this.$compile(htmlOtherMembersE)(this.$scope)).addClass('icnLblOtherMembersE');
2623
}
27-
2824
if (this.parentCtrl.availabilityType == "P") {
2925
this.iconLabelOtherMembersP2 = iconLabelOtherMembersP2;
3026
let iconLabelOtherMembersP2 = document.querySelectorAll(`prm-alma-other-members[ng-if="$ctrl.ifShowOther('P')"] md-tab-content._md.md-active.md-no-scroll div md-content._md.md-primoExplore-theme md-list.md-primoExplore-theme`);
3127
let htmlOtherMembersP2 = `
32-
<div class="icnWrp">
33-
<div class="iconDiv">
34-
<svg xmlns="http://www.w3.org/2000/svg" id="Ebene_4" width="100%" height="100%" viewBox="0 0 185 185"><g id="System_icons"><g><rect width="185" height="185" fill="none" opacity=".2"/><g><rect x="32.65" y="139.75" width="119.7" height="12.6" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><rect x="38.95" y="70.45" width="107.1" height="69.3" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="164.95" y1="152.35" x2="20.05" y2="152.35" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="51.55" y1="70.45" x2="51.55" y2="139.75" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="83.05" y1="70.45" x2="83.05" y2="139.75" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="70.45" y1="70.45" x2="70.45" y2="139.75" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="101.95" y1="70.45" x2="101.95" y2="139.75" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="114.55" y1="70.45" x2="114.55" y2="139.75" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="133.45" y1="70.45" x2="133.45" y2="139.75" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><polygon points="158.65 70.45 26.35 70.45 92.5 32.65 158.65 70.45" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/></g></g></g></svg>
35-
</div>
36-
<div class="iconLabel" translate="customized.fee.physical"></div>
37-
</div>`;
28+
<div class="icnWrp">
29+
<div class="iconDiv">
30+
<svg xmlns="http://www.w3.org/2000/svg" id="Ebene_4" width="100%" height="100%" viewBox="0 0 185 185"><g id="System_icons"><g><rect width="185" height="185" fill="none" opacity=".2"/><g><rect x="32.65" y="139.75" width="119.7" height="12.6" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><rect x="38.95" y="70.45" width="107.1" height="69.3" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="164.95" y1="152.35" x2="20.05" y2="152.35" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="51.55" y1="70.45" x2="51.55" y2="139.75" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="83.05" y1="70.45" x2="83.05" y2="139.75" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="70.45" y1="70.45" x2="70.45" y2="139.75" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="101.95" y1="70.45" x2="101.95" y2="139.75" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="114.55" y1="70.45" x2="114.55" y2="139.75" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><line x1="133.45" y1="70.45" x2="133.45" y2="139.75" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/><polygon points="158.65 70.45 26.35 70.45 92.5 32.65 158.65 70.45" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="6"/></g></g></g></svg>
31+
</div>
32+
<div class="iconLabel" translate="customized.fee.physical"></div>
33+
</div>`;
3834

3935
angular.element(iconLabelOtherMembersP2).prepend(this.$compile(htmlOtherMembersP2)(this.$scope)).addClass('icnLblOtherMembersP2');
4036
}

‎js/modules/prm-fines-after/slsp-closed-fines-bar/slsp-closed-fines-bar.controller.js‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,45 @@
11
export class slspClosedFinesBarController {
22
constructor($scope) {
3-
this.$scope = $scope
4-
this.showClosedFines = false
3+
this.$scope = $scope;
4+
this.showClosedFines = false;
55
}
66

77
$onInit() {
8-
this.parentCtrl = this.afterCtrl.parentCtrl
8+
this.parentCtrl = this.afterCtrl.parentCtrl;
99
}
1010

1111
$doCheck() {
12+
// Check if the conditions for showing the HTML code are met
1213
if (this.parentCtrl.finesTypeDropDownSelection === 'closed' || this.parentCtrl.finesTypeDropDownSelection === 'all') {
13-
const currentFinesArray = this.parentCtrl.totalNumOfFines
14+
const currentFinesArray = this.parentCtrl.totalNumOfFines;
1415
if (angular.isArray(currentFinesArray) && currentFinesArray.length > 0) {
15-
let hasClosedFines = false
16-
angular.forEach(currentFinesArray, (fine) => {
17-
if (fine.fineType === 'CLOSED' && !fine.firstWordRemoved) {
18-
hasClosedFines = true
19-
20-
//replace the first 2 words in the line right text with the fine data
21-
let fineData = fine.expandedDisplay[0].data
22-
let firstLineRightText = fine.firstLineRight
23-
const words = firstLineRightText.split(/\s+/)
24-
words.splice(0, 2)
25-
words.unshift(fineData)
26-
fine.firstLineRight = words.join(' ')
27-
fine.firstWordRemoved = true
28-
//console.log(fine);
29-
}
30-
})
31-
this.showClosedFines = hasClosedFines
16+
this.showClosedFines = true;
3217
} else {
33-
this.showClosedFines = false
18+
this.showClosedFines = false;
3419
}
3520
} else {
36-
this.showClosedFines = false
21+
this.showClosedFines = false;
22+
}
23+
24+
// Perform the word replacement independently
25+
const currentFinesArray = this.parentCtrl.totalNumOfFines;
26+
if (angular.isArray(currentFinesArray) && currentFinesArray.length > 0) {
27+
angular.forEach(currentFinesArray, (fine) => {
28+
if (fine.fineType === 'CLOSED') {
29+
if (!fine.firstWordRemoved) {
30+
// Replace the first 2 words in the line right text with the fine data
31+
let fineData = fine.expandedDisplay[0].data;
32+
let firstLineRightText = fine.firstLineRight;
33+
const words = firstLineRightText.split(/\s+/);
34+
words.splice(0, 2);
35+
words.unshift(fineData);
36+
fine.firstLineRight = words.join(' ');
37+
fine.firstWordRemoved = true;
38+
}
39+
}
40+
});
3741
}
3842
}
3943
}
4044

41-
slspClosedFinesBarController.$inject = ['$scope']
45+
slspClosedFinesBarController.$inject = ['$scope'];

‎js/modules/prm-login-after/slsp-login-box/slsp-login-box.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<div class="loginbox-register">
2-
<a ng-href="https://registration.slsp.ch/?lang={{ $ctrl.getLanguage() }}" target="_blank">
2+
<a ng-href="https://registration.slsp.ch/?lang={{ $ctrl.getLanguage() }}">
33
<span translate="nui.fulldisplay.otherLocations.register"></span>
44
<svg width="100%" height="100%" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fit=""
5-
preserveAspectRatio="xMidYMid meet" focusable="false">
5+
preserveAspectRatio="xMidYMid meet" focusable="false">
66
<path
7-
d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z">
7+
d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z">
88
</path>
99
</svg>
10-
1110
</a>
1211
</div>

‎js/modules/prm-opac-after/slsp-ovp-reservation/slsp-ovp-reservation.controller.js‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,38 @@
11
export class slspOvpReservationController {
22
constructor($scope, $element, $compile) {
3-
this.$scope = $scope
4-
this.$element = $element
5-
this.$compile = $compile
6-
this.reservationLabel = '<span translate="customized.rapido.reservation"></span>'
3+
this.$scope = $scope;
4+
this.$element = $element;
5+
this.$compile = $compile;
6+
this.reservationLabel = '<span translate="customized.rapido.reservation"></span>';
77
}
88

99
$onInit() {
10-
this.parentCtrl = this.afterCtrl.parentCtrl
11-
this.processDoCheck = true
10+
this.parentCtrl = this.afterCtrl.parentCtrl;
11+
this.processDoCheck = true;
1212
}
1313

1414
$doCheck() {
15-
let unavailability = this.parentCtrl.item.delivery.bestlocation.availabilityStatus
15+
let unavailability = this.parentCtrl.item.delivery.bestlocation.availabilityStatus;
1616

1717
// Hier das DOM-Element der Angular-Komponente abrufen
18-
let currentElement = this.$element[0]
18+
let currentElement = this.$element[0];
1919

2020
// Das Elternelement ("prm-opac") der Angular-Komponente abrufen
21-
let prmOpacElement = currentElement.closest('prm-opac')
21+
let prmOpacElement = currentElement.closest('prm-opac');
2222

2323
// Den Button innerhalb des aktuellen "prm-opac" Teils auswählen
24-
let reservationButton = prmOpacElement.querySelector('prm-service-button button span[translate="AlmaRequest"], prm-service-button button span[translate="AlmaRequestOther"]')
24+
let reservationButton = prmOpacElement.querySelector('prm-service-button button span[data-qa="AlmaRequest"], prm-service-button button span[data-qa="AlmaRequestOther"]');
2525

2626
if (!this.processDoCheck && unavailability !== "available" && unavailability !== "check_holdings") {
2727
// Überprüfen, ob das Element gefunden wurde, bevor auf innerHTML zugegriffen wird
2828
if (reservationButton && !reservationButton.innerHTML.includes('customized.rapido.reservation')) {
2929
// Element mit "reservationLabel" ersetzen
30-
let compiledHtml = this.$compile(this.reservationLabel)(this.$scope)
31-
angular.element(reservationButton).replaceWith(compiledHtml)
30+
let compiledHtml = this.$compile(this.reservationLabel)(this.$scope);
31+
angular.element(reservationButton).replaceWith(compiledHtml);
3232
}
3333
}
34-
//console.log(this.parentCtrl);
35-
this.processDoCheck = false
34+
this.processDoCheck = false;
3635
}
3736
}
3837

39-
slspOvpReservationController.$inject = ['$scope', '$element', '$compile']
38+
slspOvpReservationController.$inject = ['$scope', '$element', '$compile'];

0 commit comments

Comments
 (0)