Skip to content

Commit 640ddd4

Browse files
d22d22
authored
Merge pull request #38 from HSG-Library/develop
Release v2024.04.11, Sprint 1/24 und 2/24
2 parents 3e9930d + 8a1b88a commit 640ddd4

File tree

20 files changed

+496
-21
lines changed

20 files changed

+496
-21
lines changed

‎css/00-central-package.css‎

Lines changed: 182 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@
120120
/*445 Details*/
121121

122122

123+
/*446 Export options*/
124+
125+
123126
/*449 Other*/
124127

125128

@@ -957,11 +960,27 @@ button.switch-to-simple.zero-margin.button-with-icon.md-button.md-primoExplore-t
957960

958961
/*Resource type filter bar*/
959962

963+
prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-ripple {
964+
965+
border-radius: 3px;
966+
border-style: solid;
967+
border-width: 1px;
968+
border-color: #00000000;
969+
margin: 5px 6px 5px 0;
970+
}
971+
960972
prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-ripple:hover {
973+
974+
border-style: solid;
975+
border-width: 1px;
961976
font-weight: 500;
962977
cursor: pointer;
963978
}
964979

980+
prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-ripple:hover span {
981+
box-shadow: none;
982+
}
983+
965984
/*220 Frames*/
966985

967986
/*Genialy requests guide*/
@@ -1202,6 +1221,55 @@ div[data-facet-value="institution-5501"] {
12021221
display: none !important;
12031222
}
12041223

1224+
/*Open Knowledge Maps*/
1225+
1226+
.eth-okm-link {
1227+
height: auto !important;
1228+
line-height: normal !important;
1229+
margin-bottom: 5px;
1230+
}
1231+
1232+
.eth-okm-link a {
1233+
padding-top: 3px;
1234+
padding-bottom: 3px;
1235+
overflow: visible;
1236+
white-space: normal;
1237+
display: flex;
1238+
margin-right: 40px;
1239+
text-align: left;
1240+
align-items: center;
1241+
}
1242+
1243+
.eth-okm-link a span {
1244+
color: #3a3a3a;
1245+
line-height: 1.2em;
1246+
border-radius: 3px;
1247+
padding: 3px 0.25em;
1248+
}
1249+
1250+
.eth-okm-link strong:hover a span,
1251+
.eth-okm-link strong:focus a span {
1252+
color: #fff;
1253+
background-color: #3a3a3a;
1254+
}
1255+
1256+
.eth-okm-link a img {
1257+
width: 20px;
1258+
height: 20px;
1259+
vertical-align: middle;
1260+
margin-right: 5px;
1261+
}
1262+
1263+
/*Hide the "Open Knowledge Maps" link fully (facet group and okm link)*/
1264+
.okm-full {
1265+
display: block;
1266+
}
1267+
1268+
/*Hide the "Open Knowledge Maps" link in the facet group*/
1269+
eth-okm-link-component {
1270+
display: block;
1271+
}
1272+
12051273
/*390 Other*/
12061274

12071275

@@ -1591,7 +1659,7 @@ prm-alma-other-units>button>div>h3,
15911659
order: 7 !important;
15921660
}
15931661

1594-
[aria-label="Send to"] {
1662+
[aria-label="Export Options"] {
15951663
order: 8 !important;
15961664
}
15971665

@@ -1642,7 +1710,7 @@ prm-alma-other-units>button>div>h3,
16421710
order: 7 !important;
16431711
}
16441712

1645-
[aria-label="Senden an"] {
1713+
[aria-label="Exportoptionen"] {
16461714
order: 8 !important;
16471715
}
16481716

@@ -1693,7 +1761,7 @@ prm-alma-other-units>button>div>h3,
16931761
order: 7 !important;
16941762
}
16951763

1696-
[aria-label="Envoyer vers"] {
1764+
[aria-label="Exporter"] {
16971765
order: 8 !important;
16981766
}
16991767

@@ -1744,7 +1812,7 @@ prm-alma-other-units>button>div>h3,
17441812
order: 7 !important;
17451813
}
17461814

