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

NIHVIVO-753 Undo toggling of last name field label, and javascript name-fixing. See discussion under NIHVIVO-444 for the rationale behind these changes.

Browse source 
NIHVIVO-725 More work on publication form.
This commit is contained in:
rjy7 2010-07-07 14:57:20 +00:00
parent 98543e75e0
commit 7685f5e329
5 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
productMods/edit/forms/addAuthorsToInformationResource.jsp
View file

@ -398,7 +398,7 @@ SPARQL queries for existing values. --%>
<h3>Add an Author</h3>
<p class="inline"><v:input type="text" id="lastName" label="Name ${requiredHint}" cssClass="acInput" size="30" /></p>
<p class="inline"><v:input type="text" id="lastName" label="Last name ${requiredHint}" cssClass="acInput" size="30" /></p>
<p class="inline"><v:input type="text" id="firstName" label="First name ${requiredHint} ${initialHint}" size="20" /></p>
<p class="inline"><v:input type="text" id="middleName" label="Middle name ${initialHint}" size="20" /></p>
<input type="hidden" id="label" name="label" value="" /> <!-- Field value populated by JavaScript -->

4
productMods/edit/forms/addPublicationToAuthor.jsp
View file

@ -220,12 +220,12 @@ SPARQL queries for existing values. --%>
<v:input type="select" label="Publication type" id="pubType" />
<v:input type="text" id="title" label="title" cssClass="acInput" size="50" />
<v:input type="text" id="title" label="title" cssClass="acInput newIndLabel" size="50" />
<div class="acSelection">
<%-- RY maybe make this a label and input field. See what looks best. --%>
<p class="inline"><label>Selected :</label><span class="acSelectionName"></span></p>
<input type="hidden" id="pubUri" name="pubUri" value="" /> <!-- Field value populated by JavaScript -->
<input type="hidden" id="pubUri" name="pubUri" cssClass="existingIndUri" value="" /> <!-- Field value populated by JavaScript -->
</div>
<p class="submit"><v:input type="submit" id="submit" value="Create Publication" cancel="true" /></p>

4
productMods/edit/forms/css/customFormWithAdvanceTypeSelection.css
View file

@ -1,5 +1 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
#selectedResource {
display:none;
}

42
productMods/edit/forms/js/addAuthorsToInformationResource.js
View file

@ -130,20 +130,20 @@ var addAuthorForm = {
showFieldsForNewPerson: function() {
this.firstNameWrapper.show();
this.middleNameWrapper.show();
this.toggleLastNameLabel('Name', 'Last name');
// this.toggleLastNameLabel('Name', 'Last name');
},
hideFieldsForNewPerson: function() {
this.hideFields(this.firstNameWrapper);
this.hideFields(this.middleNameWrapper);
this.toggleLastNameLabel('Last name', 'Name');
// this.toggleLastNameLabel('Last name', 'Name');
},
toggleLastNameLabel: function(currentText, newText) {
var lastNameLabelText = this.lastNameLabel.html(),
newLastNameLabelText = lastNameLabelText.replace(currentText, newText);
this.lastNameLabel.html(newLastNameLabelText);
},
// toggleLastNameLabel: function(currentText, newText) {
// var lastNameLabelText = this.lastNameLabel.html(),
// newLastNameLabelText = lastNameLabelText.replace(currentText, newText);
// this.lastNameLabel.html(newLastNameLabelText);
// },
/* *** Ajax initializations *** */
@ -451,24 +451,26 @@ var addAuthorForm = {
onLastNameChange: function() {
this.showFieldsForNewPerson();
this.firstNameField.focus();
this.fixNames();
// this.fixNames();
},
// User may have typed first name as well as last name into last name field.
// If so, when showing first and middle name fields, move anything after a comma
// or space into the first name field.
fixNames: function() {
var lastNameInput = this.lastNameField.val(),
names = lastNameInput.split(/[, ]+/),
lastName = names[0];
this.lastNameField.val(lastName);
if (names.length > 1) {
//firstName = names[1].replace(/^[, ]+/, '');
this.firstNameField.val(names[1]);
}
},
// RY Space is problematic because they may be entering "<firstname> <lastname>", but
// comma is a clear case.
// fixNames: function() {
// var lastNameInput = this.lastNameField.val(),
// names = lastNameInput.split(/[, ]+/),
// lastName = names[0];
//
// this.lastNameField.val(lastName);
//
// if (names.length > 1) {
// //firstName = names[1].replace(/^[, ]+/, '');
// this.firstNameField.val(names[1]);
// }
// },
removeAuthorship: function(link) {
// RY Upgrade this to a modal window

1
productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
View file

@ -1,3 +1,2 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
$('#pubUri').attr('disabled', 'disabled');