diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java index f67e3f1e..9c5b374d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java @@ -202,13 +202,8 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler { Map body = new HashMap(); - String standaloneTemplate = "coAuthorPersonLevel.ftl"; - - String property = ConfigurationProperties.getBean(vitroRequest).getProperty("visualization.d3"); - if (!"disabled".equalsIgnoreCase(property)) { - body.put("coAuthorshipData", new CollaborationDataViewHelper(coAuthorshipVO)); - standaloneTemplate = "coAuthorPersonLevelD3.ftl"; - } + String standaloneTemplate = "coAuthorPersonLevelD3.ftl"; + body.put("coAuthorshipData", new CollaborationDataViewHelper(coAuthorshipVO)); body.put("egoURIParam", egoURI); @@ -264,13 +259,8 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler { body.put("numOfCoInvestigations", coPIVO.getCollaborations().size()); } - String standaloneTemplate = "coPIPersonLevel.ftl"; - - String property = ConfigurationProperties.getBean(vitroRequest).getProperty("visualization.d3"); - if (!"disabled".equalsIgnoreCase(property)) { - body.put("coInvestigatorData", new CollaborationDataViewHelper(coPIVO)); - standaloneTemplate = "coPIPersonLevelD3.ftl"; - } + String standaloneTemplate = "coPIPersonLevelD3.ftl"; + body.put("coInvestigatorData", new CollaborationDataViewHelper(coPIVO)); body.put("egoGrantSparklineVO", egoGrantSparklineVO); body.put("uniqueCoInvestigatorsSparklineVO", uniqueCopisSparklineVO); diff --git a/home/src/main/resources/config/example.runtime.properties b/home/src/main/resources/config/example.runtime.properties index ff94383a..2647bbaf 100644 --- a/home/src/main/resources/config/example.runtime.properties +++ b/home/src/main/resources/config/example.runtime.properties @@ -312,17 +312,6 @@ VitroConnection.DataSource.validationQuery = SELECT 1 # visualization.temporal = enabled - # - # The co-authorship and co-investigator graphs have two variants - the traditional Flash based view, - # and views using D3. - # The traditional views require that users have Flash installed as a plugin, whereas D3 works on any - # modern browser. - # Currently, it is not possible to choose between them from the UI. You can choose to either have - # the Flash visualizations, OR the D3 visualizations. - # If this option is not present or set to enabled, then the D3 visualizations will be used. - # If this option is present and set to disabled, then the Flash visualizations will be used. -#visualization.d3 = disabled - # # Types of individual for which we can create proxy editors. # If this is omitted, defaults to http://www.w3.org/2002/07/owl#Thing diff --git a/webapp/src/main/webapp/images/visualization/coauthorship/CoAuthor.swf b/webapp/src/main/webapp/images/visualization/coauthorship/CoAuthor.swf deleted file mode 100644 index 223ef138..00000000 Binary files a/webapp/src/main/webapp/images/visualization/coauthorship/CoAuthor.swf and /dev/null differ diff --git a/webapp/src/main/webapp/images/visualization/coauthorship/EgoCentric.swf b/webapp/src/main/webapp/images/visualization/coauthorship/EgoCentric.swf deleted file mode 100644 index cd8f8941..00000000 Binary files a/webapp/src/main/webapp/images/visualization/coauthorship/EgoCentric.swf and /dev/null differ diff --git a/webapp/src/main/webapp/images/visualization/coauthorship/playerProductInstall.swf b/webapp/src/main/webapp/images/visualization/coauthorship/playerProductInstall.swf deleted file mode 100644 index bdc34378..00000000 Binary files a/webapp/src/main/webapp/images/visualization/coauthorship/playerProductInstall.swf and /dev/null differ diff --git a/webapp/src/main/webapp/js/visualization/personlevel/person-level.js b/webapp/src/main/webapp/js/visualization/personlevel/person-level.js index 69757f27..3771f709 100644 --- a/webapp/src/main/webapp/js/visualization/personlevel/person-level.js +++ b/webapp/src/main/webapp/js/visualization/personlevel/person-level.js @@ -271,67 +271,3 @@ function getEncodedURLFor(visType){ var queryString = "uri="+ egoURI + "&vis=" + visType; return location.protocol + "//" + location.host + contextPath + visualizationDataRoot + '?' + queryString.replace(/&/g, '%26'); } - -function renderCollaborationshipVisualization() { - -// console.log('visualization is ' + visualization + ' and encodedURL is '+ encodedURL); - // Version check for the Flash Player that has the ability to start Player - // Product Install (6.0r65) - var hasProductInstall = DetectFlashVer(6, 0, 65); - - // Version check based upon the values defined in globals - var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision); - - if ( hasProductInstall && !hasRequestedVersion ) { - // DO NOT MODIFY THE FOLLOWING FOUR LINES - // Location visited after installation is complete if installation is - // required - var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn"; - var MMredirectURL = window.location; - document.title = document.title.slice(0, 47) + " - Flash Player Installation"; - var MMdoctitle = document.title; - - AC_FL_RunContent( - "src", "playerProductInstall", - "FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"", - "width", "800", - "height", "840", - "align", "middle", - "id", "EgoCentric", - "quality", "high", - "bgcolor", "#ffffff", - "name", "EgoCentric", - "allowScriptAccess","sameDomain", - "type", "application/x-shockwave-flash", - "pluginspage", "http://www.adobe.com/go/getflashplayer" - ); - } else if (hasRequestedVersion) { - // if we've detected an acceptable version - // embed the Flash Content SWF when all tests are passed - //coAuthorUrl=/vivo1/visualization?vis=coauthorship%26render_mode=data%26uri=http%3A%2F%2Fvivo.iu.edu%2Findividual%2FBrnerKaty&labelField=label&coPIUrl=/vivo1/visualization?vis=coprincipalinvestigator%26render_mode=data%26uri=http%3A%2F%2Fvivo.iu.edu%2Findividual%2FBrnerKaty&labelField=label - AC_FL_RunContent( - "src", swfLink, -// "flashVars", 'coAuthorUrl='+ encodeURL(egoCoAuthorshipDataFeederURL) + '&coPIUrl=' + encodeURL(egoCoPIDataFeederURL) , -// "flashVars", 'coAuthorUrl='+ getEncodedCoAuthorURL() + '&coPIUrl=' + getEncodedCoPIURL() , -// "flashVars", 'graphmlUrl=' + getEncodedCoAuthorURL() + '&labelField=label&visType=CoAuthor', - "flashVars", 'graphmlUrl=' + getEncodedURLFor(visType) + '&labelField=label&visType='+visKeyForFlash, - "width", "600", - "height", "850", - "align", "top", - "id", "EgoCentric", - "quality", "high", - "bgcolor", "#ffffff", - "name", "EgoCentric", - "allowScriptAccess","sameDomain", - "type", "application/x-shockwave-flash", - "pluginspage", "http://www.adobe.com/go/getflashplayer" - ); - } else { // flash is too old or we can't detect the plugin - var alternateContent = '

' - + i18nStringsPersonLvl.contentRequiresFlash + ' ' - + '' + i18nStringsPersonLvl.getFlashString + '

'; - document.write(alternateContent); // insert non-flash content - - } - -} \ No newline at end of file diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl deleted file mode 100644 index 5101fcfe..00000000 --- a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl +++ /dev/null @@ -1,262 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#assign standardVisualizationURLRoot ="/visualization"> -<#assign shortVisualizationURLRoot ="/vis"> -<#assign ajaxVisualizationURLRoot ="/visualizationAjax"> -<#assign dataVisualizationURLRoot ="/visualizationData"> - -<#assign egoURI ="${egoURIParam?url}"> -<#assign egoCoAuthorshipDataFeederURL = '${urls.base}${dataVisualizationURLRoot}?vis=coauthorship&uri=${egoURI}&vis_mode=coauthor_network_stream&labelField=label'> - -<#if egoLocalName?has_content > - - <#assign coprincipalinvestigatorURL = '${urls.base}${shortVisualizationURLRoot}/investigator-network/${egoLocalName}'> - -<#else> - - <#assign coprincipalinvestigatorURL = '${urls.base}${shortVisualizationURLRoot}/investigator-network/?uri=${egoURI}'> - - - - - -<#assign egoCoAuthorsListDataFileURL = '${urls.base}${dataVisualizationURLRoot}?vis=coauthorship&uri=${egoURI}&vis_mode=coauthors'> -<#assign egoCoAuthorshipNetworkDataFileURL = '${urls.base}${dataVisualizationURLRoot}?vis=coauthorship&uri=${egoURI}&vis_mode=coauthor_network_download'> - -<#assign swfLink = '${urls.images}/visualization/coauthorship/EgoCentric.swf'> -<#assign adobeFlashDetector = '${urls.base}/js/visualization/coauthorship/AC_OETags.js'> -<#assign googleVisualizationAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> -<#assign coAuthorPersonLevelJavaScript = '${urls.base}/js/visualization/coauthorship/coauthorship-personlevel.js'> -<#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'> - -<#assign coInvestigatorIcon = '${urls.images}/visualization/coauthorship/co_investigator_icon.png'> - - - - - - - - - - -${scripts.add('')} - -${stylesheets.add('', - '')} - -<#assign loadingImageLink = "${urls.images}/visualization/ajax-loader.gif"> - -<#assign egoVivoProfileURL = "${urls.base}/individual?uri=${egoURI}" /> - - - - - -
- -


${i18n().co_author_network}

- <#if (numOfCoAuthorShips?? && numOfCoAuthorShips > 0) || (numOfAuthors?? && numOfAuthors > 0) > -
(GraphML ${i18n().file})
- <#else> - - <#if numOfAuthors?? && numOfAuthors <= 0 > - <#assign authorsText = "multi-author" /> - - -
${i18n().currently_no_papers_for(authorsText!)} - ${i18n().this_author} ${i18n().in_the_vivo_db} -
- - -
- -
- - <#if (builtFromCacheTime??) > -
${i18n().using_cache_time} ${builtFromCacheTime?time} (${builtFromCacheTime?date?string("MMM dd yyyy")})
- -
- - <#if (numOfAuthors?? && numOfAuthors > 0) > - - - - - <#else> - - ${i18n().no_papers_for} - ${i18n().this_author} ${i18n().in_the_vivo_db} - - - - - <#if (numOfCoAuthorShips?? && numOfCoAuthorShips > 0) || (numOfAuthors?? && numOfAuthors > 0) > - -
-
- -
-
-

${i18n().profile_capitalized}

- -
-
- -

 

- - - - -
   - ${i18n().publication_s_capitalized}
-
-   ${i18n().co_author_s_capitalized}
- - - -
${i18n().incomplete_data_note1}

- <#if user.loggedIn > - ${i18n().incomplete_data_note2} - <#else> - ${i18n().incomplete_data_note3} - -
-
-
-
- - - <#if (numOfAuthors?? && numOfAuthors > 0) > - - <#-- Sparkline --> -
- - <#assign displayTable = false /> - - <#assign sparklineVO = egoPubSparklineVO /> -
<#include "personPublicationSparklineContent.ftl">
- - <#assign sparklineVO = uniqueCoauthorsSparklineVO /> -
<#include "coAuthorshipSparklineContent.ftl">
-
- -
- -

${i18n().tables_capitalized}

- -
- -

- - <#assign tableID = "publication_data_table" /> - <#assign tableCaption = "${i18n().publications_per_year} " /> - <#assign tableActivityColumnName = "${i18n().publications_capitalized}" /> - <#assign tableContent = egoPubSparklineVO.yearToActivityCount /> - <#assign fileDownloadLink = egoPubSparklineVO.downloadDataLink /> - - <#include "yearToActivityCountTable.ftl"> - -

- -
- - <#if (numOfCoAuthorShips?? && numOfCoAuthorShips > 0) > - -
-

-
- - - -
- -
- - - -
\ No newline at end of file diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl deleted file mode 100644 index 1102ab68..00000000 --- a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl +++ /dev/null @@ -1,261 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#assign standardVisualizationURLRoot ="/visualization"> -<#assign shortVisualizationURLRoot ="/vis"> -<#assign ajaxVisualizationURLRoot ="/visualizationAjax"> -<#assign dataVisualizationURLRoot ="/visualizationData"> - -<#assign egoURI ="${egoURIParam?url}"> -<#assign egoCoInvestigationDataFeederURL = '${urls.base}${dataVisualizationURLRoot}?vis=coprincipalinvestigator&uri=${egoURI}&vis_mode=copi_network_stream&labelField=label'> - -<#assign coauthorshipURL = '${urls.base}${shortVisualizationURLRoot}/author-network/?uri=${egoURI}'> - -<#if egoLocalName?has_content > - - <#assign coauthorshipURL = '${urls.base}${shortVisualizationURLRoot}/author-network/${egoLocalName}'> - -<#else> - - <#assign coauthorshipURL = '${urls.base}${shortVisualizationURLRoot}/author-network/?uri=${egoURI}'> - - - -<#assign egoCoInvestigatorsListDataFileURL = '${urls.base}${dataVisualizationURLRoot}?vis=coprincipalinvestigator&uri=${egoURI}&vis_mode=copis'> -<#assign egoCoInvestigationNetworkDataFileURL = '${urls.base}${dataVisualizationURLRoot}?vis=coprincipalinvestigator&uri=${egoURI}&vis_mode=copi_network_download'> - -<#assign coAuthorIcon = '${urls.images}/visualization/coauthorship/co_author_icon.png'> - -<#assign swfLink = '${urls.images}/visualization/coauthorship/EgoCentric.swf'> -<#assign adobeFlashDetector = '${urls.base}/js/visualization/coauthorship/AC_OETags.js'> -<#assign googleVisualizationAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> -<#assign coInvestigatorPersonLevelJavaScript = '${urls.base}/js/visualization/coPIship/coPIship-person-level.js'> -<#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'> - - - - - - - - - -${scripts.add('')} - -${stylesheets.add('', - '')} - -<#assign loadingImageLink = "${urls.images}/visualization/ajax-loader.gif"> - -<#assign egoVivoProfileURL = "${urls.base}/individual?uri=${egoURI}" /> - - - - -
-


${i18n().co_investigator_network_capitalized}

- - <#if (numOfInvestigators?? && numOfInvestigators > 0) > - - <#if (numOfCoInvestigations?? && numOfCoInvestigations > 0) || (numOfInvestigators?? && numOfInvestigators > 0) > -
(GraphML ${i18n().file_capitalized})
- <#else> - - <#if numOfInvestigators?? && numOfInvestigators <= 0 > - <#assign investigatorsText = "multi-investigator" /> - - - ${i18n().currently_no_grants_for(investigatorsText!)} - ${i18n().this_investigator} ${i18n().in_the_vivo_db} - - - - <#else> - - ${i18n().no_grants_for} - ${i18n().this_investigator} ${i18n().in_the_vivo_db} - - - - -
- -
- -
- - - <#if (numOfCoInvestigations?? && numOfCoInvestigations > 0) || (numOfInvestigators?? && numOfInvestigators > 0) > - -
-
- -
-
-

${i18n().profile_capitalized}

- -
-
- -

 

- - - - - -
   - ${i18n().grant_s_capitalized}
-
-   ${i18n().co_investigator_s_capitalized}
- - - -
${i18n().incomplete_grant_data_note1}

- <#if user.loggedIn > - ${i18n().incomplete_grant_data_note2} - <#else> - ${i18n().incomplete_grant_data_note3} - -
-
-
-
- - - - <#if (numOfInvestigators?? && numOfInvestigators > 0) > - - <#-- Sparkline --> -
- - <#assign displayTable = false /> - - <#assign sparklineVO = egoGrantSparklineVO /> -
<#include "personGrantSparklineContent.ftl">
- - <#assign sparklineVO = uniqueCoInvestigatorsSparklineVO /> -
<#include "coInvestigationSparklineContent.ftl">
-
- - -
- -

${i18n().tables_capitalized}

-

${i18n().grant_info_for_all_years} ${i18n().info_icon}

- -
- -

- - <#assign tableID = "grant_data_table" /> - <#assign tableCaption = "${i18n().grants_per_year}" /> - <#assign tableActivityColumnName = "${i18n().grants_capitalized}" /> - <#assign tableContent = egoGrantSparklineVO.yearToActivityCount /> - <#assign fileDownloadLink = egoGrantSparklineVO.downloadDataLink /> - - <#include "yearToActivityCountTable.ftl"> - -

- -
- - <#if (numOfCoInvestigations?? && numOfCoInvestigations > 0) > - -
- -

-
- - - -
- -
- - - -
\ No newline at end of file