From 48f664525b4255a439164050d7b7749c230f0204 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Tue, 20 Jul 2010 23:36:58 +0000 Subject: [PATCH] Merging r886 r905 r914:918 r923 r933:937 r957 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint --- .../edit/forms/addClinicalRoleToPerson.jsp | 1 - .../edit/forms/addGrantRoleToPerson.jsp | 2 +- .../edit/forms/addPresenterRoleToPerson.jsp | 2 +- .../edit/forms/addRoleToPersonTwoStage.jsp | 44 ++++++++++++++----- .../js/addAuthorsToInformationResource.js | 5 +-- .../js/customFormWithAdvanceTypeSelection.js | 23 +++++----- productMods/templates/entity/entityBasic.jsp | 11 ++--- themes/vivo-basic/css/login.css | 15 ++++--- themes/vivo-basic/css/screen.css | 6 +++ 9 files changed, 67 insertions(+), 42 deletions(-) diff --git a/productMods/edit/forms/addClinicalRoleToPerson.jsp b/productMods/edit/forms/addClinicalRoleToPerson.jsp index 5d94676c..7b7e5e90 100644 --- a/productMods/edit/forms/addClinicalRoleToPerson.jsp +++ b/productMods/edit/forms/addClinicalRoleToPerson.jsp @@ -3,7 +3,6 @@ - diff --git a/productMods/edit/forms/addGrantRoleToPerson.jsp b/productMods/edit/forms/addGrantRoleToPerson.jsp index 96e56f88..c655f95a 100644 --- a/productMods/edit/forms/addGrantRoleToPerson.jsp +++ b/productMods/edit/forms/addGrantRoleToPerson.jsp @@ -290,7 +290,7 @@ PREFIX core: <${vivoCore}> <%-- Needed iff we return from an invalid submission --%> -

Dates of Participation in Grant

+

Years of Participation in Grant

diff --git a/productMods/edit/forms/addPresenterRoleToPerson.jsp b/productMods/edit/forms/addPresenterRoleToPerson.jsp index 5a342d31..c85b1c43 100644 --- a/productMods/edit/forms/addPresenterRoleToPerson.jsp +++ b/productMods/edit/forms/addPresenterRoleToPerson.jsp @@ -4,7 +4,7 @@ - + diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp index e6ffad62..ebdc5309 100644 --- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp +++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp @@ -63,6 +63,7 @@ ${param.roleActivityType_optionsType} ${param.roleActivityType_objectClassUri} ${param.roleActivityType_literalOptions} +${! empty param.numDateFields ? param.numDateFields : 2 } <% @@ -100,14 +101,29 @@ <%-- label is required if we are doing an update --%> <%= request.getAttribute("objectUri")== null?"":"\"nonempty\"," %> - +<%-- + + + + + + + + +--%> + + + ${vivoCore}year + ${vivoCore}startYear + + - ?role <${startYearUri}> ?startYear . + ?role <${startYearPredicate}> ?startYear . - + - ?role <${endYearUri}> ?endYear . + ?role <${endYearPredicate}> ?endYear . @@ -144,13 +160,11 @@ - PREFIX core: <${vivoCore}> - SELECT ?existingStartYear WHERE { ?role core:startYear ?existingStartYear .} + SELECT ?existingStartYear WHERE { ?role <${startYearPredicate}> ?existingStartYear .} - PREFIX core: <${vivoCore}> - SELECT ?existingStartYear WHERE { ?role core:endYear ?existingStartYear .} + SELECT ?existingStartYear WHERE { ?role <${endYearPredicate}> ?existingStartYear .} @@ -349,9 +363,17 @@

-

Dates of Participation in

- - + + + + + +

Years of Participation in

+ + + + +

