Skip to content

Commit

Permalink
Merge pull request #34 from HSG-Library/develop
Browse files Browse the repository at this point in the history
Sprint 7 and more
  • Loading branch information
d22 authored Nov 16, 2023
2 parents 425ff0a + 7c93988 commit 83562e6
Show file tree
Hide file tree
Showing 14 changed files with 262 additions and 93 deletions.
127 changes: 99 additions & 28 deletions css/00-central-package.css
Original file line number Diff line number Diff line change
Expand Up @@ -1790,12 +1790,15 @@ prm-location-items md-list {

/*Hide "location" label for physical items*/

prm-location-items>h5,
prm-locations>div.layout-align-space-between-center.layout-row {
prm-location-items>h5 {
display: none;
}


/*
prm-locations>div.layout-align-space-between-center.layout-row {
display: none;
}
*/
/*Look of the section and icon*/

#getit_link1_0>div>prm-full-view-service-container>div.section-body>div {
Expand Down Expand Up @@ -1936,29 +1939,15 @@ primo-explore.alert alma-htgi-svc {
font-size: 1em;
}


/*442 Filter bar*/


/*locations filter by default: hide filter button*/

prm-locations button[ng-if='$ctrl.displayFiltersButton && !$ctrl.locationsPrefilterActive'] {
display: none !important;
}

prm-location-items button[ng-if='($ctrl.isFilter || $ctrl.isFiltered) && $ctrl.isAnyFilterFilled()'] {
display: none !important;
}


/*location filter "Clear" button*/
/* Location filter "Clear" button */

prm-locations-filter .md-button.button-as-link:hover:not([disabled]) {
background-color: rgba(17, 17, 17, 0.10) !important;
}


/*filter bar*/
/* Filter bar */

prm-locations-filter md-select {
margin-top: 1px;
Expand All @@ -1979,7 +1968,6 @@ html#primoExploreRoot {
overflow-y: auto !important;
}


/* Filter bar background and border color */

.bar.filter-bar {
Expand All @@ -1988,6 +1976,57 @@ html#primoExploreRoot {
padding-left: 0px !important;
}

/* Filter bar button */

prm-locations h3.section-title {
visibility: hidden;
}


button[ng-if="$ctrl.displayFiltersButton && !$ctrl.locationsPrefilterActive"],
button[ng-if="($ctrl.isFilter || $ctrl.isFiltered) && $ctrl.isAnyFilterFilled()"] {
border-radius: 5px !important;
width: auto !important;
min-width: 80px !important;
margin-bottom: 2px !important;
/* border: 1px solid rgb(44, 44, 44); */
height: 26px !important;
min-height: 20px !important;
line-height: 8px !important;
}

span.filter-label {
position: absolute;
left: 14px;

}

.filter-label:after {
display: inline-block;
content: "\25BC";
position: relative;
top: 0px;
font-size: 13px;
margin-left: 5px;
transition: transform 2s ease;
}

prm-icon[ng-if="$ctrl.isLocationsFilterVisible"] .filter-label:after {
transform: scaleY(0.5) scaleX(1) rotate(180deg);
}

prm-icon[ng-if="!$ctrl.isLocationsFilterVisible"] .filter-label:after {
transform: scaleY(0.5) scaleX(1) rotate(0deg);

}

button[ng-if="$ctrl.displayFiltersButton && !$ctrl.locationsPrefilterActive"] md-icon {
display: inline-block;
}

prm-locations-filter div[ng-include="$ctrl.templateUrl"] {
border-top: 4px solid #ececec !important;
}

/*443 Items expand for mobiles*/

Expand Down Expand Up @@ -2951,6 +2990,11 @@ div[ng-if="$ctrl.isFinesFeatureFlagEnabled && $ctrl.finesTypeDropDownSelection =
order: 3;
}

.bar.alert-bar[ng-if="$ctrl.showClosedFines"] {
height: auto !important;
padding: 0.75em 2em;
}

/*550 Block and messages*/


Expand Down Expand Up @@ -3227,12 +3271,12 @@ 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 {
background-color: #3BBFAD !important;
background-color: #4E4A99 !important;
}

@media only screen and (max-width: 599px) {
prm-topbar .top-nav-bar {
border-color: #3BBFAD !important;
border-color: #4E4A99 !important;
}
}

Expand All @@ -3250,7 +3294,7 @@ button.switch-to-simple:hover,
.md-button.button-as-link:hover:not([disabled]),
#rapidoOffer prm-service-physical-best-offer .get_it_btn_digital:hover,
prm-service-physical-best-offer .get_it_btn_physical:hover {
background-color: #83dcd0 !important;
background-color: #393765 !important;
}


Expand Down Expand Up @@ -3281,11 +3325,11 @@ prm-location-items md-list prm-service-button .md-button.button-as-link#rapidoOf
prm-service-physical-best-offer .get_it_btn_physical,
button#get_it_btn_digital,
prm-service-button>button>span {
color: #14413c !important;
color: #fff !important;
}

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


Expand All @@ -3312,13 +3356,13 @@ button.switch-to-advanced.zero-margin.button-with-icon.md-button.md-primoExplore
.prm-alert-bg,
#rapidoOffer prm-rapido-no-offer-message .main_tile,
.diamond {
background-color: #8dd8d8 !important;
background-color: #99d0d0 !important;
}

.text-highlight,
mark,
prm-location-items>md-list>md-list-item>div>div>div>div>prm-service-button>button {
box-shadow: inset 0 -0.15em 0 0 #8dd8d8;
box-shadow: inset 0 -0.15em 0 0 #99d0d0;
}


Expand All @@ -3329,7 +3373,7 @@ prm-location-items>md-list>md-list-item>div>div>div>div>prm-service-button>butto

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


Expand Down Expand Up @@ -3382,3 +3426,30 @@ div.courier-info>span a,


/*****************************************************************************/

/************** Public note - will be published in the CP ******************
p[ng-if="item.authNote"], span#public-note p {
margin-bottom: 10px !important;
}
@media (min-width: 0) and (max-width: 959px) and (orientation: portrait) {
prm-alma-viewit-items .separate-list-items .in-element-dialog-context.layout-row.flex {
flex-direction: column-reverse;
}
prm-alma-viewit-items .separate-list-items .in-element-dialog-context.layout-row.flex .md-list-item-text.layout-wrap.layout-row.flex {
max-width: 100%;
padding-left: 15px;
padding-right: 15px;
}
prm-alma-viewit-items .separate-list-items ._md-secondary-container{
align-self: flex-end;
max-height: 32px;
}
}
/*change on line 1201 (Physical items and e-resources boxes background colour and space between items)
.separate-list-items md-list-item:hover {
background-color: #ffffff0d !important;
}
*/
34 changes: 0 additions & 34 deletions css/eth-locations-filter.css

This file was deleted.

19 changes: 15 additions & 4 deletions css/hsg-off-campus-info.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,26 @@
.hsg-off-campus-info {
margin-top: 1em;
padding: 1em 1em 0.5em;
background-color: #68EAB8;
background-color: #ff9900;
color: black;
box-shadow: rgba(0, 0, 0, 0.03) 0px 1px 0px 0px, rgba(0, 0, 0, 0.07) 0px 5px 5px -3px
box-shadow: rgba(0, 0, 0, 0.03) 0px 1px 0px 0px, rgba(0, 0, 0, 0.07) 0px 5px 5px -3px;
border-radius: 3px;
}

.hsg-off-campus-info>div {
.hsg-off-campus-info > div {
margin-left: 1em;
}

.hsg-off-campus-info p {
font-weight: 600;
}

.hsg-off-campus-info a {
color: #0030a0;
}
font-weight: normal;
}

.hsg-off-campus-info > svg {
width: 55px;
margin-top: -8px;
}
2 changes: 2 additions & 0 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { hsgUserAreaExpandableAfterModule } from './modules/prm-user-area-expand
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 @@ -43,6 +44,7 @@ app.requires.push(hsgExceptionHandlerModule.name)
app.requires.push(hsgHowovpAfterModule.name)
app.requires.push(hsgHtgiSvcAfterModule.name)
app.requires.push(hsgAlmaOtherMembersAfterModule.name)
app.requires.push(hsgAlmaViewerAfterModule.name)
app.requires.push(hsgAlmaViewitAfterModule.name)
app.requires.push(hsgAlmaViewitItemsAfterModule.name)
app.requires.push(hsgFinesAfterModule.name)
Expand Down
12 changes: 12 additions & 0 deletions js/modules/prm-alma-viewer-after/hsg-alma-viewer-after.module.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { hsgAlmaViewerTitleModule } from './hsg-alma-viewer-title/hsg-alma-viewer-title.module'

export const hsgAlmaViewerAfterModule = angular
.module('hsgAlmaVihsgAlmaViewerAfterModuleewitAfterModule', [])
.component('prmAlmaViewerAfter', {
bindings: { parentCtrl: '<' },
template: `
<hsg-alma-viewer-title-component after-ctrl="$ctrl"></hsg-alma-viewer-title-component>
`
})

hsgAlmaViewerAfterModule.requires.push(hsgAlmaViewerTitleModule.name)
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@

export class hsgAlmaViewerTitleController {

constructor($scope) {
this.$scope = $scope
}

$onInit() {
this.ctrl = this.afterCtrl.parentCtrl
this.titleElement = document.getElementById('primoExploreTitle')
if (this.deregister) {
this.deregister()
}
this.customTitle = null
this.disTitle = null
this.fileName = null
}

$doCheck() {
const data = this.ctrl._data
if (data && !this.gotLabel) {
this.disTitle = data.label
this.gotLabel = this.disTitle
}
const fileNameElement = document.getElementById('file_label_0')
if (this.disTitle && fileNameElement && !this.gotFileName) {
this.fileName = fileNameElement.getAttribute('title')
this.gotFileName = this.fileName
this.customTitle = this.disTitle + ' - ' + this.fileName
this.deregister = this.registerWatcher()
}
}

registerWatcher() {
const that = this
return this.$scope.$watch(
function () {
return that.titleElement.textContent
},
function (newValue, oldValue) {
if (newValue !== that.customTitle) {
that.titleElement.textContent = that.customTitle
}
}
)
}
}

hsgAlmaViewerTitleController.$inject = ['$scope']
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { hsgAlmaViewerTitleController } from './hsg-alma-viewer-title.controller'

export const hsgAlmaViewerTitleModule = angular
.module('hsgAlmaViewerTitleModule', [])
.controller('hsgAlmaViewerTitleController', hsgAlmaViewerTitleController)
.component('hsgAlmaViewerTitleComponent', {
bindings: { afterCtrl: '<' },
controller: 'hsgAlmaViewerTitleController'
})
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div ng-if="$ctrl.isOffCampus()" class="hsg-off-campus-info" layout="row">
<svg height="24" viewBox="0 0 64 64" width="24" xmlns="http://www.w3.org/2000/svg">
<svg viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
<path
d="M 32,4 C 16.537113,4 4,16.541629 4,32 4,47.467403 16.537113,60 32,60 47.462887,60 60,47.467403 60,32 60,16.541629 47.462887,4 32,4 Z m 0,50.580645 C 19.520581,54.580645 9.419355,44.483597 9.419355,32 9.419355,19.524758 19.521032,9.419355 32,9.419355 44.47479,9.419355 54.580645,19.520919 54.580645,32 54.580645,44.479194 44.483597,54.580645 32,54.580645 Z M 36.741935,42.83871 c 0,2.614725 -2.127209,4.741935 -4.741935,4.741935 -2.614726,0 -4.741935,-2.12721 -4.741935,-4.741935 0,-2.614726 2.127209,-4.741936 4.741935,-4.741936 2.614726,0 4.741935,2.12721 4.741935,4.741936 z M 27.555,18.970855 28.322742,34.325694 c 0.03602,0.721112 0.631242,1.287209 1.353145,1.287209 h 4.648226 c 0.721903,0 1.317129,-0.566097 1.353145,-1.287209 L 36.445,18.970855 c 0.03873,-0.773839 -0.57829,-1.422468 -1.353145,-1.422468 h -6.18371 c -0.774855,0 -1.391871,0.648629 -1.353145,1.422468 z" />
</svg>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const hsgAlmaViewitItemsAfterModule = angular
template: `
<slsp-icon-label-viewit-items-component after-ctrl="$ctrl"></slsp-icon-label-viewit-items-component>
<slsp-collapse-related-e-resources-component after-ctrl="$ctrl"></slsp-collapse-related-e-resources-component>
<slsp-translate-public-note-component after-ctrl="$ctrl"></slsp-translate-public-note-component>
`
})

Expand Down
Loading

0 comments on commit 83562e6

Please sign in to comment.