Skip to content

Commit

Permalink
Merge pull request #38 from HSG-Library/develop
Browse files Browse the repository at this point in the history
Release v2024.04.11, Sprint 1/24 und 2/24
  • Loading branch information
d22 authored Apr 11, 2024
2 parents 3e9930d + 8a1b88a commit 640ddd4
Show file tree
Hide file tree
Showing 20 changed files with 496 additions and 21 deletions.
187 changes: 182 additions & 5 deletions css/00-central-package.css
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@
/*445 Details*/


/*446 Export options*/


/*449 Other*/


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

/*Resource type filter bar*/

prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-ripple {

border-radius: 3px;
border-style: solid;
border-width: 1px;
border-color: #00000000;
margin: 5px 6px 5px 0;
}

prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-ripple:hover {

border-style: solid;
border-width: 1px;
font-weight: 500;
cursor: pointer;
}

prm-resource-type-filter-bar button.md-button.md-primoExplore-theme.md-ink-ripple:hover span {
box-shadow: none;
}

/*220 Frames*/

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

/*Open Knowledge Maps*/

.eth-okm-link {
height: auto !important;
line-height: normal !important;
margin-bottom: 5px;
}

.eth-okm-link a {
padding-top: 3px;
padding-bottom: 3px;
overflow: visible;
white-space: normal;
display: flex;
margin-right: 40px;
text-align: left;
align-items: center;
}

.eth-okm-link a span {
color: #3a3a3a;
line-height: 1.2em;
border-radius: 3px;
padding: 3px 0.25em;
}

.eth-okm-link strong:hover a span,
.eth-okm-link strong:focus a span {
color: #fff;
background-color: #3a3a3a;
}

.eth-okm-link a img {
width: 20px;
height: 20px;
vertical-align: middle;
margin-right: 5px;
}

/*Hide the "Open Knowledge Maps" link fully (facet group and okm link)*/
.okm-full {
display: block;
}

/*Hide the "Open Knowledge Maps" link in the facet group*/
eth-okm-link-component {
display: block;
}

/*390 Other*/


Expand Down Expand Up @@ -1591,7 +1659,7 @@ prm-alma-other-units>button>div>h3,
order: 7 !important;
}

[aria-label="Send to"] {
[aria-label="Export Options"] {
order: 8 !important;
}

Expand Down Expand Up @@ -1642,7 +1710,7 @@ prm-alma-other-units>button>div>h3,
order: 7 !important;
}

[aria-label="Senden an"] {
[aria-label="Exportoptionen"] {
order: 8 !important;
}

Expand Down Expand Up @@ -1693,7 +1761,7 @@ prm-alma-other-units>button>div>h3,
order: 7 !important;
}

[aria-label="Envoyer vers"] {
[aria-label="Exporter"] {
order: 8 !important;
}

Expand Down Expand Up @@ -1744,7 +1812,7 @@ prm-alma-other-units>button>div>h3,
order: 7 !important;
}

