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

productMods/edit/forms/addClinicalRoleToPerson.jsp

@@ -3,7 +3,6 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="clinical activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" />
-	
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<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"] ' />

productMods/edit/forms/addGrantRoleToPerson.jsp

@@ -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 --%> 
     </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="End Year ${yearHint}" id="endYear" size="7"/> 
                    

productMods/edit/forms/addPresenterRoleToPerson.jsp

@@ -4,7 +4,7 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="presenter" />
 	<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_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"] ' />

productMods/edit/forms/addRoleToPersonTwoStage.jsp

@@ -63,6 +63,7 @@
 <c:set var="roleActivityType_optionsType" >${param.roleActivityType_optionsType}</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="numDateFields">${! empty param.numDateFields ? param.numDateFields : 2 }</c:set>
 
 <%
 
@@ -100,14 +101,29 @@
 <%-- label is required if we are doing an update --%> 
 <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" >
-      ?role <${startYearUri}> ?startYear .
+      ?role <${startYearPredicate}> ?startYear .
 </v:jsonset>
 
-<c:set var="endYearUri" value="${vivoCore}endYear" /> 
+<c:set var="endYearPredicate" value="${vivoCore}endYear" /> 
 <v:jsonset var="endYearAssertion" >
-      ?role <${endYearUri}> ?endYear .
+      ?role <${endYearPredicate}> ?endYear .
 </v:jsonset>
 
 <v:jsonset var="roleLabelAssertion" >
@@ -144,13 +160,11 @@
 </v:jsonset>
 
 <v:jsonset var="startYearQuery">
-  PREFIX core: <${vivoCore}>  
+  SELECT ?existingStartYear WHERE { ?role  <${startYearPredicate}> ?existingStartYear .}       
-  SELECT ?existingStartYear WHERE { ?role  core:startYear ?existingStartYear .}       
 </v:jsonset>
 
 <v:jsonset var="endYearQuery">
-  PREFIX core: <${vivoCore}>  
+  SELECT ?existingStartYear WHERE { ?role  <${endYearPredicate}> ?existingStartYear .}
-  SELECT ?existingStartYear WHERE { ?role  core:endYear ?existingStartYear .}
 </v:jsonset>
 
 <v:jsonset var="activityQuery">
@@ -349,9 +363,17 @@
 
         <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>
-        <v:input type="text" label="Start Year ${requiredHint} ${yearHint}" id="startYear" size="7"/>   
+            <c:when test="${numDateFields == 1}">
-        <v:input type="text" label="End Year ${yearHint}" id="endYear" size="7"/> 
+                <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="End Year ${yearHint}" id="endYear" size="7"/>             
+            </c:otherwise>
+        </c:choose>
+ 
     </div>   
      
     <p class="submit"><v:input type="submit" id="submit" value="${submitButtonText}" cancel="true" /></p>

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 {
-                }
+                }      
-                
-                
             }
         });           
     },

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);
         } 
-    },
+    }
     
 };
 

productMods/templates/entity/entityBasic.jsp

@@ -240,10 +240,11 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
                 </div> <!-- end dprop-vitro-links  -->
             </c:if>
 
-            <%-- Description --%>              
+            <%-- Description --%> 
+            <%--               
             <c:if test="${ showEdits || !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: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))}"/>
@@ -258,8 +259,8 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
                         <div class="datatypePropertyValue">
                             <div class="statementWrap">
                                 <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> 
                             </div>
                         </div>
@@ -269,7 +270,7 @@ if (VitroRequestPrep.isSelfEditing(request) || LoginFormBean.loggedIn(request, L
             		</div>
             	</c:if>
             </c:if>
-                            
+            --%>                
             
             <%-- Ontology properties --%>
             <c:import url="${entityMergedPropsListJsp}">

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;

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;
+}
+