-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* develop: UBO-231 reformat properties UBO-231 Added i18n and removed duplicate headings UBO-236 Do not display link to show '0 additional authors' UBO-234 Fixed label of relatedItem type UBO-233 Added ppn list import (#270) UBO-232 fix navigation with select2 UBO-214 Add class reflecting oa state to label (#262) UBO-227 Create html anchor when paramater xEditorHook is present (#265) UBO-229 Add class attribute to mods:part/mods:detail type="volume"/mods:number in mods-display.xsl (#266) UBO-230 Do not display value for missing i18n key for unknow type of mods:relatedItem UBO-223 Lifted version of pica2mods to 2.5-SNAPSHOT UBO-226 Added data-href attribute to breadcrumb item in mycoreobject.xsl. Evaluate data-href attribute in html-layout.xsl (#263) fixed syntax error add css class to make editor buttons sticky UBO-208 add service for additional local search to find matching local users (#253) UBO-213 Added solr field licence (needed by ThULB/ThUniBib#258) UBO-212 overwrite opacity set by bootstrap, change to 0.4
- Loading branch information
Showing
29 changed files
with
1,330 additions
and
972 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
ubo-common/src/main/java/org/mycore/ubo/importer/ppn/PPN2XMLTransformer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /** | ||
| * Copyright (c) 2017 Duisburg-Essen University Library | ||
| * | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the GNU Public License v2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html | ||
| **/ | ||
|
|
||
| package org.mycore.ubo.importer.ppn; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Arrays; | ||
|
|
||
| import org.jdom2.Document; | ||
| import org.jdom2.Element; | ||
| import org.mycore.common.content.MCRContent; | ||
| import org.mycore.common.content.MCRJDOMContent; | ||
| import org.mycore.common.content.transformer.MCRContentTransformer; | ||
|
|
||
| public class PPN2XMLTransformer extends MCRContentTransformer { | ||
|
|
||
| @Override | ||
| public MCRJDOMContent transform(MCRContent source) throws IOException { | ||
| Element root = new Element("list"); | ||
| Document xml = new Document(root); | ||
|
|
||
| Arrays.stream(source.asString().split("\\s")).filter(p -> p.trim().length() > 0) | ||
| .forEach(ppn -> { | ||
| Element e = new Element("ppn"); | ||
| e.setText(ppn); | ||
| root.addContent(e); | ||
| }); | ||
| return new MCRJDOMContent(xml); | ||
| } | ||
| } |
18 changes: 18 additions & 0 deletions
18
ubo-common/src/main/java/org/mycore/ubo/ldap/picker/LDAPWithLocalService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
ubo-common/src/main/resources/META-INF/resources/js/ImportList.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| $(document).ready(function () { | ||
| $('select[class*="autocomplete"]').chosen({search_contains: true}); | ||
| }); | ||
|
|
||
| function toggleEnrichment(select) { | ||
| if ($(select).val() == "PPNList") { | ||
| $("#enrich-yes").click(); | ||
| $("#enrich-no").attr("disabled", "disabled"); | ||
| } else { | ||
| $("#enrich-no").removeAttr("disabled"); | ||
| } | ||
| } | ||
|
|
||
| function toggleSubmit() { | ||
| let v = $("textarea").val(); | ||
|
|
||
| if (v === "undefined" || v.length == 0) { | ||
| $("#submitBtn").attr("disabled", "disabled"); | ||
| } else { | ||
| $("#submitBtn").removeAttr("disabled"); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
ubo-common/src/main/resources/META-INF/resources/scss/_ubo-oa.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| .oa-badge { | ||
| &-oa { | ||
| color: $oa-text; | ||
| background-color: $oa; | ||
| } | ||
| &-green { | ||
| color: $oa-green-text; | ||
| background-color: $oa-green; | ||
| } | ||
| &-gold { | ||
| color: $oa-gold-text; | ||
| background-color: $oa-gold; | ||
| } | ||
| &-closed { | ||
| color: $oa-closed-text; | ||
| background-color: $oa-closed; | ||
| } | ||
| &-platin { | ||
| color: $oa-platin-text; | ||
| background-color: $oa-platin; | ||
| } | ||
| &-hybrid { | ||
| color: $oa-hybrid-text; | ||
| background-color: $oa-hybrid; | ||
| } | ||
| &-bronze { | ||
| color: $oa-bronze-text; | ||
| background-color: $oa-bronze; | ||
| } | ||
| &-embargo { | ||
| color: $oa-embargo-text; | ||
| background-color: $oa-embargo; | ||
| } | ||
| &-unvalidated { | ||
| color: $oa-unvalidated-text; | ||
| background-color: $oa-unvalidated; | ||
| } | ||
| } | ||
|
|
||
| .oa-statistic { | ||
| &:hover { | ||
| filter: brightness(110%); | ||
| } | ||
| &-closed rect { fill: $oa-closed; } | ||
| &-oa rect { fill: $oa; } | ||
| &-green rect { fill: $oa-green; } | ||
| &-gold rect { fill: $oa-gold; } | ||
| &-platin rect { fill: $oa-platin; } | ||
| &-hybrid rect { fill: $oa-hybrid; } | ||
| &-bronze rect { fill: $oa-bronze; } | ||
| &-embargo rect { fill: $oa-embargo; } | ||
| &-unvalidated rect { fill: $oa-unvalidated; } | ||
| } |
Oops, something went wrong.