From afbf429165e0275bbfb98792c23be40d83652220 Mon Sep 17 00:00:00 2001 From: tworrall Date: Thu, 2 May 2013 12:31:54 -0400 Subject: [PATCH] additional home page redesign changes --- webapp/themes/vitro/images/filteredSearch.gif | Bin 0 -> 1404 bytes .../vitro/images/filteredSearchActive.gif | Bin 0 -> 1392 bytes webapp/themes/vitro/images/limit-search.png | Bin 0 -> 1707 bytes .../vitro/images/search-field-and-button.gif | Bin 0 -> 1729 bytes webapp/themes/vitro/templates/page-home.ftl | 17 ++-- webapp/web/css/vitro.css | 1 + .../freemarker/lib/lib-home-page.ftl | 74 +++++++++--------- 7 files changed, 49 insertions(+), 43 deletions(-) create mode 100644 webapp/themes/vitro/images/filteredSearch.gif create mode 100644 webapp/themes/vitro/images/filteredSearchActive.gif create mode 100644 webapp/themes/vitro/images/limit-search.png create mode 100644 webapp/themes/vitro/images/search-field-and-button.gif diff --git a/webapp/themes/vitro/images/filteredSearch.gif b/webapp/themes/vitro/images/filteredSearch.gif new file mode 100644 index 0000000000000000000000000000000000000000..16bb82be28e4b822efe9ed17ef5d9bf7f404758e GIT binary patch literal 1404 zcmZ?wbhEHbRA z9XqDap8fCNzu4sD=PzEgb$7pc`?j#GtgyU%+N@cvU0p|x9eefqwVs(-VtV?FIddjW zo0eN#+%sXq!6QeSJ38##+>V_%5uKP=-`xEF|9@RmQwFL6#sAz9z5xm@i6x0Z+Qz=3 zATc>RwL~E)H9a%WR_Xoj{Yna%DYi=CroINg16w1-Ypui3%0DIeEoa6}C!=DfvmMRzNmLSYJs2tfVB{R>=`0p#ZYeIlm}X!Bo#! zH`&0@P{GVh&(Orw%*;?n!N|bSNZ$a6%ybP+tW3?UjLa3FKnZADQA(Oskc%7CE+EfV zDWjyMz)D}gyu4hm+*mKaC|%#s($W%ShLMpjP=#)BWnM{Qg>GK4GRy>*)Z*l#%z~24 z{5%DaiHS-1r6smXK$k+ikXryZHm_I@>>a)2{9OHt!~%UoJp+)JUEg{v+u z2}(t{7puX=A(aKG`a!A1`K3k4sX*n*AgcnUy@&(kzb(T z9Bihb;hUJ8nFkWk1ncniwerj>E=kNwPW5!LRRWr!mzkMjWntuOYG7h+Y3l6eY-s3e zWMSmyYylK9b}@3cFgLJ(>2=9ZF3nBND}m`vLFjeFsTY(OatnYqyQCInmZhe+73JqD zfIV%MiQ6saIL(9VO~LIJ3!HlOfsWA!MJ-ZP!-Rn82gHOYTp$OY^i%VI>AeV;uo?gV z`}^njub)4@fBX97^QVs=-oJbM=Jl(WFP=Yp`sDGWhY#-GyL;#Mt(!NlU%Ptc@}-Lx z&YwGb=JctPCypOGdgSn-g9rBS+q-A?uAMu!Z`-%OrteG>WPn$Yr@}!9q`ulo&y1P0%+S^)NnwuIM>g#H2s;eq1%F9Yiii-*h z^7C?Yva>QX($i8?l9Lh>;^SgtqN5@s!oxyCf`bAB{QZ1=yuCa<+}&JVoShsU?CorA ztgS39%*{+qjExKp^!0Rgw6!!f)YVi~l$8_}{xws^R!vBYMYv7 z%$ZYIR(9;fiRUj~OrJe_(zI#K9Ua?t?8q%H?wK&b&dn`0Ir-JASBdHA|Ni}J?do#$ z@Q6-KJb2_tVR`wRw{Ks)e%;pH{r~@eT~kvA8UV%r+!4M33NDEyi9p)MzM>#8IXksP zAt^OIGtXA({qFrr3YjUkO5vuy2EGN(sTr9bRYj@6RemAKRoTgwDN6Qs3N{s16}bhu zsU?XD6}dTi#a0!zN{K1?NvT#qHb_`sNdc^+B->WW5hS4iveP-gC{@8!&saCvz|c^^ z%uLVF#MI2pP)EVYz|ctF0Eof6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~ zU%$M(T(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}+TSP$$Sz2y8{{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM z!Nnn!1*!T$sm1xFMaii^<;ozd3ap%qQWHz^i$e1Ab6}wukda@KU!0L&px_*Arl8@Q zn4Fmh63_(e@b$Iw%quQQ%u7!7bg@+enxU7OnPTN;;^t&xX=Y^VVqjuu=xStPyn>bnwy$e0@Is<&})oSFDNnO765H_NiE7OOHFYr%Fk5*d)g`! zi(4#=fEJsWyO}z>Ib(MVL~jZfw?On-7~s^a4|I$^C~A?S8YToxKOiPN;Q~4Eq@S7x zOz%a&gw6Q>-`_vKfBpRN{oB_spFe&4@c!M~H?Lp4eDVC*(TITuzuazHLF*x zT(NxF(j|)*EnF~v-rPB}XU&{3ecIG1lP67_(BIeF)7{nC(caeD(%jV8P+wPDQ(aYA zQC?PBQe0G6ke`>Elbw~Bk)D>ClAM&75FZyC6CD*95gryA5*!p5;P2<_Vr*n+ps%N^qphW>p{}N?qO7E-ATK8?BP}HQR1~W zYW0Gf)>Lewrw6J71g}cciy|Z^~Bd=W{zlKg(@Z?`F5!& yfd+nMIhHEfXhlgSPG_FUyrMB8+^$^g(y7Z=tX#Ev&DwSAH*DOrc}svJgEauW4exmX literal 0 HcmV?d00001 diff --git a/webapp/themes/vitro/images/limit-search.png b/webapp/themes/vitro/images/limit-search.png new file mode 100644 index 0000000000000000000000000000000000000000..9eabf8cd02eb12d93f67bbf14975a72207ee287f GIT binary patch literal 1707 zcmbVNdr;GM91k!RaWGbxCy0^-5p~igebLlbrL;WMB3G)k^Rb3Dln8A~8l)gTfQf)Z zPzD^L;MA#{6G6mNdCB3X9uDRWpWwtHI6WU6ZX&yJE=6$Lo#!9RCHeh+-+Vux@B5M) z6&dF0;_U(efNMm!T*a&;^LRK>|76KV~uQLYf{NfR5h>#%Jm3xfs#$r76d(gSTvlM#X&;o&kK?=nP zl(5ngg2xl#X%rrv7OB>!CFoHDv}7?Tv56T16Ha5G&6H@iifvM8j91L;?P3lDj;YWI zQs|9S8f6q1LQ*&=VDkd?FoJ+WAsgWfghFH?$b}Iu2WD?!hZ80Y)6i?F@F^7|qlEO~mu}R9vK~NO6b8xwVj7Fd})l6fyK(p0vfK z!8t12N+wf!rXF#A6JREH?>A&uWV{itqzI-cSfZTNC!26H9U+%O%onzSFoTRB(g&Xefi`3SeQdLJ_2x zz($y@G-lT06Lty4?l=~HFIF5v;TTO)YLZNx=zyqrk|wS3qy-F#7J~DXn4U1(1@r9% zdK0f4r-+TXA(SFb;8=#m#5+8I1^Wb zE)ycA2kqOp&CeX(jt_2TW`<&h!?*$H0|3X{5%OTQ?amWzAlV(|nS7*XZ~3JjN&i6Y zO!}`lgvb7rcHoSlD;>XyyEolIB%sT;_Gw3LS@X8fOej zl3t&@lDd9b+0qvja&^stLq9b4uIc$E|M@XLPu<*KH#<*{b<6zp%E0l#7C~Ik&K%9I zUUa0`qnVc(w&#LJONpvg<%0GbM8#>h?q3;|1+-#+Ug(cIxDItYCmhnrU=AJELeV_;hwF5`FdZPuY+9R^(@7+?s|XRC5^0ZdtXt zsIOXGzCV%geYdd1_l5V9fH}pt%N#vDGVm;QeeDGnyghHr%J3uy*za1iTV5B`>A$Ts zaaexf){T++SF=-mj-GKvoz4=QlDIF~of`+;ht4=H-L5NkxOl7Ban!qL5uu4*-Yy=P znmvpKIM{M~Q#F-GV%ur~=W}~>-F4d18DIM99-iuKt(jAyc`$jY8>?|yO}C3z8CS3#)uCpG+g{X6eyoP$P zb^DGl&tToFaM-}!H7U8IP2W}4d{etid!*?zOH2E2dCsEQI&DfRflk|aj?=UAL_>aA zkzXnVn_{fr`Uiog{u*V&5Ok=ezH78{xN>~~YVAcA6^*iVfHLWq16!STbl86%5sFB8 IwM>`!H+Bq+%K!iX literal 0 HcmV?d00001 diff --git a/webapp/themes/vitro/images/search-field-and-button.gif b/webapp/themes/vitro/images/search-field-and-button.gif new file mode 100644 index 0000000000000000000000000000000000000000..3b672288e335881ca19c6a17014e005a70905349 GIT binary patch literal 1729 zcmbVM2~-nD7!Dvx3$#>gtG3lO*cJ;UySYfBQ6UGHC*-`adj6kSwa(2 zd%{Hmp{uJaSRxT4NJ2_VPfyR#(2&7k(ChX6I^E#lVE@2CLUMAKRy!~_sMG1-HEV|S z`p(YIj*gB%k!WamnDAd?w!zZh%NyVcF(E$BU#OM~MWHYT1i`_Gj6>`#tt0}7m_uAn z_X54-TsQ=Ai&VhAkxTqUk)a}%n7D8OFkj79OXX4+69Q_fM5bh`IYglt4T9PD+9)Oy zfl&w+${{)%4*;W0E~5E_PYh`6V(Ly*e7yxu65DM_ONkwmDJtQN}25D6qprN+2M(Mrq* z{@abWqLqFTa+vG`E73582*%;I<77N{?>1xv;@+^ADiHiqgc2Sq3X{Sz%$>&};wL0A zB4&dS6VIX(4RoS_3?>AzC@!Eg*TscSg+PHblRmEFZCoaWO9yFAd^%Uag&;nKNfB_F zxQNQ5aG6dZbDZlgQ({7y2p+eK;C9EjymxZhTm>w|P=z0gO2#X|I|Rj0We6$4?ya_BWHq4Dxc*-cj40nG#-sd9OH`r zPu9q|Gh}0V{G(jPMR*Mwmv4$6-@IubScdnE0&flz!>d0>UcMOC4-M)D`um+N~k zt?laUc=Gts!w2{8wYS~9)7o)%q)SwKdhhUA}bj!ufMml@;Y> zr6t8hXA931Xin$noyt9#lb!YJiOl22GSZJ8Ih>Z7lAM&7aOmKH{rmRriQm0z=Z@`h z+hVuIY}vdiI%?yFU)HZ%`*UQ3I$RZoDHT7-QJGW{x&{deUJZ*yLBbzb1qQ7A;rkW- z%fDOZ=j-#W_tGU^i#x35ZLi^2mDtT;#;)oNMU8|VALV?sD#SatIY(9Z zG_tZiPraCw)X-57SuZPXd!}Ee&uQt^k3?}QL`=CqPUHRzAGtbVa1G>S4 z-sdj_{X?$|1jEA?*Su9#(H2u=#A@%<^D#EIs_D%(sm`&}sD-b<#>J4q1CFKSWRYw3){YL#J#{S`LK1&jDXtfRz6!ik~~ss zA0f_J{u=g~EOOS(Q~Y9;xo2Vb)cogVi2>P@Px1@pnI)V|Ms7f?l5_XYODg$n$yzhB zfl}+d_6s@-SL*hneD4K}l~$U^4K++{pH)c#xvAJKDbUf9o@-&_ zU$?$HajJ>AMj4%5?onkzSch4*U1_;SFq>rI=6|)Uxc^CGx@X#w@)Di4SrgiJwY+qw XxBWugtfdtrefM|Hw6e1?CCvK^WSi57 literal 0 HcmV?d00001 diff --git a/webapp/themes/vitro/templates/page-home.ftl b/webapp/themes/vitro/templates/page-home.ftl index c4816bc95..0e3ab91f4 100644 --- a/webapp/themes/vitro/templates/page-home.ftl +++ b/webapp/themes/vitro/templates/page-home.ftl @@ -55,14 +55,17 @@ <@widget name="login" /> -
-

