litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[VIVO-1438] Making the title of roles forms more i18n compliant (#62)

Browse source 
* Making the title of affiliation tab forms more i18n compliant
* Removing spaces
* Removing some more space
* Removing some French translation
* Removing changes out of scope of the Ticket.
* moving i18n modifications from Wilma specific theme to make them applicable application wide.
* reviews modifications
* removing roleCode variable
* Removing unnecessary variables roleCode,nameLabel and roleInLabel
* removing extra space
* putting back  "for" attributes.
* correcting for="endField"
This commit is contained in:
Kitio Fofack 2018-03-13 17:55:39 -04:00 • committed by Ben
parent 7fe329b329
commit aa5be86bd1
14 changed files with 95 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

39
webapp/src/main/webapp/i18n/vivo_all.properties
View file

@ -771,3 +771,42 @@ through_today = Publications through today's date
doi_link=Digital Object Identifier (DOI)
using_cache_time=Using information cached at
#
#New Entries for i18n purposes
#
edit_entry_for_head_role=: Edit this "head of" role
edit_entry_for_member_role=: Edit this membership
edit_entry_for_clinical_role=: Edit this clinical activity
edit_entry_for_attendee_role=: Edit this participation
edit_entry_for_organizer_role=: Edit this organizer role
edit_entry_for_editor_role=: Edit this editor role
edit_entry_for_service_provider_role=: Edit this service provider role
edit_entry_for_outreach_provider_role=: Edit this outreach provider role
edit_entry_for_researcher_role=: Edit this researcher role
edit_entry_for_reviewer_role=: Edit this reviewer role
edit_entry_for_teacher_role=: Edit this teaching role
create_entry_for_head_role=: Add a new "head of" role
create_entry_for_member_role=: Add a new membership
create_entry_for_clinical_role=: Add a new clinical activity
create_entry_for_attendee_role=: Add a new participation
create_entry_for_organizer_role=: Add a new Organizer role
create_entry_for_editor_role=: Add a new editor role
create_entry_for_service_provider_role=: Add a new service provider role
create_entry_for_outreach_provider_role=: Add a new outreach provider role
create_entry_for_researcher_role=: Add a new researcher role
create_entry_for_reviewer_role=: Add a new reviewer role
create_entry_for_teacher_role=: Add a new teaching role
save_changes=Save
start_capitalized = Start
end_capitalized = End
institution_name=Name of Institution
role_in_institution=Role in Institution
presentation_name_capitalized=Title of Presentation
role_in_presentation_capitalized=Role in Presentation
advisee_capitalized_first_name=First Name
advisee_capitalized_lastname=Last Name

8
webapp/src/main/webapp/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl
View file

@ -24,5 +24,9 @@ roleExamples-->
<#assign acMultipleTypes = "'true'" />
<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#EventSeries,http://purl.org/NET/c4dm/event.owl#Event'}" />
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">
<#assign editTitle = "${i18n().edit_entry_for_attendee_role}"/>
<#assign createTitle = "${i18n().create_entry_for_attendee_role}"/>
<#include "addRoleToPersonTwoStage.ftl">

4
webapp/src/main/webapp/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl
View file

@ -28,8 +28,12 @@ RoleToActivityPredicate
<#assign genericLabel = "${i18n().clinical_activity?capitalize}" />
<#assign acMultipleTypes = "'true'" />
<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#Project,http://purl.obolibrary.org/obo/ERO_0000005'}" />
<#assign editTitle = "${i18n().edit_entry_for_clinical_role}"/>
<#assign createTitle = "${i18n().create_entry_for_clinical_role}"/>
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">

7
webapp/src/main/webapp/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl
View file

@ -24,5 +24,10 @@ roleExamples-->
<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Collection'}" />
<#assign editTitle = "${i18n().edit_entry_for_editor_role}"/>
<#assign createTitle = "${i18n().create_entry_for_editor_role}"/>
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">
<#include "addRoleToPersonTwoStage.ftl">

6
webapp/src/main/webapp/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl
View file

@ -17,12 +17,16 @@ showRoleLAbelField
roleExamples-->
<#--Variable assignments for Add Clinical Role To Person-->
<#--Variable assignments for Add Head Role To Person-->
<#assign roleDescriptor = "${i18n().leadership}" />
<#assign typeSelectorLabel = "${i18n().organization_type}" />
<#assign genericLabel = "${i18n().organization_capitalized}" />
<#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization'}" />
<#assign editTitle = "${i18n().edit_entry_for_head_role}"/>
<#assign createTitle = "${i18n().create_entry_for_head_role}"/>
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">

9
webapp/src/main/webapp/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl
View file

@ -17,12 +17,17 @@ showRoleLAbelField
roleExamples-->
<#--Variable assignments for Add Clinical Role To Person-->
<#--Variable assignments for Add Member Role To Person-->
<#assign roleDescriptor = "${i18n().membership}" />
<#assign typeSelectorLabel = "${i18n().membership_in}" />
<#assign roleActivityVClass = "${i18n().organizations}" />
<#assign genericLabel = "${i18n().organization_capitalized}" />
<#assign acMultipleTypes = "'true'" />
<#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization,http://xmlns.com/foaf/0.1/Group,http://purl.obolibrary.org/obo/OBI_0000835'}" />
<#assign editTitle = "${i18n().edit_entry_for_member_role}"/>
<#assign createTitle = "${i18n().create_entry_for_member_role}"/>
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">
<#include "addRoleToPersonTwoStage.ftl">

4
webapp/src/main/webapp/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl
View file

@ -24,5 +24,9 @@ roleExamples-->
<#assign acMultipleTypes = "'true'" />
<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#EventSeries,http://purl.org/NET/c4dm/event.owl#Event'}">
<#assign editTitle = "${i18n().edit_entry_for_head_role}"/>
<#assign createTitle = "${i18n().create_entry_for_organizer_role}"/>
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">

3
webapp/src/main/webapp/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl
View file

@ -25,6 +25,9 @@ roleExamples-->
<#assign acMultipleTypes = "'true'" />
<#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization,http://xmlns.com/foaf/0.1/Group,http://purl.obolibrary.org/obo/OBI_0000835,http://purl.org/NET/c4dm/event.owl#Event'}" />
<#assign editTitle = "${i18n().edit_entry_for_outreach_provider_role}"/>
<#assign createTitle = "${i18n().create_entry_for_outreach_provider_role}"/>
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">

4
webapp/src/main/webapp/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
View file

@ -110,7 +110,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
</p>
<p>
<label for="presentation">${i18n().presentation_capitalized} ${i18n().name_capitalized} ${requiredHint}</label>
<label for="presentation">${i18n().presentation_name_capitalized} ${requiredHint}</label>
<input class="acSelector" size="50" type="text" id="presentation" acGroupName="presentation" name="presentationLabel" value="${presentationLabelValue}">
<input class="display" type="hidden" id="presentationDisplay" acGroupName="presentation" name="presentationLabelDisplay" value="${presentationLabelDisplayValue}">
</p>
@ -125,7 +125,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
<input class="acUriReceiver" type="hidden" id="presentationUri" name="existingPresentation" value="${existingPresentationValue}" ${flagClearLabelForExisting}="true" />
</div>
<p><label for="roleLabel">${i18n().role_in} ${i18n().presentation_capitalized} <span class="hint">(${i18n().presentation_hint})</span></label>
<p><label for="roleLabel">${i18n().role_in_presentation_capitalized} <span class="hint">(${i18n().presentation_hint})</span></label>
<input size="50" type="text" id="roleLabel" name="roleLabel" value="${roleLabelValue}" />
</p>
<p>

6
webapp/src/main/webapp/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl
View file

@ -23,7 +23,13 @@ roleExamples-->
<#assign genericLabel = "${i18n().research_activity?capitalize}" />
<#assign acMultipleTypes = "'true'" />
<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#Project,http://vivoweb.org/ontology/core#Grant'}" />
<#assign editTitle = "${i18n().edit_entry_for_researcher_role}"/>
<#assign createTitle = "${i18n().create_entry_for_researcher_role}"/>
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">

4
webapp/src/main/webapp/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl
View file

@ -25,6 +25,10 @@ roleExamples-->
<#assign acMultipleTypes = "'true'" />
<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Document,http://purl.org/ontology/bibo/Collection'}" />
<#assign editTitle = "${i18n().edit_entry_for_reviewer_role}"/>
<#assign createTitle = "${i18n().create_entry_for_reviewer_role}"/>
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">

4
webapp/src/main/webapp/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl
View file

@ -43,6 +43,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
<#--Setting values for titleVerb, submitButonText, and disabled Value-->
<#if editConfiguration.objectUri?has_content>
<#assign titleVerb = "${i18n().edit_capitalized}"/>
<#assign title= editTitle/>
<#assign submitButtonText>${i18n().save_changes}</#assign>
<#if editMode = "repair">
<#assign disabledVal = ""/>
@ -50,6 +51,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
<#assign disabledVal = "disabled"/>
</#if>
<#else>
<#assign title= createTitle/>
<#assign titleVerb = "${i18n().create_capitalized}"/>
<#assign submitButtonText>${i18n().create_entry}</#assign>
<#assign disabledVal = ""/>
@ -77,8 +79,8 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
<#assign requiredHint = "<span class='requiredHint'> *</span>" />
<#assign yearHint = "<span class='hint'>(${i18n().year_hint_format})</span>" />
<h2>${titleVerb}&nbsp;${roleDescriptor} ${i18n().entry_for} ${editConfiguration.subjectName}</h2>
<h2>${editConfiguration.subjectName}${title} </h2>
<#--Display error messages if any-->
<#if activityLabelDisplayValue?has_content >
<#assign activityLabelValue = activityLabelDisplayValue />

5
webapp/src/main/webapp/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl
View file

@ -25,7 +25,12 @@ roleExamples-->
<#assign genericLabel = "${i18n().teaching_activity?capitalize}" />
<#assign acMultipleTypes = "'true'" />
<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Conference,http://vivoweb.org/ontology/core#Course,http://purl.org/ontology/bibo/Workshop'}" />
<#assign editTitle = "${i18n().edit_entry_for_teacher_role}"/>
<#assign createTitle = "${i18n().create_entry_for_teacher_role}"/>
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">

1
webapp/src/main/webapp/themes/wilma/i18n/all.properties
View file

@ -106,3 +106,4 @@ organizer_role = Organizer Role
faculty_memberships = Faculty Memberships
edit_mailing_address = Edit Mailing Address
add_capitalized = Add