Skip to content

Commit 3e9930d

Browse files
d22d22
authored
Merge pull request #37 from HSG-Library/develop
Release v2024.2.13
2 parents 1465976 + a418cbc commit 3e9930d

File tree

10 files changed

+95
-18
lines changed

10 files changed

+95
-18
lines changed

‎css/00-central-package.css‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2043,7 +2043,9 @@ span[translate="nui.item.brief.4"] {
20432043
display: none !important;
20442044
}
20452045

2046-
/*441 How to get it sections' order*/
2046+
/*441 How to get it*/
2047+
2048+
/*How to get it sections' order*/
20472049

20482050
prm-opac {
20492051
order: 1;
@@ -2068,6 +2070,30 @@ primo-explore.alert alma-htgi-svc {
20682070
font-size: 1em;
20692071
}
20702072

2073+
/*Holding fields display*/
2074+
2075+
.weak-text.layout-row[ng-repeat="line in $ctrl.currLoc.summaryHoldings.baseSummaryShort track by $index"] {
2076+
display: none !important;
2077+
}
2078+
2079+
prm-location prm-location-holdings[ng-if="$ctrl.displayHoldingsInLocationsList"] {
2080+
display: none;
2081+
}
2082+
2083+
2084+
button.button-as-link.link-alt-color.md-button.md-primoExplore-theme.md-ink-ripple.holding-expand-button,
2085+
button.button-as-link.link-alt-color.md-button.md-primoExplore-theme.md-ink-ripple.holding-collapse-button {
2086+
line-height: 23px !important;
2087+
padding: 1px 10px 1px 0px !important;
2088+
margin-top: 10px !important;
2089+
margin-left: 0px !important;
2090+
background-color: #fff !important;
2091+
}
2092+
2093+
button.button-as-link.link-alt-color.md-button.md-primoExplore-theme.md-ink-ripple.holding-expand-button:hover,
2094+
button.button-as-link.link-alt-color.md-button.md-primoExplore-theme.md-ink-ripple.holding-collapse-button:hover {
2095+
background-color: #ddd !important;
2096+
}
20712097

20722098
/*442 Filter bar*/
20732099

@@ -3409,12 +3435,12 @@ prm-request-services .md-button.button-as-link,
34093435
prm-location-items md-list prm-service-button .md-button.button-as-link,
34103436
#rapidoOffer prm-service-physical-best-offer .get_it_btn_digital,
34113437
prm-service-physical-best-offer .get_it_btn_physical {
3412-
background-color: #3BBFAD !important;
3438+
background-color: #4E4A99 !important;
34133439
}
34143440

34153441
@media only screen and (max-width: 599px) {
34163442
prm-topbar .top-nav-bar {
3417-
border-color: #3BBFAD !important;
3443+
border-color: #4E4A99 !important;
34183444
}
34193445
}
34203446

@@ -3433,7 +3459,7 @@ button.switch-to-simple:hover,
34333459
#rapidoOffer prm-service-physical-best-offer .get_it_btn_digital:hover,
34343460
prm-service-physical-best-offer .get_it_btn_physical:hover,
34353461
prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-ripple:hover {
3436-
background-color: #83dcd0 !important;
3462+
background-color: #393765 !important;
34373463
}
34383464

34393465
/*font color of the primary color*/
@@ -3465,11 +3491,11 @@ button#get_it_btn_digital,
34653491
prm-service-button>button>span,
34663492
prm-resource-type-filter-bar .container .box div,
34673493
prm-resource-type-filter-bar prm-icon {
3468-
color: #14413c !important;
3494+
color: #fff !important;
34693495
}
34703496

34713497
button.switch-to-advanced.zero-margin.button-with-icon.md-button.md-primoExplore-theme.md-ink-ripple {
3472-
border-color: #14413c !important;
3498+
border-color: #fff !important;
34733499
}
34743500

34753501

@@ -3496,13 +3522,13 @@ button.switch-to-advanced.zero-margin.button-with-icon.md-button.md-primoExplore
34963522
.prm-alert-bg,
34973523
#rapidoOffer prm-rapido-no-offer-message .main_tile,
34983524
.diamond {
3499-
background-color: #8dd8d8 !important;
3525+
background-color: #99d0d0 !important;
35003526
}
35013527

35023528
.text-highlight,
35033529
mark,
35043530
prm-location-items>md-list>md-list-item>div>div>div>div>prm-service-button>button {
3505-
box-shadow: inset 0 -0.15em 0 0 #8dd8d8;
3531+
box-shadow: inset 0 -0.15em 0 0 #99d0d0;
35063532
}
35073533

35083534

@@ -3513,7 +3539,7 @@ prm-location-items>md-list>md-list-item>div>div>div>div>prm-service-button>butto
35133539

35143540
div.alert-bar .md-button:hover:not([disabled]),
35153541
slsp-edit-personal-details-component a.bar.alert-bar:hover {
3516-
background-color: #aff7f7 !important;
3542+
background-color: #b6fafa !important;
35173543
}
35183544

35193545

‎css/hsg-resource-type-filterbar.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,7 @@ prm-resource-type-filter-bar div.container div.box button>div:hover,
2020
prm-resource-type-filter-bar div.container div.box button div:hover prm-icon {
2121
color: #00802F !important;
2222
}
23+
24+
prm-resource-type-filter-bar div.container div.box button:hover span {
25+
box-shadow: none !important;
26+
}

‎html/homepage/homepage_de.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ <h4>swisscovery plus</h4>
216216
</a></span>
217217
</md-card-content>
218218
<md-card-content class="prm-primary-bg" flex-gt-sm="15" layout-align-gt-sm="end">
219-
<a class="ps_link legal" href="https://www.unisg.ch/de/disclosures/allgemeinerechtlicheinformationen"
219+
<a class="ps_link legal" href="https://www.unisg.ch/de/datenschutzerklaerung/"
220220
target="_blank">Rechtliche Informationen</a>
221221
</md-card-content>
222222
<md-card-content class="prm-primary-bg" flex-gt-sm="15" layout-align-gt-sm="end">

‎html/homepage/homepage_en.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ <h4>swisscovery plus</h4>
227227
(SLSP).</a></span>
228228
</md-card-content>
229229
<md-card-content class="prm-primary-bg" flex-gt-sm="15" layout-align-gt-sm="end">
230-
<a class="ps_link legal" href="https://www.unisg.ch/en/disclosures/allgemeinerechtlicheinformationen"
230+
<a class="ps_link legal" href="https://www.unisg.ch/en/data-protection-declaration/"
231231
target="_blank">Legal Information</a>
232232
</md-card-content>
233233
<md-card-content class="prm-primary-bg" flex-gt-sm="15" layout-align-gt-sm="end">

‎js/modules/prm-loan-after/hsg-loan-after.module.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
import { slspRenewItemTextModule } from './slsp-renew-item-text/slsp-renew-item-text.module'
2+
import { slspHideRapidoLoanLinkModule } from './slsp-hide-rapido-loan-link/slsp-hide-rapido-loan-link.module'
23

34
export const hsgLoanAfterModule = angular
45
.module('hsgLoanAfterModule', [])
56
.component('prmLoanAfter', {
67
bindings: { parentCtrl: '<' },
7-
template: `<slsp-renew-item-text-component after-ctrl="$ctrl"></slsp-renew-item-text-component>`
8+
template: `
9+
<slsp-renew-item-text-component after-ctrl="$ctrl"></slsp-renew-item-text-component>
10+
<slsp-hide-rapido-loan-link-component after-ctrl="$ctrl"></slsp-hide-rapido-loan-link-component>
11+
`
812
})
913

1014
hsgLoanAfterModule.requires.push(slspRenewItemTextModule.name)
15+
hsgLoanAfterModule.requires.push(slspHideRapidoLoanLinkModule.name)

‎js/modules/prm-loan-after/slsp-hide-rapido-loan-link/slsp-hide-rapido-loan-link.controller.js‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
export class slspHideRapidoLoanLinkController {
2+
constructor($element) {
3+
this.itemType = null
4+
this.itemBarcode = null
5+
this.hideTitle = false
6+
this.$element = $element
7+
}
8+
9+
$onInit() {
10+
this.parentCtrl = this.afterCtrl.parentCtrl
11+
this.itemBarcode = this.parentCtrl.item.itembarcode
12+
this.itemType = this.parentCtrl.loansService.requestParams.type
13+
14+
if (this.itemBarcode.includes("RAPIDO") || this.itemBarcode.includes("41SLSP")) {
15+
this.setTitle = setTitle
16+
function setTitle() {
17+
return this.parentCtrl.item.title
18+
}
19+
this.hideTitle = true
20+
// Hinzufügen der hide-title Klasse zum Großelternelement prm-loan
21+
this.$element.parent().parent().addClass('hide-title')
22+
}
23+
}
24+
}
25+
26+
slspHideRapidoLoanLinkController.$inject = ['$element']

‎js/modules/prm-loan-after/slsp-hide-rapido-loan-link/slsp-hide-rapido-loan-link.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<div ng-if="$ctrl.itemBarcode.includes('RAPIDO') || $ctrl.itemBarcode.includes('41SLSP')" class="loan-item-title">{{$ctrl.setTitle()}}</div>

‎js/modules/prm-loan-after/slsp-hide-rapido-loan-link/slsp-hide-rapido-loan-link.module.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { slspHideRapidoLoanLinkController } from './slsp-hide-rapido-loan-link.controller'
2+
import { slspHideRapidoLoanLinkHtml } from './slsp-hide-rapido-loan-link.html'
3+
4+
export const slspHideRapidoLoanLinkModule = angular
5+
.module('slspHideRapidoLoanLinkModule', [])
6+
.controller('slspHideRapidoLoanLinkController', slspHideRapidoLoanLinkController)
7+
.component('slspHideRapidoLoanLinkComponent', {
8+
bindings: { afterCtrl: '<' },
9+
controller: 'slspHideRapidoLoanLinkController',
10+
template: slspHideRapidoLoanLinkHtml
11+
})

‎js/modules/prm-service-details-after/hsg-service-details-foldable-items/hsg-service-details-foldable-items.config.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export const hsgServiceDetailsFoldableItemsConfig = {
2-
ignore: ['lds03'], // use the label property of an entry of 'this.parentCtrl._details'
3-
charCount: 500, // make foldable after that many chars
2+
ignore: [], // use the label property of an entry of 'this.parentCtrl._details'
3+
charCount: 400, // make foldable after that many chars
44
itemCount: 5, // make foldable after that many items
55
labels: {
66
expandButtonLabel: {
@@ -14,6 +14,6 @@ export const hsgServiceDetailsFoldableItemsConfig = {
1414
},
1515
icons: {
1616
expand: '<md-icon md-svg-icon="hardware:ic_keyboard_arrow_down_24px" class="md-primoExplore-theme"><svg width="100%" height="100%" viewBox="0 0 24 24" id="ic_keyboard_arrow_down_24px_cache154" y="264" xmlns="http://www.w3.org/2000/svg" fit="" preserveAspectRatio="xMidYMid meet" focusable="false"><path d="M7.41 7.84L12 12.42l4.59-4.58L18 9.25l-6 6-6-6z"></path></svg></md-icon>',
17-
collapse: '<md-icon class="hsg-fold-icon-collapse" md-svg-icon="hardware:ic_keyboard_arrow_down_24px" class="md-primoExplore-theme"><svg width="100%" height="100%" viewBox="0 0 24 24" id="ic_keyboard_arrow_down_24px_cache154" y="264" xmlns="http://www.w3.org/2000/svg" fit="" preserveAspectRatio="xMidYMid meet" focusable="false"><path d="M7.41 7.84L12 12.42l4.59-4.58L18 9.25l-6 6-6-6z"></path></svg></md-icon>'
17+
collapse: '<md-icon class="hsg-fold-icon-collapse" md-svg-icon="hardware:ic_keyboard_arrow_down_24px" class="md-primoExplore-theme"><svg width="100%" height="100%" viewBox="0 0 24 24" id="ic_keyboard_arrow_down_24px_cache154" y="264" xmlns="http://www.w3.org/2000/svg" fit="" preserveAspectRatio="xMidYMid meet" focusable="false"><path d="M7.41 7.84L12 12.42l4.59-4.58L18 9.25l-6 6-6-6z"></path></svg></md-icon>',
1818
},
1919
}

‎js/modules/prm-service-details-after/hsg-service-details-foldable-items/hsg-service-details-foldable-items.controller.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export class hsgServiceDetailsFoldableItemsController {
1414
$onInit() {
1515
this.parentCtrl = this.afterCtrl.parentCtrl
1616

17+
this.parentCtrl.NUMBER_OF_DETAILS_TO_SHOW = 1000
1718
this.rootEl = this.$element.parent().parent().query('div').children()
1819
let that = this
1920
// add a watcher to the root element
@@ -47,9 +48,12 @@ export class hsgServiceDetailsFoldableItemsController {
4748
let values = detail.values[0].values
4849

4950
let textLength = values[0].length
51+
const configItem = this.config.itemCount
52+
const lowerBound = configItem + 3
53+
5054
if (textLength > this.config.charCount) {
5155
this.addMarkup(this.getItemContainer(key), 1, true)
52-
} else if (values.length > this.config.itemCount) {
56+
} else if (values.length > configItem && values.length >= lowerBound) {
5357
this.addMarkup(this.getItemContainer(key), this.config.itemCount, false)
5458
}
5559
}
@@ -87,14 +91,14 @@ export class hsgServiceDetailsFoldableItemsController {
8791
collapse.style.display = 'none'
8892
item.appendChild(collapse)
8993

90-
expand.addEventListener('click', function () {
94+
expand.addEventListener('click', () => {
9195
expand.style.display = 'none'
9296
collapse.style.display = 'inline-block'
9397
itemContainer.classList.remove('hsg-collapsed')
9498
itemContainer.classList.add('hsg-expanded')
9599
})
96100

97-
collapse.addEventListener('click', function () {
101+
collapse.addEventListener('click', () => {
98102
itemContainer.classList.add('hsg-collapsed')
99103
itemContainer.classList.remove('hsg-expanded')
100104
expand.style.display = 'inline-block'

0 commit comments

Comments
 (0)