Statistics

- -
    - <@lh.allClassGroups vClassGroups! /> -
-
+ + <@lh.allClassGroups vClassGroups! /> <#include "footer.ftl"> + \ No newline at end of file diff --git a/webapp/web/css/vitro.css b/webapp/web/css/vitro.css index 6a84a8d24..54e42a6c3 100644 --- a/webapp/web/css/vitro.css +++ b/webapp/web/css/vitro.css @@ -251,6 +251,7 @@ p#mngLabelsText { /* SEARCH HOME------> */ #search-home { margin-top: 2em; + width: 570px; } #search-home h3 { diff --git a/webapp/web/templates/freemarker/lib/lib-home-page.ftl b/webapp/web/templates/freemarker/lib/lib-home-page.ftl index 7b0cac823..e184a1cac 100644 --- a/webapp/web/templates/freemarker/lib/lib-home-page.ftl +++ b/webapp/web/templates/freemarker/lib/lib-home-page.ftl @@ -17,49 +17,51 @@ <#-- Loop through classGroups first so we can account for situations when all class groups are empty --> <#assign selected = 'class="selected" ' /> <#assign classGroupList> - <#list classGroups as group> - <#-- Only display populated class groups --> - <#if (group.individualCount > 0)> - <#-- Catch the first populated class group. Will be used later as the default selected class group --> - <#if !firstPopulatedClassGroup??> - <#assign firstPopulatedClassGroup = group /> - - <#-- Determine the active (selected) group --> - <#assign activeGroup = "" /> - <#if !classGroup??> - <#if group_index == 0> - <#assign activeGroup = selected /> +
+

Statistics

+ +
<#-- Display the class group browse only if we have at least one populated class group --> <#if firstPopulatedClassGroup??> ${classGroupList} <#else> -

There is currently no content in the system, or you need to create class groups and assign your classes to them.

+

There is currently no content in the system, or you need to create class groups and assign your classes to them.

<#if user.loggedIn> <#if user.hasSiteAdminAccess>