From 37019e027b6de9cb3f03d160d0ea0c1efaaba489 Mon Sep 17 00:00:00 2001 From: Kathleen Neumann Date: Tue, 17 Jan 2023 09:19:31 +0100 Subject: [PATCH 01/17] UBO-212 overwrite opacity set by bootstrap, change to 0.4 --- .../main/resources/META-INF/resources/scss/_ubo-forms.scss | 4 ++++ .../resources/META-INF/resources/scss/_ubo-variables.scss | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-forms.scss b/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-forms.scss index f990f75e8..8e473559f 100644 --- a/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-forms.scss +++ b/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-forms.scss @@ -118,6 +118,10 @@ } } + .form-control::placeholder, .mycore-form-input-double::placeholder, .mycore-form-input::placeholder { + opacity: 0.4; + } + // Large devices (desktops) and below: <= 1200px @include media-breakpoint-down(lg) { // add/overwrite styles for responsive level lg and lower diff --git a/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-variables.scss b/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-variables.scss index 4f0aecb32..b8286093b 100644 --- a/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-variables.scss +++ b/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-variables.scss @@ -44,6 +44,6 @@ $theme-colors: ( $pmud-color: $primary !default; $pmud-color-hover: white !default; -// use transparency based on input color for placeholder +// use input color for placeholder $input-color: $body-color !default; -$input-placeholder-color: rgba($input-color, .4) !default; +$input-placeholder-color: $input-color !default; From 553e564cb2c6d7bac5530bab0d60b4eaf67632fd Mon Sep 17 00:00:00 2001 From: Silvio Hermann Date: Thu, 19 Jan 2023 09:04:46 +0100 Subject: [PATCH 02/17] UBO-213 Added solr field licence (needed by https://github.com/ThULB/ThUniBib/issues/258) UBO-213 Added field license to solr-schema.json --- .../config/ubo-common/solr/main/solr-schema.json | 9 +++++++++ ubo-common/src/main/resources/xsl/ubo-solr.xsl | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/ubo-common/src/main/resources/config/ubo-common/solr/main/solr-schema.json b/ubo-common/src/main/resources/config/ubo-common/solr/main/solr-schema.json index beea839fa..d93455387 100644 --- a/ubo-common/src/main/resources/config/ubo-common/solr/main/solr-schema.json +++ b/ubo-common/src/main/resources/config/ubo-common/solr/main/solr-schema.json @@ -626,6 +626,15 @@ "stored": false } }, + { + "add-field": { + "name": "license", + "type": "ubo_id", + "multiValued": true, + "indexed": true, + "stored": true + } + }, { "add-dynamic-field": { "name": "host_id_*", diff --git a/ubo-common/src/main/resources/xsl/ubo-solr.xsl b/ubo-common/src/main/resources/xsl/ubo-solr.xsl index 042780ecc..026d1a63a 100644 --- a/ubo-common/src/main/resources/xsl/ubo-solr.xsl +++ b/ubo-common/src/main/resources/xsl/ubo-solr.xsl @@ -36,6 +36,7 @@ + @@ -214,6 +215,12 @@ + + + + + + From 040c4882e04c646256ed47e3f60922c44353a0e3 Mon Sep 17 00:00:00 2001 From: Possommi Date: Fri, 20 Jan 2023 14:06:53 +0100 Subject: [PATCH 03/17] UBO-208 add service for additional local search to find matching local users (#253) --- .../ubo/ldap/picker/LDAPWithLocalService.java | 18 ++++++++++++++++++ .../ubo/resources/UBOPersonSearchResource.java | 16 ++++++---------- .../config/ubo-common/mycore.properties | 1 + 3 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 ubo-common/src/main/java/org/mycore/ubo/ldap/picker/LDAPWithLocalService.java diff --git a/ubo-common/src/main/java/org/mycore/ubo/ldap/picker/LDAPWithLocalService.java b/ubo-common/src/main/java/org/mycore/ubo/ldap/picker/LDAPWithLocalService.java new file mode 100644 index 000000000..21ee10978 --- /dev/null +++ b/ubo-common/src/main/java/org/mycore/ubo/ldap/picker/LDAPWithLocalService.java @@ -0,0 +1,18 @@ +package org.mycore.ubo.ldap.picker; + +import javax.naming.OperationNotSupportedException; + +import org.mycore.ubo.local.LocalService; +import org.mycore.ubo.picker.PersonSearchResult; + +public class LDAPWithLocalService extends LDAPService { + + @Override + public PersonSearchResult searchPerson(String query) throws OperationNotSupportedException { + PersonSearchResult results = super.searchPerson(query); + LocalService ls = new LocalService(); + PersonSearchResult localSr = ls.searchPerson(query); + results.personList.addAll(0, localSr.personList); + return results; + } +} diff --git a/ubo-common/src/main/java/org/mycore/ubo/resources/UBOPersonSearchResource.java b/ubo-common/src/main/java/org/mycore/ubo/resources/UBOPersonSearchResource.java index 12eab1617..9dc3aae52 100644 --- a/ubo-common/src/main/java/org/mycore/ubo/resources/UBOPersonSearchResource.java +++ b/ubo-common/src/main/java/org/mycore/ubo/resources/UBOPersonSearchResource.java @@ -18,22 +18,18 @@ package org.mycore.ubo.resources; -import com.google.gson.Gson; -import org.mycore.access.MCRAccessManager; -import org.mycore.common.MCRSession; -import org.mycore.common.MCRSessionMgr; -import org.mycore.common.MCRSystemUserInformation; -import org.mycore.common.MCRUserInformation; -import org.mycore.common.config.MCRConfiguration2; -import org.mycore.ubo.picker.IdentityService; -import org.mycore.ubo.picker.PersonSearchResult; - import javax.naming.OperationNotSupportedException; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; +import com.google.gson.Gson; +import org.mycore.access.MCRAccessManager; +import org.mycore.common.config.MCRConfiguration2; +import org.mycore.ubo.picker.IdentityService; +import org.mycore.ubo.picker.PersonSearchResult; + @Path(UBOPersonSearchResource.PATH) public class UBOPersonSearchResource { diff --git a/ubo-common/src/main/resources/config/ubo-common/mycore.properties b/ubo-common/src/main/resources/config/ubo-common/mycore.properties index 3bb89ce08..3a4611777 100644 --- a/ubo-common/src/main/resources/config/ubo-common/mycore.properties +++ b/ubo-common/src/main/resources/config/ubo-common/mycore.properties @@ -535,6 +535,7 @@ MCR.URIResolver.ModuleResolver.ires=org.mycore.ubo.picker.IdentityResolver MCR.ContentTransformer.localpidsearch.Stylesheet=xsl/localpidsearch.xsl,%UBO.DefaultHTMLLayoutSteps% MCR.IdentityPicker.strategy=org.mycore.ubo.local.Local #MCR.IdentityPicker.strategy=org.mycore.ubo.ldap.picker.LDAP +#MCR.IdentityPicker.strategy=org.mycore.ubo.ldap.picker.LDAPWithLocal # The following configuration is used to normalize (and de-normalize) the LDAP "eduPersonOrcid" attribute value # eg. delete 'https://orcid.org/', default is todo nothing From a993c20fdadae9b04e403f15c9a7d4492d222197 Mon Sep 17 00:00:00 2001 From: Kathleen Neumann Date: Sat, 21 Jan 2023 10:14:06 +0100 Subject: [PATCH 04/17] add css class to make editor buttons sticky --- .../resources/META-INF/resources/scss/_ubo-buttons.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-buttons.scss b/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-buttons.scss index b5e91e8ee..e3cfaf944 100644 --- a/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-buttons.scss +++ b/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-buttons.scss @@ -32,6 +32,14 @@ font-size: 25px; } + .ubo-sticky-editor-buttons { + position: sticky; + bottom: 0; + padding: 1.5rem 0 1rem 0; + background-color: rgb(255, 255, 255, 0.8); + margin-top: 2rem; + } + // Large devices (desktops) and below: <= 1200px @include media-breakpoint-down(lg) { // add/overwrite styles for responsive level lg and lower From d8a7fb0441b903bdc0e94fba8aaf7f1ccd82908a Mon Sep 17 00:00:00 2001 From: Kathleen Neumann Date: Sat, 21 Jan 2023 16:25:55 +0100 Subject: [PATCH 05/17] fixed syntax error --- .../main/resources/META-INF/resources/scss/_ubo-buttons.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-buttons.scss b/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-buttons.scss index e3cfaf944..57b345699 100644 --- a/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-buttons.scss +++ b/ubo-common/src/main/resources/META-INF/resources/scss/_ubo-buttons.scss @@ -36,7 +36,7 @@ position: sticky; bottom: 0; padding: 1.5rem 0 1rem 0; - background-color: rgb(255, 255, 255, 0.8); + background-color: rgba(255, 255, 255, 0.8); margin-top: 2rem; } From 9a4eaaba96483fd2da02e538944b1bcdfd2fe37b Mon Sep 17 00:00:00 2001 From: Possommi Date: Wed, 15 Feb 2023 10:02:34 +0100 Subject: [PATCH 06/17] UBO-226 Added data-href attribute to breadcrumb item in mycoreobject.xsl. Evaluate data-href attribute in html-layout.xsl (#263) --- ubo-common/src/main/resources/xsl/html-layout.xsl | 11 ++++++++++- ubo-common/src/main/resources/xsl/mycoreobject.xsl | 11 +++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ubo-common/src/main/resources/xsl/html-layout.xsl b/ubo-common/src/main/resources/xsl/html-layout.xsl index e7ce81555..9a0e2b77b 100644 --- a/ubo-common/src/main/resources/xsl/html-layout.xsl +++ b/ubo-common/src/main/resources/xsl/html-layout.xsl @@ -197,7 +197,16 @@ select="$CurrentItem/ancestor-or-self::item[@label|label][ancestor-or-self::*=$navigation.tree[@role='main']]" />
  • - + + + + + + + + + +
    • diff --git a/ubo-common/src/main/resources/xsl/mycoreobject.xsl b/ubo-common/src/main/resources/xsl/mycoreobject.xsl index a5a992d8c..ff9ea008c 100644 --- a/ubo-common/src/main/resources/xsl/mycoreobject.xsl +++ b/ubo-common/src/main/resources/xsl/mycoreobject.xsl @@ -1,4 +1,4 @@ - + @@ -64,9 +64,12 @@