diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/gemini/GeminiDocument.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/gemini/GeminiDocument.java index f5ce59180..f350ba629 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/gemini/GeminiDocument.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/gemini/GeminiDocument.java @@ -47,7 +47,7 @@ public class GeminiDocument extends AbstractMetadataDocument implements WellKnow private Number version; private List alternateTitles, spatialRepresentationTypes, datasetLanguages, securityConstraints; - private List topicCategories, dataAttributes; + private List topicCategories, observedProperties; private List geometries; private List distributionFormats; private List descriptiveKeywords; diff --git a/java/src/main/resources/codelist.properties b/java/src/main/resources/codelist.properties index bb00d2fcf..d7edd5738 100644 --- a/java/src/main/resources/codelist.properties +++ b/java/src/main/resources/codelist.properties @@ -44,7 +44,7 @@ metadata.resourceType.sample = Sample metadata.resourceType.sampleArchive = Sample Archive metadata.resourceType.series = Series metadata.resourceType.service = Service -metadata.resourceType.signpost = Signpost +metadata.resourceType.signpost = Dataset metadata.resourceType.nercSignpost = Signpost metadata.resourceType.software = Software metadata.resourceType.thirdPartyDataset = Third-party dataset @@ -99,8 +99,8 @@ metadata.recordType.sample = Sample metadata.recordType.sampleArchive = Sample archive metadata.recordType.series = Data series metadata.recordType.service = Map (web service) -metadata.recordType.signpost = Dataset -metadata.recordType.nercSignpost = Signpost +metadata.recordType.signpost = Signpost +metadata.recordType.nercSignpost = Signpost metadata.recordType.software = Software metadata.recordType.thirdPartyDataset = Third-party dataset metadata.recordType.tile = Tile diff --git a/java/src/test/resources/uk/ac/ceh/gateway/catalogue/upload/simple/page.html b/java/src/test/resources/uk/ac/ceh/gateway/catalogue/upload/simple/page.html index 63ef2c7c0..dbb1b699c 100644 --- a/java/src/test/resources/uk/ac/ceh/gateway/catalogue/upload/simple/page.html +++ b/java/src/test/resources/uk/ac/ceh/gateway/catalogue/upload/simple/page.html @@ -21,7 +21,7 @@ -Test Catalogue +Test Catalogue
    diff --git a/templates/datacite/datacite.ftlx b/templates/datacite/datacite.ftlx index 7208f7fac..26964782e 100644 --- a/templates/datacite/datacite.ftlx +++ b/templates/datacite/datacite.ftlx @@ -27,8 +27,8 @@ <#assign subjectList = subjectList + descriptiveKeyword.keywords> - <#if doc.dataAttributes?has_content> - <#assign subjectList = subjectList + doc.dataAttributes> + <#if doc.observedProperties?has_content> + <#assign subjectList = subjectList + doc.observedProperties> <#if subjectList?has_content> <#list subjectList as subject> diff --git a/templates/functions.ftlh b/templates/functions.ftlh index aaf578cee..f5e238772 100644 --- a/templates/functions.ftlh +++ b/templates/functions.ftlh @@ -1,5 +1,5 @@ <#function recordTypeOrResourceType> - <#if metadata.catalogue == "eidc"> + <#if metadata.catalogue == "eidc" || metadata.catalogue == "elter" > <#return codes.lookup('metadata.recordType', resourceType.value)?lower_case> <#else> <#return codes.lookup('metadata.resourceType', resourceType.value)?lower_case> diff --git a/templates/html/blocks.ftlh b/templates/html/blocks.ftlh index b7654c324..f3be5c652 100644 --- a/templates/html/blocks.ftlh +++ b/templates/html/blocks.ftlh @@ -4,7 +4,7 @@ type from a code list. Also display a label if this document is currently in draft or is pending publication --> <#macro title title type> -
    +
    <#if title?has_content>

    diff --git a/templates/html/document/_distribution_signpost.ftlh b/templates/html/document/_distribution_signpost.ftlh index e9136cab7..69d46ab43 100644 --- a/templates/html/document/_distribution_signpost.ftlh +++ b/templates/html/document/_distribution_signpost.ftlh @@ -1,5 +1,3 @@ -
    -

    Get the data

    <#if resourceType.value == 'nercSignpost' > @@ -8,9 +6,3 @@ <#include "_signpost.ftlh">
    -
    -
    - - - - diff --git a/templates/html/document/_elterSpecific.ftlh b/templates/html/document/_elterSpecific.ftlh index 08b8ab2f4..583e3f46a 100644 --- a/templates/html/document/_elterSpecific.ftlh +++ b/templates/html/document/_elterSpecific.ftlh @@ -1,8 +1,8 @@ <#if deimsSites?? && deimsSites?size gt 0>
    -

    DEIMS sites

    +

    DEIMS site<#if deimsSites?size gt 1>s

    <#list deimsSites as site> - ${site.title}<#sep>
    + ${site.title}<#sep>
    diff --git a/templates/html/document/_footer.ftlh b/templates/html/document/_footer.ftlh index 51012638b..dac4c1283 100644 --- a/templates/html/document/_footer.ftlh +++ b/templates/html/document/_footer.ftlh @@ -5,24 +5,15 @@

    View as json <#if resourceType??> - <#if catalogue.id == "eidc" && citation??> - Datacite xml - ISO 19115 (XML) RDF (Turtle)