1747-
[aria-label="Invia a"] {
1815+
[aria-label="Esportare"] {
17481816
order: 8 !important;
17491817
}
17501818

@@ -2298,6 +2366,114 @@ md-list.md-primoExplore-theme.icnLblOtherUnitsE {
22982366
margin-top: -5px;
22992367
}
23002368

2369+
/*446 Export options*/
2370+
2371+
/*Send email form*/
2372+
2373+
.send-email-info-box {
2374+
width: 60%;
2375+
border: 1px solid black;
2376+
border-radius: 5px;
2377+
padding: 18px 26px;
2378+
margin-bottom: 20px;
2379+
text-align: justify;
2380+
}
2381+
2382+
@media (min-width: 600px) and (max-width: 959px) {
2383+
.send-email-info-box {
2384+
width: 80%;
2385+
}
2386+
}
2387+
2388+
@media (max-width: 599px) {
2389+
.send-email-info-box {
2390+
width: 100%;
2391+
}
2392+
}
2393+
2394+
label[translate="email.to"],
2395+
label[translate="email.note"] {
2396+
color: #848484 !important;
2397+
}
2398+
2399+
/*Citation export**/
2400+
2401+
.slsp-citation-select-radio .md-container {
2402+
position: absolute;
2403+
top: 50%;
2404+
transform: translateY(-50%);
2405+
box-sizing: border-box;
2406+
display: inline-block;
2407+
width: 20px;
2408+
height: 20px;
2409+
cursor: pointer;
2410+
left: 0;
2411+
right: auto;
2412+
}
2413+
2414+
.slsp-citation-select-radio .md-container:before {
2415+
box-sizing: border-box;
2416+
background-color: transparent;
2417+
border-radius: 50%;
2418+
content: "";
2419+
position: absolute;
2420+
display: block;
2421+
height: auto;
2422+
left: 0;
2423+
top: 0;
2424+
right: 0;
2425+
bottom: 0;
2426+
transition: all .5s;
2427+
width: auto;
2428+
}
2429+
2430+
.slsp-citation-select-radio .md-on,
2431+
.slsp-citation-select-radio .md-off {
2432+
box-sizing: border-box;
2433+
position: absolute;
2434+
top: 0;
2435+
left: 0;
2436+
width: 20px;
2437+
height: 20px;
2438+
border-radius: 50%;
2439+
}
2440+
2441+
.slsp-citation-select-radio .md-off {
2442+
border-color: rgba(0, 0, 0, .57);
2443+
}
2444+
2445+
.slsp-citation-select-radio .md-off {
2446+
border-style: solid;
2447+
border-width: 2px;
2448+
transition: border-color .28s ease;
2449+
}
2450+
2451+
.slsp-citation-select-radio>span {
2452+
display: inline-block;
2453+
margin-left: 20px;
2454+
vertical-align: middle;
2455+
}
2456+
2457+
.slsp-citation-select-radio:hover:not([disabled]),
2458+
.slsp-citation-select-radio:focus:not([disabled]) {
2459+
color: unset !important;
2460+
background-color: unset !important;
2461+
}
2462+
2463+
.slsp-citation-select-radio .md-on {
2464+
transition: transform .28s ease;
2465+
transform: scale(0);
2466+
}
2467+
2468+
.slsp-citation-select-radio.md-active .md-on {
2469+
transform: scale(.5);
2470+
}
2471+
2472+
.slsp-citation-select-radio.md-active .md-on {
2473+
background-color: #4E4A99 !important;
2474+
/* add to custom css - background of the primary color*/
2475+
}
2476+
23012477
/*449 Other*/
23022478

23032479

@@ -3494,7 +3670,8 @@ prm-resource-type-filter-bar prm-icon {
34943670
color: #fff !important;
34953671
}
34963672

3497-
button.switch-to-advanced.zero-margin.button-with-icon.md-button.md-primoExplore-theme.md-ink-ripple {
3673+
button.switch-to-advanced.zero-margin.button-with-icon.md-button.md-primoExplore-theme.md-ink-ripple,
3674+
prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-ripple:hover {
34983675
border-color: #fff !important;
34993676
}
35003677

‎js/main.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ import { hsgHowovpAfterModule } from './modules/alma-howovp-after/hsg-howovp-aft
33
import { hsgHtgiSvcAfterModule } from './modules/alma-htgi-svc-after/hsg-htgi-svc-after.module'
44
import { hsgAlertMessageModule } from './modules/hsg-alert-message/hsg-alert-message.module'
55
import { hsgExceptionHandlerModule } from './modules/hsg-exception-handler/hsg-exception-handler.module'
6-
import { hsgAlmaOtherMembersAfterModule } from './modules/prm-alma-other-members-after/hsg-alma-other-members-after.module'
76
import { hsgHomeModule } from './modules/hsg-home/hsg-home.module'
7+
import { hsgAlmaOtherMembersAfterModule } from './modules/prm-alma-other-members-after/hsg-alma-other-members-after.module'
8+
import { hsgAlmaOtherUnitsAfterModule } from './modules/prm-alma-other-units-after/hsg-alma-other-units-after.module'
9+
import { hsgAlmaViewerAfterModule } from './modules/prm-alma-viewer-after/hsg-alma-viewer-after.module'
810
import { hsgAlmaViewitAfterModule } from './modules/prm-alma-viewit-after/hsg-alma-viewit-after.module'
911
import { hsgAlmaViewitItemsAfterModule } from './modules/prm-alma-viewit-items-after/hsg-alma-viewit-items-after.module'
12+
import { hsgCitationAfterModule } from './modules/prm-citation-after/hsg-citation-after.module'
1013
import { hsgFinesAfterModule } from './modules/prm-fines-after/hsg-fines-after.module'
1114
import { hsgFullViewAfterModule } from './modules/prm-full-view-after/hsg-full-view-after.module'
1215
import { hsgGalleryItemAfterModule } from './modules/prm-gallery-item-after/hsg-gallery-item-after.module'
@@ -18,11 +21,13 @@ import { hsgLocationItemsAfterModule } from './modules/prm-location-items-after/
1821
import { hsgLocationsAfterModule } from './modules/prm-locations-after/hsg-locations-after.module'
1922
import { hsgLoginAfterModule } from './modules/prm-login-after/hsg-login-after.module'
2023
import { hsgOfferDetailsTileAfterModule } from './modules/prm-offer-details-tile-after/hsg-offer-details-tile-after.module'
24+
import { hsgOpacAfterModule } from './modules/prm-opac-after/hsg-opac-after.module'
2125
import { hsgPersonalInfoAfterModule } from './modules/prm-personal-info-after/hsg-personal-info-after.module'
2226
import { hsgRequestAfterModule } from './modules/prm-request-after/hsg-request-after.module'
2327
import { hsgRequestsAfterModule } from './modules/prm-requests-after/hsg-requests-after.module'
2428
import { hsgSearchBarAfterModule } from './modules/prm-search-bar-after/hsg-search-bar-after.module'
2529
import { hsgSearchResultAvailabilityLineAfterModule } from './modules/prm-search-result-availability-line-after/hsg-search-result-availabilty-line-after.module'
30+
import { hsgSendEmailAfterModule } from './modules/prm-send-email-after/hsg-send-email-after.module'
2631
import { hsgServiceButtonAfterModule } from './modules/prm-service-button-after/hsg-service-button-after.module'
2732
import { hsgServiceDetailsAfterModule } from './modules/prm-service-details-after/hsg-service-details-after.module'
2833
import { hsgServiceNgrsAfterModule } from './modules/prm-service-ngrs-after/hsg-service-ngrs-after.module'
@@ -32,10 +37,8 @@ import { hsgStandAloneLoginAfterModule } from './modules/prm-stand-alone-login-a
3237
import { hsgTabsAndScopesSelectorAfterModule } from './modules/prm-tabs-and-scopes-selector-after/hsg-tabs-and-scopes-selector-after.module'
3338
import { hsgUnionCatalogLoginAfterModule } from './modules/prm-union-catalog-login-after/hsg-union-catalog-login-after.module'
3439
import { hsgUserAreaExpandableAfterModule } from './modules/prm-user-area-expandable-after/hsg-user-ara-expandable-after.module'
35-
import { hsgAlmaOtherUnitsAfterModule } from './modules/prm-alma-other-units-after/hsg-alma-other-units-after.module'
3640
import { slspHttpInterceptPickupInformation } from './modules/slsp-http-intercept-pickup-information/slsp-http-intercept-pickup-information.module'
3741
import { slspHttpInterceptRequestsModule } from './modules/slsp-http-intercept-requests/slsp-http-intercept-requests.module'
38-
import { hsgAlmaViewerAfterModule } from './modules/prm-alma-viewer-after/hsg-alma-viewer-after.module'
3942

4043
let app = angular.module('viewCustom', ['angularLoad'])
4144

@@ -48,6 +51,7 @@ app.requires.push(hsgAlmaOtherMembersAfterModule.name)
4851
app.requires.push(hsgAlmaViewerAfterModule.name)
4952
app.requires.push(hsgAlmaViewitAfterModule.name)
5053
app.requires.push(hsgAlmaViewitItemsAfterModule.name)
54+
app.requires.push(hsgCitationAfterModule.name)
5155
app.requires.push(hsgFinesAfterModule.name)
5256
app.requires.push(hsgFullViewAfterModule.name)
5357
app.requires.push(hsgGalleryItemAfterModule.name)
@@ -59,11 +63,13 @@ app.requires.push(hsgLocationItemsAfterModule.name)
5963
app.requires.push(hsgLocationsAfterModule.name)
6064
app.requires.push(hsgLoginAfterModule.name)
6165
app.requires.push(hsgOfferDetailsTileAfterModule.name)
66+
app.requires.push(hsgOpacAfterModule.name)
6267
app.requires.push(hsgPersonalInfoAfterModule.name)
6368
app.requires.push(hsgRequestAfterModule.name)
6469
app.requires.push(hsgRequestsAfterModule.name)
6570
app.requires.push(hsgSearchBarAfterModule.name)
6671
app.requires.push(hsgSearchResultAvailabilityLineAfterModule.name)
72+
app.requires.push(hsgSendEmailAfterModule.name)
6773
app.requires.push(hsgServiceButtonAfterModule.name)
6874
app.requires.push(hsgServiceDetailsAfterModule.name)
6975
app.requires.push(hsgServiceNgrsAfterModule.name)

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { slspCitationSelectModule } from './slsp-citation-select/slsp-citation-select.module'
2+
3+
export const hsgCitationAfterModule = angular
4+
.module('hsgCitationAfterModule', [])
5+
.component('prmCitationAfter', {
6+
bindings: { parentCtrl: '<' },
7+
template: `
8+
<slsp-citation-select-component after-ctrl="$ctrl"></slsp-citation-select-component>`
9+
})
10+
11+
hsgCitationAfterModule.requires.push(slspCitationSelectModule.name)

‎js/modules/prm-citation-after/slsp-citation-select/slsp-citation-select.controller.js‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
export class slspCitationSelectController {
2+
3+
constructor($scope, $timeout, $compile) {
4+
this.$scope = $scope
5+
this.$timeout = $timeout
6+
this.$compile = $compile
7+
}
8+
9+
$onInit() {
10+
this.$timeout(() => {
11+
this.parentCtrl = this.afterCtrl.parentCtrl
12+
13+
let citationSelectRadio = '<div class="md-container slsp-citation-select"><div class="md-off"></div><div class="md-on"></div></div>'
14+
15+
let citationSelectList = document.querySelectorAll('prm-citation ul li button')
16+
17+
angular.forEach(citationSelectList, (citationSelect) => {
18+
angular.element(citationSelect).append(this.$compile(citationSelectRadio)(this.$scope)).addClass('slsp-citation-select-radio')
19+
})
20+
}, 0)
21+
}
22+
}
23+
24+
slspCitationSelectController.$inject = ['$scope', '$timeout', '$compile']

‎js/modules/prm-citation-after/slsp-citation-select/slsp-citation-select.module.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { slspCitationSelectController } from './slsp-citation-select.controller'
2+
3+
export const slspCitationSelectModule = angular
4+
.module('slspCitationSelectModule', [])
5+
.controller('slspCitationSelectController', slspCitationSelectController)
6+
.component('slspCitationSelectComponent', {
7+
bindings: { afterCtrl: '<' },
8+
controller: 'slspCitationSelectController',
9+
})

0 commit comments

Comments
 (0)