diff --git a/webapp/web/css/menupage/menupage.css b/webapp/web/css/menupage/menupage.css index 30f10106f..760939a2d 100644 --- a/webapp/web/css/menupage/menupage.css +++ b/webapp/web/css/menupage/menupage.css @@ -237,9 +237,10 @@ ul#browse-childClasses a{ height: 35px; } /* ALPHA BROWSE------> */ -#alpha-browse-childClass{ +ul#alpha-browse-childClass{ float: left; width: 77px; + margin-bottom: 20px; } ul#alpha-browse-childClass li{ display: block; diff --git a/webapp/web/images/menupage/person-thumbnail.jpg b/webapp/web/images/menupage/person-thumbnail.jpg deleted file mode 100644 index 6ce053a07..000000000 Binary files a/webapp/web/images/menupage/person-thumbnail.jpg and /dev/null differ diff --git a/webapp/web/js/menupage/browseByVClass.js b/webapp/web/js/menupage/browseByVClass.js index 62cbda168..0f9e01eb1 100644 --- a/webapp/web/js/menupage/browseByVClass.js +++ b/webapp/web/js/menupage/browseByVClass.js @@ -72,7 +72,7 @@ var browseByVClass = { // test for individual image is not currently functional // since the image is not yet included in the JSON results if ( !results.individuals[i].image ) { - indivImage = browseByVClass.baseUrl + '/images//menupage/person-thumbnail.jpg'; + indivImage = browseByVClass.baseUrl + '/images/dummyImages/person.thumbnail.jpg'; } else { indivImage = results.individuals[i].image; } diff --git a/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl b/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl index 32aba478b..c2a20159d 100644 --- a/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl +++ b/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl @@ -1,17 +1,11 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-

People

+

${page.title}

Visual Graph

- + <#include "menupage-classGroupsMenu.ftl">
@@ -25,11 +19,8 @@ @@ -69,65 +60,8 @@
-
-

Browse by

- - - -
- -
-
+<#include "menupage-browse.ftl"> ${stylesheets.add("/css/menupage/menupage.css")} -<#---------------------------------------------------------------------------------- -requestedPage is currently provided by FreemarkerHttpServlet. Should this be moved -to PageController? Maybe we should have Java provide the domain name directly -instead of the full URL of the requested page? Chintan was also asking for a -template variable with the domain name for an AJAX request with visualizations. -------------------------------------------------------------------------------------> -<#assign domainName = requestedPage?substring(0, requestedPage?index_of("/", 7)) /> - - - -${scripts.add("/js/menupage/browseByVClass.js")} \ No newline at end of file +<#include "menupage-browseByVClass.ftl"> \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl new file mode 100644 index 000000000..9c6f4fcf2 --- /dev/null +++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl @@ -0,0 +1,46 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Template for browsing class groups in menupages --> + +
+

Browse by

+ + + +
+ +
+
\ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browseByVClass.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browseByVClass.ftl new file mode 100644 index 000000000..d12cc62fa --- /dev/null +++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browseByVClass.ftl @@ -0,0 +1,21 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Template for browsing VClasses in menupages--> + +<#---------------------------------------------------------------------------------- +requestedPage is currently provided by FreemarkerHttpServlet. Should this be moved +to PageController? Maybe we should have Java provide the domain name directly +instead of the full URL of the requested page? Chintan was also asking for a +template variable with the domain name for an AJAX request with visualizations. +------------------------------------------------------------------------------------> +<#assign domainName = requestedPage?substring(0, requestedPage?index_of("/", 7)) /> + + + +${scripts.add("/js/menupage/browseByVClass.js")} \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-classGroupsMenu.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-classGroupsMenu.ftl new file mode 100644 index 000000000..0af660f04 --- /dev/null +++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-classGroupsMenu.ftl @@ -0,0 +1,11 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Template for class groups menu in menupages --> + + \ No newline at end of file