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

Merging r886 r905 r914:918 r923 r933:937 r957 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-20 23:36:58 +00:00
parent 0b1a8394c4
commit 48f664525b
9 changed files with 67 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

1
productMods/edit/forms/addClinicalRoleToPerson.jsp
View file

@ -3,7 +3,6 @@
<jsp:include page="addRoleToPersonTwoStage.jsp"> <jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="clinical activity" /> <jsp:param name="roleActivityTypeLabel" value="clinical activity" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" /> <jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" />
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" /> <jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" /> <jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["http://vivoweb.org/ontology/core#Project", "Project" ], [ "http://vivoweb.org/ontology/core#Service","Service"] ' /> <jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["http://vivoweb.org/ontology/core#Project", "Project" ], [ "http://vivoweb.org/ontology/core#Service","Service"] ' />

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

@ -290,7 +290,7 @@ PREFIX core: <${vivoCore}>
<v:input type="hidden" id="existingGrantLabel" name="existingGrantLabel" cssClass="acLabelReceiver" /> <%-- Needed iff we return from an invalid submission --%> <v:input type="hidden" id="existingGrantLabel" name="existingGrantLabel" cssClass="acLabelReceiver" /> <%-- Needed iff we return from an invalid submission --%>
</div> </div>
<h4>Dates of Participation in Grant</h4> <h4>Years of Participation in Grant</h4>
<v:input type="text" label="Start Year ${requiredHint} ${yearHint}" id="startYear" size="7"/> <v:input type="text" label="Start Year ${requiredHint} ${yearHint}" id="startYear" size="7"/>
<v:input type="text" label="End Year ${yearHint}" id="endYear" size="7"/> <v:input type="text" label="End Year ${yearHint}" id="endYear" size="7"/>

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

