merging r4248 into the trunk

productMods/config/listViewConfig-organizationForPosition.xml

@@ -33,7 +33,9 @@
                                   ?dateTimeEndValue core:dateTime ?dateTimeEnd  
                        }
             # Get current positions only: end date is either null or not in the past
-            } FILTER ( !bound(?dateTimeEnd) ||                        
+            } 
+              NOT EXISTS { ?position core:hideFromDisplay ?hideThis }
+              FILTER ( !bound(?dateTimeEnd) ||                        
                        afn:substring(str(?dateTimeEnd), 0, 4) >= afn:substring(str(afn:now()), 0, 4) )
               <critical-data-required>
               FILTER ( bound(?person) )

productMods/templates/freemarker/edit/forms/js/managePeopleForOrganization.js

@@ -0,0 +1,85 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+var managePeople = {
+
+    /* *** Initial page setup *** */
+   
+    onLoad: function() {
+    
+            this.mixIn();               
+            this.initPage();       
+        },
+
+    mixIn: function() {
+
+        // Get the custom form data from the page
+        $.extend(this, customFormData);
+    },
+
+    // Initial page setup. Called only at page load.
+    initPage: function() {
+
+        this.initPeopleData();
+       
+        this.bindEventListeners();
+                       
+    },
+
+    // On page load, associate data with each list item. Then we don't
+    // have to keep retrieving data from or modifying the DOM as we manipulate the
+    // items.
+    initPeopleData: function() {
+        $('.pubCheckbox').each(function(index) {
+            $(this).data(peopleData[index]);  
+        });
+    },
+    
+    bindEventListeners: function() {
+
+        $('.pubCheckbox').click(function() {
+            managePeople.processPeople(this);
+            //return false;
+        });
+               
+    },
+                      
+    processPeople: function(person) {
+        
+        var add = "";
+        var retract = "";
+        var n3String = "<" + $(person).data('positionUri') + "> <http://vivoweb.org/ontology/core#hideFromDisplay> \"true\" ." ;
+
+        if ( $(person).is(':checked') ) {
+            add = n3String;
+        }
+        else {
+            retract = n3String;
+        } 
+        
+        $.ajax({
+            url: managePeople.processingUrl,
+            type: 'POST', 
+            data: {
+                additions: add,
+                retractions: retract
+            },
+            dataType: 'json',
+            context: person, // context for callback
+            complete: function(request, status) {
+            
+                if (status === 'success') {
+                    window.status = "The person has been successfully excluded from the organization page."; 
+
+                } else {
+                    alert('Error processing request: the person cannot be excluded from the organization page.');
+                    $(person).removeAttr('checked');
+                }
+            }
+        });        
+    },
+
+};
+
+$(document).ready(function() {   
+    managePeople.onLoad();
+}); 

productMods/templates/freemarker/edit/forms/managePeopleForOrganization.ftl

@@ -0,0 +1,55 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#import "lib-vivo-form.ftl" as lvf>
+
+<#-- Custom form for managing web pages for individuals -->
+<h2>Manage People Affiliated with ${subjectName}</h2>
+<p style="margin-left:25px;margin-bottom:12px">
+Check those people you want to exclude from the profile page.
+<script type="text/javascript">
+    var peopleData = [];
+</script>
+</p>
+
+<@lvf.unsupportedBrowser urls.base /> 
+
+       
+    <#list allSubclasses as sub>
+    <h4>${sub}s</h4>
+        <section id="pubsContainer" role="container">
+        <#assign peeps = people[sub]>
+        <ul >
+            <#list peeps as person>
+            <li>
+                <input type="checkbox" class="pubCheckbox" <#if person.hideThis??>checked</#if> />${person.name}
+            </li>
+            <script type="text/javascript">
+                peopleData.push({
+                    "positionUri": "${person.position}"              
+                });
+            </script>      
+            
+            </#list>
+        </ul>
+        </section>
+    </#list>
+
+<br />    
+<p>
+    <a href="${urls.referringPage}#affiliation" title="return to profile page">Return to profile page</a>
+</p>
+
+<script type="text/javascript">
+var customFormData = {
+    processingUrl: '${urls.base}/edit/primitiveRdfEdit'
+};
+</script>
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />',
+                  '<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')}
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/utils.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
+                '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/managePeopleForOrganization.js"></script>')}
+