- diff --git a/templates/html/document/_linked.ftlh b/templates/html/document/_linked.ftlh index 686ee07d0..f74acdcf1 100644 --- a/templates/html/document/_linked.ftlh +++ b/templates/html/document/_linked.ftlh @@ -6,7 +6,7 @@ - <#if resourceStatus?? && resourceStatus?has_content && resourceStatus != "Available" && resourceStatus != "Controlled" && resourceStatus != "Unknown" > - <#assign notificationIcon = "fa-circle-info"> - <#if resourceStatus == "Restricted" > - <#assign notificationIcon = "fa-triangle-exclamation "> - - + <#if permission.userCanEditRestrictedFields(metadata.catalogue) && metadata.catalogue == "eidc">
<#include "document/_metadataqualityAlert.ftlh"> @@ -166,8 +187,6 @@
- - <#if permission.userCanEditRestrictedFields(metadata.catalogue) && metadata.catalogue == "eidc">
@@ -184,10 +203,8 @@ Edit

- -
- <#include "document/_footer.ftlh"> -
+ + <#include "document/_footer.ftlh"> +<#assign catalogueid=""> + <#macro master title catalogue="" rdf="" schemaorg="" canonical="" searching=false can_edit_restricted=false containerClass="container" scripts=defaultScripts> +<#assign catalogueid=""> +<#if catalogue?has_content> + <#assign catalogueid= catalogue.id > + + <#compress> -data-catalogue=${catalogue.id}> + @@ -52,9 +59,9 @@ <#if catalogue?has_content> - ${catalogue.title} + ${catalogue.title} <#else> - UKCEH + UKCEH
diff --git a/templates/rdf/ttl.ftlh b/templates/rdf/ttl.ftlh index 635fcefed..559f51974 100644 --- a/templates/rdf/ttl.ftlh +++ b/templates/rdf/ttl.ftlh @@ -107,7 +107,7 @@ - <#if type=='dataset' || type=='nonGeographicDataset'> + <#if type=='dataset' || type=='nonGeographicDataset' || type=='signpost'> <#include "turtle/_dataset.ftlh"> <#elseif type=='aggregate'|| type=='collection'|| type=='series'> <#include "turtle/_aggregation.ftlh"> diff --git a/templates/schema.org/schema.org.ftlh b/templates/schema.org/schema.org.ftlh index 5010e841b..4ade777f3 100644 --- a/templates/schema.org/schema.org.ftlh +++ b/templates/schema.org/schema.org.ftlh @@ -14,7 +14,7 @@ > -<#if type=='dataset' || type=='nonGeographicDataset'> +<#if type=='dataset' || type=='nonGeographicDataset' || type=='signpost'> <#assign docType = "Dataset"> <#elseif type=='aggregate' || type=='series'> <#assign docType = "Series"> @@ -56,8 +56,8 @@ "url":"${uri}", -<#if dataAttributes?? && dataAttributes?has_content> - "variableMeasured": [<#list dataAttributes as da>"${da.value}"<#sep>,], +<#if observedProperties?? && observedProperties?has_content> + "variableMeasured": [<#list observedProperties as op>"${op.value}"<#sep>,], <#if descriptiveKeywords?has_content> diff --git a/templates/xml/iso19115/_descriptiveKeywords.ftlx b/templates/xml/iso19115/_descriptiveKeywords.ftlx index 281c2e030..1aa473bb8 100644 --- a/templates/xml/iso19115/_descriptiveKeywords.ftlx +++ b/templates/xml/iso19115/_descriptiveKeywords.ftlx @@ -1,5 +1,5 @@ <#assign all_keywords = []> -<#if descriptiveKeywords?? || dataAttributes??> +<#if descriptiveKeywords?? || observeableProperties??> <#function controlledKeywords hash regex match=true> <#local result = []> @@ -25,8 +25,8 @@ - <#if dataAttributes??> - <#assign all_keywords = all_keywords + dataAttributes> + <#if observedProperties??> + <#assign all_keywords = all_keywords + observedProperties> <#assign diff --git a/web/img/CEHlogoSmall.png b/web/img/CEHlogoSmall.png deleted file mode 100644 index 7d82ab6eb..000000000 Binary files a/web/img/CEHlogoSmall.png and /dev/null differ diff --git a/web/img/NERC_EDS.png b/web/img/NERC_EDS.png new file mode 100644 index 000000000..08a44ecf9 Binary files /dev/null and b/web/img/NERC_EDS.png differ diff --git a/web/img/logo/datalabs.png b/web/img/cataloguelogo/datalabs.png similarity index 100% rename from web/img/logo/datalabs.png rename to web/img/cataloguelogo/datalabs.png diff --git a/web/img/logo/eidc.png b/web/img/cataloguelogo/eidc.png similarity index 100% rename from web/img/logo/eidc.png rename to web/img/cataloguelogo/eidc.png diff --git a/web/img/logo/elter.png b/web/img/cataloguelogo/elter.png similarity index 100% rename from web/img/logo/elter.png rename to web/img/cataloguelogo/elter.png diff --git a/web/img/logo/inms.png b/web/img/cataloguelogo/inms.png similarity index 100% rename from web/img/logo/inms.png rename to web/img/cataloguelogo/inms.png diff --git a/web/img/logo/ukceh.png b/web/img/cataloguelogo/ukceh.png similarity index 100% rename from web/img/logo/ukceh.png rename to web/img/cataloguelogo/ukceh.png diff --git a/web/img/elter/ozcar_logo.png b/web/img/elter/ozcar_logo.png new file mode 100644 index 000000000..4a69f80d9 Binary files /dev/null and b/web/img/elter/ozcar_logo.png differ diff --git a/web/img/elter/sites_logo.png b/web/img/elter/sites_logo.png new file mode 100644 index 000000000..3e97d4e1a Binary files /dev/null and b/web/img/elter/sites_logo.png differ diff --git a/web/img/ukceh_logo_mono.png b/web/img/ukceh_logo_mono.png new file mode 100644 index 000000000..f246350b8 Binary files /dev/null and b/web/img/ukceh_logo_mono.png differ diff --git a/web/less/metadata.less b/web/less/metadata.less index 2d457fff9..5cf318182 100644 --- a/web/less/metadata.less +++ b/web/less/metadata.less @@ -1,816 +1,899 @@ -:root { - --quality-success: hsl(120, 100%, 25%); - --quality-success-fade: hsl(120, 50%, 85%); - --quality-warning: hsl(34, 100%, 50%); - --quality-warning-fade: hsl(34, 50%, 85%); - --quality-info: hsl(240, 100%, 50%); - --quality-info-fade: hsl(240, 50%, 85%); - --quality-error: hsl(0, 100%, 50%); - --quality-error-fade: hsl(0, 50%, 85%); - --border_radius: 0.5em; -} -.metadata-grid { - .col1 { - grid-area: col1; - } - .col2 { - grid-area: col2; - } - display: grid; - grid-template-columns: auto 360px; - gap: 0 2em; - grid-template-areas: - "col2 col2" - "col1 col1"; -} - -#metadata { - .section { - padding: 2em 0; - &-grey { - background-color: hsl(0, 0%, 95%); - border: 1px solid #ccc; - border-width: 1px 0; - } - } - - .description { - display: grid; - grid-template-columns: auto fit-content(450px); - .browseimage { - display: none; - img { - padding: 1em; - max-width: 100%; - max-height: 200px; - } - } - .description-text { - line-height: @line-height-base; - } - - @media only screen and (min-width: 640px) { - .browseimage { - display: block; - } - } - } - - #section-title { - margin-top: 3em; - padding: 1em 0; - &:not(:has(.notification)) { - border-bottom: 1px solid @gray-light; - margin-bottom: 1em; - } - - h1 { - margin-top: 0; - margin-bottom: 0.2em; - } - - .authorList { - color: #717171; - } - - .doi { - font-size: 90%; - margin: 0; - } - - .alert-In-progress, - .alert-Embargoed { - .alert; - .alert-info; - } - - .alert-Superseded, - .alert-Withdrawn { - .alert; - .alert-danger; - } - } - - .publicationDate { - margin-top: 1.6em; - font-weight: bolder; - } - - .alert--linked { - margin: -1em 1em 1em 1em; - display: grid; - grid-template-columns: 1fr; - gap: 1em; - align-items: center; - justify-items: center; - border: 2px solid gray; - padding: 1em; - &-eidc { - display: grid; - grid-template-columns: 1fr; - align-items: center; - justify-items: center; - gap: 1em; - } - - > div { - font-weight: bold; - text-align: center; - } - } - - #latestVersion { - margin-bottom: 1.5em; - .otherVersions { - margin-left: 0.6em; - color: @link-color; - - &:hover { - color: @link-hover-color; - text-decoration: underline; - cursor: pointer; - } - } - - ul { - li { - a { - font-size: 0.85em; - padding: 0.75em 1.5em; - } - } - } - } - - .missingResourceType { - margin: 4em 0; - - a { - margin-left: 1em; - .btn; - .btn-danger; - .btn-xs; - } - } - - #qualityAlert { - .alert { - margin: 1em 0 -0.5em 0; - background-color: transparent; - border: 2px solid #aaa; - border-radius: 10px; - } - - .alert-MDquality_danger { - border-color: var(--quality-error); - color: var(--quality-error); - } - - .alert-MDquality_error { - border-color: var(--quality-error); - color: var(--quality-error); - } - - .alert-MDquality_warning { - border-color: var(--quality-warning); - color: var(--quality-warning); - } - - .alert-MDquality_info { - border-color: var(--quality-info); - color: var(--quality-info); - } - - span { - margin: 0 1.2em; - } - } - - .distribution-dataset { - > div { - margin-bottom: 2em; - } - .licenceText { - .ogl-logo { - margin-top: 0.3em; - .pull-right; - } - } - } - - .modal-body { - #citation-text { - margin: -0.5em 2em 2em 2em; - } - - .licenceText { - margin-top: 3em; - .text-center; - - img { - display: block; - margin: 5px auto; - } - } - } - - #document-description { - margin: 1em 0; - padding-top: 1em; - } - - #document-thirdparty { - display: block; - } - #section-children { - margin-top: 3em; - } - - #section-citations { - .citations { - max-height: 500px; - overflow-y: auto; - overflow-x: clip; - padding-right: 0.5em; - } - ::-webkit-scrollbar { - width: 8px; - } - ::-webkit-scrollbar-track { - background: #f1f1f1; - } - ::-webkit-scrollbar-thumb { - background: #ccc; - } - ::-webkit-scrollbar-thumb:hover { - background: #888; - } - ::-webkit-scrollbar-thumb:focus { - background: #888; - } - ::-webkit-scrollbar-thumb { - background: #888; - } - } - - .supplement, - .citation { - margin: 2em 0; - overflow: hidden; - } - - .notification { - --notification-color: @gray-light; - display: grid; - grid-template-columns: 50px auto; - border: 2px solid var(--notification-color); - gap: 1em; - padding: 1em; - margin: 1.6em 0 1em 0; - background-color: white; - border-radius: 6px; - align-items: center; - small { - font-size: 80%; - text-decoration: underline; - text-decoration-style: dotted; - } - span { - color: red; - font-weight: bolder; - } - &_icon { - text-align: center; - color: var(--notification-color); - } - p:last-of-type { - margin-bottom: 0; - } - &--Restricted { - --notification-color: red; - } - &--Restricted { - --notification-color: blue; - } - } - - #document-distribution { - .signpostURL { - display: block; - margin: 1em 0; - overflow: hidden; - text-overflow: ellipsis; - } - - .divider { - height: 1px; - background: @gray-light; - margin: 1.2em 0; - } - .onlineResourceLinks { - margin: 2em 0; - .btn { - margin: 0.8em 0; - color: white; - - &:active { - transform: translate(2px, 2px); - } - span:first-child { - margin-right: 0.35em; - } - &-download { - .btn-block; - font-weight: bold; - background-color: @brand-success; - &:hover, - &:focus { - background-color: lighten(@brand-success, 15%); - } - } - &-supporting { - .btn-block; - background-color: lighten(@brand-success, 15%); - &:hover, - &:focus { - background-color: lighten(@brand-success, 30%); - } - } - } - } - } - - .notice { - padding: 1em; - margin: 1em 0; - font-weight: bolder; - &-signpost { - display: grid; - grid-template-columns: 50px auto; - gap: 1em; - background-color: rgb(206, 219, 235); - - .licenceText { - display: none; - } - } - } - - #document-otherContacts { - dl.dl-horizontal { - dd, - dt { - margin-bottom: 0; - } - } - } - - h2 { - margin-top: 2.5em; - border-bottom: 1px solid @gray-light; - padding-bottom: 6px; - } - - .cards { - --card-background: hsl(0, 0%, 100%); - --card-inverse: @brand-success; - display: flex; - justify-content: center; - gap: 1em; - flex-wrap: wrap; - a.card { - display: grid; - width: 365px; - grid-template-columns: 70px auto; - border: 2px solid var(--card-inverse); - padding: 1rem; - background-color: var(--card-background); - border-radius: 8px; - text-decoration: none; - .content { - display: flex; - gap: 1em; - flex-direction: row; - } - .card-icon { - display: grid; - justify-content: center; - align-content: center; - width: 5rem; - height: 5rem; - border-radius: 8px; - background-color: var(--card-background); - color: var(--card-inverse); - } - .card-type { - color: #999; - } - .card-title { - color: black; - } - &:hover, - &:focus { - background-color: var(--card-inverse); - .card-type, - .card-title { - color: var(--card-background); - } - .fa-stack-2x { - display: none; - } - .fa-inverse { - --fa-inverse: var(--card-inverse); - } - } - } - } - - .list a.card { - display: block; - padding: 0.5em; - border-bottom: 1px solid #ddd; - .card-icon { - display: none; - } - .card-type { - display: inline-block; - margin-right: 1em; - } - .card-title { - display: inline-block; - font-weight: bold; - } - } - - .toggleList {text-align: right;} - - .panel-right { - .panel-title { - font-size: 1.4em; - font-weight: normal; - color: #bb4c1a; - margin-bottom: 0.5em; - } - } - - #adminPanel { - margin: 1.75em auto -1.75em auto; - - #adminToolbar, - .adminToolbar { - .btn-wide { - min-width: 10em; - } - } - - ul { - a { - font-size: 90%; - } - - div.msg { - margin: 1em; - white-space: nowrap; - } - } - } - - #studyarea-map, - #geometry-map { - height: 300px; - width: 300px; - } - - .mintDOI { - margin: 0 1em; - } - - // Prevent definition lists from wrapping the term - .dl-horizontal dt { - white-space: normal; - } - - .panel { - overflow-wrap: break-word; - } - - .panel, - .panel-heading { - border-radius: 0; - } - - .panel-heading { - padding: 0.5em 1em; - } - .externalVocabularyLink { - font-size: 0.85em; - } - .responsibleParty { - a.contactEmail { - margin-left: 0.5em; - font-size: 75%; - } - - a.contactEmail:hover { - background-color: #99aefd; - color: #fff; - text-decoration: none; - } - - .nameIdentifier { - font-size: 90%; - - span { - font-size: 80%; - margin-left: 0.75em; - } - } - - margin-bottom: 1.5em; - - address { - margin-bottom: 0; - } - } - - #document-authors { - a.moreAuthors { - &::after { - content: "fewer ↑"; - } - - span { - display: none; - } - } - - a.moreAuthors.collapsed { - &::after { - content: "more ↓"; - } - - span { - display: inline; - } - } - } - - #document-upload-panel { - border-radius: 0; - - .panel-body { - padding: 1em; - - p { - font-weight: bold; - font-size: 1.2em; - margin: 0; - } - } - } - - .funding { - .award { - .awardNumber { - margin-left: 2em; - } - } - } - - #associations { - div { - margin-bottom: 2.5em; - - p { - margin: 0 0 0.4em 3em; - } - } - } - - #section-onlineResources { - p { - margin-bottom: 1.5em; - } - } - - .panel { - border-radius: --var(border_radius); - - .panel-heading { - border-radius: --var(border_radius) --var(border_radius) 0 0; - } - } - - @media (min-width: 768px) { - .dl-horizontal dt { - width: 15em; - white-space: normal; - } - - .dl-horizontal dd { - margin-left: 16em; - margin-bottom: 0.3em; - } - - .alert--linked-eidc { - grid-template-columns: 240px auto; - } - } - - @media (min-width: 468px) { - .dl-horizontal dd { - margin-bottom: 1em; - } - } - - #section-metadataQuality { - .panel-heading { - color: #fff; - - .col-sm-9 { - text-align: right; - } - } - - .panel-heading.MDquality_error { - background-color: var(--quality-error); - } - - .panel-heading.MDquality_warning { - background-color: var(--quality-warning); - } - - .panel-heading.MDquality_info { - background-color: var(--quality-info); - } - - ul.MDquality_error { - li { - color: var(--quality-error); - font-weight: bold; - background-color: var(--quality-error-fade); - } - } - - ul.MDquality_warning { - li { - color: var(--quality-warning); - font-weight: bold; - background-color: var(--quality-warning-fade); - } - } - - ul.MDquality_info { - li { - background-color: var(--quality-info-fade); - } - } - - span { - color: #00d; - - &::before { - content: " «"; - } - - &::after { - content: "» "; - } - } - } - - .browseGraphic { - .pull-right; - margin: 0 0 1em 2em; - max-width: 30em; - max-height: 30em; - } -} - -#publication { - div { - margin: 4em auto; - text-align: center; - - .btn { - min-width: 18em; - } - } -} - -.footer { - background-color: #ccc; - padding-top: 1em; - position: absolute; - width: 100%; - bottom: 0; - span:not(:last-of-type)::after { - content: "|"; - margin: 0 1em; - } -} - -dl.dl-horizontal { - &--compact { - margin-left: 5rem; - dt { - overflow: hidden; - text-overflow: ellipsis; - } - - dd { - margin-bottom: 0.3rem !important; - } - } -} - -@media screen and (min-width: 768px) { - .ceh-model { - dl.dl-horizontal { - &--compact { - margin-left: 0; - } - } - } -} - -.ceh-model { - .description { - margin-bottom: 2em; - } - - section { - h2 { - color: gray; - margin-top: 4em; - border: none; - } - } - .key-value { - padding: 1.5em 0; - border-top: 1px solid lightgray; - &:first-of-type { - border: none; - } - - .key { - .key-name { - font-size: 1.1em; - font-weight: bold; - } - } - } -} - -.codeDocument { - .adminToolbar { - z-index: 1000; - position: absolute; - top: 8rem; - left: min(calc(100vw - 20em), 1120px); - width: fit-content; - } - - .grid { - display: grid; - grid-template-columns: auto 280px; - grid-template-areas: - "one one" - "two two" - "three three"; - - .grid--one { - grid-area: one; - } - .grid--two { - grid-area: two; - } - .grid--three { - grid-area: three; - } - @media screen and (min-width: 850px) { - --gridspacing: 1em; - grid-template-areas: - "one two" - "three two"; - .grid--two { - > div { - border-left: 1px solid lightgray; - padding-left: var(--gridspacing); - margin-left: var(--gridspacing); - } - } - } - } -} - -//MEDIA -@media only screen and (min-width: 1020px) { - .metadata-grid { - grid-template-areas: "col1 col2"; - .col2 { - border-left: 1px solid lightgray; - padding-left: 2em; - } - } -} +:root { + --quality-success: hsl(120, 100%, 25%); + --quality-success-fade: hsl(120, 50%, 85%); + --quality-warning: hsl(34, 100%, 50%); + --quality-warning-fade: hsl(34, 50%, 85%); + --quality-info: hsl(240, 100%, 50%); + --quality-info-fade: hsl(240, 50%, 85%); + --quality-error: hsl(0, 100%, 50%); + --quality-error-fade: hsl(0, 50%, 85%); + --border_radius: 0.5em; +} +.metadata-grid { + .col1 { + grid-area: col1; + } + .col2 { + grid-area: col2; + } + display: grid; + grid-template-columns: auto fit-content(360px); + gap: 2em 0; + grid-template-areas: + "col2 col2" + "col1 col1"; +} + +#metadata { + a { + word-break: break-word; + } + .section { + padding: 2em 0; + &-grey { + background-color: hsl(0, 0%, 95%); + border: 1px solid #ccc; + border-width: 1px 0; + } + } + + .description { + display: grid; + grid-template-columns: auto fit-content(450px); + .browseimage { + display: none; + img { + padding: 1em; + max-width: 100%; + max-height: 200px; + } + } + .description-text { + line-height: @line-height-base; + } + + @media only screen and (min-width: 640px) { + .browseimage { + display: block; + } + } + } + + #section-title { + margin-top: 3em; + padding: 1em 0; + &:not(:has(.notice)) { + border-bottom: 1px solid @gray-light; + margin-bottom: 1em; + } + + h1 { + margin-top: 0; + margin-bottom: 0.2em; + } + + .authorList { + color: #717171; + } + + .doi { + font-size: 90%; + margin: 0; + } + + .alert-In-progress, + .alert-Embargoed { + .alert; + .alert-info; + } + + .alert-Superseded, + .alert-Withdrawn { + .alert; + .alert-danger; + } + } + + .publicationDate { + margin-top: 1.6em; + font-weight: bolder; + } + + .alternativeViews { + .dropdown-toggle { + padding: 0.6em 1em; + + cursor: pointer; + } + &:hover, + &:selected { + background-color: rgba(0, 0, 0, 0.05); + } + &.open { + .dropdown-toggle { + box-shadow: none; + } + } + } + + .alert--linked { + margin: -1em 1em 1em 1em; + display: grid; + grid-template-columns: 1fr; + gap: 1em; + align-items: center; + justify-items: center; + border: 2px solid gray; + padding: 1em; + &-eidc { + display: grid; + grid-template-columns: 1fr; + align-items: center; + justify-items: center; + gap: 1em; + } + + > div { + font-weight: bold; + text-align: center; + } + } + + #latestVersion { + margin-bottom: 1.5em; + .otherVersions { + margin-left: 0.6em; + color: @link-color; + + &:hover { + color: @link-hover-color; + text-decoration: underline; + cursor: pointer; + } + } + + ul { + li { + a { + font-size: 0.85em; + padding: 0.75em 1.5em; + } + } + } + } + + .missingResourceType { + margin: 4em 0; + + a { + margin-left: 1em; + .btn; + .btn-danger; + .btn-xs; + } + } + + #qualityAlert { + .alert { + margin: 1em 0 -0.5em 0; + background-color: transparent; + border: 2px solid #aaa; + border-radius: 10px; + } + + .alert-MDquality_danger { + border-color: var(--quality-error); + color: var(--quality-error); + } + + .alert-MDquality_error { + border-color: var(--quality-error); + color: var(--quality-error); + } + + .alert-MDquality_warning { + border-color: var(--quality-warning); + color: var(--quality-warning); + } + + .alert-MDquality_info { + border-color: var(--quality-info); + color: var(--quality-info); + } + + span { + margin: 0 1.2em; + } + } + + .distribution-dataset { + > div { + margin-bottom: 2em; + } + .licenceText { + .ogl-logo { + margin-top: 0.3em; + .pull-right; + } + } + } + + .modal-body { + #citation-text { + margin: -0.5em 2em 2em 2em; + } + + .licenceText { + margin-top: 3em; + .text-center; + + img { + display: block; + margin: 5px auto; + } + } + } + + #document-description { + margin: 1em 0; + padding-top: 1em; + } + + #document-thirdparty { + display: block; + } + #section-children { + margin-top: 3em; + } + + #section-citations { + .citations { + max-height: 500px; + overflow-y: auto; + overflow-x: clip; + padding-right: 0.5em; + } + ::-webkit-scrollbar { + width: 8px; + } + ::-webkit-scrollbar-track { + background: #f1f1f1; + } + ::-webkit-scrollbar-thumb { + background: #ccc; + } + ::-webkit-scrollbar-thumb:hover { + background: #888; + } + ::-webkit-scrollbar-thumb:focus { + background: #888; + } + ::-webkit-scrollbar-thumb { + background: #888; + } + } + + .supplement, + .citation { + margin: 2em 0; + overflow: hidden; + } + + .notice { + --notice-background-color: white; + --notice-border-color: @gray-light; + --notice-border-width: 2px; + border: var(--notice-border-width) solid var(--notice-border-color); + padding: 1em; + margin: 1.4em 0; + background-color: var(--notice-background-color); + border-radius: 6px; + z-index: 1000; + small { + font-size: 80%; + text-decoration: underline; + text-decoration-style: dotted; + } + span { + color: red; + font-weight: bolder; + } + p:last-of-type { + margin-bottom: 0; + } + &--restricted { + --notice-color: red; + } + &-signpost { + .licenceText { + display: none; + } + } + } + + #document-distribution { + .signpostURL { + display: block; + margin: 1em 0; + overflow: hidden; + text-overflow: ellipsis; + } + + .divider { + height: 1px; + background: @gray-light; + margin: 1.2em 0; + } + .onlineResourceLinks { + margin: 2em 0; + .btn { + margin: 0.8em 0; + color: white; + + &:active { + transform: translate(2px, 2px); + } + span:first-child { + margin-right: 0.35em; + } + &-download { + .btn-block; + font-weight: bold; + background-color: @brand-success; + &:hover, + &:focus { + background-color: lighten(@brand-success, 15%); + } + } + &-supporting { + .btn-block; + background-color: lighten(@brand-success, 15%); + &:hover, + &:focus { + background-color: lighten(@brand-success, 30%); + } + } + } + } + } + + #document-otherContacts { + dl.dl-horizontal { + dd, + dt { + margin-bottom: 0; + } + } + } + + h2 { + margin-top: 2.5em; + border-bottom: 1px solid @gray-light; + padding-bottom: 6px; + } + + .cards { + --card-background: hsl(0, 0%, 100%); + --card-inverse: @brand-success; + display: flex; + justify-content: center; + gap: 1em; + flex-wrap: wrap; + a.card { + display: grid; + width: 365px; + grid-template-columns: 70px auto; + border: 2px solid var(--card-inverse); + padding: 1rem; + background-color: var(--card-background); + border-radius: 8px; + text-decoration: none; + .content { + display: flex; + gap: 1em; + flex-direction: row; + } + .card-icon { + display: grid; + justify-content: center; + align-content: center; + width: 5rem; + height: 5rem; + border-radius: 8px; + background-color: var(--card-background); + color: var(--card-inverse); + } + .card-type { + color: #999; + } + .card-title { + color: black; + } + &:hover, + &:focus { + background-color: var(--card-inverse); + .card-type, + .card-title { + color: var(--card-background); + } + .fa-stack-2x { + display: none; + } + .fa-inverse { + --fa-inverse: var(--card-inverse); + } + } + } + } + + .list a.card { + display: block; + padding: 0.5em; + border-bottom: 1px solid #ddd; + .card-icon { + display: none; + } + .card-type { + display: inline-block; + margin-right: 1em; + } + .card-title { + display: inline-block; + font-weight: bold; + } + } + + .toggleList { + text-align: right; + } + + .panel-right { + .panel-title { + font-size: 1.4em; + font-weight: normal; + color: #bb4c1a; + margin-bottom: 0.5em; + } + } + + #adminPanel { + margin: 1.75em auto -1.75em auto; + + #adminToolbar, + .adminToolbar { + .btn-wide { + min-width: 10em; + } + } + + ul { + a { + font-size: 90%; + } + + div.msg { + margin: 1em; + white-space: nowrap; + } + } + } + + #studyarea-map, + #geometry-map { + height: 300px; + width: 300px; + } + + .mintDOI { + margin: 0 1em; + } + + // Prevent definition lists from wrapping the term + .dl-horizontal dt { + white-space: normal; + } + + .panel { + overflow-wrap: break-word; + } + + .panel, + .panel-heading { + border-radius: 0; + } + + .panel-heading { + padding: 0.5em 1em; + } + .externalVocabularyLink { + font-size: 0.85em; + } + .responsibleParty { + a.contactEmail { + margin-left: 0.5em; + font-size: 75%; + } + + a.contactEmail:hover { + background-color: #99aefd; + color: #fff; + text-decoration: none; + } + + .nameIdentifier { + font-size: 90%; + + span { + font-size: 80%; + margin-left: 0.75em; + } + } + + margin-bottom: 1.5em; + + address { + margin-bottom: 0; + } + } + + #document-authors { + a.moreAuthors { + &::after { + content: "fewer ↑"; + } + + span { + display: none; + } + } + + a.moreAuthors.collapsed { + &::after { + content: "more ↓"; + } + + span { + display: inline; + } + } + } + + #document-upload-panel { + border-radius: 0; + + .panel-body { + padding: 1em; + + p { + font-weight: bold; + font-size: 1.2em; + margin: 0; + } + } + } + + .funding { + .award { + .awardNumber { + margin-left: 2em; + } + } + } + + #associations { + div { + margin-bottom: 2.5em; + + p { + margin: 0 0 0.4em 3em; + } + } + } + + #section-onlineResources { + p { + margin-bottom: 1.5em; + } + } + + .panel { + border-radius: --var(border_radius); + + .panel-heading { + border-radius: --var(border_radius) --var(border_radius) 0 0; + } + } + + @media (min-width: 768px) { + .dl-horizontal dt { + width: 15em; + white-space: normal; + } + + .dl-horizontal dd { + margin-left: 16em; + margin-bottom: 0.3em; + } + + .alert--linked-eidc { + grid-template-columns: 240px auto; + } + } + + @media (min-width: 468px) { + .dl-horizontal dd { + margin-bottom: 1em; + } + } + + #section-metadataQuality { + .panel-heading { + color: #fff; + + .col-sm-9 { + text-align: right; + } + } + + .panel-heading.MDquality_error { + background-color: var(--quality-error); + } + + .panel-heading.MDquality_warning { + background-color: var(--quality-warning); + } + + .panel-heading.MDquality_info { + background-color: var(--quality-info); + } + + ul.MDquality_error { + li { + color: var(--quality-error); + font-weight: bold; + background-color: var(--quality-error-fade); + } + } + + ul.MDquality_warning { + li { + color: var(--quality-warning); + font-weight: bold; + background-color: var(--quality-warning-fade); + } + } + + ul.MDquality_info { + li { + background-color: var(--quality-info-fade); + } + } + + span { + color: #00d; + + &::before { + content: " «"; + } + + &::after { + content: "» "; + } + } + } + + .browseGraphic { + .pull-right; + margin: 0 0 1em 2em; + max-width: 30em; + max-height: 30em; + } + + /*SIGNPOST*/ + .signpost-content { + .signpost-logo { + grid-area: signpost-logo; + justify-self: right; + } + .signpost-text { + grid-area: signpost-text; + } + .signpost-url { + grid-area: signpost-url; + } + } + + #section-title { + .signpost-logo { + display: none; + } + .signpost-logo img { + max-width: 140px; + } + .signpost-content { + display: grid; + gap: 1em; + grid-template-columns: auto fit-content(120px); + grid-template-areas: + "signpost-text signpost-text" + "signpost-url signpost-url"; + } + @media only screen and (min-width: 420px) { + .signpost-content { + grid-template-areas: + "signpost-text signpost-logo" + "signpost-url signpost-logo"; + } + .signpost-logo { + display: block; + } + } + } + + .distribution-signpost { + .signpost-logo { + img { + max-width: 140px; + } + } + .signpost-content { + display: grid; + gap: 1em; + grid-template-columns: auto fit-content(200px); + grid-template-areas: + "signpost-logo signpost-logo" + "signpost-text signpost-text" + "signpost-url signpost-url"; + .signpost-logo { + justify-self: center; + } + } + + @media only screen and (max-width: 1020px) and (min-width: 420px) { + .signpost-content { + grid-template-areas: + "signpost-text signpost-logo" + "signpost-url signpost-logo"; + .signpost-logo { + justify-self: right; + } + } + } + } +} + +#publication { + div { + margin: 4em auto; + text-align: center; + + .btn { + min-width: 18em; + } + } +} + +.footer { + background-color: #ccc; + padding: 1em; + position: absolute; + width: 100%; + bottom: 0; + span { + &:not(:last-of-type)::after { + content: "|"; + margin: 0 0.6em; + } + } + .altviews { + span:first-of-type { + margin-left: 0.6em; + } + } +} + +dl.dl-horizontal { + &--compact { + margin-left: 5rem; + dt { + overflow: hidden; + text-overflow: ellipsis; + } + + dd { + margin-bottom: 0.3rem !important; + } + } +} + +@media screen and (min-width: 768px) { + .ceh-model { + dl.dl-horizontal { + &--compact { + margin-left: 0; + } + } + } +} + +.ceh-model { + .description { + margin-bottom: 2em; + } + + section { + h2 { + color: gray; + margin-top: 4em; + border: none; + } + } + .key-value { + padding: 1.5em 0; + border-top: 1px solid lightgray; + &:first-of-type { + border: none; + } + + .key { + .key-name { + font-size: 1.1em; + font-weight: bold; + } + } + } +} + +.codeDocument { + .adminToolbar { + z-index: 1000; + position: absolute; + top: 8rem; + left: min(calc(100vw - 20em), 1120px); + width: fit-content; + } + + .grid { + display: grid; + grid-template-columns: auto 280px; + grid-template-areas: + "one one" + "two two" + "three three"; + + .grid--one { + grid-area: one; + } + .grid--two { + grid-area: two; + } + .grid--three { + grid-area: three; + } + @media screen and (min-width: 850px) { + --gridspacing: 1em; + grid-template-areas: + "one two" + "three two"; + .grid--two { + > div { + border-left: 1px solid lightgray; + padding-left: var(--gridspacing); + margin-left: var(--gridspacing); + } + } + } + } +} + +//MEDIA +@media only screen and (min-width: 1020px) { + .metadata-grid { + gap: 0 2em; + grid-template-areas: "col1 col2"; + .col2:has(*) { + border-left: 1px solid lightgray; + padding-left: 2em; + } + } +} diff --git a/web/scripts/editor/src/editors/ElterEditorView.js b/web/scripts/editor/src/editors/ElterEditorView.js index 98147d019..4f7924bf0 100644 --- a/web/scripts/editor/src/editors/ElterEditorView.js +++ b/web/scripts/editor/src/editors/ElterEditorView.js @@ -16,7 +16,7 @@ import { SingleObjectView, SpatialReferenceSystemView, SpatialRepresentationTypeView, SpatialResolutionView, SupplementalView, TemporalExtentView, - TextareaView, TopicCategoryView, ElterProjectView, KeywordVocabularyView + TextareaView, TopicCategoryView, ElterProjectView, KeywordVocabularyView, ServiceView, MapDataSourceView } from '../views' import { AccessLimitation, @@ -25,7 +25,7 @@ import { InspireTheme, MultipleDate, OnlineResource, - ResourceType, SpatialResolution, + ResourceType, SpatialResolution, Service, MapDataSource, TopicCategory, ElterProject } from '../models' import EditorView from '../EditorView' @@ -558,6 +558,40 @@ export default EditorView.extend({ rows: 7, helpText: `

