Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UBO-18 finetuning #319

Closed
wants to merge 10 commits into from
Closed

UBO-18 finetuning #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8653383
UBO-259 FSU40THUL-1218 Made solr field "origin_exact" stored
Possommi Aug 22, 2023
84287d8
UBO-262 Set version of pica2mods to 2.8-SNAPSHOT
Possommi Aug 28, 2023
eee7c80
UBO-96 ORCID-Anbindung optimieren (#284)
Possommi Aug 28, 2023
2a1afbb
UBO-261 FSU040THUL-1243 Added/index dynamic solr field "*_nid_text" t…
Possommi Aug 25, 2023
aaa840b
UBO-31 add kdsf editor fields and other minor adoptions from koeln
kkrebs Aug 30, 2023
8ade2e3
UBO-263 FSU040THUL-405 Allow to search arbitrary realm in LocalService
Possommi Aug 30, 2023
6630877
UBO-18 unify name identifier handling (#316)
kkrebs Sep 4, 2023
9acb9a7
Merge branch 'develop' of [email protected]:MyCoRe-Org/ubo.git into develop
kkrebs Sep 5, 2023
47946eb
UBO-18 fix css class for connected person
kkrebs Sep 5, 2023
aa89579
UBO-18 add <sup> for connected persons and more details to person box
kkrebs Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ubo-common/src/main/resources/META-INF/resources/scss/_ubo-common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@
cursor: pointer;
}

.is-connected-author {
color: $primary;
.ubo-person-connected {
// color: $warning;
}

.ubo-mandatory::before {
Expand Down
5 changes: 5 additions & 0 deletions ubo-common/src/main/resources/config/ubo-common/messages_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,11 @@ ubo.partOf.validation = Bitte geben Sie an, ob die Pub
ubo.partner = Praxispartner*in
ubo.patent.application = Jahr der Erstanmeldung
ubo.peerreviewed = Peer Reviewed
ubo.person.affiliation = Affiliation
ubo.person.connected = der Hochschule zugeordnete*r Autor*in
ubo.person.connected.sup = HSB
ubo.person.corresponding = korrespondierende*r Autor*in
ubo.person.other = Sonstiges
ubo.place = Erscheinungsort
ubo.place.country = Anmeldeland
ubo.placeholder.abstract.link = WWW-Link zum Abstract
Expand Down
5 changes: 5 additions & 0 deletions ubo-common/src/main/resources/config/ubo-common/messages_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,6 +1065,11 @@ ubo.partOf.validation = Please specify if the publicat
ubo.partner = Practice Partner
ubo.patent.application = Application date
ubo.peerreviewed = Peer Reviewed
ubo.person.affiliation = Affiliation
ubo.person.connected = connected with university
ubo.person.connected.sup = HSB
ubo.person.corresponding = corresponding author
ubo.person.other = Other
ubo.place = Place of publication
ubo.place.country = Country of registration
ubo.placeholder.abstract.link = Web link to abstract
Expand Down
51 changes: 51 additions & 0 deletions ubo-common/src/main/resources/xsl/mods-display.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,9 @@
</xsl:if>
</xsl:attribute>
</span>
<xsl:if test="$is-connected-author = true()">
<sup><xsl:value-of select="i18n:translate('ubo.person.connected.sup')" /></sup>
</xsl:if>

<div id="{$popId}-content" class="d-none">
<dl>
Expand All @@ -534,6 +537,30 @@
<xsl:apply-templates select="mods:nameIdentifier[not(@type='connection')]" />
</xsl:otherwise>
</xsl:choose>
<xsl:if test="$is-connected-author = true() or $is-corresponding-author = true()">
<dt>
<xsl:value-of select="i18n:translate('ubo.person.affiliation')" />
</dt>
<dd>
<xsl:apply-templates select="mods:affiliation" mode="details" />
</dd>
</xsl:if>
<xsl:if test="$is-connected-author = true() or $is-corresponding-author = true()">
<dt>
<xsl:value-of select="i18n:translate('ubo.person.other')" />
</dt>
<dd>
<xsl:if test="$is-connected-author = true()">
<xsl:value-of select="i18n:translate('ubo.person.connected')" />
</xsl:if>
<xsl:if test="$is-connected-author = true() and $is-corresponding-author = true()">
<br />
</xsl:if>
<xsl:if test="$is-corresponding-author = true()">
<xsl:value-of select="i18n:translate('ubo.person.corresponding')" />
</xsl:if>
</dd>
</xsl:if>
</dl>
</div>
</xsl:if>
Expand Down Expand Up @@ -594,6 +621,30 @@
<xsl:value-of select="@value" />
</xsl:otherwise>
</xsl:choose>
<xsl:if test="$is-connected-author = true() or $is-corresponding-author = true()">
<dt>
<xsl:value-of select="i18n:translate('ubo.person.affiliation')" />
</dt>
<dd>
<xsl:apply-templates select="mods:affiliation" mode="details" />
</dd>
</xsl:if>
<xsl:if test="$is-connected-author = true() or $is-corresponding-author = true()">
<dt>
<xsl:value-of select="i18n:translate('ubo.person.other')" />
</dt>
<dd>
<xsl:if test="$is-connected-author = true()">
<xsl:value-of select="i18n:translate('ubo.person.connected')" />
</xsl:if>
<xsl:if test="$is-connected-author = true() and $is-corresponding-author = true()">
<br />
</xsl:if>
<xsl:if test="$is-corresponding-author = true()">
<xsl:value-of select="i18n:translate('ubo.person.corresponding')" />
</xsl:if>
</dd>
</xsl:if>
</dd>
</xsl:if>
</xsl:for-each>
Expand Down
1 change: 0 additions & 1 deletion ubo-common/src/main/resources/xsl/user-orcid-oauth.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<xsl:param name="CurrentLang" />
<xsl:param name="WebApplicationBaseURL" />
<xsl:param name="UBO.Build.TimeStamp" select="''" />
<xsl:param name="MCR.ORCID.LinkURL" />

<xsl:output method="html" encoding="UTF-8" media-type="text/html" indent="yes" xalan:indent-amount="2" />

Expand Down