selected#if> >${i18n().standard_view}
selected#if> >${i18n().quick_view}
@@ -201,6 +200,13 @@ var profileTypeData = {
individualUri: '${individual.uri!}',
defaultProfileType: '${profileType!}'
};
+var i18nStrings = {
+ errorProcessingTypeChange: '${i18n().error_processing_type_change}',
+ displayLess: '${i18n().display_less}',
+ displayMoreEllipsis: '${i18n().display_more_ellipsis}',
+ showMoreContent: '${i18n().show_more_content}',
+ verboseTurnOff: '${i18n().verbose_turn_off}'
+};
<#if editable>
${stylesheets.add(' ')}
diff --git a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
index 823f7d77..4e40f816 100644
--- a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
+++ b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
@@ -120,14 +120,25 @@
-
+};
+var i18nStrings = {
+ vocServiceUnavailable: '${i18n().vocabulary_service_unavailable}',
+ noResultsFound: '${i18n().no_serch_results_found}',
+ labelTypeString: '${i18n().label_type}',
+ definitionString: '${i18n().definition_capitalized}',
+ bestMatchString: '${i18n().best_match}',
+ selectTermFromResults: '${i18n().select_term_from_results}',
+ selectVocSource: '${i18n().select_vocabulary_source_to_search}',
+ confirmTermDelete: '${i18n().confirm_term_deletion}',
+ errorTernNotRemoved: '${i18n().error_term_not_deleted}'
+};
+
${stylesheets.add(' ')}
${stylesheets.add(' ')}
diff --git a/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl b/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
index 66944f8c..af1d23e8 100644
--- a/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
+++ b/productMods/templates/freemarker/edit/forms/addAuthorsToInformationResource.ftl
@@ -30,7 +30,7 @@
<#assign title="${editConfiguration.subjectName} " />
<#assign requiredHint=" * " />
-<#assign initialHint="(${i18n().initial okay}) " />
+<#assign initialHint="(${i18n().initial_okay}) " />
<@lvf.unsupportedBrowser urls.base/>
@@ -184,12 +184,22 @@ var customFormData = {
orgUrl: 'http://xmlns.com/foaf/0.1/Organization',
reorderUrl: '${urls.base}/edit/reorder'
};
+var i18nStrings = {
+ authorNameWrapperTitle: '${i18n().drag_drop_reorder_authors}',
+ reorderAuthorsAlert: '${i18n().reordering_authors_failed}',
+ removeAuthorshipMessage: '${i18n().confirm_author_removal}',
+ removeAuthorshipAlert: '${i18n().error_processing_aithor_request}',
+ authorTypeText: '${i18n().author_capitalized}',
+ organizationTypeText: '${i18n().organization_capitalized}',
+ helpTextSelect: '${i18n().select_an_existing}',
+ helptextAdd: '${i18n().or_add_new_one}'
+};
${stylesheets.add(' ',
- ' ',
- ' ',
- ' ')}
+ ' ',
+ ' ',
+ ' ')}
${scripts.add('')}
diff --git a/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
index 30caeaa1..3520f23a 100644
--- a/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
@@ -165,6 +165,11 @@ var customFormData = {
blankSentinel: '${blankSentinel}',
flagClearLabelForExisting: '${flagClearLabelForExisting}'
};
+ var i18nStrings = {
+ selectAnExisting: '${i18n().select_an_existing}',
+ orCreateNewOne: '${i18n().or_create_new_one}',
+ selectedString: '${i18n().selected}'
+ };
${stylesheets.add(' ')}
${stylesheets.add(' ')}
diff --git a/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
index ba26d03f..b5fd9b02 100644
--- a/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl
@@ -192,6 +192,11 @@ var customFormData = {
blankSentinel: '${blankSentinel}',
flagClearLabelForExisting: '${flagClearLabelForExisting}'
};
+var i18nStrings = {
+ selectAnExisting: '${i18n().select_an_existing}',
+ orCreateNewOne: '${i18n().or_create_new_one}',
+ selectedString: '${i18n().selected}'
+};
diff --git a/productMods/templates/freemarker/edit/forms/addPublicationToPerson.ftl b/productMods/templates/freemarker/edit/forms/addPublicationToPerson.ftl
index bcfa8036..92019649 100644
--- a/productMods/templates/freemarker/edit/forms/addPublicationToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addPublicationToPerson.ftl
@@ -326,6 +326,11 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
blankSentinel: '${blankSentinel}',
flagClearLabelForExisting: '${flagClearLabelForExisting}'
};
+ var i18nStrings = {
+ selectAnExisting: '${i18n().select_an_existing}',
+ orCreateNewOne: '${i18n().or_create_new_one}',
+ selectedString: '${i18n().selected}'
+ };
+ var i18nStrings = {
+ selectAnExisting: '${i18n().select_an_existing}',
+ orCreateNewOne: '${i18n().or_create_new_one}',
+ selectedString: '${i18n().selected}'
+ };
+
${stylesheets.add(' ')}
${stylesheets.add(' ')}
diff --git a/productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl b/productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
index ef45c4fb..5956d3eb 100644
--- a/productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
+++ b/productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
@@ -55,6 +55,11 @@
defaultTypeName: 'concept', // used in repair mode to generate button text
baseHref: '${urls.base}/individual?uri='
};
+ var i18nStrings = {
+ selectAnExisting: '${i18n().select_an_existing}',
+ orCreateNewOne: '${i18n().or_create_new_one}',
+ selectedString: '${i18n().selected}'
+ };
${stylesheets.add(' ')}
diff --git a/productMods/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl b/productMods/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl
index 8285ed4b..003b17e2 100644
--- a/productMods/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl
+++ b/productMods/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl
@@ -70,6 +70,11 @@ Also multiple types parameter set to true only if more than one type returned-->
sparqlQueryUrl: '${sparqlQueryUrl}',
defaultTypeName: '${propertyPublicName}'
};
+ var i18nStrings = {
+ selectExisting: '${i18n().select_an_existing}',
+ orCreateNewOne: '$i18n().or_create_new_one}',
+ selectedString: '$i18n().selected}'
+ };
${stylesheets.add(' ')}
diff --git a/productMods/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js b/productMods/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js
index 71992350..83f2c5be 100644
--- a/productMods/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js
+++ b/productMods/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js
@@ -34,6 +34,9 @@ var addAuthorForm = {
// Get the custom form data from the page
$.extend(this, customFormData);
+
+ // Get the i18n variables from the page
+ $.extend(this, i18nStrings);
},
// On page load, create references for easy access to form elements.
@@ -372,7 +375,7 @@ var addAuthorForm = {
}
$('.authorNameWrapper').each(function() {
- $(this).attr('title', 'Drag and drop to reorder authors');
+ $(this).attr('title', addAuthorForm.authorNameWrapperTitle);
});
authorshipList.sortable({
@@ -427,7 +430,7 @@ var addAuthorForm = {
ui.item.appendTo(authorships);
}
- alert('Reordering of authors failed.');
+ alert(addAuthorForm.reorderAuthorsAlert);
}
}
});
@@ -549,13 +552,6 @@ var addAuthorForm = {
return false;
});
-// this.undoLinks.click(function() {
-// $.ajax({
-// url: $(this).attr('href')
-// });
-// return false;
-// });
-
},
prepareSubmit: function() {
@@ -618,7 +614,7 @@ var addAuthorForm = {
authorName = $(link).prev().children().text();
var removeLast = false,
- message = 'Are you sure you want to remove this author:\n\n' + authorName + ' ?\n\n';
+ message = addAuthorForm.removeAuthorshipMessage + '\n\n' + authorName + ' ?\n\n';
if (!confirm(message)) {
return false;
}
@@ -710,7 +706,7 @@ var addAuthorForm = {
});
} else {
- alert('Error processing request: author not removed');
+ alert(addAuthorForm.removeAuthorshipAlert);
}
}
@@ -743,14 +739,14 @@ var addAuthorForm = {
addAcHelpText: function(selectedObj) {
var typeText;
if ( $(selectedObj).attr('id') == "lastName" ) {
- typeText = "Author";
+ typeText = addAuthorForm.authorTypeText;
}
else {
- typeText = "Organization";
+ typeText = addAuthorForm.organizationTypeText;
}
if (!$(selectedObj).val()) {
- $(selectedObj).val("Select an existing " + typeText + " or add a new one.")
+ $(selectedObj).val(addAuthorForm.helpTextSelect + " " + typeText + " " + addAuthorForm.helpTextAdd)
.addClass(this.acHelpTextClass);
}
},
diff --git a/productMods/templates/freemarker/edit/forms/js/addConcept.js b/productMods/templates/freemarker/edit/forms/js/addConcept.js
index e80358ca..5eb9318c 100644
--- a/productMods/templates/freemarker/edit/forms/js/addConcept.js
+++ b/productMods/templates/freemarker/edit/forms/js/addConcept.js
@@ -33,6 +33,8 @@ var addConceptForm = {
$.extend(this, vitro.customFormUtils);
// Get the custom form data from the page
$.extend(this, customFormData);
+ // Get the i18n variables from the page
+ $.extend(this, i18nStrings);
},
// On page load, create references for easy access to form elements.
initObjects: function() {
@@ -145,7 +147,7 @@ var addConceptForm = {
//This should return an object including the concept list or any errors if there are any
$.getJSON(dataServiceUrl, function(results) {
var htmlAdd = "";
- var vocabUnavailable = "The vocabulary service is unavailable. Please try again later.
";
+ var vocabUnavailable = "" + addConceptForm.vocServiceUnavailable + "
";
if ( results== null || results.semanticServicesError != null || results.conceptList == null) {
htmlAdd = vocabUnavailable;
}
@@ -176,7 +178,7 @@ var addConceptForm = {
}
htmlAdd+= "";
} else {
- htmlAdd+= "No search results were found.
";
+ htmlAdd+= "" + addConceptForm.noResultsFound + "
";
}
}
@@ -221,7 +223,7 @@ var addConceptForm = {
return {"bestMatch":bestMatchResults, "alternate":alternateResults};
},
addResultsHeader:function() {
- var htmlAdd = "Label (Type) Definition Best Match
";
+ var htmlAdd = "" + addConceptForm.labelTypeString + " " + addConceptForm.definitionString + " " + addConceptForm.bestMatchString + "
";
return htmlAdd;
},
hideSearchResults:function() {
@@ -293,17 +295,17 @@ var addConceptForm = {
validateConceptSelection:function(checkedElements) {
var numberElements = checkedElements.length;
if(numberElements < 1) {
- addConceptForm.errors.html("Please select at least one term from the search search results.
");
+ addConceptForm.errors.html("" + addConceptForm.selectTermFromResults + "
");
return false;
}
return true;
},
showUncheckedSourceError:function() {
- addConceptForm.errors.html("Please select at least one external vocabulary source to search.
");
+ addConceptForm.errors.html("" + addConceptForm.selectVocSource + "
");
},
removeExistingConcept: function(link) {
var removeLast = false,
- message = 'Are you sure you want to remove this term?';
+ message = addConceptForm.confirmTermDelete;
if (!confirm(message)) {
return false;
@@ -339,7 +341,7 @@ var addConceptForm = {
});
} else {
- alert('Error processing request: term not removed');
+ alert(addConceptForm.errorTernNotRemoved);
}
}
});
diff --git a/productMods/templates/freemarker/edit/forms/js/addTerminology.js b/productMods/templates/freemarker/edit/forms/js/addTerminology.js
deleted file mode 100644
index ff18a0ed..00000000
--- a/productMods/templates/freemarker/edit/forms/js/addTerminology.js
+++ /dev/null
@@ -1,250 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-var addTerminologyForm = {
-
- /* *** Initial page setup *** */
-
- onLoad: function() {
-
- if (this.disableFormInUnsupportedBrowsers()) {
- return;
- }
- this.mixIn();
- this.initObjects();
- this.initPage();
- },
-
- disableFormInUnsupportedBrowsers: function() {
- var disableWrapper = $('#ie67DisableWrapper');
-
- // Check for unsupported browsers only if the element exists on the page
- if (disableWrapper.length) {
- if (vitro.browserUtils.isIELessThan8()) {
- disableWrapper.show();
- $('.noIE67').hide();
- return true;
- }
- }
- return false;
- },
-
- mixIn: function() {
- // Mix in the custom form utility methods
- $.extend(this, vitro.customFormUtils);
- // Get the custom form data from the page
- $.extend(this, customFormData);
- },
- // On page load, create references for easy access to form elements.
- initObjects: function() {
-
- this.form = $('#addTerminologyForm');
- this.showFormButtonWrapper = $('#showAddForm');
- this.submit = this.form.find(':submit');
- this.cancel = this.form.find('.cancel');
- //Add term
- this.addTermButton = $('#showAddFormButton');
- //section where results should be displayed
- this.selectedTerm = $('#selectedTerm');
- //input for search term form
- this.searchTerm = $('#searchTerm');
- this.searchSubmit = $('#searchButton');
- //Hidden inputs for eventual submission
- this.referencedTerm = $('#referencedTerm');
- this.entryTerm = $('#entryTerm');
- this.termLabel = $('#termLabel');
- this.termType = $('#termType');
- this.removeTermLinks = $('a.remove');
- this.errors = $('#errors');
- },
-
- initPage: function() {
- this.initTermData();
- this.bindEventListeners();
-
- },
- bindEventListeners: function() {
- this.searchSubmit.click(function() {
- addTerminologyForm.submitSearchTerm();
- addTerminologyForm.clearErrors();
- return false;
- });
-
- this.form.submit(function() {
- return addTerminologyForm.prepareSubmit();
- });
-
- this.addTermButton.click(function() {
- addTerminologyForm.initForm();
-
- });
- this.removeTermLinks.click(function() {
- addTerminologyForm.removeExistingTerm(this);
- return false;
- });
- },
- initForm: function() {
- // Hide the button that shows the form
- this.showFormButtonWrapper.hide();
- this.clearSearchResults();
-
- this.cancel.unbind('click');
- this.cancel.bind('click', function() {
- //show only list of existing terms and hide adding term form
- addTerminologyForm.showTermListOnlyView();
- return false;
- });
-
- // Show the form
- this.form.show();
- },
- // On page load, associate data with each existing term element. Then we don't
- // have to keep retrieving data from or modifying the DOM as we manipulate the
- // authorships.
- initTermData: function() {
- $('.existingTerm').each(function(index) {
- $(this).data(existingTermsData[index]);
- $(this).data('position', index+1);
- });
- },
- clearSearchResults:function() {
- $('#selectedTerm').empty();
- },
- clearErrors:function() {
- addTerminologyForm.errors.empty();
- },
- showTermListOnlyView: function() {
- this.hideForm();
- this.showFormButtonWrapper.show();
- },
- submitSearchTerm: function() {
- //Get value of search term
- var searchValue = this.searchTerm.val();
- this.entryTerm.val(searchValue);
- var dataServiceUrl = addTerminologyForm.dataServiceUrl + "?searchTerm=" + encodeURIComponent(searchValue);
- $.getJSON(dataServiceUrl, function(results) {
- if ( results.All.length == 0 ) {
- } else {
- //update existing content type with correct class group name and hide class group select again
- var bestMatchResults = results["Best Match"];
- var numberMatches = bestMatchResults.length;
- var i;
- //For each result, display
- var htmlAdd = "";
- if(numberMatches > 0) {
- htmlAdd = "";
- htmlAdd+= addTerminologyForm.addResultsHeader();
- for(i = 0; i < numberMatches; i++) {
- var termResult = bestMatchResults[i];
- var CUI = termResult.CUI;
- var label = termResult.label;
- var definition = termResult.definition;
- var type = termResult.type;
- var cuiURI = addTerminologyForm.UMLSCUIURL + CUI;
- htmlAdd+= addTerminologyForm.generateIndividualTermDisplay(cuiURI, label, definition, type);
- }
- htmlAdd+= " ";
- } else {
- htmlAdd+= "No search results found.
";
- }
- $('#selectedTerm').html(htmlAdd);
- }
-
- });
- },
- addResultsHeader:function() {
- var htmlAdd = "Label (Type) Definition
";
- return htmlAdd;
- },
- hideSearchResults:function() {
- this.selectedTerm.hide();
- },
- prepareSubmit:function() {
- var checkedElements = $("#CUI:checked");
- if(!addTerminologyForm.validateTermSelection(checkedElements)) {
- return false;
- }
- var i;
- var len = checkedElements.length;
- var checkedTerm, checkedTermElement, termLabel, termType;
- var referencedTerms = [];
- var termLabels = [];
- var termTypes = [];
-
- checkedElements.each(function() {
- checkedTermElement = $(this);
- checkedTerm = checkedTermElement.val();
- termType = checkedTermElement.attr("termType");
- termLabel = checkedTermElement.attr("label");
- referencedTerms.push(checkedTerm);
- termLabels.push(termLabel);
- termTypes.push(termType);
- });
- this.referencedTerm.val(referencedTerms);
- this.termLabel.val(termLabels);
- this.termType.val(termTypes);
- return true;
- },
- generateIndividualTermDisplay: function(cuiURI, label, definition, type) {
- var htmlAdd = "" +
- "" +
- "" +
- " " +
- label + " (" + type + ") " +
- "" + definition + " " +
- "
" +
- " ";
- return htmlAdd;
- }, validateTermSelection:function(checkedElements) {
- var numberElements = checkedElements.length;
- if(numberElements < 1) {
- addTerminologyForm.errors.html("Please select at least one term from search results to add or click cancel.
");
- return false;
- }
- return true;
- }, removeExistingTerm: function(link) {
- var removeLast = false,
- message = 'Are you sure you want to remove this term?';
-
- if (!confirm(message)) {
- return false;
- }
-
- if ($(link)[0] === $('.remove:last')[0]) {
- removeLast = true;
- }
-
- $.ajax({
- url: $(link).attr('href'),
- type: 'POST',
- data: {
- deletion: $(link).parents('.existingTerm').data('termNodeUri')
- },
- dataType: 'json',
- context: link, // context for callback
- complete: function(request, status) {
- var existingTerm,
- termNodeUri;
-
- if (status === 'success') {
-
- existingTerm = $(this).parents('.existingTerm');
- existingTerm.fadeOut(400, function() {
- var numTerms;
- // For undo link: add to a deletedAuthorships array
- // Remove from the DOM
- $(this).remove();
- // Actions that depend on the author having been removed from the DOM:
- numTerms = $('.existingTerm').length; // retrieve the length after removing authorship from the DOM
- });
-
- } else {
- alert('Error processing request: term not removed');
- }
- }
- });
- }
-};
-
-$(document).ready(function() {
- addTerminologyForm.onLoad();
-});
diff --git a/productMods/templates/freemarker/edit/forms/js/advisingRelationshipUtils.js b/productMods/templates/freemarker/edit/forms/js/advisingRelationshipUtils.js
index 67407d91..a7ad71ef 100644
--- a/productMods/templates/freemarker/edit/forms/js/advisingRelationshipUtils.js
+++ b/productMods/templates/freemarker/edit/forms/js/advisingRelationshipUtils.js
@@ -13,6 +13,7 @@ var advisingRelUtils = {
this.bindEventListeners();
$.extend(this, vitro.customFormUtils);
+ $.extend(this, i18nStrings);
if ( this.findValidationErrors() ) {
this.resetLastNameLabel();
@@ -41,9 +42,9 @@ var advisingRelUtils = {
bindEventListeners: function() {
this.idCache = {};
- //we want to use the advisee label in the relationship label.
+ // we want to use the advisee label in the relationship label.
// since the former gets cleared on submit in some cases, store
- //the value in a hidden field and map to relationship label
+ // the value in a hidden field and map to relationship label
this.advisee.change( function(objEvent) {
window.setTimeout('advisingRelUtils.mapAdviseeValue()', 180);
});
@@ -89,13 +90,13 @@ var advisingRelUtils = {
buildAdvisingRelLabel: function() {
if ( this.advisee.val() != "" ) {
- this.adRelshiplabel.val(this.subjName + " advising " + this.advisee.val());
+ this.adRelshiplabel.val(this.subjName + " " + advisingRelUtils.advisingString + " " + this.advisee.val());
}
else if ( this.saveAdviseeLabel.val() != "" ){
- this.adRelshiplabel.val(this.subjName + " advising " + this.saveAdviseeLabel.val());
+ this.adRelshiplabel.val(this.subjName + " " + advisingRelUtils.advisingString + " " + this.saveAdviseeLabel.val());
}
else {
- this.adRelshiplabel.val(this.subjName + " advising relationship");
+ this.adRelshiplabel.val(this.subjName + " " + advisingRelUtils.advisingRelationshipString);
}
},
diff --git a/productMods/templates/freemarker/edit/forms/js/awardReceiptUtils.js b/productMods/templates/freemarker/edit/forms/js/awardReceiptUtils.js
index cda8c075..518dc706 100644
--- a/productMods/templates/freemarker/edit/forms/js/awardReceiptUtils.js
+++ b/productMods/templates/freemarker/edit/forms/js/awardReceiptUtils.js
@@ -9,6 +9,8 @@ var awardReceiptUtils = {
this.baseHref = href;
this.editMode = mode;
$.extend(this, vitro.customFormUtils);
+ $.extend(this, i18nStrings);
+
// in edit mode copy the year awarded to the displayed input element
if ( this.editMode == "edit" ) {
this.hiddenOrgDiv = $('div#hiddenOrgLabel');
@@ -67,7 +69,7 @@ var awardReceiptUtils = {
},
showConferredBy: function() {
- this.org.val('Select an existing Organization or create a new one.');
+ this.org.val(awardReceiptUtils.selectAnOrganization);
this.org.addClass('acSelectorWithHelpText');
this.org.parent('p').show();
if ( this.editMode == "edit" ) {
diff --git a/productMods/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js b/productMods/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js
index ae6c7dd4..f2761f78 100644
--- a/productMods/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js
+++ b/productMods/templates/freemarker/edit/forms/js/customFormWithDataAutocomplete.js
@@ -34,6 +34,7 @@ var customForm = {
// Get the custom form data from the page
$.extend(this, customFormData);
+ $.extend(this, i18nStrings);
},
// On page load, create references for easy access to form elements.
@@ -126,7 +127,7 @@ var customForm = {
this.or.show();
this.requiredLegend.show();
this.button.show();
- this.setButtonText('new');
+// this.setButtonText('new');
this.setLabels();
// Set the initial autocomplete help text in the acSelector field.
@@ -330,7 +331,7 @@ var customForm = {
this.acSelector.val(label);
this.acSelectionInfo.html(label);
- this.setButtonText('existing');
+// this.setButtonText('existing');
this.cancel.unbind('click');
this.cancel.click(function() {
@@ -355,7 +356,8 @@ var customForm = {
this.acSelectionInfo.html('');
if (this.formSteps > 1) {
- this.acSelection.find('label').html('Selected ');
+ htmlString = customForm.selectedString + " ";
+ this.acSelection.find('label').html(htmlString);
}
}
},
@@ -419,7 +421,7 @@ var customForm = {
// First case applies on page load; second case applies when the type gets changed.
if (!this.acSelector.val() || this.acSelector.hasClass(this.acHelpTextClass)) {
- var helpText = "Select an existing " + typeText + " or create a new one.";
+ var helpText = customForm.selectExisting + " " + typeText + " " + customForm.orCreateNewOne;
//Different for object property autocomplete
this.acSelector.val(helpText)
.addClass(this.acHelpTextClass);
diff --git a/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js b/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js
index 77ecbff5..037ab0f9 100644
--- a/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js
+++ b/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js
@@ -6,6 +6,7 @@ var mailingAddressUtils = {
this.initObjectReferences();
this.bindEventListeners();
this.sortCountrySelector(mode,country);
+ $.extend(this, i18nStrings);
if ( mode == "add" && !this.errorSection.attr('id') ) {
this.containerDiv.hide();
@@ -76,14 +77,14 @@ var mailingAddressUtils = {
processCountryRelatedFields: function() {
if ( mailingAddressUtils.addressClassIsNonUS() ) {
- this.stateLabel.text("Province or Region");
+ 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("State");
+ this.stateLabel.text(mailingAddressUtils.stateString);
this.postalCodeField.attr('size', '8');
this.stateField.hide();
this.stateSelector.show();
@@ -122,24 +123,24 @@ var mailingAddressUtils = {
if ( this.errorSection.is(':visible') ) {
this.countrySelector.prepend($(" ")
.attr("value","")
- .text("Select one"));
+ .text(mailingAddressUtils.selectOne));
this.countrySelector.val(country);
}
else if ( mode == "add" ) {
this.countrySelector.prepend($(" ")
.attr("value","")
- .text("Select one"));
+ .text(mailingAddressUtils.selectOne));
}
else if ( mode == "edit" || country.length > 1 ) {
this.countrySelector.prepend($(" ")
.attr("value","")
- .text("Select one"));
+ .text(mailingAddressUtils.selectOne));
this.countrySelector.val(country);
}
else if ( country.length == 0 ) {
this.countrySelector.prepend($(" ")
.attr("value","")
- .text("Select one"));
+ .text(mailingAddressUtils.selectOne));
this.countrySelector.val(country);
}
}
diff --git a/productMods/templates/freemarker/edit/forms/js/manageGrantsForIndividual.js b/productMods/templates/freemarker/edit/forms/js/manageGrantsForIndividual.js
index 5c673c55..36eb16e8 100644
--- a/productMods/templates/freemarker/edit/forms/js/manageGrantsForIndividual.js
+++ b/productMods/templates/freemarker/edit/forms/js/manageGrantsForIndividual.js
@@ -14,6 +14,7 @@ var manageGrants = {
// Get the custom form data from the page
$.extend(this, customFormData);
+ $.extend(this, i18nStrings);
},
// Initial page setup. Called only at page load.
@@ -68,10 +69,10 @@ var manageGrants = {
complete: function(request, status) {
if (status === 'success') {
- window.status = "The item has been successfully excluded from the profile page.";
+ window.status = manageGrants.grantSuccessfullyExcluded;
} else {
- alert('Error processing request: the item cannot be excluded from the profile page.');
+ alert(manageGrants.errorExcludingGrant);
$(grant).removeAttr('checked');
}
}
diff --git a/productMods/templates/freemarker/edit/forms/js/managePeopleForOrganization.js b/productMods/templates/freemarker/edit/forms/js/managePeopleForOrganization.js
index 4a7aaea3..672ee820 100644
--- a/productMods/templates/freemarker/edit/forms/js/managePeopleForOrganization.js
+++ b/productMods/templates/freemarker/edit/forms/js/managePeopleForOrganization.js
@@ -14,6 +14,7 @@ var managePeople = {
// Get the custom form data from the page
$.extend(this, customFormData);
+ $.extend(this, i18nStrings);
},
// Initial page setup. Called only at page load.
@@ -68,10 +69,10 @@ var managePeople = {
complete: function(request, status) {
if (status === 'success') {
- window.status = "The person has been successfully excluded from the organization page.";
+ window.status = managePeople.personSuccessfullyExcluded;
} else {
- alert('Error processing request: the person cannot be excluded from the organization page.');
+ alert(managePeople.errorExcludingPerson);
$(person).removeAttr('checked');
}
}
diff --git a/productMods/templates/freemarker/edit/forms/js/managePublicationsForIndividual.js b/productMods/templates/freemarker/edit/forms/js/managePublicationsForIndividual.js
index 672c2dbe..5d39f2e9 100644
--- a/productMods/templates/freemarker/edit/forms/js/managePublicationsForIndividual.js
+++ b/productMods/templates/freemarker/edit/forms/js/managePublicationsForIndividual.js
@@ -14,6 +14,7 @@ var managePublications = {
// Get the custom form data from the page
$.extend(this, customFormData);
+ $.extend(this, i18nStrings);
},
// Initial page setup. Called only at page load.
@@ -68,10 +69,10 @@ var managePublications = {
complete: function(request, status) {
if (status === 'success') {
- window.status = "The publication will has been successfully excluded from the profile page.";
+ window.status = managePublications.publicationSuccessfullyExcluded;
} else {
- alert('Error processing request: the publication cannot be excluded from the profile page.');
+ alert(managePublications.errorExcludingPublication);
$(publication).removeAttr('checked');
}
}
diff --git a/productMods/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js b/productMods/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js
index a8a881d7..1b30c4bc 100644
--- a/productMods/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js
+++ b/productMods/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js
@@ -14,6 +14,7 @@ var manageWebpages = {
// Get the custom form data from the page
$.extend(this, customFormData);
+ $.extend(this, i18nStrings);
},
// Initial page setup. Called only at page load.
@@ -68,7 +69,7 @@ var manageWebpages = {
}
$('.webpageName').each(function() {
- $(this).attr('title', 'Drag and drop to reorder web pages');
+ $(this).attr('title', manageWebpages.dragDropToReorderWebpages);
});
webpages.sortable({
@@ -121,7 +122,7 @@ var manageWebpages = {
ui.item.appendTo(webpages);
}
- alert('Reordering of web pages failed.');
+ alert(manageWebpages.webpageReorderingFailed);
}
}
});
@@ -152,7 +153,7 @@ var manageWebpages = {
removeWebpage: function(link) {
// RY Upgrade this to a modal window
var removeLast = false,
- message = 'Are you sure you want to remove this web page?';
+ message = manageWebpages.confirmWebpageDeletion;
if (!confirm(message)) {
return false;
@@ -212,7 +213,7 @@ var manageWebpages = {
});
} else {
- alert('Error processing request: web page not removed.');
+ alert(manageWebpages.errorRemovingWebpage);
}
}
});
diff --git a/productMods/templates/freemarker/edit/forms/js/publicationToPersonUtils.js b/productMods/templates/freemarker/edit/forms/js/publicationToPersonUtils.js
index b560f758..bd622114 100644
--- a/productMods/templates/freemarker/edit/forms/js/publicationToPersonUtils.js
+++ b/productMods/templates/freemarker/edit/forms/js/publicationToPersonUtils.js
@@ -10,6 +10,7 @@ var publicationToPersonUtils = {
this.baseHref = href;
this.sentinel = blankSentinel;
$.extend(this, vitro.customFormUtils);
+ $.extend(this, i18nStrings);
this.displayFieldsForType();
if ( this.findValidationErrors() ) {
@@ -163,23 +164,23 @@ var publicationToPersonUtils = {
// if the user has changed type, ensure that irrelevant fields are cleared
// and reset an acSelection divs
- if ( this.book.val() != '' && this.book.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.book.val() != '' && this.book.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.book.val('');
this.resetAcSelection('book');
}
- if ( this.editor.val() != '' && this.editor.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.editor.val() != '' && this.editor.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.editor.val('');
this.resetAcSelection('editor');
}
- if ( this.publisher.val() != '' && this.publisher.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.publisher.val() != '' && this.publisher.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.publisher.val('');
this.resetAcSelection('publisher');
}
- if ( this.presentedAt.val() != '' && this.presentedAt.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.presentedAt.val() != '' && this.presentedAt.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.presentedAt.val('');
this.resetAcSelection('conference');
}
- if ( this.proceedingsOf.val() != '' && this.proceedingsOf.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.proceedingsOf.val() != '' && this.proceedingsOf.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.proceedingsOf.val('');
this.resetAcSelection('event');
}
@@ -214,15 +215,15 @@ var publicationToPersonUtils = {
// if the user is changing type, ensure that irrelevant fields are cleared
// and reset an acSelection divs
- if ( this.collection.val() != '' && this.collection.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.collection.val() != '' && this.collection.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.collection.val('');
this.resetAcSelection('collection');
}
- if ( this.presentedAt.val() != '' && this.presentedAt.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.presentedAt.val() != '' && this.presentedAt.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.presentedAt.val('');
this.resetAcSelection('conference');
}
- if ( this.proceedingsOf.val() != '' && this.proceedingsOf.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.proceedingsOf.val() != '' && this.proceedingsOf.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.proceedingsOf.val('');
this.resetAcSelection('event');
}
@@ -250,15 +251,15 @@ var publicationToPersonUtils = {
// if the user is changing type, ensure that irrelevant fields are cleared
// and reset an acSelection divs
- if ( this.collection.val() != '' && this.collection.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.collection.val() != '' && this.collection.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.collection.val('');
this.resetAcSelection('collection');
}
- if ( this.presentedAt.val() != '' && this.presentedAt.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.presentedAt.val() != '' && this.presentedAt.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.presentedAt.val('');
this.resetAcSelection('conference');
}
- if ( this.proceedingsOf.val() != '' && this.proceedingsOf.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.proceedingsOf.val() != '' && this.proceedingsOf.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.proceedingsOf.val('');
this.resetAcSelection('event');
}
@@ -286,19 +287,19 @@ var publicationToPersonUtils = {
// if the user is changing type, ensure that irrelevant fields are cleared
// and reset an acSelection divs
- if ( this.book.val() != '' && this.book.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.book.val() != '' && this.book.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.book.val('');
this.resetAcSelection('book');
}
- if ( this.editor.val() != '' && this.editor.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.editor.val() != '' && this.editor.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.editor.val('');
this.resetAcSelection('editor');
}
- if ( this.publisher.val() != '' && this.publisher.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.publisher.val() != '' && this.publisher.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.publisher.val('');
this.resetAcSelection('publisher');
}
- if ( this.proceedingsOf.val() != '' && this.proceedingsOf.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.proceedingsOf.val() != '' && this.proceedingsOf.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.proceedingsOf.val('');
this.resetAcSelection('event');
}
@@ -319,23 +320,23 @@ var publicationToPersonUtils = {
// if the user is changing type, ensure that irrelevant fields are cleared
// and reset an acSelection divs
- if ( this.collection.val() != '' && this.collection.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.collection.val() != '' && this.collection.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.collection.val('');
this.resetAcSelection('collection');
}
- if ( this.book.val() != '' && this.book.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.book.val() != '' && this.book.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.book.val('');
this.resetAcSelection('book');
}
- if ( this.editor.val() != '' && this.editor.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.editor.val() != '' && this.editor.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.editor.val('');
this.resetAcSelection('editor');
}
- if ( this.publisher.val() != '' && this.publisher.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.publisher.val() != '' && this.publisher.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.publisher.val('');
this.resetAcSelection('publisher');
}
- if ( this.proceedingsOf.val() != '' && this.proceedingsOf.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.proceedingsOf.val() != '' && this.proceedingsOf.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.proceedingsOf.val('');
this.resetAcSelection('event');
}
@@ -350,27 +351,27 @@ var publicationToPersonUtils = {
// if the user is changing type, ensure that irrelevant fields are cleared
// and reset an acSelection divs
- if ( this.collection.val() != '' && this.collection.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.collection.val() != '' && this.collection.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.collection.val('');
this.resetAcSelection('collection');
}
- if ( this.book.val() != '' && this.book.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.book.val() != '' && this.book.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.book.val('');
this.resetAcSelection('book');
}
- if ( this.editor.val() != '' && this.editor.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.editor.val() != '' && this.editor.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.editor.val('');
this.resetAcSelection('editor');
}
- if ( this.publisher.val() != '' && this.publisher.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.publisher.val() != '' && this.publisher.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.publisher.val('');
this.resetAcSelection('publisher');
}
- if ( this.proceedingsOf.val() != '' && this.proceedingsOf.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.proceedingsOf.val() != '' && this.proceedingsOf.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.proceedingsOf.val('');
this.resetAcSelection('event');
}
- if ( this.presentedAt.val() != '' && this.presentedAt.val().substring(0, 18) != "Select an existing" ) {
+ if ( this.presentedAt.val() != '' && this.presentedAt.val().substring(0, 18) != publicationToPersonUtils.selectAnExisting ) {
this.presentedAt.val('');
this.resetAcSelection('conference');
}
diff --git a/productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl b/productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl
index a24f50c9..8a2e3db1 100644
--- a/productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl
+++ b/productMods/templates/freemarker/edit/forms/manageGrantsForIndividual.ftl
@@ -47,6 +47,10 @@ ${i18n().check_grants_to_exclude}
var customFormData = {
processingUrl: '${urls.base}/edit/primitiveRdfEdit'
};
+var i18nStrings = {
+ grantSuccessfullyExcluded: '${i18n().grant_successfully_excluded}',
+ errorExcludingGrant: '${i18n().error_excluding_grant}'
+};
${stylesheets.add(' ',
diff --git a/productMods/templates/freemarker/edit/forms/managePeopleForOrganization.ftl b/productMods/templates/freemarker/edit/forms/managePeopleForOrganization.ftl
index fb03ed70..e02dd101 100644
--- a/productMods/templates/freemarker/edit/forms/managePeopleForOrganization.ftl
+++ b/productMods/templates/freemarker/edit/forms/managePeopleForOrganization.ftl
@@ -43,6 +43,10 @@ ${i18n().check_people_to_exclude}
var customFormData = {
processingUrl: '${urls.base}/edit/primitiveRdfEdit'
};
+var i18nStrings = {
+ personSuccessfullyExcluded: '${i18n().person_successfully_excluded}',
+ errorExcludingPerson: '${i18n().error_excluding_person}'
+};
${stylesheets.add(' ',
diff --git a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
index 75bb6023..87cd39da 100644
--- a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
+++ b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
@@ -41,7 +41,7 @@
${i18n().edit_capitalized} |
- ${i18n().delete_capitalized}
+ ${i18n().delete_button}
@@ -69,6 +69,12 @@ var customFormData = {
rankPredicate: '${editConfiguration.pageData.rankPredicate}',
reorderUrl: '${urls.base}/edit/reorder'
};
+var i18nStrings = {
+ dragDropToReorderWebpages: '${i18n().drag_drop_to_reorder_webpages}',
+ webpageReorderingFailed: '${i18n().webpage_reordering_failed}',
+ confirmWebpageDeletion: '${i18n().confirm_webpage_deletion}',
+ errorRemovingWebpage: '${i18n().error_removing_webpage}'
+};
${stylesheets.add(' ',
diff --git a/productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl b/productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
index 0e06ec6c..dd78baa3 100644
--- a/productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
+++ b/productMods/templates/freemarker/edit/forms/organizationHasPositionHistory.ftl
@@ -164,7 +164,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
flagClearLabelForExisting: '${flagClearLabelForExisting}'
};
-
+ var i18nStrings = {
+ selectAnExisting: '${i18n().select_an_existing}',
+ orCreateNewOne: '${i18n().or_create_new_one}',
+ selectedString: '${i18n().selected}'
+ };
+
diff --git a/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl b/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
index a3b6c513..01904b49 100644
--- a/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
+++ b/productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
@@ -212,6 +212,11 @@ var customFormData = {
blankSentinel: '${blankSentinel}',
flagClearLabelForExisting: '${flagClearLabelForExisting}'
};
+var i18nStrings = {
+ selectAnExisting: '${i18n().select_an_existing}',
+ orCreateNewOne: '${i18n().or_create_new_one}',
+ selectedString: '${i18n().selected}'
+};
diff --git a/productMods/templates/freemarker/edit/forms/personHasMailingAddress.ftl b/productMods/templates/freemarker/edit/forms/personHasMailingAddress.ftl
index cb2d6ff1..029872a5 100644
--- a/productMods/templates/freemarker/edit/forms/personHasMailingAddress.ftl
+++ b/productMods/templates/freemarker/edit/forms/personHasMailingAddress.ftl
@@ -191,6 +191,14 @@
+
+
${stylesheets.add(' ')}
diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
index 23c84b3d..3abb1896 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
+++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
@@ -70,10 +70,68 @@ we will use rev 293 (dev build version) of the flot & excanvas files.
${scripts.add('',
diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
index c332b2d5..06ee8ac9 100644
--- a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
+++ b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl
@@ -66,7 +66,45 @@ var comparisonScienceMapCsvDataUrlPrefix = "${urls.base}${dataVisualizationURLRo
var entityMapOfScienceSubDisciplineCSVURLPrefix = "${urls.base}${dataVisualizationURLRoot}?vis=${mapOfScienceVisParam}&output=csv&vis_mode=subdiscipline&&uri="
var entityMapOfScienceDisciplineCSVURL = "${entityMapOfScienceDisciplineCSVURL}";
var entityMapOfScienceSubDisciplineCSVURL = "${entityMapOfScienceSubDisciplineCSVURL}";
-
+var i18nStrings = {
+ firstString: '${i18n().vis_first_link}',
+ lastString: '${i18n().vis_last_link}',
+ previousString: '${i18n().vis_previous_link}',
+ nextString: '${i18n().vis_next_link}',
+ organizationsString: '${i18n().organizations_capitalized}',
+ peopleString: '${i18n().people_capitalized}',
+ infoIconString: '${i18n().info_icon}',
+ entityTypeString: '${i18n().entity_type}',
+ organizationString: '${i18n().organization_capitalized}',
+ personString: '${i18n().person_capitalized}',
+ numberOfPubs: '${i18n().of_pubs}',
+ maxNbrForComp: '${i18n().max_nbr_for_comp}',
+ noMatchingScienceAreas: '${i18n().no_matching_science_areas}',
+ clearSearchQuery: '${i18n().clear_search_query}',
+ saveAllAsCSV: '${i18n().save_all_as_csv}',
+ drillDownString: '${i18n().drill_down}',
+ subdisciplinesString: '${i18n().subdisciplines}',
+ disciplinesString: '${i18n().disciplines}',
+ scienceAreaLevel: '${i18n().science_area_level}',
+ ofActivityString: '${i18n().of_activity}',
+ subdisciplinesLower: '${i18n().subdisciplines_lower}',
+ disciplinesLower: '${i18n().disciplines_lower}',
+ showDisciplineLabels: '${i18n().show_discipline_labels}',
+ noAttributedPubs: '${i18n().no_attributed_publications}',
+ noneOfThe: '${i18n().none_of_the}',
+ pubsAttributedTo: '${i18n().publications_attributed_to}',
+ beenScienceLocated: '${i18n().been_science_located}',
+ pubAttributedTo: '${i18n().publication_attributed_to}',
+ notScienceLocated: '${i18n().not_science_located}',
+ publicationsString: '${i18n().publications}',
+ publicationString: '${i18n().publication}',
+ noJournalInformation: '${i18n().no_journal_information}',
+ noMatchingMapLocation: '${i18n().no_matching_map_location}',
+ loadingDataFor: '${i18n().loading_data_for}',
+ mapBeingRefreshed: '${i18n().map_being_refreshed_msg}',
+ publicationsPubs: '${i18n().publication_pubs}',
+ percentActivity: '${i18n().percent_activity}'
+};
${scripts.add('',
diff --git a/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl b/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
index 20818b1f..35b0253e 100644
--- a/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
+++ b/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
@@ -58,6 +58,18 @@ var contextPath = "${urls.base}";
var visualizationDataRoot = "${dataVisualizationURLRoot}";
// -->
+var i18nStringsCoauthorship = {
+ coAuthorsString: '${i18n().co_authors_capitalized}',
+ authorString: '${i18n().author_capitalized}',
+ publicationsWith: '${i18n().publications_with}',
+ publicationsString: '${i18n().publication_s_capitalized}',
+ coauthorsString: '${i18n().co_author_s_capitalized}'
+};
+var i18nStringsPersonLvl = {
+ fileCapitalized: '${i18n().file_capitalized}',
+ contentRequiresFlash: '${i18n().content_requires_flash}',
+ getFlashString: '${i18n().get_flash}'
+};
diff --git a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
index 5036f399..3801f4a5 100644
--- a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
+++ b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
@@ -57,6 +57,18 @@ var contextPath = "${urls.base}";
var visualizationDataRoot = "${dataVisualizationURLRoot}";
// -->
+var i18nStringsCoPi = {
+ coInvestigatorString: '${i18n().co_inestigators_capitalized}',
+ investigatorString: '${i18n().investigator_capitalized}',
+ grantsWithString: '${i18n().grants_with}',
+ grantsCapitalized: '${i18n().grant_s_capitalized}',
+ coInvestigatorCapitalized: '${i18n().co_investigator_s_capitalized}'
+};
+var i18nStringsPersonLvl = {
+ fileCapitalized: '${i18n().file_capitalized}',
+ contentRequiresFlash: '${i18n().content_requires_flash}',
+ getFlashString: '${i18n().get_flash}'
+};
diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index 50f37f6e..6f70a2c3 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -1700,9 +1700,6 @@ input[type="submit"] {
.edit-individual {
border-left: 1px dotted #B2D15A;
}
-div#profileTypeContainer h2:after {
- content:"Profile Type";
-}
/* -------------------------------------------------> */
/* SITE ADMIN DASHBOARD ----------------------------> */
/* -------------------------------------------------> */
diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties
index 48f166d6..2aa17572 100644
--- a/themes/wilma/i18n/all.properties
+++ b/themes/wilma/i18n/all.properties
@@ -110,6 +110,7 @@ missing_info_resource = missing information resource
award_receipt_name = award receipt name
award_name = award name
conferred_by = conferred by
+selected_award = Selected award
incomplete_date_time_interval = incomplete date/time interval
incomplete_date_time_value = incomplete date/time value
@@ -174,6 +175,7 @@ selection_in_process = Your selection is being processed.
for = for
background_top_image = background top image
full_view_icon = full view icon
+profile_type = Profile Type
#
# body templates ( /templates/freemarker/body/ )
#
@@ -293,6 +295,7 @@ no_linked_author = no linked author
remove_author_link = remove author link
add_author = Add Author
return_to_grant = Return to grant
+return_to_publication = Return to publication
add_an_author = Add an Author
person_capitalized = Person
organization_capitalized = Organization
@@ -406,7 +409,7 @@ create_own_concept_all_caps = Create Your Own Concept
concept_capitalized = Concept
selected_concept = Selected Concept
create_concept = Create Concept
-return_to+manage_concepts = Return to Manage Concepts
+return_to_manage_concepts = Return to Manage Concepts
institutional_internal_class = Institutional Internal Class
internal_class_intro_one = This class will be used to designate those individuals internal to your institution.
@@ -673,3 +676,140 @@ vis_caching_process = What's involved in the caching process?
vis_tools_note_two = To this end we have devised a caching solution which will retain information about the hierarchy of organizations -- namely, which publications are attributed to which organizations -- by storing the RDF model.
vis_tools_note_three = We're currently caching these models in memory. The cache is built (only once) on the first user request after a server restart. Because of this, the same model will be served until the next restart. This means that the data in these models may become stale depending upon when it was last created. This works well enough for now. In future releases we will improve this solution so that models are stored on disk and periodically updated.
vis_tools_note_four = The models are refreshed each time the server restarts. Since this is not generally practical on production instances, administrators can instead use the "refresh cache" link above to do this without a restart.
+
+#
+# custom form javascript variables ( /templates/freemarker/edit/js)
+#
+drag_drop_reorder_authors = Drag and drop to reorder authors
+reordering_authors_failed = Reordering of authors failed.
+confirm_author_removal = Are you sure you want to remove this author:
+error_processing_aithor_request = Error processing request: author not removed
+author_capitalized = Author
+or_add_new_one = or add a new one.
+
+vocabulary_service_unavailable = The vocabulary service is unavailable. Please try again later.
+no_serch_results_found = No search results were found.
+label_type = Label (Type)
+definition_capitalized = Definition
+best_match = Best Match
+select_term_from_results = Please select at least one term from the search search results.
+select_vocabulary_source_to_search = Please select at least one external vocabulary source to search.
+confirm_term_deletion = Are you sure you want to remove this term?
+error_term_not_deleted = Error processing request: term not removed
+
+advising = advising
+advising_relationship = advising relationship
+
+select_or_create_organization = Select an existing Organization or create a new one.
+
+province_or_region = Province or Region
+
+grant_successfully_excluded = The item has been successfully excluded from the profile page.
+error_excluding_grant = Error processing request: the item cannot be excluded from the profile page.
+
+person_successfully_excluded = The person has been successfully excluded from the organization page.
+error_excluding_person = Error processing request: the person cannot be excluded from the organization page.
+
+publication_successfully_excluded = The publication will has been successfully excluded from the profile page.
+error_excluding_publication = Error processing request: the publication cannot be excluded from the profile page.
+
+drag_drop_to_reorder_webpages = Drag and drop to reorder web pages
+webpage_reordering_failed = Reordering of web pages failed.
+confirm_webpage_deletion = Are you sure you want to remove this web page?
+error_removing_webpage = Error processing request: web page not removed.
+
+#
+# miscellaneous javascript variables ( productMods/js)
+#
+researcher = researcher
+researchers = researchers
+currently_no_researchers = There are currently no researchers with a defined geographic focus.
+countries_and_regions = countries and regions.
+map_states_string = states.
+map_state_string = state.
+statewide_locations = state-wide locations.
+researchers_in = researchers in
+
+no_faculty_found = No faculty members found.
+placeholder_image = placeholder image
+view_all_departments = view all academic departments
+view_all_faculty = view all faculty
+no_departments_found = No academic departments found.
+
+#
+# individual javascript variables ( productMods/js/individual)
+#
+error_processing_type_change = Error processing request: the unchecked labels could not be deleted.
+
+display_more_ellipsis = ...more
+show_more_content = show more content
+
+#
+# visualization javascript variables ( productMods/js/visualization)
+#
+publications_with = Publications with
+
+co_inestigators_capitalized = Co-investigators
+grants_with = Grants with
+
+vis_first_link = First
+vis_last_link = Last
+vis_previous_link = Prev
+vis_next_link = Next
+
+max_entity_note = A Maximum 10 entities can be compared. Please remove some & try again.
+organizations_and_people = Organizations and People
+loading_data_for = Loading data for
+data_for = Data for
+refreshing_data_message = is now being refreshed. The visualization will load as soon as we are done computing, or you can search or browse other data in VIVO and come back in a few minutes.
+disclaimer_text_one = This information is based solely on
+disclaimer_text_two = which have been loaded into the VIVO system as of
+level_undefined_error = ENTITY LEVEL UNDEFINED ERROR
+
+total_number_of = Total Number of
+number_of = Number of
+have_an_unknown = have an unknown
+year_not_chartered = year (not charted above)
+in_completed_year = in a completed year
+were = were
+in_current_incomplete_year = in the current incomplete year (not charted above)
+publication_count = Publication Count
+grant_count = Grant Count
+entity_type = Entity Type
+no_matching_entities_found = No matching entities found
+clear_search_query = clear search query
+short_max_entity_note = A Maximum of 10 entities can be compared.
+information_capitalized = Information
+entity_type = Entity Type
+content_requires_flash = This content requires the Adobe Flash Player.
+get_flash = Get Flash
+of_pubs = of pubs.
+max_nbr_for_comp = The maximum number of items for comparison is 3.
+no_matching_science_areas = No matching science areas found
+
+subdisciplines = Subdisciplines
+disciplines = Disciplines
+science_area_level = Level of Science Area
+of_activity = of activity
+
+drill_down = drill down
+
+disciplines_lower = disciplines
+subdisciplines_lower = subdisciplines
+show_discipline_labels = Show discipline labels
+
+no_attributed_publications = No publications in the system have been attributed to this
+none_of_the = None of the
+publications_attributed_to = publications attributed to this
+been_science_located = have been "science-located."
+publication_attributed_to = The publication attributed to this
+not_science_located = has not been "science-located."
+no_journal_information = have no journal information.
+no_matching_map_location = could not be matched with a map location using their journal information.
+
+map_being_refreshed_msg = is now being refreshed. The visualization will load as soon as we are done computing, or you can search or browse other data in VIVO and come back in a few minutes.
+
+publication_pubs = publications (pubs.)
+percent_activity = % activity
+
+
diff --git a/themes/wilma/templates/individual--foaf-person.ftl b/themes/wilma/templates/individual--foaf-person.ftl
index 5ef60e5a..83138449 100644
--- a/themes/wilma/templates/individual--foaf-person.ftl
+++ b/themes/wilma/templates/individual--foaf-person.ftl
@@ -117,6 +117,12 @@
#if>
${stylesheets.add(' ',
diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl
index 76286b52..0a71962c 100644
--- a/themes/wilma/templates/page-home.ftl
+++ b/themes/wilma/templates/page-home.ftl
@@ -85,5 +85,23 @@
<#include "footer.ftl">
<#-- builds a json object that is used by js to render the academic departments section -->
<@lh.listAcademicDepartments />
+