Skip to content

Commit

Permalink
Merge pull request #39 from HSG-Library/develop
Browse files Browse the repository at this point in the history
Release v2024.05.10
  • Loading branch information
d22 authored May 10, 2024
2 parents 640ddd4 + 37602ab commit 99115ce
Show file tree
Hide file tree
Showing 17 changed files with 361 additions and 16 deletions.
182 changes: 171 additions & 11 deletions css/00-central-package.css
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@
/*310 Facets*/


/*320 Top bar*/


/*390 Other*/


Expand Down Expand Up @@ -1160,14 +1163,12 @@ prm-static.md-padding.flex {

/*300 General*/


/*backgound search results boxes*/

.list-item-wrapper {
background-color: #f9f9f9;
}


/*title color*/

prm-brief-result .item-title span {
Expand Down Expand Up @@ -1195,13 +1196,6 @@ a.md-mini.md-button.md-primoExplore-theme.md-ink-ripple:hover {
color: white !important;
}

/*Save query button*/

#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]) {
color: #111111 !important;
background-color: rgba(17, 17, 17, 0.10) !important;
}

/*310 Facets*/

/*facet titles*/
Expand Down Expand Up @@ -1270,6 +1264,125 @@ eth-okm-link-component {
display: block;
}

/*320 Top Bar*/

#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]) {
color: #111111 !important;
background-color: rgba(17, 17, 17, 0.10) !important;
}

prm-search-result-tool-bar span.text.tiny-uppercase-text {
display: none;
}

prm-search-result-tool-bar .results-title {
font-style: normal;
font-size: 14px;
}

prm-add-query-to-saved-searches button.button-as-link.link-alt-color.md-button.md-primoExplore-theme.md-ink-ripple {
border: 1px solid #1c1c1c;
line-height: 30px;
}

prm-add-query-to-saved-searches button.button-as-link.link-alt-color.md-button.md-primoExplore-theme.md-ink-ripple:focus {
background-color: #d3d3d3 !important;
color: #111 !important;
}

prm-add-query-to-saved-searches md-icon {
width: 20px;
height: 20px;
min-width: 20px;
min-height: 20px;
}

span[translate="results.savequery"] {
font-weight: 400 !important;
color: #111 !important;
font-size: 14px !important;
}

prm-search-result-tool-bar .search-toolbar-title.hide-xs.layout-row {
margin-bottom: 1px;
}

prm-search-result-list .pages-separated-with-gaps .results-title:not(.results-title-favorites) {
place-content: space-between;
}

prm-search-result-list span.results-count.layout-align-center-start {
font-style: normal !important;
}

prm-search-result-list .toolbar-actions.layout-align-end-center.layout-row.flex {
max-width: 10%;
}

prm-search-result-list .mobile-page-range span.text.tiny-uppercase-text {
display: none;
}

/*Mobiles*/

@media only screen and (max-width: 959px) {

prm-add-query-to-saved-searches button.button-as-link.link-alt-color.md-button.md-primoExplore-theme.md-ink-ripple,
prm-search-result-list button.button-link.padding-zero.facet-filter.button-as-link-mobile.link-alt-color.md-button.md-primoExplore-theme.md-ink-ripple,
button#sidebar-trigger {
border: 1px solid #1c1c1c;
width: 36px;
height: 36px;
margin: 6px !important;
}

prm-add-query-to-saved-searches button.button-as-link.link-alt-color.md-button.md-primoExplore-theme.md-ink-ripple:hover,
prm-search-result-list button.button-link.padding-zero.facet-filter.button-as-link-mobile.link-alt-color.md-button.md-primoExplore-theme.md-ink-ripple:hover,
button#sidebar-trigger:hover,
prm-add-query-to-saved-searches button.button-as-link.link-alt-color.md-button.md-primoExplore-theme.md-ink-ripple:focus,
prm-search-result-list button.button-link.padding-zero.facet-filter.button-as-link-mobile.link-alt-color.md-button.md-primoExplore-theme.md-ink-ripple:focus,
button#sidebar-trigger:focus {
background-color: #ddd !important;
color: #111 !important;
}

prm-search-result-list .pages-separated-with-gaps .results-title:not(.results-title-favorites) {
flex-direction: row-reverse;
align-items: center;
}

md-toolbar.md-toolbar-tools.results-title._md.md-primoExplore-theme.layout-align-start-center.layout-row._md-toolbar-transitions {
flex-direction: row;
align-content: center;
}

prm-search-result-tool-bar .md-toolbar-tools {
padding: 0 10px !important;
}
}

@media only screen and (max-width: 599px) {
prm-search-result-list div.mobile-actions.layout-align-end-center.layout-row.flex {
align-items: normal !important;
}
}

@media only screen and (min-width: 600px) and (max-width: 959px) {
prm-add-query-to-saved-searches {
height: 38px !important;
}

prm-search-result-list .mobile-actions.layout-align-end-center.layout-row.flex {
align-items: center !important;
}
}

