style="float:left;border-right:1px solid #A6B1B0;"> <#-- Label --> - <@p.label individual editable labelCount/> + <@p.label individual editable labelCount localesCount/>
<#-- Display preferredTitle if it exists; otherwise mostSpecificTypes --> <#assign title = propertyGroups.pullProperty("${core}preferredTitle")!> @@ -51,7 +54,7 @@${statement.value}
<#else>
${statement.value}
- <@p.editingLinks "${title.name}" statement editable />
+ <@p.editingLinks "${title.name}" "" statement editable />
diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
index 810250b5..f957f097 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
@@ -12,6 +12,9 @@
<#if !labelCount??>
<#assign labelCount = 0 >
+<#if !localesCount??>
+ <#assign localesCount = 1>
+
<#assign qrCodeIcon = "qr-code-icon.png">
<#assign individualImage>
<@p.image individual=individual
@@ -52,7 +55,7 @@
${individualImage}
style="float:left;border-right:1px solid #A6B1B0;"> <#-- Label --> - <@p.label individual editable labelCount/> + <@p.label individual editable labelCount localesCount/>
<#-- Display preferredTitle if it exists; otherwise mostSpecificTypes --> <#assign title = propertyGroups.pullProperty("${core}preferredTitle")!> @@ -63,7 +66,7 @@${statement.value}
<#else>
${statement.value}
- <@p.editingLinks "${title.name}" statement editable />
+ <@p.editingLinks "${title.name}" "" statement editable />
diff --git a/productMods/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl b/productMods/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
index 9c0985ed..aa3ea7f7 100644
--- a/productMods/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
+++ b/productMods/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
@@ -8,6 +8,12 @@
+ <#--TODO: With ISF changes, add middle name input-->
+
+
+
diff --git a/productMods/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl b/productMods/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl index c5b8b144..833f5e99 100644 --- a/productMods/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl +++ b/productMods/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl @@ -5,6 +5,9 @@ <#--Get existing value for specific data literals and uris, in case the form is returned because of an error--> <#assign firstNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "firstName")/> <#assign lastNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "lastName")/> +<#--With ISF changes, we also have a niddle name value, also add error field below--> +<#--assign middleNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "middleName") /--> + <#assign labelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "label")/> <#assign newLabelLanguageValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "newLabelLanguage")/> diff --git a/productMods/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl b/productMods/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl new file mode 100644 index 00000000..cca1dcb6 --- /dev/null +++ b/productMods/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl @@ -0,0 +1,4 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#--Some values for labels etc. may be different between vitro and other systems --> +<#assign returnText = "${i18n().return_to_profile}" /> \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl index a221398a..5a02ac66 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl @@ -1,9 +1,9 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- Contact info on individual profile page --> -<#assign phone = propertyGroups.pullProperty("${core}phoneNumber")!> -<#assign pEmail = propertyGroups.pullProperty("${core}primaryEmail")!> -<#assign email = propertyGroups.pullProperty("${core}email")!> +<#assign phone = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Telephone")!> +<#assign pEmail = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Work")!> +<#assign email = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Email")!> <#if editable || ( phone?has_content || pEmail?has_content || email?has_content ) >
${i18n().contact_capitalized}
@@ -39,8 +39,8 @@-
<#list phone.statements as statement>
- style="padding-left:10px;"> - ${statement.value} - <@p.editingLinks "${phone.localName}" statement editable /> + ${statement.number!} + <@p.editingLinks "${phone.localName}" "${phone.name}" statement editable />
- ${i18n().contact_info}
- style="list-style:none;margin-left:0;">
<#list phone.statements as statement>
- - ${statement.value} - <@p.editingLinks "${phone.localName}" statement editable /> + ${statement.number!} + <@p.editingLinks "${phone.localName}" "${phone.name}" statement editable />
- style="list-style:none;margin-left:0;">
<#list email.statements as statement>
- - ${statement.value} - <@p.editingLinks "${email.localName}" statement editable /> + ${statement.emailAddress!} + <@p.editingLinks "${email.localName}" "${email.name}" statement editable />
${statement.value}
- <@p.editingLinks "${overview.name}" statement editable />
+ <@p.editingLinks "${overview.name}" "" statement editable />
-
\ No newline at end of file
+
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-positions.ftl b/productMods/templates/freemarker/body/partials/individual/individual-positions.ftl
index b74aab68..76611713 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-positions.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-positions.ftl
@@ -1,11 +1,11 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- List of positions for the individual -->
-<#assign positions = propertyGroups.pullProperty("${core}personInPosition")!>
+<#-- List of positions for the individual -->
+<#assign positions = propertyGroups.pullProperty("${core}relatedBy", "${core}Position")!>
<#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#assign localName = positions.localName>
${positions.name?capitalize} <@p.addLink positions editable /> <@p.verboseDisplay positions />
-
<@p.objectProperty positions editable />
- ${i18n().websites}
- <#if statement.street1?has_content>
-
-
-
- <#if statement.street2?has_content>
- <#if !statement.street1?has_content>
-
- <#else>
-
-
- <#-- Pre-1.4 addresses may only have an rdfs:label, since users using the default
- object property form sometimes entered the entire address as the label. Display that when
- there's no address data. -->
- <#elseif statement.editable>
- <#-- This can be removed when the custom form is available. Until then, provide a link to the
- address profile so the data can be edited. -->
- ${statement.label!statement.localName}
- <#else>
- ${statement.label!}
+ <#if ( statement.country?has_content && (statement.country == "US" || statement.country?contains("United States") || statement.country?contains("U.S.") || statement.country?contains("U.S.A.") || statement.country?contains("USA")))>
+ <#local cityState><@s.join [statement.locality!, statement.region!], ", " />
+ <#local cityStateZip><@s.join [ cityState!, statement.postalCode!], " " />
+ <#if cityStateZip?has_content>
+ ${statement.street2}
-
-
-
- <#if statement.street3?has_content>
- <#if !statement.street1?has_content && !statement.street2?has_content>
-
- <#else>
- ${statement.street3}
-
-
+ <#if statement.street?has_content>
+ + ${statement.street} +
+ - <#-- If the subclass is vivo:US Postal Address, or if the country is - the US, display the city, state, and postal code on a single line. --> - <#if ( statement.subclass?? && statement.subclass?contains("USPostalAddress") ) || - ( statement.country?? && ( statement.country?contains("United States") || - statement.country == "US" || - statement.country == "USA" ) )> - <#local cityState><@s.join [statement.city!, statement.state!], ", " /> - <#local cityStateZip><@s.join [ cityState!, statement.postalCode!], " " /> - <#if cityStateZip?has_content> -${cityStateZip}
-
- <#else>
- <#if statement.city?has_content>${statement.city!}
- <#if statement.state?has_content>${statement.state}
- <#if statement.postalCode?has_content>${statement.postalCode}
-
-
- <#if statement.country?has_content>
- ${statement.country}
-
- ${cityStateZip}
+${statement.country!}
+ + <#else> + <#if statement.locality?has_content> ++ ${statement.locality} +
+ + <#if statement.region?has_content> ++ ${statement.region} +
+ + <#if statement.postalCode?has_content> ++ ${statement.postalCode} +
+ + <#if statement.country?has_content> ++ ${statement.country} +
+ - - \ No newline at end of file + + \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-telephoneNumber.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-telephoneNumber.ftl new file mode 100644 index 00000000..2e97990b --- /dev/null +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-telephoneNumber.ftl @@ -0,0 +1,17 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- + This template must be self-contained and not rely on other variables set for the individual page, because it + is also used to generate the property statement during a deletion. + --> +<@showTelephone statement /> + +<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the + next statement --> +<#macro showTelephone statement> + + <#if statement.number?has_content> + ${statement.number} + + + \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl index 725603c6..0fc71494 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl @@ -26,7 +26,7 @@ <#macro showWebpage statement count identifier> <#local linkText> - <#if statement.anchor?has_content>${statement.anchor}<#t> + <#if statement.label?has_content>${statement.label}<#t> <#elseif statement.url?has_content>${statement.url}<#t> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl index 55084052..2c2fde31 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl @@ -7,7 +7,7 @@ --> <#assign linkText> - <#if statement.anchor?has_content>${statement.anchor}<#t> + <#if statement.label?has_content>${statement.label}<#t> <#elseif statement.url?has_content>${statement.url}<#t> diff --git a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl index f08e0f35..316683c6 100644 --- a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl +++ b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl @@ -1,6 +1,6 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#import "lib-vivo-form.ftl" as lvf> - +<#include "addAssociatedConceptVocabSpecificDisplay.ftl" > <#assign existingConcepts = editConfiguration.pageData.existingConcepts/> <#assign userDefinedConceptUrl = editConfiguration.pageData.userDefinedConceptUrl/> <#assign sources = editConfiguration.pageData.searchServices/> @@ -35,26 +35,44 @@ --
+
-
+ ++++
Concept (Type)
+++Vocabulary Source
+++
+
<#list existingConcepts as existingConcept>
- -
-
-
-
-
- ${existingConcept.conceptLabel}
- <#if existingConcept.vocabURI?has_content && existingConcept.vocabLabel?has_content>
- (${existingConcept.vocabLabel})
+
- +
@@ -148,6 +179,7 @@ ${stylesheets.add('')} ${scripts.add('')} +${scripts.add('')} ${scripts.add('')} ${scripts.add('')} ${scripts.add('')} diff --git a/productMods/templates/freemarker/edit/forms/addAssociatedConceptVocabSpecificDisplay.ftl b/productMods/templates/freemarker/edit/forms/addAssociatedConceptVocabSpecificDisplay.ftl new file mode 100644 index 00000000..43ab963e --- /dev/null +++ b/productMods/templates/freemarker/edit/forms/addAssociatedConceptVocabSpecificDisplay.ftl @@ -0,0 +1,14 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#--The original concept javascript is service independent, i.e. all vocabulary service information is returned from the servlet +and the template itself generates the same display for all the services. Right now we would like to show a different label +in the search results based on the service. I am storing that information here and later we can consider how the display +can return to being independent of vocabulary service-specific display options. +These values will be passed to the javascript--> + +<#assign vocabSpecificDisplay = { +"http://link.informatics.stonybrook.edu/umls":"${i18n().label_type}", +"http://aims.fao.org/aos/agrovoc/agrovocScheme":"${i18n().label_altLabels}", +"http://www.eionet.europa.eu/gemet/gemetThesaurus":"${i18n().label_type}", +"http://id.loc.gov/authorities/subjects":"${i18n().label_altLabels}" +}/> diff --git a/productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl b/productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl index a19b9e21..bf818392 100644 --- a/productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl +++ b/productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl @@ -13,7 +13,7 @@ <#--Retrieve variables needed--> <#assign url = lvf.getFormFieldValue(editSubmission, editConfiguration, "url")/> <#assign urlTypeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "urlType")/> -<#assign anchor = lvf.getFormFieldValue(editSubmission, editConfiguration, "anchor") /> +<#assign label = lvf.getFormFieldValue(editSubmission, editConfiguration, "label") /> <#assign newRank = editConfiguration.pageData.newRank!"" /> <#if url?has_content> @@ -66,8 +66,8 @@ - - + + <#if editMode="add"> diff --git a/productMods/templates/freemarker/edit/forms/addFullNameToPerson.ftl b/productMods/templates/freemarker/edit/forms/addFullNameToPerson.ftl new file mode 100644 index 00000000..5f448533 --- /dev/null +++ b/productMods/templates/freemarker/edit/forms/addFullNameToPerson.ftl @@ -0,0 +1,102 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- this is in request.subject.name --> + +<#-- leaving this edit/add mode code in for reference in case we decide we need it --> + +<#import "lib-vivo-form.ftl" as lvf> + +<#--Retrieve certain edit configuration information--> +<#if editConfiguration.objectUri?has_content> + <#assign editMode = "edit"> +<#else> + <#assign editMode = "add"> + + +<#assign htmlForElements = editConfiguration.pageData.htmlForElements /> + +<#--Retrieve variables needed--> +<#assign firstNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "firstName") /> +<#assign middleNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "middleName") /> +<#assign lastNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "lastName") /> + + +<#--If edit submission exists, then retrieve validation errors if they exist--> +<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content> + <#assign submissionErrors = editSubmission.validationErrors/> + + +<#if editMode == "edit"> + <#assign titleVerb="${i18n().edit_capitalized}"> + <#assign submitButtonText="${titleVerb}" + " ${i18n().full_name}"> + <#assign disabledVal="disabled"> +<#else> + <#assign titleVerb="${i18n().create_capitalized}"> + <#assign submitButtonText="${titleVerb}" + " ${i18n().full_name}"> + <#assign disabledVal=""/> + + +<#assign requiredHint = " *" /> + ++${existingConcept.conceptLabel} + <#if existingConcept.conceptSemanticTypeLabel?has_content> + (${existingConcept.conceptSemanticTypeLabel}) - - - ${i18n().remove_capitalized} - +++ <#if existingConcept.vocabURI?has_content && existingConcept.vocabLabel?has_content> + ${existingConcept.vocabLabel} + ++ +${titleVerb} ${i18n().full_name_for} ${editConfiguration.subjectName}
+ +<#--Display error messages if any--> +<#if submissionErrors?has_content> ++ + + +<@lvf.unsupportedBrowser urls.base /> + +
+ + <#--Checking if any required fields are empty--> + <#if lvf.submissionErrorExists(editSubmission, "firstName")> + ${i18n().enter_first_name}
+
+ + <#if lvf.submissionErrorExists(editSubmission, "lastName")> + ${i18n().enter_last_name}
+ ++ + + + + +${stylesheets.add('')} +${stylesheets.add('')} +${stylesheets.add('')} + +${scripts.add('', + '', + '', + '')} + + diff --git a/productMods/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl index e889d511..241b3c2a 100644 --- a/productMods/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl +++ b/productMods/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl @@ -1,28 +1,28 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#--Two stage form for service provider role--> - -<#-- -Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are: -roleDescriptor. -The other required values (roleType, optionsType, objectClassUri, and literalOptions are -set in the JAVA class corresponding to the form, e.g. AddOrganizerRoleToPersonGenerator.java. - -Optional values can be set, but each of these has default values -set in addRoleToPersonTwoStage.ftl: - -buttonText -typeSelectorLabel -numDateFields -showRoleLAbelField -roleExamples--> - - -<#--Variable assignments--> -<#assign roleDescriptor = "${i18n().organizer_of}" /> -<#assign typeSelectorLabel = "${i18n().organizer_of}" /> -<#assign genericLabel = "${i18n().event_capitalized}" /> -<#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--> +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#--Two stage form for service provider role--> + +<#-- +Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are: +roleDescriptor. +The other required values (roleType, optionsType, objectClassUri, and literalOptions are +set in the JAVA class corresponding to the form, e.g. AddOrganizerRoleToPersonGenerator.java. + +Optional values can be set, but each of these has default values +set in addRoleToPersonTwoStage.ftl: + +buttonText +typeSelectorLabel +numDateFields +showRoleLAbelField +roleExamples--> + + +<#--Variable assignments--> +<#assign roleDescriptor = "${i18n().organizer_of}" /> +<#assign typeSelectorLabel = "${i18n().organizer_of}" /> +<#assign genericLabel = "${i18n().event_capitalized}" /> +<#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"> \ No newline at end of file diff --git a/productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl index b5616f07..6d1f8e9f 100644 --- a/productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl +++ b/productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl @@ -1,29 +1,29 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#--Two stage form for service provider role--> - -<#-- -Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are: -roleDescriptor. -The other required values (roleType, optionsType, objectClassUri, and literalOptions are -set in the JAVA class corresponding to the form, e.g. AddReviewerRoleToPersonGenerator.java. - -Optional values can be set, but each of these has default values -set in addRoleToPersonTwoStage.ftl: - -buttonText -typeSelectorLabel -numDateFields -showRoleLAbelField -roleExamples--> - - -<#--Variable assignments for Add Clinical Role To Person--> -<#assign roleDescriptor = "${i18n().reviewer_of}" /> -<#assign typeSelectorLabel = "${i18n().reviewer_of}" /> -<#assign genericLabel = "${i18n().item_capitalized}" /> - -<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#InformationResource'}" /> - -<#--Each of the two stage forms will include the form below--> -<#include "addRoleToPersonTwoStage.ftl"> - +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#--Two stage form for service provider role--> + +<#-- +Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are: +roleDescriptor. +The other required values (roleType, optionsType, objectClassUri, and literalOptions are +set in the JAVA class corresponding to the form, e.g. AddReviewerRoleToPersonGenerator.java. + +Optional values can be set, but each of these has default values +set in addRoleToPersonTwoStage.ftl: + +buttonText +typeSelectorLabel +numDateFields +showRoleLAbelField +roleExamples--> + + +<#--Variable assignments for Add Clinical Role To Person--> +<#assign roleDescriptor = "${i18n().reviewer_of}" /> +<#assign typeSelectorLabel = "${i18n().reviewer_of}" /> +<#assign genericLabel = "${i18n().item_capitalized}" /> + +<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Document'}" /> + +<#--Each of the two stage forms will include the form below--> +<#include "addRoleToPersonTwoStage.ftl"> + diff --git a/productMods/templates/freemarker/edit/forms/css/addConcept.css b/productMods/templates/freemarker/edit/forms/css/addConcept.css index 967571ab..225b86bf 100644 --- a/productMods/templates/freemarker/edit/forms/css/addConcept.css +++ b/productMods/templates/freemarker/edit/forms/css/addConcept.css @@ -1,5 +1,9 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ +.conceptsListContainer { + overflow:hidden; + width:100%; +} .concepts .column { float:left; padding-right:3px; @@ -44,4 +48,29 @@ form#addConceptForm { form#addConceptForm span#createOwnOne{ float:left; margin-top:24px +} + +/*For existing concepts, display will also be tabular with columns*/ + +.existingConcept .row, .conceptHeadings .row { + clear:both; + float:left; +} + +.existingConcept .column , .conceptHeadings .column { + float:left; + padding-right:3px; + clear:none !important; /*Overriding customFor div's clearing*/ +} +/*label and semantic type if it exists*/ +.existingConcept .conceptLabelInfo, .conceptHeadings .conceptLabelInfo { + width:220px; +} + +.existingConcept .conceptVocabSource, .conceptHeadings .conceptVocabSource { + width:220px; +} + +.conceptHeadings .row { + border-bottom: 1px solid #5F6464; } \ No newline at end of file diff --git a/productMods/templates/freemarker/edit/forms/js/addConcept.js b/productMods/templates/freemarker/edit/forms/js/addConcept.js index d650d349..606a981b 100644 --- a/productMods/templates/freemarker/edit/forms/js/addConcept.js +++ b/productMods/templates/freemarker/edit/forms/js/addConcept.js @@ -55,12 +55,19 @@ var addConceptForm = { this.externalConceptLabel = $('#conceptLabel'); this.externalConceptSource = $('#conceptSource'); this.externalConceptSemanticTypeLabel = $("#conceptSemanticTypeLabel"); + this.externalConceptBroaderUris = $("#conceptBroaderURI"); + this.externalConceptNarrowerUris = $("#conceptNarrowerURI"); //remove links this.removeConceptLinks = $('a.remove'); this.errors = $('#errors'); this.createOwn1 = $('#createOwnOne'); this.createOwn2 = $('#createOwnTwo'); this.orSpan = $('span.or') + this.loadingIndicator = $("#indicator"); + this.showHideSearchResults = $("#showHideResults"); + //Value we are setting to cut off length of alternate labels string + this.maxNumberAlternateLabels = 4; + this.numberOfMaxInitialSearchResults = 7; }, initPage: function() { @@ -87,6 +94,10 @@ var addConceptForm = { addConceptForm.removeExistingConcept(this); return false; }); + this.showHideSearchResults.find("a#showHideLink").click(function() { + addConceptForm.showHideMultipleSearchResults(this); + return false; + }); }, initForm: function() { // Hide the button that shows the form @@ -99,7 +110,9 @@ var addConceptForm = { //Also clear the search input this.searchTerm.val(""); this.cancel.unbind('click'); - + //make sure results loading indicator is hidden + this.loadingIndicator.addClass("hidden"); + this.showHideSearchResults.hide(); // Show the form this.form.show(); }, @@ -114,6 +127,8 @@ var addConceptForm = { }, clearSearchResults:function() { $('#selectedConcept').empty(); + //Hide the indicator icon if still there + $("#indicator").addClass("hidden"); }, clearErrors:function() { addConceptForm.errors.empty(); @@ -134,6 +149,25 @@ var addConceptForm = { this.hideForm(); this.showFormButtonWrapper.show(); }, + showHideMultipleSearchResults: function(link) { + if($(link).hasClass("showmore")) { + //if clicking and already says show more then need to show the rest of the results + $("li.concepts").show(); //show everything + $(link).html("Show fewer results"); + $(link).removeClass("showmore"); + } else { + //if clicking and does not say show more than need to show less + $("li.concepts").slice(addConceptForm.numberOfMaxInitialSearchResults).hide(); + $(link).html("Show more results"); + $(link).addClass("showmore"); + } + }, + //reset this to default, which is hidden with show more link + resetShowHideMultipleSearchResults: function() { + addConceptForm.showHideSearchResults.hide(); + addConceptForm.showHideSearchResults.find("a#showHideLink").html("Show more results"); + addConceptForm.showHideSearchResults.find("a#showHideLink").addClass("showmore"); + }, submitSearchTerm: function() { //Get value of search term var searchValue = this.searchTerm.val(); @@ -145,7 +179,11 @@ var addConceptForm = { } var vocabSourceValue = checkedVocabSource.val(); var dataServiceUrl = addConceptForm.dataServiceUrl + "?searchTerm=" + encodeURIComponent(searchValue) + "&source=" + encodeURIComponent(vocabSourceValue); - //This should return an object including the concept list or any errors if there are any + //Show the loading icon until the results appear + addConceptForm.loadingIndicator.removeClass("hidden"); + //Hide and reset the show more button + addConceptForm.resetShowHideMultipleSearchResults(); + //This should return an object including the concept list or any errors if there are any $.getJSON(dataServiceUrl, function(results) { var htmlAdd = ""; var vocabUnavailable = "" + addConceptForm.vocServiceUnavailable + "
"; @@ -166,7 +204,7 @@ var addConceptForm = { //For each result, display if(numberTotalMatches > 0) { htmlAdd = "- ";
- htmlAdd+= addConceptForm.addResultsHeader();
+ htmlAdd+= addConceptForm.addResultsHeader(vocabSourceValue);
//Show best matches first
for(i = 0; i < numberBestMatches; i++) {
var conceptResult = bestMatchResults[i];
@@ -184,6 +222,8 @@ var addConceptForm = {
}
if(htmlAdd.length) {
+ //hide the loading icon again
+ addConceptForm.loadingIndicator.addClass("hidden");
$('#selectedConcept').html(htmlAdd);
if (htmlAdd.indexOf("No search results") >= 0) {
addConceptForm.showHiddenElements(hasResults);
@@ -191,6 +231,8 @@ var addConceptForm = {
else {
hasResults = true;
addConceptForm.showHiddenElements(hasResults);
+ //Here, tweak the display based on the number of results
+ addConceptForm.displayUptoMaxResults();
}
}
});
@@ -203,9 +245,12 @@ var addConceptForm = {
var definedBy = conceptResult.definedBy;
var type = conceptResult.type;
var uri = conceptResult.uri;
+ //also adding broader and narrower uris wherever they exist
+ var broaderUris = conceptResult.broaderURIList;
+ var narrowerUris = conceptResult.narrowerURIList;
//this will be null if there are no alternate labels
var altLabels = conceptResult.altLabelList;
- return addConceptForm.generateIndividualConceptDisplay(uri, label, altLabels, definition, type, definedBy, isBestMatch);
+ return addConceptForm.generateIndividualConceptDisplay(uri, label, altLabels, definition, type, definedBy, isBestMatch, broaderUris, narrowerUris);
},
//This should now return all best matches in one array and other results in another
parseResults:function(resultsArray) {
@@ -225,10 +270,19 @@ var addConceptForm = {
}
return {"bestMatch":bestMatchResults, "alternate":alternateResults};
},
- addResultsHeader:function() {
- var htmlAdd = "
- " + addConceptForm.labelTypeString + " " + addConceptForm.definitionString + "" + addConceptForm.bestMatchString + "";
+ addResultsHeader:function(vocabSourceValue) {
+ var htmlAdd = "
- " + + addConceptForm.getVocabSpecificColumnLabel(vocabSourceValue) + " " + addConceptForm.definitionString + "" + addConceptForm.bestMatchString + "";
return htmlAdd;
},
+ //currently just the first column label depends on which service has been utilized
+ getVocabSpecificColumnLabel: function(vocabSourceValue) {
+ var columnLabel = addConceptForm.vocabSpecificLabels[vocabSourceValue];
+ if(columnLabel == undefined) {
+ columnLabel = addConceptForm.defaultLabelTypeString;
+ }
+ return columnLabel;
+ },
hideSearchResults:function() {
this.selectedConcept.hide();
},
@@ -239,11 +293,14 @@ var addConceptForm = {
}
var i;
var len = checkedElements.length;
- var checkedConcept, checkedConceptElement, conceptLabel, conceptSource, conceptSemanticType;
+ var checkedConcept, checkedConceptElement, conceptLabel, conceptSource, conceptSemanticType,
+ conceptBroaderUri, conceptNarrowerUri;
var conceptNodes = [];
var conceptLabels = [];
var conceptSources = [];
var conceptSemanticTypes = [];
+ var conceptBroaderUris = []; //each array element can be a string which is comma delimited for multiple uris
+ var conceptNarrowerUris = [];//same as above
checkedElements.each(function() {
checkedConceptElement = $(this);
@@ -251,22 +308,32 @@ var addConceptForm = {
conceptLabel = checkedConceptElement.attr("label");
conceptSource = checkedConceptElement.attr("conceptDefinedBy");
conceptSemanticType = checkedConceptElement.attr("conceptType");
+ conceptBroaderUri = checkedConceptElement.attr("broaderUris");
+ conceptNarrowerUri = checkedConceptElement.attr("narrowerUris");
conceptNodes.push(checkedConcept);
conceptLabels.push(conceptLabel);
conceptSources.push(conceptSource);
conceptSemanticTypes.push(conceptSemanticType);
+ conceptBroaderUris.push(conceptBroaderUri);
+ conceptNarrowerUris.push(conceptNarrowerUri);
});
this.externalConceptURI.val(conceptNodes);
this.externalConceptLabel.val(conceptLabels);
this.externalConceptSource.val(conceptSources);
this.externalConceptSemanticTypeLabel.val(conceptSemanticTypes);
+ //Using JSON here because there may be multiple broader and narrower uris per concept
+ //and using a regular string representation does not differentiate between which set of uris
+ //would belong to which concept
+ this.externalConceptBroaderUris.val(JSON.stringify(conceptBroaderUris));
+ this.externalConceptNarrowerUris.val(JSON.stringify(conceptNarrowerUris));
+
return true;
},
- generateIndividualConceptDisplay: function(cuiURI, label, altLabels, definition, type, definedBy, isBestMatch) {
+ generateIndividualConceptDisplay: function(cuiURI, label, altLabels, definition, type, definedBy, isBestMatch, broaderUris, narrowerUris) {
var htmlAdd = "
- " +
"" + "" + - addConceptForm.generateIndividualCUIInput(cuiURI, label, type, definedBy) + + addConceptForm.generateIndividualCUIInput(cuiURI, label, type, definedBy, broaderUris, narrowerUris) + addConceptForm.generateIndividualLabelsDisplay(label, altLabels) + addConceptForm.generateIndividualTypeDisplay(type) + "" + addConceptForm.generateIndividualDefinitionDisplay(definition) + addConceptForm.generateBestOrAlternate(isBestMatch) + @@ -274,14 +341,23 @@ var addConceptForm = { ""; return htmlAdd; }, - generateIndividualCUIInput:function(cuiURI, label, type, definedBy) { - return ""; + generateIndividualCUIInput:function(cuiURI, label, type, definedBy, broaderUris, narrowerUris) { + return ""; }, //In case there are multiple labels display those generateIndividualLabelsDisplay:function(label, altLabels) { var labelDisplay = label; + var displayAltLabels = altLabels; if(altLabels != null && altLabels.length > 0) { - labelDisplay += "
[" + altLabels + "]"; + //Certain vocabulary services might return a long list of alternate labels, in which case we will show fewer + //display only upto a certain number of alternate labels and use an ellipsis to signify there + //are additional terms + if(altLabels.length > addConceptForm.maxNumberAlternateLabels) { + displayAltLabels = altLabels.slice(0, addConceptForm.maxNumberAlternateLabels) + ",..."; + } + labelDisplay += "
(" + displayAltLabels + ")"; } return labelDisplay; }, @@ -307,6 +383,18 @@ var addConceptForm = { } return ""; }, + //Certain vocabulary services return a great number of results, we would like the ability to show more or less of those results + displayUptoMaxResults:function() { + var numberConcepts = $("li.concepts").length; + if(numberConcepts > addConceptForm.numberOfMaxInitialSearchResults) { + $("li.concepts").slice(addConceptForm.numberOfMaxInitialSearchResults).hide(); + //Hide the link for showing/hiding search results + addConceptForm.showHideSearchResults.show(); + addConceptForm.showHideSearchResults.find("a#showHideLink").html("Show more results"); + addConceptForm.showHideSearchResults.find("a#showHideLink").addClass("showmore"); + } + + }, validateConceptSelection:function(checkedElements) { var numberElements = checkedElements.length; if(numberElements < 1) { diff --git a/productMods/templates/freemarker/edit/forms/js/awardReceiptUtils.js b/productMods/templates/freemarker/edit/forms/js/awardReceiptUtils.js index 518dc706..6a5ed540 100644 --- a/productMods/templates/freemarker/edit/forms/js/awardReceiptUtils.js +++ b/productMods/templates/freemarker/edit/forms/js/awardReceiptUtils.js @@ -91,8 +91,14 @@ var awardReceiptUtils = { buildAwardReceiptLabel: function() { var rdfsLabel = ""; + var $acSelection = $("div.acSelection[acGroupName='award']") if ( this.editMode == "edit" ) { - rdfsLabel = this.awardDisplay.val(); + if ( $acSelection.find("span.acSelectionInfo").text().length > 0 ) { + rdfsLabel = $("span.acSelectionInfo").text(); + } + else { + rdfsLabel = this.award.val(); + } } else { rdfsLabel = this.award.val(); diff --git a/productMods/templates/freemarker/edit/forms/js/educationalTrainingUtils.js b/productMods/templates/freemarker/edit/forms/js/educationalTrainingUtils.js new file mode 100644 index 00000000..85e6dc8d --- /dev/null +++ b/productMods/templates/freemarker/edit/forms/js/educationalTrainingUtils.js @@ -0,0 +1,31 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + + +var educationalTrainingUtils = { + + onLoad: function(href, blankSentinel) { + this.initObjectReferences(); + this.bindEventListeners(); + $.extend(this, customFormData); + }, + + initObjectReferences: function() { + + this.form = $('#personHasEducationalTraining'); + this.aDLabel = $('#awardedDegreeLabel'); + this.degreeSelector = $('#degreeUri'); + }, + + bindEventListeners: function() { + + this.degreeSelector.change(function() { + educationalTrainingUtils.setAwardedDegreeLabel(); + }); + + }, + + setAwardedDegreeLabel: function() { + var degreeLabel = this.subjectName + ": " + this.degreeSelector.find(":selected").text(); + this.aDLabel.val(degreeLabel); + } +} diff --git a/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js b/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js deleted file mode 100644 index 037ab0f9..00000000 --- a/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js +++ /dev/null @@ -1,147 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -var mailingAddressUtils = { - - onLoad: function(mode,country) { - this.initObjectReferences(); - this.bindEventListeners(); - this.sortCountrySelector(mode,country); - $.extend(this, i18nStrings); - - if ( mode == "add" && !this.errorSection.attr('id') ) { - this.containerDiv.hide(); - this.submitButton.hide(); - } - else { - this.processCountryRelatedFields(); - } - }, - - initObjectReferences: function() { - this.form = $('#personHasMailingAddress'); - - // The external auth ID field and messages - this.countrySelector = $('#country'); - this.countrySelectorOptions = $('#country option'); - this.address1Field = $('#addrLineOne'); - this.cityField = $('#city'); - this.stateField = $('#state'); - this.stateSelector= $('#stateSelect'); - this.stateLabel = $('#stateLabel'); - this.postalCodeField = $('#postalCode'); - this.postalCodeLabel = $('#postalCodeLabel'); - this.subjectField = $('#subjectName'); - this.rdfsLabel = $('#addrLabel'); - this.addrTypeField = $('#addressType'); - this.submitButton = $('#submit'); - this.containerDiv = $('#addressDetails'); - this.orSpan = $('span.or'); - this.errorSection = $('section#error-alert'); - }, - - bindEventListeners: function() { - this.idCache = {}; - - this.countrySelector.change(function() { - mailingAddressUtils.processCountryRelatedFields(); - mailingAddressUtils.showHiddenElements(); - }); - - this.form.submit(function() { - mailingAddressUtils.buildAddressLabel(); - }); - - this.stateSelector.change(function() { - mailingAddressUtils.setStateValue(); - }); - }, - - addressClassIsNonUS: function() { - var country = this.countrySelector.val(); - if ( country.search( 'United States' ) == -1 ) { - return true; - } - else { - return false; - } - }, - - buildAddressLabel: function() { - if ( mailingAddressUtils.addressClassIsNonUS() ) { - this.rdfsLabel.val(this.address1Field.val() + " " + this.cityField.val() + " " + this.countrySelector.val()); - } - else { - this.rdfsLabel.val(this.address1Field.val() + " " + this.cityField.val() + " " + this.stateField.val()); - } - }, - - processCountryRelatedFields: function() { - if ( mailingAddressUtils.addressClassIsNonUS() ) { - this.stateLabel.text(mailingAddressUtils.provinceOrRegion); - this.postalCodeField.attr('size', '40'); - this.stateSelector.hide(); - this.stateField.show(); - this.addrTypeField.val("http://vivoweb.org/ontology/core#Address"); - } - else { - this.stateLabel.text(mailingAddressUtils.stateString); - this.postalCodeField.attr('size', '8'); - this.stateField.hide(); - this.stateSelector.show(); - this.addrTypeField.val("http://vivoweb.org/ontology/core#USPostalAddress"); - } - }, - - showHiddenElements: function() { - this.containerDiv.show(); - this.submitButton.show(); - this.orSpan.show(); - }, - - setStateValue: function() { - this.stateField.val(this.stateSelector.val()); - }, - - // in the ftl we remove the "the" that precedes some countries, so we need to - // re-sort them alphabetically - sortCountrySelector: function(mode,country) { - // Get options from select box - var the_options = this.countrySelectorOptions; - // sort alphabetically - the_options.sort(function(a,b) { - if (a.text > b.text) return 1; - else if (a.text < b.text) return -1; - else return 0 - }) - //replace with sorted the_options; - this.countrySelector.append( the_options ); - - // if it's add mode, add the "select one" option have it be selected; - // if it's edit mode, add the "Select one" option but have the correct country selected. - // if it's repair mode, add the "Select one" option but only select it if there's no country - - if ( this.errorSection.is(':visible') ) { - this.countrySelector.prepend($("") - .attr("value","") - .text(mailingAddressUtils.selectOne)); - this.countrySelector.val(country); - } - else if ( mode == "add" ) { - this.countrySelector.prepend($("") - .attr("value","") - .text(mailingAddressUtils.selectOne)); - } - else if ( mode == "edit" || country.length > 1 ) { - this.countrySelector.prepend($("") - .attr("value","") - .text(mailingAddressUtils.selectOne)); - this.countrySelector.val(country); - } - else if ( country.length == 0 ) { - this.countrySelector.prepend($("") - .attr("value","") - .text(mailingAddressUtils.selectOne)); - this.countrySelector.val(country); - } - } -} \ No newline at end of file diff --git a/productMods/templates/freemarker/edit/forms/js/newIndividualFormUtils.js b/productMods/templates/freemarker/edit/forms/js/newIndividualFormUtils.js new file mode 100644 index 00000000..d1cbbf33 --- /dev/null +++ b/productMods/templates/freemarker/edit/forms/js/newIndividualFormUtils.js @@ -0,0 +1,37 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +var newIndividualFormUtils = { + + onLoad: function(mode,country) { + this.initObjectReferences(); + this.bindEventListeners(); + }, + + initObjectReferences: function() { + this.form = $('#newIndividual'); + + // The external auth ID field and messages + this.fName = $('#firstName'); + this.lName = $('#lastName'); + this.rdfsLabel = $('#label'); + }, + + bindEventListeners: function() { + this.idCache = {}; + + this.form.submit(function() { + newIndividualFormUtils.buildRDFSLabel(); + }); + + }, + + buildRDFSLabel: function() { + if ( this.fName.length > 0 ) { + this.rdfsLabel.val(this.lName.val() + ", " + this.fName.val()); + } + }, +} + +$(document).ready(function() { + newIndividualFormUtils.onLoad(); +}); diff --git a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl index d480933e..c4f0b1d0 100644 --- a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl +++ b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl @@ -29,8 +29,8 @@-
<#list editConfiguration.pageData.webpages as webpage>
- - <#if webpage.anchor??> - <#assign anchor=webpage.anchor > + <#if webpage.label??> + <#assign anchor=webpage.label > <#else> <#assign anchor=webpage.url > @@ -39,7 +39,7 @@ ${anchor} - ${i18n().edit_capitalized} | + ${i18n().edit_capitalized} | ${i18n().delete_button} diff --git a/productMods/templates/freemarker/edit/forms/newIndividualForm.ftl b/productMods/templates/freemarker/edit/forms/newIndividualForm.ftl index 28dadfc1..286b4b8b 100644 --- a/productMods/templates/freemarker/edit/forms/newIndividualForm.ftl +++ b/productMods/templates/freemarker/edit/forms/newIndividualForm.ftl @@ -56,6 +56,8 @@ + + <#else>
@@ -75,3 +77,4 @@ ${stylesheets.add('')} +${scripts.add('')} \ No newline at end of file diff --git a/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl b/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl index b2e06895..d7ab5d20 100644 --- a/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl +++ b/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl @@ -33,16 +33,18 @@ Set this flag on the input acUriReceiver where you would like this behavior to o <#assign deptValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "dept") /> <#assign infoValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "info") /> <#assign majorFieldValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "majorField") /> -<#assign degreeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "degree") /> +<#assign degreeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "degreeType") /> +<#assign awardedDegreeLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "awardedDegreeLabel") /> <#assign existingOrgValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "existingOrg") /> <#assign trainingTypeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "trainingType")/> +<#assign existingADLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "existingAwardedDegreeLabel") /> <#--If edit submission exists, then retrieve validation errors if they exist--> <#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content> <#assign submissionErrors = editSubmission.validationErrors/> -<#if editMode == "edit"> +<#if editMode == "edit" || editMode == "repair"> <#assign titleVerb="${i18n().edit_capitalized}"> <#assign submitButtonText="${i18n().save_changes}"> <#assign disabledVal="disabled"> @@ -56,7 +58,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o <#assign yearHint = "(${i18n().year_hint_format})" /> -
${titleVerb} ${i18n().educational_training_for} ${subjectName}${editConfiguration.subjectName}
+${titleVerb} ${i18n().educational_training_for} ${editConfiguration.subjectName}
<#--Display error messages if any--> <#if submissionErrors?has_content> @@ -155,13 +157,19 @@ Set this flag on the input acUriReceiver where you would like this behavior to o- <#assign degreeOpts = editConfiguration.pageData.degree /> - + <#if editMode == "edit" || editMode == "repair"> + + + <#else> + +@@ -208,13 +216,18 @@ var customFormData = { defaultTypeName: 'organization', baseHref: '${urls.base}/individual?uri=', blankSentinel: '${blankSentinel}', - flagClearLabelForExisting: '${flagClearLabelForExisting}' + flagClearLabelForExisting: '${flagClearLabelForExisting}', + subjectName: '${editConfiguration.subjectName}' }; var i18nStrings = { selectAnExisting: '${i18n().select_an_existing}', orCreateNewOne: '${i18n().or_create_new_one}', selectedString: '${i18n().selected}' }; + +$(document).ready(function() { + educationalTrainingUtils.onLoad(); +}); @@ -229,6 +242,7 @@ ${scripts.add('', '', '', + '', '')} diff --git a/productMods/templates/freemarker/edit/forms/personHasEmailAddress.ftl b/productMods/templates/freemarker/edit/forms/personHasEmailAddress.ftl new file mode 100644 index 00000000..8d498191 --- /dev/null +++ b/productMods/templates/freemarker/edit/forms/personHasEmailAddress.ftl @@ -0,0 +1,86 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- this is in request.subject.name --> + +<#-- leaving this edit/add mode code in for reference in case we decide we need it --> + +<#import "lib-vivo-form.ftl" as lvf> + +<#--Retrieve certain edit configuration information--> +<#if editConfiguration.objectUri?has_content> + <#assign editMode = "edit"> +<#else> + <#assign editMode = "add"> + + +<#assign htmlForElements = editConfiguration.pageData.htmlForElements /> + +<#--Retrieve variables needed--> +<#assign emailAddressValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "emailAddress") /> + +<#--If edit submission exists, then retrieve validation errors if they exist--> +<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content> + <#assign submissionErrors = editSubmission.validationErrors/> + + +<#if editMode == "edit"> + <#assign titleVerb="${i18n().edit_capitalized}"> + <#assign submitButtonText="${titleVerb}" + " ${i18n().email_address}"> + <#assign disabledVal="disabled"> +<#else> + <#assign titleVerb="${i18n().create_capitalized}"> + <#assign submitButtonText="${titleVerb}" + " ${i18n().email_address}"> + <#assign disabledVal=""/> + + +<#assign requiredHint = " *" /> + +
${titleVerb} ${i18n().email_address_for} ${editConfiguration.subjectName}
+ +<#--Display error messages if any--> +<#if submissionErrors?has_content> ++ + + +<@lvf.unsupportedBrowser urls.base /> + +
+ + <#--Checking if any required fields are empty--> + <#if lvf.submissionErrorExists(editSubmission, "emailAddress")> + ${i18n().enter_email_address}
+
+ ++ + + + + +${stylesheets.add('')} +${stylesheets.add('')} +${stylesheets.add('')} + +${scripts.add('', + '', + '', + '')} + + diff --git a/productMods/templates/freemarker/edit/forms/personHasMailingAddress.ftl b/productMods/templates/freemarker/edit/forms/personHasMailingAddress.ftl index 029872a5..99236069 100644 --- a/productMods/templates/freemarker/edit/forms/personHasMailingAddress.ftl +++ b/productMods/templates/freemarker/edit/forms/personHasMailingAddress.ftl @@ -16,13 +16,9 @@ <#assign htmlForElements = editConfiguration.pageData.htmlForElements /> <#--Retrieve variables needed--> -<#assign addrLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "addrLabel") /> -<#assign addressTypeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "addressType") /> -<#assign addrLineOneValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "addrLineOne") /> -<#assign addrLineTwoValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "addrLineTwo") /> -<#assign addrLineThreeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "addrLineThree") /> -<#assign cityValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "city") /> -<#assign stateValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "state") /> +<#assign streetAddressValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "streetAddress") /> +<#assign localityValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "locality") /> +<#assign regionValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "region") /> <#assign postalCodeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "postalCode") /> <#assign countryValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "country") /> @@ -52,13 +48,13 @@<#--Checking if any required fields are empty--> <#if lvf.submissionErrorExists(editSubmission, "country")> - ${i18n().select_a_country}
+ ${i18n().enter_a_country}
- <#if lvf.submissionErrorExists(editSubmission, "addrLineOne")> - ${i18n().enter_address1_value}
+ <#if lvf.submissionErrorExists(editSubmission, "streetAddress")> + ${i18n().enter_street_address}
- <#if lvf.submissionErrorExists(editSubmission, "city")> - ${i18n().enter_a_city}
+ <#if lvf.submissionErrorExists(editSubmission, "locality")> + ${i18n().enter_a_locality}
<#if lvf.submissionErrorExists(editSubmission, "postalCode")> ${i18n().enter_postal_code} @@ -74,138 +70,43 @@${titleVerb} ${i18n().mailing_address_for} ${editConfiguration.subjectName}
+ +<#--Display error messages if any--> +<#if submissionErrors?has_content> ++ + + +<@lvf.unsupportedBrowser urls.base /> + +
+ + <#--Checking if any required fields are empty--> + <#if lvf.submissionErrorExists(editSubmission, "telephoneNumber")> + ${i18n().enter_telephone_number}
+
+ ++ + + + + +${stylesheets.add('')} +${stylesheets.add('')} +${stylesheets.add('')} + +${scripts.add('', + '', + '', + '')} + + diff --git a/rdf/abox/filegraph/us-states.rdf b/rdf/abox/filegraph/us-states.rdf index 3fdbdaad..eacb0984 100644 --- a/rdf/abox/filegraph/us-states.rdf +++ b/rdf/abox/filegraph/us-states.rdf @@ -1,308 +1,309 @@
- +
-
+ <#if (existingConcepts?size > 0)>
+