diff --git a/productMods/edit/forms/js/addAuthorsToInformationResource.js b/productMods/edit/forms/js/addAuthorsToInformationResource.js index 96ea185c..b0776678 100644 --- a/productMods/edit/forms/js/addAuthorsToInformationResource.js +++ b/productMods/edit/forms/js/addAuthorsToInformationResource.js @@ -209,7 +209,6 @@ var addAuthorForm = { }, setAcFilter: function() { - var existingAuthors = $('#authorships .authorName'); this.acFilter = []; @@ -391,9 +390,7 @@ var addAuthorForm = { alert('Reordering of authors failed.'); } // What should we do if the reordering fails? else { - } - - + } } }); }, diff --git a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js index 69aa1bbf..fc332933 100644 --- a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js +++ b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js @@ -21,7 +21,7 @@ var customForm = { // On page load, create references for easy access to form elements. // NB These must be assigned after the elements have been loaded onto the page. initObjects: function(){ - + this.form = $('#content form'); this.fullViewOnly = $('.fullViewOnly'); this.button = $('#submit'); @@ -84,7 +84,7 @@ var customForm = { }, initFormView: function() { - + var typeVal = this.typeSelector.val(); if (this.findValidationErrors()) { @@ -104,7 +104,7 @@ var customForm = { }, initFormTypeView: function() { - + this.setType(); // empty any previous values (perhaps not needed) this.hideFields(this.fullViewOnly); this.button.hide(); @@ -177,7 +177,7 @@ var customForm = { // Bind event listeners that persist over the life of the page. Event listeners // that depend on the view should be initialized in the view setup method. bindEventListeners: function() { - + this.typeSelector.change(function() { var typeVal = $(this).val(); @@ -197,7 +197,7 @@ var customForm = { }, initAutocomplete: function() { - + if (this.editMode === 'edit') { return; } @@ -220,7 +220,7 @@ var customForm = { dataType: 'json', data: { term: request.term, - type: customForm.acType, + type: customForm.acType }, complete: function(xhr, status) { // Not sure why, but we need an explicit json parse here. jQuery @@ -233,15 +233,13 @@ var customForm = { }); }, select: function(event, ui) { - customForm.showAutocompleteSelection(ui.item.label, ui.item.uri); - + customForm.showAutocompleteSelection(ui.item.label, ui.item.uri); } }); - }, getAcFilter: function() { - + if (!this.sparqlForAcFilter) { //console.log('autocomplete filtering turned off'); this.acFilter = null; @@ -249,7 +247,7 @@ var customForm = { } //console.log("sparql for autocomplete filter: " + this.sparqlForAcFilter); - + // Define this.acFilter here, so in case the sparql query fails // we don't get an error when referencing it later. this.acFilter = []; @@ -268,6 +266,7 @@ var customForm = { }, setAcFilter: function(data) { + var key = data.head.vars[0]; $.each(data.results.bindings, function() { @@ -418,7 +417,7 @@ var customForm = { else { this.button.val('Add ' + this.baseButtonText); } - }, + } }; diff --git a/productMods/templates/entity/entityBasic.jsp b/productMods/templates/entity/entityBasic.jsp index e41e951b..a622f5cf 100644 --- a/productMods/templates/entity/entityBasic.jsp +++ b/productMods/templates/entity/entityBasic.jsp @@ -240,10 +240,11 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L - <%-- Description --%> + <%-- Description --%> + <%-- - + @@ -258,8 +259,8 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
${entity.description}
- - ${editLinksForExisitngDesc} + + ${editLinksForExistingDesc}
@@ -269,7 +270,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L - + --%> <%-- Ontology properties --%> diff --git a/themes/vivo-basic/css/login.css b/themes/vivo-basic/css/login.css index fd192de9..236d25cc 100644 --- a/themes/vivo-basic/css/login.css +++ b/themes/vivo-basic/css/login.css @@ -147,27 +147,28 @@ line-height:30px; } -##confirmationAlert p{ +#confirmationAlert p{ padding-left:30px; font-size:0.9em; line-height:30px; } - - - .formFieldAlert{ border:2px solid #900; - } .red{ color:#900; } - - +/* In IE6/7, .hidden defined in screen.css doesn't override + * display: inline-block defined for #adminDashboard .pageBodyGroup, + * so define again with context selector here. + */ +#adminDashboard .pageBodyGroup.hidden { + display: none !important; +} p.passwordNote{ margin:0; diff --git a/themes/vivo-basic/css/screen.css b/themes/vivo-basic/css/screen.css index d1b99c91..44c0145d 100644 --- a/themes/vivo-basic/css/screen.css +++ b/themes/vivo-basic/css/screen.css @@ -740,6 +740,12 @@ clear:both; display:none !important; } +/* Fix IE6/7 bug: display:none alone doesn't override another display setting */ +.invisible { + display: none !important; + visibility: hidden; +} +