@ -4,7 +4,7 @@
<jsp:include page="addRoleToPersonTwoStage.jsp"> <jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="presenter" /> <jsp:param name="roleActivityTypeLabel" value="presenter" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" /> <jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />
<jsp:param name="numDateFields" value="1" />
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" /> <jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" /> <jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["http://vivoweb.org/ontology/core#Presentation", "Presentation" ], [ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' /> <jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["http://vivoweb.org/ontology/core#Presentation", "Presentation" ], [ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' />

40
productMods/edit/forms/addRoleToPersonTwoStage.jsp
View file

@ -63,6 +63,7 @@
<c:set var="roleActivityType_optionsType" >${param.roleActivityType_optionsType}</c:set> <c:set var="roleActivityType_optionsType" >${param.roleActivityType_optionsType}</c:set>
<c:set var="roleActivityType_objectClassUri" >${param.roleActivityType_objectClassUri}</c:set> <c:set var="roleActivityType_objectClassUri" >${param.roleActivityType_objectClassUri}</c:set>
<c:set var="roleActivityType_literalOptions" >${param.roleActivityType_literalOptions}</c:set> <c:set var="roleActivityType_literalOptions" >${param.roleActivityType_literalOptions}</c:set>
<c:set var="numDateFields">${! empty param.numDateFields ? param.numDateFields : 2 }</c:set>
<% <%
@ -100,14 +101,29 @@
<%-- label is required if we are doing an update --%> <%-- label is required if we are doing an update --%>
<c:set var="labelRequired" ><%= request.getAttribute("objectUri")== null?"":"\"nonempty\"," %></c:set> <c:set var="labelRequired" ><%= request.getAttribute("objectUri")== null?"":"\"nonempty\"," %></c:set>
<c:set var="startYearUri" value="${vivoCore}startYear" /> <%--
<c:choose>
<c:when test="${numDateFields == 1}">
<c:set var="startYearPredicate" value="${vivoCore}year" />
</c:when>
<c:otherwise>
<c:set var="startYearPredicate" value="${vivoCore}startYear" />
</c:otherwise>
</c:choose>
--%>
<c:set var="startYearPredicate">
<c:choose>
<c:when test="${numDateFields == 1}">${vivoCore}year</c:when>
<c:otherwise>${vivoCore}startYear</c:otherwise>
</c:choose>
</c:set>
<v:jsonset var="startYearAssertion" > <v:jsonset var="startYearAssertion" >
?role <${startYearUri}> ?startYear . ?role <${startYearPredicate}> ?startYear .
</v:jsonset> </v:jsonset>
<c:set var="endYearUri" value="${vivoCore}endYear" /> <c:set var="endYearPredicate" value="${vivoCore}endYear" />
<v:jsonset var="endYearAssertion" > <v:jsonset var="endYearAssertion" >
?role <${endYearUri}> ?endYear . ?role <${endYearPredicate}> ?endYear .
</v:jsonset> </v:jsonset>
<v:jsonset var="roleLabelAssertion" > <v:jsonset var="roleLabelAssertion" >
@ -144,13 +160,11 @@
</v:jsonset> </v:jsonset>
<v:jsonset var="startYearQuery"> <v:jsonset var="startYearQuery">
PREFIX core: <${vivoCore}> SELECT ?existingStartYear WHERE { ?role <${startYearPredicate}> ?existingStartYear .}
SELECT ?existingStartYear WHERE { ?role core:startYear ?existingStartYear .}
</v:jsonset> </v:jsonset>
<v:jsonset var="endYearQuery"> <v:jsonset var="endYearQuery">
PREFIX core: <${vivoCore}> SELECT ?existingStartYear WHERE { ?role <${endYearPredicate}> ?existingStartYear .}
SELECT ?existingStartYear WHERE { ?role core:endYear ?existingStartYear .}
</v:jsonset> </v:jsonset>
<v:jsonset var="activityQuery"> <v:jsonset var="activityQuery">
@ -349,9 +363,17 @@
<p><v:input type="text" id="newIndLabel" name="roleLabel" label="Role in ### ${requiredHint}" size="50" /></p> <p><v:input type="text" id="newIndLabel" name="roleLabel" label="Role in ### ${requiredHint}" size="50" /></p>
<h4 id="dateHeader">Dates of Participation in </h4> <c:choose>
<c:when test="${numDateFields == 1}">
<v:input type="text" label="Year ${requiredHint} ${yearHint}" id="startYear" size="7"/>
</c:when>
<c:otherwise>
<h4 id="dateHeader">Years of Participation in </h4>
<v:input type="text" label="Start Year ${requiredHint} ${yearHint}" id="startYear" size="7"/> <v:input type="text" label="Start Year ${requiredHint} ${yearHint}" id="startYear" size="7"/>
<v:input type="text" label="End Year ${yearHint}" id="endYear" size="7"/> <v:input type="text" label="End Year ${yearHint}" id="endYear" size="7"/>
</c:otherwise>
</c:choose>
</div> </div>
<p class="submit"><v:input type="submit" id="submit" value="${submitButtonText}" cancel="true" /></p> <p class="submit"><v:input type="submit" id="submit" value="${submitButtonText}" cancel="true" /></p>

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

@ -209,7 +209,6 @@ var addAuthorForm = {
}, },
setAcFilter: function() { setAcFilter: function() {
var existingAuthors = $('#authorships .authorName'); var existingAuthors = $('#authorships .authorName');
this.acFilter = []; this.acFilter = [];
@ -392,8 +391,6 @@ var addAuthorForm = {
} // What should we do if the reordering fails? } // What should we do if the reordering fails?
else { else {
} }
} }
}); });
}, },

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

