diff --git a/languages/example/themes/wilma/i18n/all_es.properties b/languages/example/themes/wilma/i18n/all_es.properties index c779a684..1dc13fa6 100644 --- a/languages/example/themes/wilma/i18n/all_es.properties +++ b/languages/example/themes/wilma/i18n/all_es.properties @@ -869,4 +869,10 @@ select_credential_or_enter_name = Por favor, introduzca o seleccione un valor en type_of_credential = Tipo de Credencial credential_name = Nombre de Credencial selected_credential = Credential seleccionado -year_issued = Año de Emisión \ No newline at end of file +year_issued = Año de Emisión +year_awarded_for = año otorgado por +create_year_awarded = Crear año concede +edit_year_awarded = Editar año concede +publication_date_for = fecha de publicación de +create_publication_date = Crear fecha de publicación +edit_publication_date = Editar fecha de publicación diff --git a/productMods/config/listViewConfig-issuedCredential.xml b/productMods/config/listViewConfig-issuedCredential.xml index a59a9fd1..349187ad 100644 --- a/productMods/config/listViewConfig-issuedCredential.xml +++ b/productMods/config/listViewConfig-issuedCredential.xml @@ -44,7 +44,7 @@ ?dateTimeEndValue core:dateTime ?dateTimeEnd } } - OPTIONAL { ?issuedCredential core:dateTimeValue ?dateTimeValue + OPTIONAL { ?issuedCredential core:dateIssued ?dateTimeValue OPTIONAL { ?dateTimeValue core:dateTime ?dateTime } } } ORDER BY DESC(?dateTime) DESC(?dateTimeEnd) @@ -136,12 +136,12 @@ CONSTRUCT { ?subject ?property ?issuedCredential . ?issuedCredential a core:IssuedCredential . - ?issuedCredential core:dateTimeValue ?dateTimeValue . + ?issuedCredential core:dateIssued ?dateTimeValue . ?dateTimeValue core:dateTime ?dateTime } WHERE { ?subject ?property ?issuedCredential . ?issuedCredential a core:IssuedCredential . - ?issuedCredential core:dateTimeValue ?dateTimeValue . + ?issuedCredential core:dateIssued ?dateTimeValue . ?dateTimeValue core:dateTime ?dateTime } diff --git a/productMods/templates/freemarker/edit/forms/dateTimeValueForm.ftl b/productMods/templates/freemarker/edit/forms/dateTimeValueForm.ftl new file mode 100644 index 00000000..48439917 --- /dev/null +++ b/productMods/templates/freemarker/edit/forms/dateTimeValueForm.ftl @@ -0,0 +1,58 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Template for adding/editing time values --> + +<#--Retrieve certain edit configuration information--> +<#assign editMode = editConfiguration.pageData.editMode /> +<#assign htmlForElements = editConfiguration.pageData.htmlForElements /> +<#assign domainUri = editConfiguration.pageData.domainUri!"" /> + +<#if editMode == "edit"> + <#assign titleVerb="${i18n().edit_capitalized}"> + <#assign disabledVal="disabled"> + <#assign submitButtonText="${i18n().edit_date_time_value}"> +<#else> + <#assign titleVerb="${i18n().create_capitalized}"> + <#assign submitButtonText="${i18n().create_date_time_value}"> + <#assign disabledVal=""/> +#if> +<#if domainUri?contains("IAO_0000030")> + <#assign titleObject="${i18n().publication_date_for}"> + <#if editMode == "edit"> + <#assign submitButtonText="${i18n().edit_publication_date}"> + <#else> + <#assign submitButtonText="${i18n().create_publication_date}"> + #if> +<#elseif domainUri?contains("AwardReceipt")> + <#assign titleObject="${i18n().year_awarded_for}"> + <#if editMode == "edit"> + <#assign submitButtonText="${i18n().edit_year_awarded}"> + <#else> + <#assign submitButtonText="${i18n().create_year_awarded}"> + #if> +<#else> + <#assign titleObject="${i18n().date_time_value_for}"> +#if> + +