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

Merge branch 'develop' into feature/microformats

Browse source 
Merging the latest changes in develop into the microformats branch. Necessary before doing ther pull request and merging microformats back into develop. (I think.)
This commit is contained in:
Tim Worrall 2014-11-25 13:10:51 -05:00
commit ce3c4a3539
25 changed files with 218 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

10
productMods/WEB-INF/resources/startup_listeners.txt
View file

@ -7,6 +7,8 @@
edu.cornell.mannlib.vitro.webapp.servlet.setup.JvmSmokeTests
edu.cornell.mannlib.vitro.webapp.application.ApplicationSetup
edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSetup
edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSmokeTests
@ -16,15 +18,12 @@ edu.cornell.mannlib.vitro.webapp.servlet.setup.GuardAgainstUnmigratedRDB
edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings$Setup
edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$Setup
edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$ComponentsSetup
edu.cornell.mannlib.vitro.webapp.config.RevisionInfoSetup
edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory$Setup
# In 1.8, this should replace JenaPersistentDataSourceSetup, RDFServiceSetup, and maybe more.
edu.cornell.mannlib.vitro.webapp.servlet.setup.rdfsetup.RDFSetup
edu.cornell.mannlib.vitro.webapp.servlet.setup.ConfigurationModelsSetup
edu.cornell.mannlib.vitro.webapp.servlet.setup.ContentModelSetup
@ -64,9 +63,6 @@ edu.ucsf.vitro.opensocial.OpenSocialSmokeTests
# For multiple language support
edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup
# Add VIVO specific DocumentModifers, this must come before SearchIndexerSetup
edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoDocumentModifiers
# The search indexer uses a "public" permission, so the PropertyRestrictionPolicyHelper
# and the PermissionRegistry must already be set up.
edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerSetup

2
productMods/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl
View file

@ -20,7 +20,7 @@ roleExamples-->
<#--Variable assignments for Add Clinical Role To Person-->
<#assign roleDescriptor = "${i18n().collection_series_editor_role}" />
<#assign typeSelectorLabel = "${i18n().editor_role_in}" />
<#assign genericLabel = "Collection" />
<#assign genericLabel = "Collection or Series" />
<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Collection'}" />

3
productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
View file

@ -53,7 +53,8 @@
editMode: 'add',
typeName: 'Concept',
defaultTypeName: 'concept', // used in repair mode to generate button text
baseHref: '${urls.base}/individual?uri='
baseHref: '${urls.base}/individual?uri=',
limitToConceptClasses:["http://www.w3.org/2004/02/skos/core#Concept"]
};
var i18nStrings = {
selectAnExisting: '${i18n().select_an_existing}',

16
productMods/templates/freemarker/edit/forms/js/addAuthorsToInformationResource.js
View file

@ -113,7 +113,7 @@ var addAuthorForm = {
// after hitting 'cancel.'
initAuthorListOnlyView: function() {
if ($('.authorship').length) { // make sure we have at least one author
if ($('li.authorship').length) { // make sure we have at least one author
// Reorder authors on page load so that previously unranked authors get a rank. Otherwise,
// when we add a new author, it will get put ahead of any previously unranked authors, instead
// of at the end of the list. (It is also helpful to normalize the data before we get started.)
@ -282,7 +282,7 @@ var addAuthorForm = {
setAcFilter: function() {
this.acFilter = [];
$('.authorship').each(function() {
$('li.authorship').each(function() {
var uri = $(this).data('authorUri');
addAuthorForm.acFilter.push(uri);
});
@ -404,7 +404,7 @@ var addAuthorForm = {
type: 'POST',
success: function(data, status, request) {
var pos;
$('.authorship').each(function(index){
$('li.authorship').each(function(index){
pos = index + 1;
// Set the new position for this element. The only function of this value
// is so we can reset an element to its original position in case reordering fails.
@ -440,7 +440,7 @@ var addAuthorForm = {
// have to keep retrieving data from or modifying the DOM as we manipulate the
// authorships.
initAuthorshipData: function() {
$('.authorship').each(function(index) {
$('li.authorship').each(function(index) {
$(this).data(authorshipData[index]);
// RY We might still need position to put back an element after reordering
@ -462,7 +462,7 @@ var addAuthorForm = {
findAuthorship: function(key, value) {
var matchingAuthorship = $(); // if we don't find one, return an empty jQuery set
$('.authorship').each(function() {
$('li.authorship').each(function() {
var authorship = $(this);
if ( authorship.data(key) === value ) {
matchingAuthorship = authorship;
@ -644,7 +644,7 @@ var addAuthorForm = {
url: $(link).attr('href'),
type: 'POST',
data: {
deletion: $(link).parents('.authorship').data('authorshipUri')
deletion: $(link).parents('li.authorship').data('authorshipUri')
},
dataType: 'json',
context: link, // context for callback
@ -654,7 +654,7 @@ var addAuthorForm = {
if (status === 'success') {
authorship = $(this).parents('.authorship');
authorship = $(this).parents('li.authorship');
// Clear autocomplete cache entries matching this author's name, else
// autocomplete will be retrieved from the cache, which excludes the removed author.
@ -673,7 +673,7 @@ var addAuthorForm = {
$(this).remove();
// Actions that depend on the author having been removed from the DOM:
numAuthors = $('.authorship').length; // retrieve the length after removing authorship from the DOM
numAuthors = $('li.authorship').length; // retrieve the length after removing authorship from the DOM
// If removed item not last, reorder to remove any gaps
if (numAuthors > 0 && ! removeLast) {