@media only screen and (min-width: 960px) {
prm-search-result-list .pages-separated-with-gaps .results-title:not(.results-title-favorites) {
padding: 0 8px 0 13px !important;
}
}

/*390 Other*/


Expand Down Expand Up @@ -2140,7 +2253,7 @@ primo-explore.alert alma-htgi-svc {

/*Holding fields display*/

.weak-text.layout-row[ng-repeat="line in $ctrl.currLoc.summaryHoldings.baseSummaryShort track by $index"] {
prm-location-holdings.holding-data-expandable .weak-text.layout-row[ng-repeat="line in $ctrl.currLoc.summaryHoldings.baseSummaryShort track by $index"] {
display: none !important;
}

Expand Down Expand Up @@ -3305,6 +3418,18 @@ div.loan-item-title {
display: none;
}

/*Cancel request popup box*/

prm-requests md-dialog.in-element-dialog {
width: 94%;
height: 80%;
background-color: #fff;
}

prm-requests md-dialog.in-element-dialog button.md-button.md-primoExplore-theme.md-ink-ripple {
border: 1px solid #8e8e8e;
}

/*540 Fees*/

/*Alert bar for closed fines*/
Expand Down Expand Up @@ -3464,6 +3589,40 @@ prm-request>div>div.service-form-dynamic-panel.zero-margin.layout-padding.layout

/*940 Favorites*/

form[ng-submit="$ctrl.addNewLabel()"] {
background-color: unset;
}

form[ng-submit="$ctrl.addNewLabel()"] input[ng-model="$ctrl.newLabel"] {
border-bottom: 1px solid #bbbbbb;
}

form[ng-submit="$ctrl.addNewLabel()"] label[translate="nui.favorites.labels.new"] {
color: #aaa !important;
}

button.slsp-save-label-button {
background: none;
border: unset;
}

button.slsp-save-label-button svg {
fill: #9c9c9c;
}

button.slsp-save-label-button:hover svg {
fill: #111111;
}

md-menu-content#menuContent md-menu-item .md-button:focus {
background-color: #ffffff !important;
color: #111 !important;
}

md-menu-content#menuContent md-menu-item .md-button:hover {
background-color: #111111 !important;
color: #fff !important;
}

/*950 Alma viewer*/

