Merge remote-tracking branch 'upstream/main' into fix-enabling-video-mediaviewer-without-image-mediaviewer-main

# Conflicts:
#	src/app/item-page/simple/item-types/publication/publication.component.html
#	src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
This commit is contained in:
Alexandre Vryghem
2023-03-29 10:12:16 +02:00
7 changed files with 234 additions and 32 deletions

View File

@@ -1,6 +1,20 @@
.ngx-gallery {
display: inline-block;
margin-bottom: 20px;
width: 340px !important;
height: 279px !important;
:host ::ng-deep {
.ngx-gallery {
width: unset !important;
height: unset !important;
}
ngx-gallery-image {
max-width: 340px !important;
.ngx-gallery-image {
background-position: left;
}
}
ngx-gallery-image:after {
padding-top: 75%;
display: block;
content: '';
}
}

View File

@@ -1,4 +1,10 @@
video {
width: 340px;
height: 279px;
width: 100%;
height: auto;
max-width: 340px;
}
.buttons {
display: flex;
gap: .25rem;
}

View File

@@ -20,9 +20,9 @@
<ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
</ds-metadata-field-wrapper>
</ng-container>
<ng-container *ngIf="mediaViewer.image || mediaViewer.video">
<div *ngIf="mediaViewer.image || mediaViewer.video" class="mb-2">
<ds-themed-media-viewer [item]="object"></ds-themed-media-viewer>
</ng-container>
</div>
<ds-themed-item-page-file-section [item]="object"></ds-themed-item-page-file-section>
<ds-item-page-date-field [item]="object"></ds-item-page-date-field>
<ds-themed-metadata-representation-list class="ds-item-page-mixed-author-field"

View File

@@ -16,14 +16,14 @@
</div>
<div class="row">
<div class="col-xs-12 col-md-4">
<ng-container *ngIf="!mediaViewer.image">
<ng-container *ngIf="!(mediaViewer.image || mediaViewer.video)">
<ds-metadata-field-wrapper [hideIfNoTextContent]="false">
<ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
</ds-metadata-field-wrapper>
</ng-container>
<ng-container *ngIf="mediaViewer.image || mediaViewer.video">
<div *ngIf="mediaViewer.image || mediaViewer.video" class="mb-2">
<ds-themed-media-viewer [item]="object"></ds-themed-media-viewer>
</ng-container>
</div>
<ds-themed-item-page-file-section [item]="object"></ds-themed-item-page-file-section>
<ds-item-page-date-field [item]="object"></ds-item-page-date-field>
<ds-themed-metadata-representation-list class="ds-item-page-mixed-author-field"

View File

@@ -2680,7 +2680,7 @@
"itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
"itemtemplate.edit.metadata.notifications.discarded.title": "Changed discarded",
"itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
"itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
@@ -2690,7 +2690,7 @@
"itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
"itemtemplate.edit.metadata.notifications.outdated.title": "Changed outdated",
"itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
"itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",

View File

@@ -156,7 +156,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "Nimi",
// TODO New key - Add a translation
// "admin.registries.bitstream-formats.table.id" : "ID",
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Return",
@@ -207,7 +208,7 @@
"admin.registries.metadata.schemas.table.delete": "Poista valittu",
// "admin.registries.metadata.schemas.table.id": "ID",
"admin.registries.metadata.schemas.table.id": "ID-tunnus",
"admin.registries.metadata.schemas.table.id": "ID",
// "admin.registries.metadata.schemas.table.name": "Name",
"admin.registries.metadata.schemas.table.name": "Nimi",
@@ -237,7 +238,8 @@
// "admin.registries.schema.fields.table.field": "Field",
"admin.registries.schema.fields.table.field": "Kenttä",
// TODO New key - Add a translation
// "admin.registries.schema.fields.table.id" : "ID",
"admin.registries.schema.fields.table.id" : "ID",
// "admin.registries.schema.fields.table.scopenote": "Scope Note",
@@ -408,7 +410,7 @@
"admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Jäsenenä näissä ryhmissä:",
// "admin.access-control.epeople.form.table.id": "ID",
"admin.access-control.epeople.form.table.id": "ID-tunnus",
"admin.access-control.epeople.form.table.id": "ID",
// "admin.access-control.epeople.form.table.name": "Name",
"admin.access-control.epeople.form.table.name": "Nimi",
@@ -2495,7 +2497,7 @@
"item.edit.tabs.status.buttons.reinstate.label": "Palauta tietue arkistoon",
// "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
"item.edit.tabs.status.buttons.withdraw.button": "poista tämä kohde",
"item.edit.tabs.status.buttons.withdraw.button": "Poista tämä kohde",
// "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
"item.edit.tabs.status.buttons.withdraw.label": "Poista tietue käytöstä",
@@ -2510,7 +2512,7 @@
"item.edit.tabs.status.labels.handle": "Handle-tunnus",
// "item.edit.tabs.status.labels.id": "Item Internal ID",
"item.edit.tabs.status.labels.id": "Tietueen sisäinen ID-tunnus",
"item.edit.tabs.status.labels.id": "Tietueen sisäinen ID",
// "item.edit.tabs.status.labels.itemPage": "Item Page",
"item.edit.tabs.status.labels.itemPage": "Tietueen tiedot",
@@ -3351,7 +3353,7 @@
"orgunit.page.edit": "Muokkaa tietuetta",
// "orgunit.page.id": "ID",
"orgunit.page.id": "ID-tunnus",
"orgunit.page.id": "ID",
// "orgunit.page.titleprefix": "Organizational Unit: ",
"orgunit.page.titleprefix": "Organisaatioyksikkö: ",
@@ -3403,7 +3405,7 @@
"person.page.orcid": "ORCID-tunniste",
// "person.page.staffid": "Staff ID",
"person.page.staffid": "Henkilökunnan ID-tunnus",
"person.page.staffid": "Henkilökunnan ID",
// "person.page.titleprefix": "Person: ",
"person.page.titleprefix": "Käyttäjä: ",
@@ -3655,7 +3657,7 @@
"project.page.funder": "Rahoittajat",
// "project.page.id": "ID",
"project.page.id": "ID-tunnus",
"project.page.id": "ID",
// "project.page.keyword": "Keywords",
"project.page.keyword": "Asiasanat",
@@ -3939,7 +3941,7 @@
"resource-policies.form.eperson-group-list.table.headers.action": "Toimenpide",
// "resource-policies.form.eperson-group-list.table.headers.id": "ID",
"resource-policies.form.eperson-group-list.table.headers.id": "ID-tunnus",
"resource-policies.form.eperson-group-list.table.headers.id": "ID",
// "resource-policies.form.eperson-group-list.table.headers.name": "Name",
"resource-policies.form.eperson-group-list.table.headers.name": "Nimi",
@@ -3987,7 +3989,7 @@
"resource-policies.table.headers.group": "Ryhmä",
// "resource-policies.table.headers.id": "ID",
"resource-policies.table.headers.id": "ID-tunnus",
"resource-policies.table.headers.id": "ID",
// "resource-policies.table.headers.name": "Name",
"resource-policies.table.headers.name": "Nimi",
@@ -4914,8 +4916,8 @@
// "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
"submission.sections.upload.header.policy.default.withlist": "Yksittäisten tiedostojen pääsyrajoitusten lisäksi {{collectionName}}-kokoelmaan ladatut tiedostot ovat seuraavien ryhmien saatavilla:",
// "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files by dragging & dropping them anywhere on the page.</strong>",
"submission.sections.upload.info": "Tietueen kaikki tiedostot on lueteltu tässä. Voit päivittää tiedoston metadataa ja pääsyehtoja tai <strong>ladata lisää tiedostoja raahaamalla ne mihin hyvänsä sivun kohtaan</strong>",
// "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files just dragging & dropping them everywhere in the page</strong>",
"submission.sections.upload.info": "Tietueen kaikki tiedostot on lueteltu tässä. Voit päivittää tiedoston metadataa ja pääsyehtoja tai <strong>ladata lisää tiedostoja raahaamalla ne mihin hyvänsä sivun kohtaan.</strong>",
// "submission.sections.upload.no-entry": "No",
"submission.sections.upload.no-entry": "Ei",
@@ -5066,8 +5068,7 @@
"uploader.or": " tai",
// "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
// TODO Source message changed - Revise the translation
"uploader.processing": "Käsitellään",
"uploader.processing": "Käsitellään ladattuja tiedostoja... (voit sulkea tämän sivun)",
// "uploader.queue-length": "Queue length",
"uploader.queue-length": "Jonon pituus",

View File

@@ -951,6 +951,9 @@
// "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
"bitstream-request-a-copy.submit.error": "Un problème est survenu lors de la soumission de la demande d'Item",
//"browse.back.all-results": "All browse results",
"browse.back.all-results": "Tous les résultats",
// "browse.comcol.by.author": "By Author",
"browse.comcol.by.author": "Auteur",
@@ -1068,9 +1071,18 @@
// "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
"browse.title": "Parcourir la collection {{ collection }} par {{ field }} {{ value }}",
//"browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
"browse.title.page": "Parcourir la collection {{ collection }} par {{ field }} {{ value }}",
//"search.browse.item-back": "Back to Results",
"search.browse.item-back": "Retour aux résultats",
// "chips.remove": "Remove chip",
"chips.remove": "Supprimer fragment",
//"claimed-approved-search-result-list-element.title": "Approved",
"claimed-approved-search-result-list-element.title": "Approuvé",
// "collection.create.head": "Create a Collection",
"collection.create.head": "Créer une collection",
@@ -1718,6 +1730,9 @@
// "cookies.consent.decline": "Decline",
"cookies.consent.decline": "Refuser",
//"cookies.consent.ok": "That's ok",
"cookies.consent.ok": "Accepter",
// "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
"cookies.consent.content-notice.description": "Vos données personnelles sont récupérées et utilisées dans les contextes suivants : <strong>authentification, préférences, consentement et statistiques</strong>. <br/> Pour plus d'informations, veuillez vous référer à la {privacyPolicy}.",
@@ -1883,6 +1898,9 @@
// "dso-selector.set-scope.community.button": "Search all of DSpace",
"dso-selector.set-scope.community.button": "Chercher dans toutes les collections",
//"dso-selector.set-scope.community.or-divider": "or",
"dso-selector.set-scope.community.or-divider": "ou",
// "dso-selector.set-scope.community.input-header": "Search for a community or collection",
"dso-selector.set-scope.community.input-header": "Chercher une communauté ou une collection",
@@ -2495,6 +2513,71 @@
// "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
"item.edit.tabs.item-mapper.title": "Édition d'Item - Association de collection",
// "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
"item.edit.identifiers.doi.status.UNKNOWN": "Inconnu",
// "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
"item.edit.identifiers.doi.status.TO_BE_REGISTERED": "En attente d'inscription",
// "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
"item.edit.identifiers.doi.status.TO_BE_RESERVED": "En attente de réservation",
// "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
"item.edit.identifiers.doi.status.IS_REGISTERED": "Inscrit",
// "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
"item.edit.identifiers.doi.status.IS_RESERVED": "Réseré",
// "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
"item.edit.identifiers.doi.status.UPDATE_RESERVED": "Réservé (en attente)",
// "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
"item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Inscrit (en attente)",
// "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
"item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "En attente pour la mise à jour et l'inscription",
// "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
"item.edit.identifiers.doi.status.TO_BE_DELETED": "En attente pour la suppression",
// "item.edit.identifiers.doi.status.DELETED": "Deleted",
"item.edit.identifiers.doi.status.DELETED": "Supprimé",
// "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
"item.edit.identifiers.doi.status.PENDING": "En attente (non inscrit)",
// "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
"item.edit.identifiers.doi.status.MINTED": "Émis (non inscrit)",
// "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
"item.edit.tabs.status.buttons.register-doi.label": "Inscrire un nouveau DOI ou un DOI en attente",
// "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
"item.edit.tabs.status.buttons.register-doi.button": "Inscrire le DOI...",
// "item.edit.register-doi.header": "Register a new or pending DOI",
"item.edit.register-doi.header": "Inscrire un nouveau DOI ou un DOI en attente",
// "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
"item.edit.register-doi.description": "Réviser les identifiants en attente and les métadonnées ci-dessous item metadata below puis cliquer sur Confirmer afin de lancer l'inscription du DOI ou sur Annuler pour interrompre l'inscription",
// "item.edit.register-doi.confirm": "Confirm",
"item.edit.register-doi.confirm": "Confirmer",
// "item.edit.register-doi.cancel": "Cancel",
"item.edit.register-doi.cancel": "Annuler",
// "item.edit.register-doi.success": "DOI queued for registration successfully.",
"item.edit.register-doi.success": "DOI mis en attente pour l'inscription.",
// "item.edit.register-doi.error": "Error registering DOI",
"item.edit.register-doi.error": "Erreur lors de l'inscription du DOI",
// "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
"item.edit.register-doi.to-update": "Le DOI suivant a déjà été généré et sera mis en attente pour être inscrit",
// "item.edit.item-mapper.buttons.add": "Map item to selected collections",
"item.edit.item-mapper.buttons.add": "Associer l'Item aux collections sélectionnées",
@@ -3738,6 +3821,9 @@
// "mydspace.show.workspace": "Your Submissions",
"mydspace.show.workspace": "Vos dépôts",
//"mydspace.show.supervisedWorkspace": "Supervised items",
"mydspace.show.supervisedWorkspace": "Items supervisés",
// "mydspace.status.archived": "Archived",
"mydspace.status.archived": "Archivés",
@@ -3804,6 +3890,9 @@
// "nav.stop-impersonating": "Stop impersonating EPerson",
"nav.stop-impersonating": "Retour à votre propre EPerson",
//"nav.subscriptions" : "Subscriptions",
"nav.subscriptions" : "Abonnements",
// "nav.toggle": "Toggle navigation",
"nav.toggle": "Basculer la navigation",
@@ -5060,6 +5149,9 @@
// "submission.import-external.source.crossref": "CrossRef",
"submission.import-external.source.crossref": "CrossRef (DOI)",
//"submission.import-external.source.datacite": "DataCite",
"submission.import-external.source.datacite": "DataCite (DOI)",
// "submission.import-external.source.scielo": "SciELO",
"submission.import-external.source.scielo": "SciELO",
@@ -5075,6 +5167,9 @@
// "submission.import-external.source.orcidWorks": "ORCID",
"submission.import-external.source.orcidWorks": "ORCID",
//"submission.import-external.source.epo": "European Patent Office (EPO)",
"submission.import-external.source.epo": "Office Européen des brevets (OEB)",
// "submission.import-external.source.loading": "Loading ...",
"submission.import-external.source.loading": "En cours de chargement ...",
@@ -5991,14 +6086,24 @@
// "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
"virtual-metadata.delete-relationship.modal-head": "Sélectionner les Items pour lesquels vous souhaitez sauvegarder les métadonnées virtuelles en tant que métadonnées réelles",
//"supervisedWorkspace.search.results.head": "Supervised Items",
"supervisedWorkspace.search.results.head": "Items supervisés",
//"workspace.search.results.head": "Your submissions",
"workspace.search.results.head": "Vos dépôts",
// "workspace.search.results.head": "Your submissions",
"workspace.search.results.head": "Vos soumissions",
"workspace.search.results.head": "Vos dépôts",
// "workflowAdmin.search.results.head": "Administer Workflow",
"workflowAdmin.search.results.head": "Workflow Administrateur",
// "workflow.search.results.head": "Workflow tasks",
"workflow.search.results.head": "Tableau de suivi",
//"supervision.search.results.head": "Workflow and Workspace tasks",
"supervision.search.results.head": "Tableau de suivi et dépôts en cours",
// "workflow-item.edit.breadcrumbs": "Edit workflowitem",
"workflow-item.edit.breadcrumbs": "Éditer l'Item du Workflow",
@@ -6072,7 +6177,83 @@
// "idle-modal.log-out": "Log out",
"idle-modal.log-out": "Déconnexion",
// "idle-modal.extend-session": "Extend session"
"idle-modal.extend-session": "Prolonger la session"
// "idle-modal.extend-session": "Extend session",
"idle-modal.extend-session": "Prolonger la session",
// "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
"system-wide-alert-banner.retrieval.error": "Une erreur s'est produite lors de la récupération de la bannière du message d'avertissement",
//"system-wide-alert-banner.countdown.prefix": "In",
"system-wide-alert-banner.countdown.prefix": "Dans",
// "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
"system-wide-alert-banner.countdown.days": "{{days}} jour(s),",
// "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
"system-wide-alert-banner.countdown.hours": "{{hours}} heure(s) et",
// "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
"system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
// "menu.section.system-wide-alert": "System-wide Alert",
"menu.section.system-wide-alert": "Messages d'avertissement",
// "system-wide-alert.form.header": "System-wide Alert",
"system-wide-alert.form.header": "Messages d'avertissement",
// "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
"system-wide-alert-form.retrieval.error": "Une erreur s'est produite lors de la récupération de la bannière du message d'avertissement",
//"system-wide-alert.form.cancel": "Cancel",
"system-wide-alert.form.cancel": "Annuler",
//"system-wide-alert.form.save": "Save",
"system-wide-alert.form.save": "Sauvegarder",
//"system-wide-alert.form.label.active": "ACTIVE",
"system-wide-alert.form.label.active": "ACTIF",
//"system-wide-alert.form.label.inactive": "INACTIVE",
"system-wide-alert.form.label.inactive": "INACTIF",
//"system-wide-alert.form.error.message": "The system wide alert must have a message",
"system-wide-alert.form.error.message": "Le message d'avertissement ne peut pas être vide",
//"system-wide-alert.form.label.message": "Alert message",
"system-wide-alert.form.label.message": "Message d'avertissement",
//"system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
"system-wide-alert.form.label.countdownTo.enable": "Activer un compte à rebours",
//"system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
"system-wide-alert.form.label.countdownTo.hint": "Lorsque cette option est activée, il est possible de fixer une date dans le futur et la bannière du message d'avertissement effectuera un compte à rebours jusqu'à la date fixée. À la fin du compte à rebours, le message d'avertissement disparaîtra mais le serveur ne sera pas arrêté automatiquement.",
//"system-wide-alert.form.label.preview": "System-wide alert preview",
"system-wide-alert.form.label.preview": "Aperçu du message d'avertissement",
//"system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
"system-wide-alert.form.update.success": "Le message d'avertissement a été mis à jour",
//"system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
"system-wide-alert.form.update.error": "Un erreur s'est produite lors de la mise à jour du message d'avertissement",
//"system-wide-alert.form.create.success": "The system-wide alert was successfully created",
"system-wide-alert.form.create.success": "Le message d'avertissement a été crée",
//"system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
"system-wide-alert.form.create.error": "Un erreur s'est produite lors de la création du message d'avertissement",
//"admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
"admin.system-wide-alert.breadcrumbs": "Messages d'avertissement",
//"admin.system-wide-alert.title": "System-wide Alerts",
"admin.system-wide-alert.title": "Messages d'avertissement",
}