@ -220,7 +220,7 @@ var customForm = {
dataType: 'json', dataType: 'json',
data: { data: {
term: request.term, term: request.term,
type: customForm.acType, type: customForm.acType
}, },
complete: function(xhr, status) { complete: function(xhr, status) {
// Not sure why, but we need an explicit json parse here. jQuery // Not sure why, but we need an explicit json parse here. jQuery
@ -234,10 +234,8 @@ var customForm = {
}, },
select: function(event, ui) { select: function(event, ui) {
customForm.showAutocompleteSelection(ui.item.label, ui.item.uri); customForm.showAutocompleteSelection(ui.item.label, ui.item.uri);
} }
}); });
}, },
getAcFilter: function() { getAcFilter: function() {
@ -268,6 +266,7 @@ var customForm = {
}, },
setAcFilter: function(data) { setAcFilter: function(data) {
var key = data.head.vars[0]; var key = data.head.vars[0];
$.each(data.results.bindings, function() { $.each(data.results.bindings, function() {
@ -418,7 +417,7 @@ var customForm = {
else { else {
this.button.val('Add ' + this.baseButtonText); this.button.val('Add ' + this.baseButtonText);
} }
}, }
}; };

9
productMods/templates/entity/entityBasic.jsp
View file

@ -241,9 +241,10 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
</c:if> </c:if>
<%-- Description --%> <%-- Description --%>
<%--
<c:if test="${ showEdits || !empty entity.description}"> <c:if test="${ showEdits || !empty entity.description}">
<c:if test="${not empty entity.description }"> <c:if test="${not empty entity.description }">
<c:set var="editLinksForExisitngDesc"><edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" data="${entity.description}" icons="false"/></c:set> <c:set var="editLinksForExistingDesc"><edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" data="${entity.description}" icons="false"/></c:set>
</c:if> </c:if>
<c:set var="editLinksForNewDesc"><edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" icons="false"/></c:set> <c:set var="editLinksForNewDesc"><edLnk:editLinks item="<%= VitroVocabulary.DESCRIPTION %>" icons="false"/></c:set>
<c:set var="mayEditDesc" value="${showEdits && ((empty entity.description and not empty editLinksForNewDesc) or (not empty entity.description and not empty editLinksForExisitngDesc))}"/> <c:set var="mayEditDesc" value="${showEdits && ((empty entity.description and not empty editLinksForNewDesc) or (not empty entity.description and not empty editLinksForExisitngDesc))}"/>
@ -258,8 +259,8 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
<div class="datatypePropertyValue"> <div class="datatypePropertyValue">
<div class="statementWrap"> <div class="statementWrap">
<div class="description"><p:process>${entity.description}</p:process></div> <div class="description"><p:process>${entity.description}</p:process></div>
<c:if test="${showEdits && !empty editLinksForExisitngDesc}"> <c:if test="${showEdits && !empty editLinksForExistingDesc}">
<span class="editLinks">${editLinksForExisitngDesc}</span> <span class="editLinks">${editLinksForExistingDesc}</span>
</c:if> </c:if>
</div> </div>
</div> </div>
@ -269,7 +270,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
</div> </div>
</c:if> </c:if>
</c:if> </c:if>
--%>
<%-- Ontology properties --%> <%-- Ontology properties --%>
<c:import url="${entityMergedPropsListJsp}"> <c:import url="${entityMergedPropsListJsp}">

15
themes/vivo-basic/css/login.css
View file

@ -147,27 +147,28 @@ line-height:30px;
} }
##confirmationAlert p{ #confirmationAlert p{
padding-left:30px; padding-left:30px;
font-size:0.9em; font-size:0.9em;
line-height:30px; line-height:30px;
} }
.formFieldAlert{ .formFieldAlert{
border:2px solid #900; border:2px solid #900;
} }
.red{ .red{
color:#900; 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{ p.passwordNote{
margin:0; margin:0;

6
themes/vivo-basic/css/screen.css
View file

@ -740,6 +740,12 @@ clear:both;
display:none !important; display:none !important;
} }
/* Fix IE6/7 bug: display:none alone doesn't override another display setting */
.invisible {
display: none !important;
visibility: hidden;
}