[aria-label="Invia a"] {
[aria-label="Esportare"] {
order: 8 !important;
}

Expand Down Expand Up @@ -2298,6 +2366,114 @@ md-list.md-primoExplore-theme.icnLblOtherUnitsE {
margin-top: -5px;
}

/*446 Export options*/

/*Send email form*/

.send-email-info-box {
width: 60%;
border: 1px solid black;
border-radius: 5px;
padding: 18px 26px;
margin-bottom: 20px;
text-align: justify;
}

@media (min-width: 600px) and (max-width: 959px) {
.send-email-info-box {
width: 80%;
}
}

@media (max-width: 599px) {
.send-email-info-box {
width: 100%;
}
}

label[translate="email.to"],
label[translate="email.note"] {
color: #848484 !important;
}

/*Citation export**/

.slsp-citation-select-radio .md-container {
position: absolute;
top: 50%;
transform: translateY(-50%);
box-sizing: border-box;
display: inline-block;
width: 20px;
height: 20px;
cursor: pointer;
left: 0;
right: auto;
}

.slsp-citation-select-radio .md-container:before {
box-sizing: border-box;
background-color: transparent;
border-radius: 50%;
content: "";
position: absolute;
display: block;
height: auto;
left: 0;
top: 0;
right: 0;
bottom: 0;
transition: all .5s;
width: auto;
}

.slsp-citation-select-radio .md-on,
.slsp-citation-select-radio .md-off {
box-sizing: border-box;
position: absolute;
top: 0;
left: 0;
width: 20px;
height: 20px;
border-radius: 50%;
}

.slsp-citation-select-radio .md-off {
border-color: rgba(0, 0, 0, .57);
}

.slsp-citation-select-radio .md-off {
border-style: solid;
border-width: 2px;
transition: border-color .28s ease;
}

.slsp-citation-select-radio>span {
display: inline-block;
margin-left: 20px;
vertical-align: middle;
}

.slsp-citation-select-radio:hover:not([disabled]),
.slsp-citation-select-radio:focus:not([disabled]) {
color: unset !important;
background-color: unset !important;
}

.slsp-citation-select-radio .md-on {
transition: transform .28s ease;
transform: scale(0);
}

.slsp-citation-select-radio.md-active .md-on {
transform: scale(.5);
}

.slsp-citation-select-radio.md-active .md-on {
background-color: #4E4A99 !important;
/* add to custom css - background of the primary color*/
}

/*449 Other*/


Expand Down Expand Up @@ -3494,7 +3670,8 @@ prm-resource-type-filter-bar prm-icon {
color: #fff !important;
}

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

Expand Down
12 changes: 9 additions & 3 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@ import { hsgHowovpAfterModule } from './modules/alma-howovp-after/hsg-howovp-aft
import { hsgHtgiSvcAfterModule } from './modules/alma-htgi-svc-after/hsg-htgi-svc-after.module'
import { hsgAlertMessageModule } from './modules/hsg-alert-message/hsg-alert-message.module'
import { hsgExceptionHandlerModule } from './modules/hsg-exception-handler/hsg-exception-handler.module'
import { hsgAlmaOtherMembersAfterModule } from './modules/prm-alma-other-members-after/hsg-alma-other-members-after.module'
import { hsgHomeModule } from './modules/hsg-home/hsg-home.module'
import { hsgAlmaOtherMembersAfterModule } from './modules/prm-alma-other-members-after/hsg-alma-other-members-after.module'
import { hsgAlmaOtherUnitsAfterModule } from './modules/prm-alma-other-units-after/hsg-alma-other-units-after.module'
import { hsgAlmaViewerAfterModule } from './modules/prm-alma-viewer-after/hsg-alma-viewer-after.module'
import { hsgAlmaViewitAfterModule } from './modules/prm-alma-viewit-after/hsg-alma-viewit-after.module'
import { hsgAlmaViewitItemsAfterModule } from './modules/prm-alma-viewit-items-after/hsg-alma-viewit-items-after.module'
import { hsgCitationAfterModule } from './modules/prm-citation-after/hsg-citation-after.module'
import { hsgFinesAfterModule } from './modules/prm-fines-after/hsg-fines-after.module'
import { hsgFullViewAfterModule } from './modules/prm-full-view-after/hsg-full-view-after.module'
import { hsgGalleryItemAfterModule } from './modules/prm-gallery-item-after/hsg-gallery-item-after.module'
Expand All @@ -18,11 +21,13 @@ import { hsgLocationItemsAfterModule } from './modules/prm-location-items-after/
import { hsgLocationsAfterModule } from './modules/prm-locations-after/hsg-locations-after.module'
import { hsgLoginAfterModule } from './modules/prm-login-after/hsg-login-after.module'
import { hsgOfferDetailsTileAfterModule } from './modules/prm-offer-details-tile-after/hsg-offer-details-tile-after.module'
import { hsgOpacAfterModule } from './modules/prm-opac-after/hsg-opac-after.module'
import { hsgPersonalInfoAfterModule } from './modules/prm-personal-info-after/hsg-personal-info-after.module'
import { hsgRequestAfterModule } from './modules/prm-request-after/hsg-request-after.module'
import { hsgRequestsAfterModule } from './modules/prm-requests-after/hsg-requests-after.module'
import { hsgSearchBarAfterModule } from './modules/prm-search-bar-after/hsg-search-bar-after.module'
import { hsgSearchResultAvailabilityLineAfterModule } from './modules/prm-search-result-availability-line-after/hsg-search-result-availabilty-line-after.module'
import { hsgSendEmailAfterModule } from './modules/prm-send-email-after/hsg-send-email-after.module'
import { hsgServiceButtonAfterModule } from './modules/prm-service-button-after/hsg-service-button-after.module'
import { hsgServiceDetailsAfterModule } from './modules/prm-service-details-after/hsg-service-details-after.module'
import { hsgServiceNgrsAfterModule } from './modules/prm-service-ngrs-after/hsg-service-ngrs-after.module'
Expand All @@ -32,10 +37,8 @@ import { hsgStandAloneLoginAfterModule } from './modules/prm-stand-alone-login-a
import { hsgTabsAndScopesSelectorAfterModule } from './modules/prm-tabs-and-scopes-selector-after/hsg-tabs-and-scopes-selector-after.module'
import { hsgUnionCatalogLoginAfterModule } from './modules/prm-union-catalog-login-after/hsg-union-catalog-login-after.module'
import { hsgUserAreaExpandableAfterModule } from './modules/prm-user-area-expandable-after/hsg-user-ara-expandable-after.module'
import { hsgAlmaOtherUnitsAfterModule } from './modules/prm-alma-other-units-after/hsg-alma-other-units-after.module'
import { slspHttpInterceptPickupInformation } from './modules/slsp-http-intercept-pickup-information/slsp-http-intercept-pickup-information.module'
import { slspHttpInterceptRequestsModule } from './modules/slsp-http-intercept-requests/slsp-http-intercept-requests.module'
import { hsgAlmaViewerAfterModule } from './modules/prm-alma-viewer-after/hsg-alma-viewer-after.module'

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

Expand All @@ -48,6 +51,7 @@ app.requires.push(hsgAlmaOtherMembersAfterModule.name)
app.requires.push(hsgAlmaViewerAfterModule.name)
app.requires.push(hsgAlmaViewitAfterModule.name)
app.requires.push(hsgAlmaViewitItemsAfterModule.name)
app.requires.push(hsgCitationAfterModule.name)
app.requires.push(hsgFinesAfterModule.name)
app.requires.push(hsgFullViewAfterModule.name)
app.requires.push(hsgGalleryItemAfterModule.name)
Expand All @@ -59,11 +63,13 @@ app.requires.push(hsgLocationItemsAfterModule.name)
app.requires.push(hsgLocationsAfterModule.name)
app.requires.push(hsgLoginAfterModule.name)
app.requires.push(hsgOfferDetailsTileAfterModule.name)
app.requires.push(hsgOpacAfterModule.name)
app.requires.push(hsgPersonalInfoAfterModule.name)
app.requires.push(hsgRequestAfterModule.name)
app.requires.push(hsgRequestsAfterModule.name)
app.requires.push(hsgSearchBarAfterModule.name)
app.requires.push(hsgSearchResultAvailabilityLineAfterModule.name)
app.requires.push(hsgSendEmailAfterModule.name)
app.requires.push(hsgServiceButtonAfterModule.name)
app.requires.push(hsgServiceDetailsAfterModule.name)
app.requires.push(hsgServiceNgrsAfterModule.name)
Expand Down
11 changes: 11 additions & 0 deletions js/modules/prm-citation-after/hsg-citation-after.module.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { slspCitationSelectModule } from './slsp-citation-select/slsp-citation-select.module'

export const hsgCitationAfterModule = angular
.module('hsgCitationAfterModule', [])
.component('prmCitationAfter', {
bindings: { parentCtrl: '<' },
template: `
<slsp-citation-select-component after-ctrl="$ctrl"></slsp-citation-select-component>`
})

hsgCitationAfterModule.requires.push(slspCitationSelectModule.name)
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
export class slspCitationSelectController {

constructor($scope, $timeout, $compile) {
this.$scope = $scope
this.$timeout = $timeout
this.$compile = $compile
}

$onInit() {
this.$timeout(() => {
this.parentCtrl = this.afterCtrl.parentCtrl

let citationSelectRadio = '<div class="md-container slsp-citation-select"><div class="md-off"></div><div class="md-on"></div></div>'

let citationSelectList = document.querySelectorAll('prm-citation ul li button')

angular.forEach(citationSelectList, (citationSelect) => {
angular.element(citationSelect).append(this.$compile(citationSelectRadio)(this.$scope)).addClass('slsp-citation-select-radio')
})
}, 0)
}
}

slspCitationSelectController.$inject = ['$scope', '$timeout', '$compile']
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { slspCitationSelectController } from './slsp-citation-select.controller'

export const slspCitationSelectModule = angular
.module('slspCitationSelectModule', [])
.controller('slspCitationSelectController', slspCitationSelectController)
.component('slspCitationSelectComponent', {
bindings: { afterCtrl: '<' },
controller: 'slspCitationSelectController',
})
Loading

0 comments on commit 640ddd4

Please sign in to comment.