Expand Down Expand Up @@ -3610,7 +3769,8 @@ button.switch-to-simple,
prm-request-services .md-button.button-as-link,
prm-location-items md-list prm-service-button .md-button.button-as-link,
#rapidoOffer prm-service-physical-best-offer .get_it_btn_digital,
prm-service-physical-best-offer .get_it_btn_physical {
prm-service-physical-best-offer .get_it_btn_physical,
md-input-container:after {
background-color: #4E4A99 !important;
}

Expand Down
4 changes: 2 additions & 2 deletions html/homepage/homepage_de.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h1 class="md-headline">Willkommen bei <b>HSGswisscovery</b></h1>
</p>
<ul>
<li>Recherchieren Sie in von der HSG-Bibliothek bereitgestellten Dokumenten
<li>Erweitern Sie Ihre Suche mit einem Klick auf &uuml;ber <a href="https://slsp.ch/libraries"
<li>Erweitern Sie Ihre Suche mit einem Klick auf &uuml;ber <a href="https://libraries.swisscovery.help/"
target="_blank">500 wissenschaftliche Bibliotheken</a> in der Schweiz</li>
<li>Nutzen Sie lizenzierte E-Medien der HSG-Bibliothek und erhalten Sie Zugang zu frei
verf&uuml;gbaren Titeln</li>
Expand All @@ -48,7 +48,7 @@ <h2 class="md-headline">Wir sind f&uuml;r Sie da</h2>
<md-card-content>
<p>
<a href="https://www.unisg.ch/de/universitaet/bibliothek/"
target="_blank">Aktuelles</a>
target="_blank">Aktuelles</a>
</p>
<p>
<a href="https://www.unisg.ch/de/universitaet/bibliothek/suchen-und-nutzen/beschaffung/anschaffungsvorschlag/"
Expand Down
2 changes: 1 addition & 1 deletion html/homepage/homepage_en.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h1 class="md-headline">Welcome to <b>HSGswisscovery</b></h1>
</p>
<ul>
<li>Search in the printed and electronic content provided by the HSG-Library
<li>With one click, expand your search to more than <a href="https://slsp.ch/libraries"
<li>With one click, expand your search to more than <a href="https://libraries.swisscovery.help/"
target="_blank">500 scientific libraries</a> in Switzerland
<li>Access e-media licensed by the HSG-Library as well as Open Access content
<li>Request books from the HSG-Library or other participating libraries, directly or via SLSP
Expand Down
6 changes: 6 additions & 0 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { hsgAlmaViewerAfterModule } from './modules/prm-alma-viewer-after/hsg-al
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 { hsgFavoritesEditLabelsMenuAfterModule } from './modules/prm-favorites-edit-labels-menu-after/hsg-favorites-edit-labels-menu-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 @@ -27,6 +28,8 @@ import { hsgRequestAfterModule } from './modules/prm-request-after/hsg-request-a
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 { hsgSearchResultListAfterModule } from './modules/prm-search-result-list-after/hsg-search-result-list-after.module'
import { hsgSearchResultToolBarAfterModule } from './modules/prm-search-result-tool-bar-after/hsg-search-result-tool-bar-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'
Expand All @@ -53,6 +56,7 @@ app.requires.push(hsgAlmaViewitAfterModule.name)
app.requires.push(hsgAlmaViewitItemsAfterModule.name)
app.requires.push(hsgCitationAfterModule.name)
app.requires.push(hsgFinesAfterModule.name)
app.requires.push(hsgFavoritesEditLabelsMenuAfterModule.name)
app.requires.push(hsgFullViewAfterModule.name)
app.requires.push(hsgGalleryItemAfterModule.name)
app.requires.push(hsgJournalsAfterModule.name)
Expand All @@ -69,6 +73,8 @@ app.requires.push(hsgRequestAfterModule.name)
app.requires.push(hsgRequestsAfterModule.name)
app.requires.push(hsgSearchBarAfterModule.name)
app.requires.push(hsgSearchResultAvailabilityLineAfterModule.name)
app.requires.push(hsgSearchResultListAfterModule.name)
app.requires.push(hsgSearchResultToolBarAfterModule.name)
app.requires.push(hsgSendEmailAfterModule.name)
app.requires.push(hsgServiceButtonAfterModule.name)
app.requires.push(hsgServiceDetailsAfterModule.name)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { slspSaveLabelButtonModule } from './slsp-save-label-button/slsp-save-label-button.module'

export const hsgFavoritesEditLabelsMenuAfterModule = angular
.module('hsgFavoritesEditLabelsMenuAfterModule', [])
.component('hsgFavoritesEditLabelsMenuAfterModule', {
bindings: { parentCtrl: '<' },
template: `
<slsp-save-label-button-component after-ctrl="$ctrl"></slsp-save-label-button-component>
<slsp-favorites-edit-labels-menu-after parent-ctrl="$parent.$ctrl"></<slsp-favorites-edit-labels-menu-after>`
})


hsgFavoritesEditLabelsMenuAfterModule.requires.push(slspSaveLabelButtonModule.name)
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
export class slspSaveLabelButtonController {
constructor($scope, $compile, $element) {
this.$scope = $scope
this.$compile = $compile
this.$element = $element
}

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

// Erstellen Sie den "Add" -Button
let buttonAdd = '<button type="submit" class="slsp-save-label-button"><md-icon class="md-primoExplore-theme"><svg width="100%" height="100%" viewBox="0 0 24 24" id="ic_add_24px_cache88" x="24" xmlns="http://www.w3.org/2000/svg" fit="" preserveAspectRatio="xMidYMid meet" focusable="false"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path></svg></md-icon></button>'

// Holen Sie sich alle passenden Formulare
let labelForms = document.querySelectorAll('form[ng-submit="$ctrl.addNewLabel()"]')

// Fügen Sie den "Add"-Button für jedes Formular hinzu, wenn er noch nicht hinzugefügt wurde
labelForms.forEach(form => {
if (!angular.element(form).data('buttonAdded')) {
let mdInputContainer = angular.element(form).find('md-input-container')
mdInputContainer.after(buttonAdd)
angular.element(form).data('buttonAdded', true)
}
})
}
}

slspSaveLabelButtonController.$inject = ['$scope', '$compile', '$element']
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { slspSaveLabelButtonController } from './slsp-save-label-button.controller'

export const slspSaveLabelButtonModule = angular
.module('slspSaveLabelButtonModule', [])
.controller('slspSaveLabelButtonController', slspSaveLabelButtonController)
.component('slspSaveLabelButtonComponent', {
bindings: { afterCtrl: '<' },
controller: 'slspSaveLabelButtonController',
})
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { slspHoldingCollapseModule } from './slsp-holding-collapse/slsp-holding-collapse.module'
import { slspIButtonModule } from './slsp-i-button/slsp-i-button.module'

export const hsgLocationHoldingsAfterModule = angular
.module('hsgLocationHoldingsAfterModule', [])
.component('prmLocationHoldingsAfter', {
bindings: { parentCtrl: '<' },
template: `<slsp-i-button-component after-ctrl="$ctrl"></slsp-i-button-component>`
template: `<slsp-i-button-component after-ctrl="$ctrl"></slsp-i-button-component>
<slsp-holding-collapse-component after-ctrl="$ctrl"></slsp-holding-collapse-component>`
})

hsgLocationHoldingsAfterModule.requires.push(slspIButtonModule.name)
hsgLocationHoldingsAfterModule.requires.push(slspHoldingCollapseModule.name)
Loading

0 comments on commit 99115ce

Please sign in to comment.