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

additional home page redesign changes

Browse source
This commit is contained in:
tworrall 2013-05-02 12:34:18 -04:00
parent 94e23fef67
commit af4f84759c
6 changed files with 221 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

8
productMods/WEB-INF/ontologies/app/loadedAtStartup/homePageDataGetters.n3
View file

@ -8,13 +8,13 @@
@prefix vivoweb: <http://vivoweb.org/ontology#> . @prefix vivoweb: <http://vivoweb.org/ontology#> .
@prefix foaf: <http://xmlns.com/foaf/0.1/> . @prefix foaf: <http://xmlns.com/foaf/0.1/> .
# research facility datagetter # academic departments datagetter
<freemarker:researchFacilities.ftl> display:hasDataGetter display:researchFacsDataGetter . <freemarker:lib-home-page.ftl> display:hasDataGetter display:academicDeptsDataGetter .
display:researchFacsDataGetter display:academicDeptsDataGetter
a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter> ; a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter> ;
display:saveToVar "researchFacsDG" ; display:saveToVar "academicDeptDG" ;
display:query """ display:query """
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>

29
productMods/js/homePageMaps.js
View file

@ -310,16 +310,27 @@ $(document).ready(function(){
action: "getGeoFocusLocations", action: "getGeoFocusLocations",
}, },
complete: function(xhr, status) { complete: function(xhr, status) {
var results = $.parseJSON(xhr.responseText);
$.each(results, function() { var results = $.parseJSON(xhr.responseText);
var locale = this.properties.popupContent; if ( results.length == 0 ) {
this.geometry.coordinates = getLatLong(locale); var html = "There are currently no researchers with a defined geographic focus.";
this.properties.mapType = getMapType(locale); $('section#home-geo-focus div#timeIndicator span').html(html);
researchAreas["features"].push(this); $('section#home-geo-focus').css("height","175px");
}); $('section#home-geo-focus div#timeIndicator').css("margin-top","50px");
buildGlobalMap(); $('section#home-geo-focus div#mapGlobal').hide();
$('div#timeIndicator').hide(); $('section#home-geo-focus div#mapUS').hide();
$('section#home-geo-focus div#mapState').hide();
}
else {
$.each(results, function() {
var locale = this.properties.popupContent;
this.geometry.coordinates = getLatLong(locale);
this.properties.mapType = getMapType(locale);
researchAreas["features"].push(this);
});
buildGlobalMap();
$('div#timeIndicator').hide();
}
} }
}); });
} }

116
productMods/js/homePageUtils.js
View file