If this record is being retracted, the reasons for withdrawal or replacement should be explained here.

+` + }) + ] + }, + { + label: 'Web service', + title: 'Web service details', + views: [ + new ServiceView({ + model: this.model, + modelAttribute: 'service', + ModelType: Service, + label: 'Service' + }), + + new ParentView({ + model: this.model, + modelAttribute: 'mapDataDefinition.data', + ModelType: MapDataSource, + multiline: true, + label: 'Web map service', + ObjectInputView: MapDataSourceView, + helpText: `\ +

Link this metadata record to an ingested geospatial file and create a WMS (https://catalogue.ceh.ac.uk/maps/{METADATA_ID}?request=getCapabilities&service=WMS). The supported formats are:

+
    +
  • Shapefiles - Vector (ignore the .shp extension when specifying the path)
    • +
  • GeoTiff - Raster
    • +
+

To maximise performance, it is generally best to provide reprojected variants of data sources in common EPSG codes.

+

Vector datasets should be spatially indexed (using shptree)

+

Raster datasets should be provided with overviews. GeoTiff supports internal overviews.

+

The 'Byte?' option that appears for raster (GeoTiff) datasets is used to indicate whether the GeoTiff is a 'byte' or 'non-byte' datatype. +This is only needed if you configure 'Styling=Classification' for your GeoTiff.

+

Paths should be specified relative to the base of the datastore. e.g. 5b3fcf9f-19d4-4ad3-a8bb-0a5ea02c857e/my_shapefile

\ ` }) ] diff --git a/web/scripts/editor/src/editors/GeminiEditorView.js b/web/scripts/editor/src/editors/GeminiEditorView.js index 959bf0ad0..c2a436a5e 100644 --- a/web/scripts/editor/src/editors/GeminiEditorView.js +++ b/web/scripts/editor/src/editors/GeminiEditorView.js @@ -254,14 +254,6 @@ export default EditorView.extend({ ` }), - new ParentView({ - model: this.model, - modelAttribute: 'dataAttributes', - label: 'Data attributes', - ObjectInputView: KeywordVocabularyView, - multiline: true - }), - new ParentView({ model: this.model, ModelType: InspireTheme, @@ -721,6 +713,19 @@ This is only needed if you configure 'Stylying=Classification' for your GeoTiff. disabled }) ] + }, + { + label: 'beta', + title: 'Experimental', + views: [ + new ParentView({ + model: this.model, + modelAttribute: 'observedProperties', + label: 'Observed properties', + ObjectInputView: KeywordVocabularyView, + multiline: true + }) + ] } ] diff --git a/web/scripts/editor/src/models/ElterProject.js b/web/scripts/editor/src/models/ElterProject.js index 6e3d8b531..fc26910c8 100644 --- a/web/scripts/editor/src/models/ElterProject.js +++ b/web/scripts/editor/src/models/ElterProject.js @@ -6,7 +6,8 @@ export default Backbone.Model.extend({ }, uris: { - 'TA-RA project': 'https://elter-ri.eu/transnational-remote-access-ta-ra' + 'TA-RA project': 'http://vocabs.lter-europe.net/elter_cl/10684', + 'e-shape': '' }, initialize () { diff --git a/web/scripts/editor/src/templates/ElterProject.tpl b/web/scripts/editor/src/templates/ElterProject.tpl index 520e179c5..d55a23042 100644 --- a/web/scripts/editor/src/templates/ElterProject.tpl +++ b/web/scripts/editor/src/templates/ElterProject.tpl @@ -1,4 +1,5 @@ diff --git a/web/scripts/editor/src/templates/KeywordVocabulary.tpl b/web/scripts/editor/src/templates/KeywordVocabulary.tpl index 121563cbc..ea86786a4 100644 --- a/web/scripts/editor/src/templates/KeywordVocabulary.tpl +++ b/web/scripts/editor/src/templates/KeywordVocabulary.tpl @@ -1,6 +1,6 @@
- +
@@ -11,4 +11,4 @@
-
\ No newline at end of file +
diff --git a/web/scripts/editor/src/templates/RelatedRecord.tpl b/web/scripts/editor/src/templates/RelatedRecord.tpl index 7ed1090d8..5300b824d 100644 --- a/web/scripts/editor/src/templates/RelatedRecord.tpl +++ b/web/scripts/editor/src/templates/RelatedRecord.tpl @@ -1,16 +1,6 @@
-
- -
-
- -
-
-
-
- -
-
+
+
-
-
-
- -
-
- +
+
+
+ +
+
-
+
\ No newline at end of file