diff --git a/productMods/edit/forms/css/customFormWithAutocomplete.css b/productMods/edit/forms/css/customFormWithAutocomplete.css index aa5dc66c..7c66f21b 100644 --- a/productMods/edit/forms/css/customFormWithAutocomplete.css +++ b/productMods/edit/forms/css/customFormWithAutocomplete.css @@ -27,4 +27,7 @@ form.customForm h4 { border-width: 0; background: none; color: #000; -} \ No newline at end of file +} +.disabledSubmit { + cursor: default ! important; +} diff --git a/productMods/edit/forms/js/customFormWithAutocomplete.js b/productMods/edit/forms/js/customFormWithAutocomplete.js index 8ada5c74..4b4d92f8 100644 --- a/productMods/edit/forms/js/customFormWithAutocomplete.js +++ b/productMods/edit/forms/js/customFormWithAutocomplete.js @@ -185,6 +185,7 @@ var customForm = { } //Disable submit button until selection made this.button.attr('disabled', 'disabled'); + this.button.addClass('disabledSubmit'); // tlw }, // Bind event listeners that persist over the life of the page. Event listeners @@ -378,6 +379,7 @@ var customForm = { if(this.supportEdit) { //On initialization in this mode, submit button is disabled this.button.removeAttr('disabled'); + this.button.removeClass('disabledSubmit'); // tlw } this.setButtonText('existing'); @@ -408,10 +410,11 @@ var customForm = { if (this.formSteps > 1) { this.acSelection.find('label').html('Selected '); } - + //Resetting so disable submit button again for object property autocomplete if(this.supportEdit) { - //this.button.attr('disabled', 'disabled'); + this.button.attr('disabled', 'disabled'); + this.button.addClass('disabledSubmit'); } } diff --git a/productMods/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl b/productMods/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl index c8ea8e49..87f04025 100644 --- a/productMods/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl +++ b/productMods/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl @@ -23,8 +23,13 @@ <#assign selectedObjectUri = ""/> #if> +<#if editConfiguration.formTitle?contains("collaborator") > + <#assign formTitle = "Select an existing Collaborator for ${editConfiguration.subjectName}" /> +<#else> + <#assign formTitle = editConfiguration.formTitle /> +#if> -
${editConfiguration.propertyPublicDescription}
#if> - - <#---This section should become autocomplete instead-->- +
@@ -68,7 +71,7 @@There are no entries in the system from which to select.
#if> #if> - +<#if editConfiguration.propertyOfferCreateNewOption = true> <#include "defaultOfferCreateNewOptionForm.ftl"> @@ -102,7 +105,6 @@ - ${stylesheets.add('')} ${stylesheets.add('')} ${stylesheets.add('')}