diff --git a/webapp/web/js/menupage/browseByVClass.js b/webapp/web/js/menupage/browseByVClass.js index ec36e5445..2cafc0ff4 100644 --- a/webapp/web/js/menupage/browseByVClass.js +++ b/webapp/web/js/menupage/browseByVClass.js @@ -73,9 +73,6 @@ var browseByVClass = { // Where all the magic happens -- gonna fetch me some individuals getIndividuals: function(vclassUri, alpha, page, scroll) { var url = this.dataServiceUrl + encodeURIComponent(vclassUri); - if ( this.internalClassUri !== "undefined" ) { - url += '&vclassId='+ this.internalClassUri +'&page=1'; - } if ( alpha && alpha != "all") { url += '&alpha=' + alpha; } diff --git a/webapp/web/js/menupage/browseByVClasses.js b/webapp/web/js/menupage/browseByVClasses.js deleted file mode 100644 index b13d71828..000000000 --- a/webapp/web/js/menupage/browseByVClasses.js +++ /dev/null @@ -1,121 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -// This file extends and proxies the default behavior defined in vitro/webapp/web/js/menupage/browseByVClass.js - -// Saving the original getIndividuals function from browseByVClass -var getPersonIndividuals = browseByVClass.getIndividuals; - -browseByVClass.getIndividuals = function(vclassUri, alpha, page, scroll) { - url = encodeURIComponent(vclassUri); - var restrictClasses = $('#restrictClasses').val(); - if(restrictClasses.length > 0) { - if(restrictClasses.indexOf(",") != -1) { - var restrictClassesArray = restrictClasses.split(","); - var restrictUris = restrictClassesArray.join("&vclassId="); - url += "&vclassId=" + restrictUris; - } - else { - //does this need to be uri encoded? - assuming already url encoded - url += "&vclassId=" + restrictClasses; - } - } - url = this.dataServiceUrl + url; - //Get restriction classes from url - - if ( alpha && alpha != "all") { - url = url + '&alpha=' + alpha; - } - if ( page ) { - url += '&page=' + page; - } else { - page = 1; - } - if ( typeof scroll === "undefined" ) { - scroll = true; - } - - // Scroll to #menupage-intro page unless told otherwise - if ( scroll != false ) { - // only scroll back up if we're past the top of the #browse-by section - scrollPosition = browseByVClass.getPageScroll(); - browseByOffset = $('#browse-by').offset(); - if ( scrollPosition[1] > browseByOffset.top) { - $.scrollTo('#menupage-intro', 500); - } - } - - $.getJSON(url, function(results) { - var individualList = ""; - - // Catch exceptions when empty individuals result set is returned - // This is very likely to happen now since we don't have individual counts for each letter and always allow the result set to be filtered by any letter - if ( results.individuals.length == 0 ) { - browseByVClass.emptyResultSet(results.vclass, alpha) - } else { - $.each(results.individuals, function(i, item) { - var individual, - label, - firstName, - lastName, - fullName, - vclassName, - preferredTitle, - uri, - profileUrl, - image, - listItem; - - individual = results.individuals[i]; - label = individual.label; - firstName = individual.firstName; - lastName = individual.lastName; - if ( firstName && lastName ) { - fullName = firstName + ' ' + lastName; - } else { - fullName = label; - } - var vclassName = individual.vclassName; - if ( individual.preferredTitle ) { - preferredTitle = individual.preferredTitle; - } - uri = individual.URI; - profileUrl = individual.profileUrl; - if ( !individual.thumbUrl ) { - image = browseByVClass.baseUrl + '/images/placeholders/person.thumbnail.jpg'; - } else { - image = browseByVClass.baseUrl + individual.thumbUrl; - } - // Build the content of each list item, piecing together each component - listItem = '
  • '; - listItem += ''+ fullName +''; - listItem += '

    '+ fullName +'

    '; - // Include the calculated preferred title (see above) only if it's not empty - if ( preferredTitle ) { - listItem += ''+ preferredTitle +''; - } - listItem += '
  • '; - // browseByVClass.individualsInVClass.append(listItem); - individualList += listItem; - }) - - // Remove existing content - browseByVClass.wipeSlate(); - - // And then add the new content - browseByVClass.individualsInVClass.append(individualList); - - // Check to see if we're dealing with pagination - if ( results.pages.length ) { - pages = results.pages; - browseByVClass.pagination(pages, page); - } - - if(results.vclass) { - $('h3.selected-class').text(results.vclass.name); - // set selected class, alpha and page - browseByVClass.selectedVClass(results.vclass.URI); - } - browseByVClass.selectedAlpha(alpha); - } - }); -}; \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/menupage/menupage--individualsforclasses.ftl b/webapp/web/templates/freemarker/body/menupage/menupage--individualsforclasses.ftl deleted file mode 100644 index c8f961c60..000000000 --- a/webapp/web/templates/freemarker/body/menupage/menupage--individualsforclasses.ftl +++ /dev/null @@ -1,9 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#--Need to add restrict classes information--> - -<#--Using the same page setup as regular class groups so including the entire template--> -<#include "menupage.ftl"> -<#--add script--> -<#if !noData> - ${scripts.add('')} - \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-scripts.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-scripts.ftl index ab20ca495..d3eb7eec4 100644 --- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-scripts.ftl +++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-scripts.ftl @@ -18,9 +18,10 @@