@ -3,71 +3,83 @@
$(document).ready(function(){ $(document).ready(function(){
$.extend(this, urlsBase); $.extend(this, urlsBase);
// $.extend(this, facultyMemberCount); $.extend(this, facultyMemberCount);
// this will ensure that the hidden classgroup input is cleared if the back button is used
// to return to th ehome page from the search results
$('input[name="classgroup"]').val("");
getFacultyMembers(); getFacultyMembers();
buildAcademicDepartments(); buildAcademicDepartments();
if ( $('section#home-geo-focus').length == 0 ) { if ( $('section#home-geo-focus').length == 0 ) {
$('section#home-stats').css("display","inline-block").css("margin-top","20px"); $('section#home-stats').css("display","inline-block").css("margin-top","20px");
} }
function getFacultyMembers() { function getFacultyMembers() {
var individualList = "";
// determine the row at which to start the solr query if ( facultyMemberCount > 0 ) {
var rowStart = Math.floor((Math.random()*facultyMemberCount)+1)-1; // determine the row at which to start the solr query
var diff; var rowStart = Math.floor((Math.random()*facultyMemberCount)+1)-1;
var pageSize = 4; // the number of faculty to display on the home page var diff;
var pageSize = 4; // the number of faculty to display on the home page
// in case the random number is equal to or within 3 of the facultyMemberCount // in case the random number is equal to or within 3 of the facultyMemberCount
if ( (rowStart + (pageSize-1)) > facultyMemberCount ) { if ( (rowStart + (pageSize-1)) > facultyMemberCount ) {
diff = (rowStart + (pageSize-1)) - facultyMemberCount; diff = (rowStart + (pageSize-1)) - facultyMemberCount;
if ( diff == 0 ) { if ( diff == 0 ) {
rowStart = rowStart - (pageSize-1); rowStart = rowStart - (pageSize-1);
}
else {
rowStart = rowStart - diff;
}
} }
else {
rowStart = rowStart - diff;
}
}
var dataServiceUrl = urlsBase + "/dataservice?getRandomSolrIndividualsByVClass=1&vclassId="; var dataServiceUrl = urlsBase + "/dataservice?getRandomSolrIndividualsByVClass=1&vclassId=";
var url = dataServiceUrl + encodeURIComponent("http://vivoweb.org/ontology/core#FacultyMember"); var url = dataServiceUrl + encodeURIComponent("http://vivoweb.org/ontology/core#FacultyMember");
url += "&page=" + rowStart + "&pageSize=" + pageSize; url += "&page=" + rowStart + "&pageSize=" + pageSize;
$.getJSON(url, function(results) { $.getJSON(url, function(results) {
var individualList = "";
if ( results == null || results.individuals.length == 0 ) { if ( results == null || results.individuals.length == 0 ) {
individualList = "<p><li>No faculty records found.</li></p>"; individualList = "<p><li>No faculty members found.</li></p>";
$('div#tempSpacing').hide(); $('div#tempSpacing').hide();
$('div#research-faculty-mbrs ul#facultyThumbs').append(individualList); $('div#research-faculty-mbrs ul#facultyThumbs').append(individualList);
} }
else { else {
var vclassName = results.vclass.name; var vclassName = results.vclass.name;
$.each(results.individuals, function(i, item) { $.each(results.individuals, function(i, item) {
var individual = results.individuals[i]; var individual = results.individuals[i];
individualList += individual.shortViewHtml; individualList += individual.shortViewHtml;
}); });
$('div#tempSpacing').hide(); $('div#tempSpacing').hide();
$('div#research-faculty-mbrs ul#facultyThumbs').append(individualList); $('div#research-faculty-mbrs ul#facultyThumbs').append(individualList);
$.each($('div#research-faculty-mbrs ul#facultyThumbs li.individual'), function() { $.each($('div#research-faculty-mbrs ul#facultyThumbs li.individual'), function() {
if ( $(this).children('img').length == 0 ) { if ( $(this).children('img').length == 0 ) {
var imgHtml = "<img width='60' alt='placeholder image' src='" + urlsBase + "/images/placeholders/person.bordered.thumbnail.jpg'>"; var imgHtml = "<img width='60' alt='placeholder image' src='" + urlsBase + "/images/placeholders/person.bordered.thumbnail.jpg'>";
$(this).prepend(imgHtml); $(this).prepend(imgHtml);
} }
else { else {
$(this).children('img').load( function() { $(this).children('img').load( function() {
adjustImageHeight($(this)); adjustImageHeight($(this));
}); });
} }
}); });
var viewMore = "<ul id='viewMoreFac'><li><a href='" var viewMore = "<ul id='viewMoreFac'><li><a href='"
+ urlsBase + urlsBase
+ "/people/%23http://vivoweb.org/ontology/core%23FacultyMember' alt='view all faculty'>" + "/people/%23http://vivoweb.org/ontology/core%23FacultyMember' alt='view all faculty'>"
+ "View all ...</a></li?</ul>"; + "View all ...</a></li?</ul>";
$('div#research-faculty-mbrs').append(viewMore); $('div#research-faculty-mbrs').append(viewMore);
} }
}); });
}
else {
individualList = "<p><li>No faculty members found.</li></p>";
$('div#tempSpacing').hide();
$('div#research-faculty-mbrs ul#facultyThumbs').append(individualList);
$('div#research-faculty-mbrs ul#facultyThumbs').css("padding", "1.0em 0 0.825em 0.75em");
}
} }
function adjustImageHeight(theImg) { function adjustImageHeight(theImg) {
@ -87,7 +99,7 @@ $(document).ready(function(){
var index = Math.floor((Math.random()*deptNbr)+1)-1; var index = Math.floor((Math.random()*deptNbr)+1)-1;
if ( deptNbr == 0 ) { if ( deptNbr == 0 ) {
html += "<p><li>No academic departments found.</li></p>"; html = "<ul style='list-style:none'><p><li style='padding-top:0.3em'>No academic departments found.</li></p></ul>";
} }
else if ( deptNbr > 6 ) { else if ( deptNbr > 6 ) {
for ( var i=0;i<6;i++) { for ( var i=0;i<6;i++) {
@ -109,5 +121,5 @@ $(document).ready(function(){
} }
$('div#academic-depts').html(html); $('div#academic-depts').html(html);
} }
}); });

159
productMods/templates/freemarker/lib/lib-home-page.ftl
View file

@ -12,6 +12,20 @@
</#list> </#list>
</#macro> </#macro>
<#-- Renders the html for the faculty member section on the home page. -->
<#-- Works in conjunction with the homePageUtils.js file, which contains the ajax call. -->
<#macro facultyMbrHtml>
<section id="home-faculty-mbrs" class="home-sections" >
<h4>Faculty</h4>
<div id="tempSpacing">&nbsp;</div>
<div id="research-faculty-mbrs">
<!-- populated via an ajax call -->
<ul id="facultyThumbs">
</ul>
</div>
</section>
</#macro>
<#-- We need the faculty count in order to randomly select 4 faculty using a solr query --> <#-- We need the faculty count in order to randomly select 4 faculty using a solr query -->
<#macro facultyMemberCount classGroups> <#macro facultyMemberCount classGroups>
<#assign foundClassGroup = false /> <#assign foundClassGroup = false />
@ -39,49 +53,51 @@
<#-- Loop through classGroups first so we can account for situations when all class groups are empty --> <#-- Loop through classGroups first so we can account for situations when all class groups are empty -->
<#assign selected = 'class="selected" ' /> <#assign selected = 'class="selected" ' />
<#assign classGroupList> <#assign classGroupList>
<#list classGroups as group> <section id="home-stats" class="home-sections" >
<#-- Only display populated class groups --> <h4>Statistics</h4>
<#if (group.individualCount > 0)> <ul id="stats">
<#-- Catch the first populated class group. Will be used later as the default selected class group --> <#assign groupCount = 1>
<#if !firstPopulatedClassGroup??> <#list classGroups as group>
<#assign firstPopulatedClassGroup = group /> <#if (groupCount > 6) >
</#if> <#break/>
<#-- Determine the active (selected) group -->
<#assign activeGroup = "" />
<#if !classGroup??>
<#if group_index == 0>
<#assign activeGroup = selected />
</#if> </#if>
<#elseif classGroup.uri == group.uri> <#-- Only display populated class groups -->
<#assign activeGroup = selected /> <#if (group.individualCount > 0)>
</#if> <#-- Catch the first populated class group. Will be used later as the default selected class group -->
<#if group.displayName != "equipment" && group.displayName != "locations" && group.displayName != "courses" > <#if !firstPopulatedClassGroup??>
<li> <#assign firstPopulatedClassGroup = group />
<a href="#"> </#if>
<p class="stats-count"> <#if group.displayName != "equipment" && group.displayName != "courses" >
<#if (group.individualCount > 10000) > <li>
<#assign overTen = group.individualCount/1000> <a href="#">
${overTen?round}<span>k</span> <p class="stats-count">
<#elseif (group.individualCount > 1000)> <#if (group.individualCount > 10000) >
<#assign underTen = group.individualCount/1000> <#assign overTen = group.individualCount/1000>
${underTen?string("0.#")}<span>k</span> ${overTen?round}<span>k</span>
<#else> <#elseif (group.individualCount > 1000)>
${group.individualCount}<span>&nbsp;</span> <#assign underTen = group.individualCount/1000>
</#if> ${underTen?string("0.#")}<span>k</span>
</p> <#else>
<p class="stats-type">${group.displayName?capitalize}</p> ${group.individualCount}<span>&nbsp;</span>
</a> </#if>
</li> </p>
</#if> <p class="stats-type">${group.displayName?capitalize}</p>
</#if> </a>
</#list> </li>
<#assign groupCount = groupCount + 1>
</#if>
</#if>
</#list>
</ul>
</section>
</#assign> </#assign>
<#-- Display the class group browse only if we have at least one populated class group --> <#-- Display the class group browse only if we have at least one populated class group -->
<#if firstPopulatedClassGroup??> <#if firstPopulatedClassGroup??>
${classGroupList} ${classGroupList}
<#else> <#else>
<h3>There is currently no content in the system, or you need to create class groups and assign your classes to them.</h3> <h3 id="noContentMsg">There is currently no content in the system, or you need to create class groups and assign your classes to them.</h3>
<#if user.loggedIn> <#if user.loggedIn>
<#if user.hasSiteAdminAccess> <#if user.hasSiteAdminAccess>
@ -97,24 +113,39 @@
<#-- builds the "research" box on the home page --> <#-- builds the "research" box on the home page -->
<#macro researchClasses classGroups=vClassGroups> <#macro researchClasses classGroups=vClassGroups>
<#assign foundClassGroup = false /> <#assign foundClassGroup = false />
<#list classGroups as group> <section id="home-research" class="home-sections">
<#if (group.individualCount > 0) && group.displayName == "research" > <h4>Research</h4>
<#assign foundClassGroup = true /> <ul>
<#list group.classes as class> <#list classGroups as group>
<#if (class.name == "Academic Article" || class.name == "Book" || class.name == "Conference Paper" ||class.name == "Media Contribution" || class.name == "Report" || class.name == "Library Collection") && (class.individualCount > 0)> <#if (group.individualCount > 0) && group.displayName == "research" >
<li role="listitem"><span>${class.individualCount!}</span>&nbsp;<a href='${urls.base}/individuallist?vclassId=${class.uri?replace("#","%23")!}'>${class.name}s</a></li> <#assign foundClassGroup = true />
<#list group.classes as class>
<#if (class.name == "Academic Article" || class.name == "Book" || class.name == "Conference Paper" ||class.name == "Media Contribution" || class.name == "Report" || class.name == "Library Collection") && (class.individualCount > 0)>
<li role="listitem"><span>${class.individualCount!}</span>&nbsp;<a href='${urls.base}/individuallist?vclassId=${class.uri?replace("#","%23")!}'>${class.name}s</a></li>
</#if>
</#list>
<li><a href="${urls.base}/research" alt="view all research">View all ...</a></li>
</#if> </#if>
</#list> </#list>
<li><a href="${urls.base}/research" alt="view all research">View all ...</a></li> <#if !foundClassGroup>
</#if> <p><li>No research content found.</li></p>
</#list> </#if>
<#if !foundClassGroup> </ul>
<p><li>No research records found.</li></p> </section>
</#if> </#macro>
<#-- Renders the html for the academic departments section on the home page. -->
<#-- Works in conjunction with the homePageUtils.js file -->
<#macro academicDeptsHtml>
<section id="home-academic-depts" class="home-sections">
<h4>Departments</h4>
<div id="academic-depts">
</div>
</section>
</#macro> </#macro>
<#-- builds the "academic departments" box on the home page --> <#-- builds the "academic departments" box on the home page -->
<#macro academicDepartments> <#macro listAcademicDepartments>
<script> <script>
var academicDepartments = [ var academicDepartments = [
<#if academicDeptDG?has_content> <#if academicDeptDG?has_content>
@ -129,3 +160,33 @@ var academicDepartments = [
var urlsBase = "${urls.base}"; var urlsBase = "${urls.base}";
</script> </script>
</#macro> </#macro>
<#-- renders the "geographic focus" section on the home page. works in -->
<#-- conjunction with the homePageMaps.js and latLongJson.js files, as well -->
<#-- as the leaflet javascript library. -->
<#macro geographicFocusHtml>
<section id="home-geo-focus" class="home-sections">
<h4>Geographic Focus</h4>
<#-- map controls allow toggling between multiple map types: e.g., global, country, state/province. -->
<#-- VIVO default is for only a global display, though the javascript exists to support the other -->
<#-- types. See map documentation for additional information on how to implement additional types. -->
<#--
<div id="mapControls">
<a id="globalLink" class="selected" href="javascript:">Global Research</a>&nbsp;|&nbsp;
<a id="usLink" href="javascript:">US Research</a>&nbsp;|&nbsp;
<a id="stateLink" href="javascript:">State-wide Research</a>
</div>
-->
<div id="researcherTotal"></div>
<div id="timeIndicator">
<span>Loading map information . . .&nbsp;&nbsp;&nbsp;
<img src="${urls.images}/indicatorWhite.gif">
</span>
</div>
<div id="mapGlobal" class="mapArea"></div>
<#--
<div id="mapUS" class="mapArea"></div>
<div id="mapState" class="mapArea"></div>
-->
</section>
</#macro>

14
src/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java
View file

@ -62,20 +62,22 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder {
try { try {
geoLocations = getGeoLocations(vreq); geoLocations = getGeoLocations(vreq);
// String response = "{\"type\": \"FeatureCollection\",\"features\": [";
String response = "["; String response = "[";
String geometry = "{\"geometry\": {\"type\": \"Point\",\"coordinates\": \"\"},"; String geometry = "{\"geometry\": {\"type\": \"Point\",\"coordinates\": \"\"},";
String typeProps = "\"type\": \"Feature\",\"properties\": {\"mapType\": \"\","; String typeProps = "\"type\": \"Feature\",\"properties\": {\"mapType\": \"\",";
String previousLabel = ""; String previousLabel = "";
for (Map<String, String> map: geoLocations) { for (Map<String, String> map: geoLocations) {
String label = map.get("label"); String label = map.get("label");
String html = map.get("count"); String html = map.get("count");
String uri = UrlBuilder.urlEncode(map.get("location")); String uri = map.get("location");
if ( uri != null ) {
uri = UrlBuilder.urlEncode(uri);
}
Integer count = Integer.parseInt(map.get("count")); Integer count = Integer.parseInt(map.get("count"));
String radius = String.valueOf(calculateRadius(count)); String radius = String.valueOf(calculateRadius(count));
if ( !label.equals(previousLabel) ) { if ( label != null && !label.equals(previousLabel) ) {
String tempStr = geometry; //+label String tempStr = geometry; //+label
tempStr += typeProps //+ label tempStr += typeProps //+ label
+ "\"popupContent\": \"" + "\"popupContent\": \""
@ -91,7 +93,9 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder {
previousLabel = label; previousLabel = label;
} }
} }
response = response.substring(0, response.lastIndexOf(",")); if ( response.lastIndexOf(",") > 0 ) {
response = response.substring(0, response.lastIndexOf(","));
}
response += " ]"; response += " ]";
log.debug(response); log.debug(response);
return response; return response;

61
themes/wilma/templates/page-home.ftl
View file

@ -49,7 +49,9 @@
<input type="hidden" name="classgroup" class="search-homepage" value="" autocapitalize="off" /> <input type="hidden" name="classgroup" class="search-homepage" value="" autocapitalize="off" />
</div> </div>
<a class="filter-search filter-default" href="#" title="Filter search"><span class="displace">filter search</span></a> <a class="filter-search filter-default" href="#" title="Filter search">
<span class="displace">filter search</span>
</a>
<ul id="filter-search-nav"> <ul id="filter-search-nav">
<li><a class="active" href="">All</a></li> <li><a class="active" href="">All</a></li>
@ -63,60 +65,25 @@
<@widget name="login" /> <@widget name="login" />
<section id="home-research" class="home-sections"> <!-- List of research classes: e.g., articles, books, collections, conference papers -->
<h4>Research</h4> <@lh.researchClasses />
<ul>
<@lh.researchClasses />
</ul> <!-- List of four randomly selected faculty members -->
</section> <@lh.facultyMbrHtml />
<section id="home-faculty-mbrs" class="home-sections" > <!-- List of randomly selected academic departments -->
<h4>Faculty</h4> <@lh.academicDeptsHtml />
<div id="tempSpacing">&nbsp;</div>
<div id="research-faculty-mbrs">
<!-- populated via an ajax call -->
<ul id="facultyThumbs">
</ul>
</div>
</section>
<section id="home-academic-depts" class="home-sections">
<h4>Departments</h4>
<div id="academic-depts"></div>
</section>
<#if geoFocusMapsEnabled > <#if geoFocusMapsEnabled >
<section id="home-geo-focus" class="home-sections"> <!-- Map display of researchers' areas of geographic focus. Must be enabled in runtime.properties -->
<h4>Geographic Focus</h4> <@lh.geographicFocusHtml />
<div id="mapControls">
<a id="globalLink" class="selected" href="javascript:">Global Research</a>&nbsp;|&nbsp;
<a id="usLink" href="javascript:">US Research</a>&nbsp;|&nbsp;
<#-- <a id="stateLink" href="javascript:">NY Research</a> -->
</div>
<div id="researcherTotal"></div>
<div id="timeIndicator">
<span>Loading map information . . .&nbsp;&nbsp;&nbsp;
<img src="${urls.images}/indicatorWhite.gif">
</span>
</div>
<div id="mapGlobal" class="mapArea"></div>
<div id="mapUS" class="mapArea"></div>
<div id="mapState" class="mapArea"></div>
</section>
</#if> </#if>
<section id="home-stats" class="home-sections" > <!-- Statistical information relating to property groups and their classes; displayed horizontally, not vertically-->
<h4>Statistics</h4> <@lh.allClassGroups vClassGroups! />
<ul id="stats">
<@lh.allClassGroups vClassGroups! />
</ul>
</section>
<#include "footer.ftl"> <#include "footer.ftl">
<#-- builds a json object that is used by js to render the academic departments section --> <#-- builds a json object that is used by js to render the academic departments section -->
<@lh.academicDepartments /> <@lh.listAcademicDepartments />
</body> </body>
</html> </html>