From 0b0cc67059de188c978649a5725e32086678f10c Mon Sep 17 00:00:00 2001 From: mb863 Date: Mon, 3 Jan 2011 21:40:37 +0000 Subject: [PATCH] NIHVIVO-641: Included in menupage--classgroup-people.ftl 3 include files: *menupage-browse.ftl: Template for browsing class groups in menupages *menupage-classCroupMenu.ftl: Template for class groups menu in menupages *menupage-browseByVClass.ftl: Template for browsing VClasses in menupages Removed some Find By filters Added existing dummy individual: foaf person picture (Before I was using a duplicated image file) --- webapp/web/css/menupage/menupage.css | 3 +- .../web/images/menupage/person-thumbnail.jpg | Bin 1787 -> 0 bytes webapp/web/js/menupage/browseByVClass.js | 2 +- .../menupage/menupage--classgroup-people.ftl | 74 +----------------- .../partials/menupage/menupage-browse.ftl | 46 +++++++++++ .../menupage/menupage-browseByVClass.ftl | 21 +++++ .../menupage/menupage-classGroupsMenu.ftl | 11 +++ 7 files changed, 85 insertions(+), 72 deletions(-) delete mode 100644 webapp/web/images/menupage/person-thumbnail.jpg create mode 100644 webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl create mode 100644 webapp/web/templates/freemarker/body/partials/menupage/menupage-browseByVClass.ftl create mode 100644 webapp/web/templates/freemarker/body/partials/menupage/menupage-classGroupsMenu.ftl 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 6ce053a0786f374e2f350c943cb682dd0c0b575b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1787 zcmY*X3pkYN9)CZd8D?C@bVMzVkjscdE^8`6shNW_Zi5DG&A5k?!i+?28C#l0Fn9(?C*V^_kI7j_xF3=|6evFdkxgct|V6g z$pOGX7LZ8+{y;oEiUlAb4*;Mbt_7g##E3l}0vJCd9!MqunLzFjz{m}jM|M~qCBFd_ z8ub-uw1R@7f&vIWf+$Og3Xun}JSw>zS zGxajpu1)nO5!wAysh&}z!xnqNx~QObruL&KRcQ{0uz*b~2$2}ZxO z*xG+9QggG}x13*nV|60?8(+{J>{;APr*hx>hlq89b&A}^{_c|9xvrhP@v<^ z;Bg+Rb{LDxG69ha&`i>zi&Dv21cMXEylwYL$JCoSMh<4*?6v#HMM;*yde>lGZrn;) zP+*FNlfMw@pp#2Gv!auwmsb;OKF}H=An;72uTt`j8yrMa1!o@fMUI8Wv3=TuKaFGk zqW8aUSt#i>J-cKxK6#)nd;Zt1LS@a2E*EC>$p!6#z2p9DL4Hj&Bxt}h&5F!&n~nMl$RX1)cVp} z|Cz(^UK(e5Yj9LgV)aCP2NXz4Fndy>F;rmRr17O}+_$n^E#v)2U66H03 zZ@1B()#kZq+oqr+vJq$!+ZpjKHvaTUUXi>N*yGappX4*Gw#ScE(68;jvfOUbcGF-|+BlgrrY7fS3O^*o zgSnwK@2P|tba&tUHU18 zduyyU^vUP6ZaM+e!*m|CH2BSL-mcJ}dc9|WE#kbIKJ;RDQt`Uo*-qw}?u+*>Il5QP zJsPfkP}$0845oH)`PlG8^P;|DYF6)MA2lAY8m{6+__n-ZHPUwNVu?GiC4Ne{A21z9 zb$cG?P%=V7ccJkW2knX#caerC{Fz1;F49J!5B;__SKk5$h0oAwF((>Jkji}VAz@nbgzn$;EycNmJslkNuU3P+_MN=hT|Jq(Ec*M}_>nn$DH zofofKPQ^Fb=q^88@x7Gaw3YV!L}HbfyWTo7DSFyDI*HW?L0Rj|$is}sb8Xa@C0}ax d+)m0Au5MCY8}Q*C=8BWDD%3afgkiGb{{R^%=_LRF 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