From 5478f6edb3da3f2b98554f39263908a26658c53f Mon Sep 17 00:00:00 2001 From: berick Date: Wed, 13 Apr 2011 13:53:14 -0400 Subject: [PATCH] Pull SVF attrs into displayed bib rec (results page only thus far). use SVF value to determine format icon and icon label --- .../perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm | 2 +- Open-ILS/web/images/format_icons/item_type/a.png | Bin 0 -> 1538 bytes Open-ILS/web/images/format_icons/item_type/c.png | Bin 0 -> 1112 bytes Open-ILS/web/images/format_icons/item_type/d.png | Bin 0 -> 1112 bytes Open-ILS/web/images/format_icons/item_type/e.png | Bin 0 -> 1324 bytes Open-ILS/web/images/format_icons/item_type/f.png | Bin 0 -> 1324 bytes Open-ILS/web/images/format_icons/item_type/g.png | Bin 0 -> 1648 bytes Open-ILS/web/images/format_icons/item_type/i.png | Bin 0 -> 1330 bytes Open-ILS/web/images/format_icons/item_type/j.png | Bin 0 -> 1726 bytes Open-ILS/web/images/format_icons/item_type/k.png | Bin 0 -> 891 bytes Open-ILS/web/images/format_icons/item_type/m.png | Bin 0 -> 955 bytes Open-ILS/web/images/format_icons/item_type/o.png | Bin 0 -> 1724 bytes Open-ILS/web/images/format_icons/item_type/p.png | Bin 0 -> 1724 bytes Open-ILS/web/images/format_icons/item_type/r.png | Bin 0 -> 1392 bytes Open-ILS/web/images/format_icons/item_type/t.png | Bin 0 -> 1538 bytes .../images/{media => format_icons/mattype}/2.png | Bin .../images/{media => format_icons/mattype}/5.png | Bin .../images/{media => format_icons/mattype}/a.png | Bin .../images/{media => format_icons/mattype}/b.png | Bin .../images/{media => format_icons/mattype}/c.png | Bin .../images/{media => format_icons/mattype}/d.png | Bin .../images/{media => format_icons/mattype}/e.png | Bin .../images/{media => format_icons/mattype}/f.png | Bin .../images/{media => format_icons/mattype}/h.png | Bin .../images/{media => format_icons/mattype}/i.png | Bin .../images/{media => format_icons/mattype}/j.png | Bin .../images/{media => format_icons/mattype}/k.png | Bin .../images/{media => format_icons/mattype}/l.png | Bin .../images/{media => format_icons/mattype}/m.png | Bin .../mattype}/media_downloadableebook.png | Bin .../mattype}/media_electronicgames.png | Bin .../mattype}/media_evideo.png | Bin .../mattype}/media_onlinejournal.png | Bin .../mattype}/media_player.png | Bin .../mattype}/media_podcasts.png | Bin .../mattype}/media_streamingaudio.png | Bin .../mattype}/media_streamingvideo.png | Bin .../{media => format_icons/mattype}/media_vhs.png | Bin .../images/{media => format_icons/mattype}/n.png | Bin .../images/{media => format_icons/mattype}/o.png | Bin .../images/{media => format_icons/mattype}/p.png | Bin .../images/{media => format_icons/mattype}/q.png | Bin .../images/{media => format_icons/mattype}/r.png | Bin .../images/{media => format_icons/mattype}/s.png | Bin .../images/{media => format_icons/mattype}/t.png | Bin .../images/{media => format_icons/mattype}/v.png | Bin .../images/{media => format_icons/mattype}/w.png | Bin .../images/{media => format_icons/mattype}/x.png | Bin .../images/{media => format_icons/mattype}/y.png | Bin .../images/{media => format_icons/mattype}/z.png | Bin .../web/templates/default/opac/parts/misc_util.tt2 | 12 ++++--- .../templates/default/opac/parts/result/table.tt2 | 35 +++++++-------------- .../web/templates/default/opac/parts/searchbar.tt2 | 2 +- 53 files changed, 22 insertions(+), 29 deletions(-) create mode 100644 Open-ILS/web/images/format_icons/item_type/a.png create mode 100644 Open-ILS/web/images/format_icons/item_type/c.png create mode 100644 Open-ILS/web/images/format_icons/item_type/d.png create mode 100644 Open-ILS/web/images/format_icons/item_type/e.png create mode 100644 Open-ILS/web/images/format_icons/item_type/f.png create mode 100644 Open-ILS/web/images/format_icons/item_type/g.png create mode 100644 Open-ILS/web/images/format_icons/item_type/i.png create mode 100644 Open-ILS/web/images/format_icons/item_type/j.png create mode 100644 Open-ILS/web/images/format_icons/item_type/k.png create mode 100644 Open-ILS/web/images/format_icons/item_type/m.png create mode 100644 Open-ILS/web/images/format_icons/item_type/o.png create mode 100644 Open-ILS/web/images/format_icons/item_type/p.png create mode 100644 Open-ILS/web/images/format_icons/item_type/r.png create mode 100644 Open-ILS/web/images/format_icons/item_type/t.png rename Open-ILS/web/images/{media => format_icons/mattype}/2.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/5.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/a.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/b.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/c.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/d.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/e.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/f.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/h.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/i.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/j.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/k.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/l.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/m.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/media_downloadableebook.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/media_electronicgames.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/media_evideo.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/media_onlinejournal.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/media_player.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/media_podcasts.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/media_streamingaudio.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/media_streamingvideo.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/media_vhs.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/n.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/o.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/p.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/q.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/r.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/s.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/t.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/v.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/w.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/x.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/y.png (100%) rename Open-ILS/web/images/{media => format_icons/mattype}/z.png (100%) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm index fe61149e06..1cae862952 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm @@ -140,7 +140,7 @@ sub load_rresults { return Apache2::Const::OK if @$rec_ids == 0; my ($facets, @data) = $self->get_records_and_facets( - $rec_ids, $results->{facet_key}, {flesh => '{holdings_xml}'}); + $rec_ids, $results->{facet_key}, {flesh => '{holdings_xml,mra}'}); # shove recs into context in search results order for my $rec_id (@$rec_ids) { diff --git a/Open-ILS/web/images/format_icons/item_type/a.png b/Open-ILS/web/images/format_icons/item_type/a.png new file mode 100644 index 0000000000000000000000000000000000000000..2800684510d01bcf308f447d40b16fd9e768f9e8 GIT binary patch literal 1538 zcmV+d2L1VoP)Cl-@X{RmSD5bPgDAEFwxFE<^Wna*_D&di;=9M2t*EfVE_xHv2_Yo>#hKc3zfEzPt6gK~OFd|Rf z!j=#G8wU6Aguwt9Fq}5IYGq08t8;QZ?9LQpu{dH%9MMPwWqH}icxg8}rak+DBQp50 zLHLya1dr=_UXo*nNT9o{;B=JJ&lB}FPl()TSr$WL`4-C>2wg!?C`nH4oK zDI*)+q#UAlUn+L{y`GrlJWUK;GetH9@Fd9=fg>D>vOTyl z;Kvo;ZB*oEBEdP!n%sAQg-~Q<7vQ=jos+sQ%y10%x}uWfBy>Hoke{_;ZP~)oqE9!L zm!!oMjcU4K@=gfjzC14jt%Cs!k3~_K=1KrkN*~b2$`ee?DWcbq#Jl=_FO!2q)~IN! zBcKLfv2^+B^-s^;lxmj{*K{*6VxFq8tJxUeBAYmTt{I{zqR8WhVfy-h(U=Y{yNu+V z64DYQf_v!l95NcF2FDNZTk|kC=E|s?RyY+VU3YEHHYvzwS zOB#tn5CuL#Q*S7Y=H6kP3fmD>#)N0I_62$&ys zvUBu!G{5uWcYR@fM@+Qt#p4{NlhVb+W491h*G*e9@e=li&IYEC(@Y2T z2k>iK7aF{M6F?cK4!d)fXecz0X4+W|RHTexYulG@&PZUwykQ@ixS5C*=aDRcL|BirULJ@p(fFBAkS!jv;JU8sH14dwYbmJu=bbcYBM8 zpjvE=_7VSa)E`~lI(;6Qkz#`yje%$0wn+kw#Whmj>Z3KSKK$9^N58@$AUH`S>BQ^Z zN1^t19t!g*dqwCEI7#3P&76p-oaKP~+Ak|Qo9cwg3oEHCi9`@YwDt~=PtIPZKiwRH zelx z&L^|dowSL$W7iM$^prP<$XI)|c&!hFn7QJ?ZkXyb!R0|EL?Dv;M;ITrGwdlidr!O`de=imq oNsU{Rjxdpwza5Xqj=uyL0K*88J(~EBSpWb407*qoM6N<$f`T*Bxc~qF literal 0 HcmV?d00001 diff --git a/Open-ILS/web/images/format_icons/item_type/c.png b/Open-ILS/web/images/format_icons/item_type/c.png new file mode 100644 index 0000000000000000000000000000000000000000..132ca40b6f919c1fa56d866d95e2dd6e5029ac59 GIT binary patch literal 1112 zcmeAS@N?(olHy`uVBq!ia0vp^feU|?Vf#3n!t z1jflAl54r;D;bbAWd)AuKpJd6!=CNBOBooLet5b#hG?8GJ?)z>?JB|k;lJ_cGw1f* z=zD!6P^ds*39s+Vg-%XRkB+c2>|=~?V!qE+`1lHUhnJ|++7(wqL_DOd`yN+3KBB+d z+Iq9`ogIb0W9vd%mo<9uJ_tOrRppwW1Y5WRi=vKhsHxTV>He=zc3-X7^!My{9j2^^ z9}JS7T_!v}OW!j2O+6ex?Z3@-@!+WQrL(GITj#~=zK^JUs5*f`PHuzw=2!jluRg7R z^ptz*yrXk7%`acv%Tn02>7}&2QQJdCNhXd%73){OKK*mH{NYDm6LyO{To;#YYV7^E zL_2p*qxMWzWd(&BZeE$4B~Nlf=9g}eiw$$i-JRj^*Z=9U!tIx5{r?+mS$C^@hTZ=>;4NIttQ4a!nrF7k~S>_IwoAk~K$fIclpx7fB7rBkMs2JD*7aH3tj{@*>3%T;x^?ss^< zS>;xwyrQwaSxC&$toO3#GmU5tm4fSs@83E5IqvjU`IHX(Jyw}()VJwrd{gNDwJL7f z;?0x$R#v=@+cj&((^5M*+nNs?nT*BVCsmBHckVrXOZZ@7nU!6wnf@s~{mZ>N-=|#N zP}z7>Dmv%5_|K|TuDx4-x^DVzC!CV*1J-lS4wIrlvqUv?BbjnF!#Upf2K#z zroL`EXUPoA5UQZ8mXcVKYL#4+3Zxi}fSE|w&`8(FJjBq<%Fxitz*yJ7)XKo1aapG> ziiX_$l+3hBxCTRm5JOWdLlY|#Gl+)EoFdynSq@}FRzYgIRdRk#eo=8jVlvPcozl?x uKuHC-WN~6{K~82~x^7xxa!Gy>gJFfC4ivwf`lkS>mci52&t;ucLK6Ub^3fUq literal 0 HcmV?d00001 diff --git a/Open-ILS/web/images/format_icons/item_type/d.png b/Open-ILS/web/images/format_icons/item_type/d.png new file mode 100644 index 0000000000000000000000000000000000000000..132ca40b6f919c1fa56d866d95e2dd6e5029ac59 GIT binary patch literal 1112 zcmeAS@N?(olHy`uVBq!ia0vp^feU|?Vf#3n!t z1jflAl54r;D;bbAWd)AuKpJd6!=CNBOBooLet5b#hG?8GJ?)z>?JB|k;lJ_cGw1f* z=zD!6P^ds*39s+Vg-%XRkB+c2>|=~?V!qE+`1lHUhnJ|++7(wqL_DOd`yN+3KBB+d z+Iq9`ogIb0W9vd%mo<9uJ_tOrRppwW1Y5WRi=vKhsHxTV>He=zc3-X7^!My{9j2^^ z9}JS7T_!v}OW!j2O+6ex?Z3@-@!+WQrL(GITj#~=zK^JUs5*f`PHuzw=2!jluRg7R z^ptz*yrXk7%`acv%Tn02>7}&2QQJdCNhXd%73){OKK*mH{NYDm6LyO{To;#YYV7^E zL_2p*qxMWzWd(&BZeE$4B~Nlf=9g}eiw$$i-JRj^*Z=9U!tIx5{r?+mS$C^@hTZ=>;4NIttQ4a!nrF7k~S>_IwoAk~K$fIclpx7fB7rBkMs2JD*7aH3tj{@*>3%T;x^?ss^< zS>;xwyrQwaSxC&$toO3#GmU5tm4fSs@83E5IqvjU`IHX(Jyw}()VJwrd{gNDwJL7f z;?0x$R#v=@+cj&((^5M*+nNs?nT*BVCsmBHckVrXOZZ@7nU!6wnf@s~{mZ>N-=|#N zP}z7>Dmv%5_|K|TuDx4-x^DVzC!CV*1J-lS4wIrlvqUv?BbjnF!#Upf2K#z zroL`EXUPoA5UQZ8mXcVKYL#4+3Zxi}fSE|w&`8(FJjBq<%Fxitz*yJ7)XKo1aapG> ziiX_$l+3hBxCTRm5JOWdLlY|#Gl+)EoFdynSq@}FRzYgIRdRk#eo=8jVlvPcozl?x uKuHC-WN~6{K~82~x^7xxa!Gy>gJFfC4ivwf`lkS>mci52&t;ucLK6Ub^3fUq literal 0 HcmV?d00001 diff --git a/Open-ILS/web/images/format_icons/item_type/e.png b/Open-ILS/web/images/format_icons/item_type/e.png new file mode 100644 index 0000000000000000000000000000000000000000..f9f804746fc6fa7d8e2e499ea96ab49af839a14b GIT binary patch literal 1324 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 ZfIf#t{ELagRgUf#Aba^AswPHU{2N!v;l%&| literal 0 HcmV?d00001 diff --git a/Open-ILS/web/images/format_icons/item_type/i.png b/Open-ILS/web/images/format_icons/item_type/i.png new file mode 100644 index 0000000000000000000000000000000000000000..b6ddf3e1d60dd86f0594951918141800876bd375 GIT binary patch literal 1330 zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g!!2~2PxbLh2Qk(@Ik;Ond1&sNp9lZ-=xRtm@ zlmsP~D-;yvr)B1(DwI?fq$)TD1Q;4IaDgc<1u!r)er}%g|2*f}^ys{_nLe-mx&Z@&ro>8KYr}}>{5N|mc3PBHr6y)R^?7h0XxWm- zjSP%#(>$`(R2eo+<6Ji-sYg<4iExk3zTc&PZyK!h@qeFduPylh$Kj`^y}45zmaxWL zH}GIsUt7R-piqX%B!$mpo@`EO|D2!3@ppfPrDr7;<^5lN@7$}C>GH9wDuk9Cko~u6 z?wYL%$0Qh-7$g?lw9CuMyRN^dI{WRvwATTxTbmR2T|WPQ&HvxE$eWG(JBWxH`N^Xe+&zhBWcaqQ@|xc}$XtxxB#O=}hHSsrK-yLM`iX0&q5dgo8a`uUX}#Wei?FRySw;_waz z0scqp->9J*BO3#$(yjhM4OFVP^3L|R>=W2yCD*4Jm~_58T9@-=@Pkyh=(Ep$ z#rr>!S$=+9f#f%~s)!dm0`4YGl2BItY{9=|g~kV=Vwu3F?@A)><=RhWJ^nuW?e5;= zmQRBI&h<1uqpfFy`c7%?isBk#ZZkX?wbuwAp8cFqD=3D_K!q7@CV#*7f5n+I zQ`MhG&8?dlJnyB(Y4;_cO}u$UPiY)mQqa5A*~v#{D%W!@o>hm+cLx@)di9}EGi9la z`r^7d5@)LeCoww*?|D-$l6k(c_TkUC$RAHnT)0$uVRtCnp2Bua9293))bx}0r=BH$)Rl+qG8iW{{S{a&HnV3N|T;>$n4%8qB zvLUM=HQg#XKPSJaxF9hZXp2s1=zO500$j2FVdQ&MBb@04PF4?EnA( literal 0 HcmV?d00001 diff --git a/Open-ILS/web/images/format_icons/item_type/j.png b/Open-ILS/web/images/format_icons/item_type/j.png new file mode 100644 index 0000000000000000000000000000000000000000..5ada234d52426600c6ca4720f020e0108c5fcd45 GIT binary patch literal 1726 zcmY+EdoRV_V-H=)HGbMhoClq3m-3s2knG-oAi!ADX1 zM$}K61WaPnjeDMi-757xHpsHvrY(&9k*%zbu_~rsF)}JUA?ftv#v4m3f8qB&t~#r@VV^R)xq{K< zKSq=24H_wP&W)U#jG9Cm|3y{I_Uz00_ir+edxPp@z#+Cug$m_&Y3&iIl)ErJ*2TU3 z?JX6l?bdS5d21Ic8k>yUrK>9ueS^O}Qn8ReI50KU>V9AFVN)(8aevhl+a~)hZbfD0 zN%x7!W)OgGi<&7YG&`6#JNfSKIv-e)P}y=vbdG!3I$m>E9JLFZ+wFJSk7!22DW)| zZY4dbS!%zh#5f$nc-UYa9Li6xyle4eS?`Kur28nvFgZRh=KTOA<>gL+kP5#)URC>C z2SytKx#`Bs#@sos_Ug>KN{^>!VTcPw{*Ic_eA#*UT{_K_qjma$djWR7 zxa`|51VdQ5&N3e*-~Q0 zK(D=cW7VK)@|xCnIe$4H4>nwV{%X$~E5^4dZ1B$$6JE+2tJ{rmWbE_RuCa7AI6ES| ze!cYmZeT!swlbpG3)|As>u-ya8LB?@4EJun=+`tlQ$|-h=vW@e3Nnz~k?gP!5qTb@i`Z_=S}5+*}PnS{aBRf9T!SV}{ zXJ#)fR7=A=-V&zLkqK^V6>Uxy2IkIncKw`Xr_+c7gJK;dZZAFmW-1oo=djw?%>jYi)2CM0bAD#7Y7|l+dkGDP+X>`IYThAmQH{auM$|riCn(;PQ-UK^PoCPRnB6-FPpxCZ7 z^dF>6$!sh5%Mn!f%%h>Vx$Lc~f-Cy99@o9$7_DPomK) zmNpP%0}^ncg$)SCm8atV&u}$_8OXZ+rvU<~kcACoZewowU&Dwh>YoaO#^;2;vHb&V z7$HF+oG><>p-3^i=24_LV*Wga(XX HTKs1BCpEP)+ZU{(|=?a!Yr3O@WISC=lq5_=YNKJQh5by#7UwO zqGY0bMAz3!I(7EuA0E9%-Z5UTs>)5t*`Lrf96`Hrjd-yLGFAhR^St7DMzRU|o^CAE z)q)FAioWK5fJayv|12wUAB+r#j;3}v6iqnVL9k>gzyPm~W6L=XJKYFQ1W$dun_Fb0$Q@m-8{4nv^Au>J6Eu&HVAL>VDOCqXheh~C#V z=!=U1uT_KgxGjBgtcG~ltw*tx+Ex7x=Qn-t3|;AmuQv@psW;cqtY=_Rt_pZ1)(~+f)ys< zu#bU}Z-zn{Y9`Qw!2rDi1ZGxEmpBUZF~vHtXrE3a{v{&W@SufEcme9r1dt7DAkd`s zfPn$sr#P9~C-``B-Rk$3#X9SFCwyKTjIp~!uY^F^^?-q}5jj_Rg18jpBOO?9nb7l3gfzV22+>AyONm?=khr_mo-UyAH!`WrGGt@fSpC`h|{m?G~1_0-b40y-C RC_4ZE002ovPDHLkV1mMHpfmsg literal 0 HcmV?d00001 diff --git a/Open-ILS/web/images/format_icons/item_type/m.png b/Open-ILS/web/images/format_icons/item_type/m.png new file mode 100644 index 0000000000000000000000000000000000000000..a347513012706dac1e919df66d6db62803b72a29 GIT binary patch literal 955 zcmV;s14R6ZP)pc5&bgNz zonM$Ox$fDKzCE6S(J6}=t}23-cf&xLr*6l)^4V2VU$ zxZiApMFDtL+R72uBuO70( zMM(~nloU#ZE&;lUM2ARXrN9ZqsYsNnoH)%4wM0rXlA+7%Q;A`v|#$@Fe(LL|L>t0ect z8kdopsqqn1-2ye}?7(4q<0A0$qr;G-L|KwpDyJ+2K0NsfOSRtCyD^XWvh~%|-(h)SW=Iy&H7_C)kb9=31gtjshMfRKASL2C%x#4WCK!He>*P94a)fAxy4kZ|xgBtKl5gGR0+|1-*pAKfT8?(#b-?`})#KlGs`c%LndSZxkq50~DZz4G#N;|Fim@0mY|;8y)Nb7K17;R|!G-JmPunr_WH&A zIM@(P+SGvJr{xtpnYR~CpPZZ?8^kkvYdClFTlU@E-{BWMcIMa&Ci*KVy6(*J`GwbM zDbLgTqR|b(UijeS%>!ny1bt-RQ2%GAUYvUN(C85CMMcvC`9`ZRv2=e8pWI$r{JY(G zi*sH#n}?SjJNNn4@GRLce{GD#DtmLJ>c8YUV#4LzPmO8EQZBExI$zaF#jE>=stvpD d51)So7y!1usag!@32guX002ovPDHLkV1g_S$Q=Lx literal 0 HcmV?d00001 diff --git a/Open-ILS/web/images/format_icons/item_type/o.png b/Open-ILS/web/images/format_icons/item_type/o.png new file mode 100644 index 0000000000000000000000000000000000000000..f7b5c7be4214fa300613b754a9adcb7aa7865400 GIT binary patch literal 1724 zcmY*ZdpOhkAOE^#=D4IX$HMDaJiqtzyxy<(^L~F`&+D(xE8We-UInTR1pq+B z(ZS9`$}lN3A+pk5xjT1zp+tA^iI#H652zLJ$ECwBtW(}Bk03UJ&ZLEsDI^3dj!r_@ zxVeF70Q!TVh#v)-K}}69%*>CN2U{FPp-`X{rcy}j2yweZtB=m=Y}>@rZNjAd!ykYZ zVK)Il!Ozjo#tZYBnlqNO8>f3AX~ts+H$HS@wn!)xwtg1aYh4O@0_g)}gXLjiL+8@n zuYfNUzsU843+AnAtwa-++JUhZDc#5i!Ke(1H>}9UPtiuJP<-|DCqk7lG6u)S-Hcx0 zbtf!}<(|dEgZ-YoCTI=8X^G;DG$?`}cKw}`R5z74hfk)9Pxzxj{4 zQ-T-Sy$3Jp>?%pL@0x&yj>!T$f0EVG@Ei`61(W=}&fYor)M;=(W2a_USNo;|T(UvS zEmh!!AoRWEckvgYulN_PArF-%0|a>_r^>T2*_+#|nVuY@bMUI1d$IV8>cR+HKi~OZ zzwMbk;#Q&RHsNKfy90vfqY;SIsvFD`r4r%b*Os%>#&Ic?$R&AknL6b9#RvHINY$?i zEm7yDMudY+->c!aYfic9XVUh|L@3wJZpGh?|NOh%{^*WpphncYeI;|4x+-Db=SLUZ z>vuiXQ!fx`Txbd%*IclCn-x|UaD2VkpeG%cf>a*l;drpTSHi&KMMD`?LODi)H_tT};lv#2}rb>;@^#!mk>hY;X8fT4)*Doj+&W>-ySffGSkm zKk)gKe0tHm?I-oE9EBiP6|GJ(Cg6_nZr&GmLE1Pat)_XtvEqG#qRWFrnB_C6?u;HQ zrv}LzP2;uZ$pZnBQcA>VlX6loZso!#_TI-!hnolK>aX*??LGx+m`@;7qW zTTTC;bj}~JNX)xKIedOA{C-koiI<6AQe{A2!bNT3OjNc>sB*_OUTe+cmTD4ewEL>l zb91YG9U?|U-XDH*{>1^)uUl8jBhIVEZSpNLDvtf$eu5w1>OSvKqh0hzYt(WhD^YTmjmM#94m6QT2})!`lFjYhd(gZnbV^5 zl(jnD!I^8d|el5KY z3eL-w>VV17`=#&q%kjqoffRZ+POe+gn3-CJD=fhToL?<#5?gP|vHfosM`f7iW46A3 z7#v=9K5AitPoww3D_)g|uS_WW<(mLEpsqps&xjLv3{YpZ4AcLG>pJ*?84N<~StWdzzl%J1B3n@E-6 z4%KbYKVVs?UAm>lNLqMSY%QGZ)2PC#N9cfRkb8Z_ipM)~8=VeU_PthL^u3f5e(7e% z;u0KchKGL?Jlb>*_f8|nV+{vf{ABYVmb6n zXGgaOdP&D*9Tfn;S4On?rcVNd1=p4hUoLtt4PCwMI1dS8k+4K2NlE}(8q`K0+6Zmo z1)5_)5Q{ougfhdTP{~#4M*kN0=6?$Yly$j<#st7~Ao70@=5NrYZvn?sE_QXc Hgp~gRW%m?R literal 0 HcmV?d00001 diff --git a/Open-ILS/web/images/format_icons/item_type/p.png b/Open-ILS/web/images/format_icons/item_type/p.png new file mode 100644 index 0000000000000000000000000000000000000000..f7b5c7be4214fa300613b754a9adcb7aa7865400 GIT binary patch literal 1724 zcmY*ZdpOhkAOE^#=D4IX$HMDaJiqtzyxy<(^L~F`&+D(xE8We-UInTR1pq+B z(ZS9`$}lN3A+pk5xjT1zp+tA^iI#H652zLJ$ECwBtW(}Bk03UJ&ZLEsDI^3dj!r_@ zxVeF70Q!TVh#v)-K}}69%*>CN2U{FPp-`X{rcy}j2yweZtB=m=Y}>@rZNjAd!ykYZ zVK)Il!Ozjo#tZYBnlqNO8>f3AX~ts+H$HS@wn!)xwtg1aYh4O@0_g)}gXLjiL+8@n zuYfNUzsU843+AnAtwa-++JUhZDc#5i!Ke(1H>}9UPtiuJP<-|DCqk7lG6u)S-Hcx0 zbtf!}<(|dEgZ-YoCTI=8X^G;DG$?`}cKw}`R5z74hfk)9Pxzxj{4 zQ-T-Sy$3Jp>?%pL@0x&yj>!T$f0EVG@Ei`61(W=}&fYor)M;=(W2a_USNo;|T(UvS zEmh!!AoRWEckvgYulN_PArF-%0|a>_r^>T2*_+#|nVuY@bMUI1d$IV8>cR+HKi~OZ zzwMbk;#Q&RHsNKfy90vfqY;SIsvFD`r4r%b*Os%>#&Ic?$R&AknL6b9#RvHINY$?i zEm7yDMudY+->c!aYfic9XVUh|L@3wJZpGh?|NOh%{^*WpphncYeI;|4x+-Db=SLUZ z>vuiXQ!fx`Txbd%*IclCn-x|UaD2VkpeG%cf>a*l;drpTSHi&KMMD`?LODi)H_tT};lv#2}rb>;@^#!mk>hY;X8fT4)*Doj+&W>-ySffGSkm zKk)gKe0tHm?I-oE9EBiP6|GJ(Cg6_nZr&GmLE1Pat)_XtvEqG#qRWFrnB_C6?u;HQ zrv}LzP2;uZ$pZnBQcA>VlX6loZso!#_TI-!hnolK>aX*??LGx+m`@;7qW zTTTC;bj}~JNX)xKIedOA{C-koiI<6AQe{A2!bNT3OjNc>sB*_OUTe+cmTD4ewEL>l zb91YG9U?|U-XDH*{>1^)uUl8jBhIVEZSpNLDvtf$eu5w1>OSvKqh0hzYt(WhD^YTmjmM#94m6QT2})!`lFjYhd(gZnbV^5 zl(jnD!I^8d|el5KY z3eL-w>VV17`=#&q%kjqoffRZ+POe+gn3-CJD=fhToL?<#5?gP|vHfosM`f7iW46A3 z7#v=9K5AitPoww3D_)g|uS_WW<(mLEpsqps&xjLv3{YpZ4AcLG>pJ*?84N<~StWdzzl%J1B3n@E-6 z4%KbYKVVs?UAm>lNLqMSY%QGZ)2PC#N9cfRkb8Z_ipM)~8=VeU_PthL^u3f5e(7e% z;u0KchKGL?Jlb>*_f8|nV+{vf{ABYVmb6n zXGgaOdP&D*9Tfn;S4On?rcVNd1=p4hUoLtt4PCwMI1dS8k+4K2NlE}(8q`K0+6Zmo z1)5_)5Q{ougfhdTP{~#4M*kN0=6?$Yly$j<#st7~Ao70@=5NrYZvn?sE_QXc Hgp~gRW%m?R literal 0 HcmV?d00001 diff --git a/Open-ILS/web/images/format_icons/item_type/r.png b/Open-ILS/web/images/format_icons/item_type/r.png new file mode 100644 index 0000000000000000000000000000000000000000..7b76d03f5c21603b78675b8adeca37babffd0c4a GIT binary patch literal 1392 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 literal 0 HcmV?d00001 diff --git a/Open-ILS/web/images/media/2.png b/Open-ILS/web/images/format_icons/mattype/2.png similarity index 100% rename from Open-ILS/web/images/media/2.png rename to Open-ILS/web/images/format_icons/mattype/2.png diff --git a/Open-ILS/web/images/media/5.png b/Open-ILS/web/images/format_icons/mattype/5.png similarity index 100% rename from Open-ILS/web/images/media/5.png rename to Open-ILS/web/images/format_icons/mattype/5.png diff --git a/Open-ILS/web/images/media/a.png b/Open-ILS/web/images/format_icons/mattype/a.png similarity index 100% rename from Open-ILS/web/images/media/a.png rename to Open-ILS/web/images/format_icons/mattype/a.png diff --git a/Open-ILS/web/images/media/b.png b/Open-ILS/web/images/format_icons/mattype/b.png similarity index 100% rename from Open-ILS/web/images/media/b.png rename to Open-ILS/web/images/format_icons/mattype/b.png diff --git a/Open-ILS/web/images/media/c.png b/Open-ILS/web/images/format_icons/mattype/c.png similarity index 100% rename from Open-ILS/web/images/media/c.png rename to Open-ILS/web/images/format_icons/mattype/c.png diff --git a/Open-ILS/web/images/media/d.png b/Open-ILS/web/images/format_icons/mattype/d.png similarity index 100% rename from Open-ILS/web/images/media/d.png rename to Open-ILS/web/images/format_icons/mattype/d.png diff --git a/Open-ILS/web/images/media/e.png b/Open-ILS/web/images/format_icons/mattype/e.png similarity index 100% rename from Open-ILS/web/images/media/e.png rename to Open-ILS/web/images/format_icons/mattype/e.png diff --git a/Open-ILS/web/images/media/f.png b/Open-ILS/web/images/format_icons/mattype/f.png similarity index 100% rename from Open-ILS/web/images/media/f.png rename to Open-ILS/web/images/format_icons/mattype/f.png diff --git a/Open-ILS/web/images/media/h.png b/Open-ILS/web/images/format_icons/mattype/h.png similarity index 100% rename from Open-ILS/web/images/media/h.png rename to Open-ILS/web/images/format_icons/mattype/h.png diff --git a/Open-ILS/web/images/media/i.png b/Open-ILS/web/images/format_icons/mattype/i.png similarity index 100% rename from Open-ILS/web/images/media/i.png rename to Open-ILS/web/images/format_icons/mattype/i.png diff --git a/Open-ILS/web/images/media/j.png b/Open-ILS/web/images/format_icons/mattype/j.png similarity index 100% rename from Open-ILS/web/images/media/j.png rename to Open-ILS/web/images/format_icons/mattype/j.png diff --git a/Open-ILS/web/images/media/k.png b/Open-ILS/web/images/format_icons/mattype/k.png similarity index 100% rename from Open-ILS/web/images/media/k.png rename to Open-ILS/web/images/format_icons/mattype/k.png diff --git a/Open-ILS/web/images/media/l.png b/Open-ILS/web/images/format_icons/mattype/l.png similarity index 100% rename from Open-ILS/web/images/media/l.png rename to Open-ILS/web/images/format_icons/mattype/l.png diff --git a/Open-ILS/web/images/media/m.png b/Open-ILS/web/images/format_icons/mattype/m.png similarity index 100% rename from Open-ILS/web/images/media/m.png rename to Open-ILS/web/images/format_icons/mattype/m.png diff --git a/Open-ILS/web/images/media/media_downloadableebook.png b/Open-ILS/web/images/format_icons/mattype/media_downloadableebook.png similarity index 100% rename from Open-ILS/web/images/media/media_downloadableebook.png rename to Open-ILS/web/images/format_icons/mattype/media_downloadableebook.png diff --git a/Open-ILS/web/images/media/media_electronicgames.png b/Open-ILS/web/images/format_icons/mattype/media_electronicgames.png similarity index 100% rename from Open-ILS/web/images/media/media_electronicgames.png rename to Open-ILS/web/images/format_icons/mattype/media_electronicgames.png diff --git a/Open-ILS/web/images/media/media_evideo.png b/Open-ILS/web/images/format_icons/mattype/media_evideo.png similarity index 100% rename from Open-ILS/web/images/media/media_evideo.png rename to Open-ILS/web/images/format_icons/mattype/media_evideo.png diff --git a/Open-ILS/web/images/media/media_onlinejournal.png b/Open-ILS/web/images/format_icons/mattype/media_onlinejournal.png similarity index 100% rename from Open-ILS/web/images/media/media_onlinejournal.png rename to Open-ILS/web/images/format_icons/mattype/media_onlinejournal.png diff --git a/Open-ILS/web/images/media/media_player.png b/Open-ILS/web/images/format_icons/mattype/media_player.png similarity index 100% rename from Open-ILS/web/images/media/media_player.png rename to Open-ILS/web/images/format_icons/mattype/media_player.png diff --git a/Open-ILS/web/images/media/media_podcasts.png b/Open-ILS/web/images/format_icons/mattype/media_podcasts.png similarity index 100% rename from Open-ILS/web/images/media/media_podcasts.png rename to Open-ILS/web/images/format_icons/mattype/media_podcasts.png diff --git a/Open-ILS/web/images/media/media_streamingaudio.png b/Open-ILS/web/images/format_icons/mattype/media_streamingaudio.png similarity index 100% rename from Open-ILS/web/images/media/media_streamingaudio.png rename to Open-ILS/web/images/format_icons/mattype/media_streamingaudio.png diff --git a/Open-ILS/web/images/media/media_streamingvideo.png b/Open-ILS/web/images/format_icons/mattype/media_streamingvideo.png similarity index 100% rename from Open-ILS/web/images/media/media_streamingvideo.png rename to Open-ILS/web/images/format_icons/mattype/media_streamingvideo.png diff --git a/Open-ILS/web/images/media/media_vhs.png b/Open-ILS/web/images/format_icons/mattype/media_vhs.png similarity index 100% rename from Open-ILS/web/images/media/media_vhs.png rename to Open-ILS/web/images/format_icons/mattype/media_vhs.png diff --git a/Open-ILS/web/images/media/n.png b/Open-ILS/web/images/format_icons/mattype/n.png similarity index 100% rename from Open-ILS/web/images/media/n.png rename to Open-ILS/web/images/format_icons/mattype/n.png diff --git a/Open-ILS/web/images/media/o.png b/Open-ILS/web/images/format_icons/mattype/o.png similarity index 100% rename from Open-ILS/web/images/media/o.png rename to Open-ILS/web/images/format_icons/mattype/o.png diff --git a/Open-ILS/web/images/media/p.png b/Open-ILS/web/images/format_icons/mattype/p.png similarity index 100% rename from Open-ILS/web/images/media/p.png rename to Open-ILS/web/images/format_icons/mattype/p.png diff --git a/Open-ILS/web/images/media/q.png b/Open-ILS/web/images/format_icons/mattype/q.png similarity index 100% rename from Open-ILS/web/images/media/q.png rename to Open-ILS/web/images/format_icons/mattype/q.png diff --git a/Open-ILS/web/images/media/r.png b/Open-ILS/web/images/format_icons/mattype/r.png similarity index 100% rename from Open-ILS/web/images/media/r.png rename to Open-ILS/web/images/format_icons/mattype/r.png diff --git a/Open-ILS/web/images/media/s.png b/Open-ILS/web/images/format_icons/mattype/s.png similarity index 100% rename from Open-ILS/web/images/media/s.png rename to Open-ILS/web/images/format_icons/mattype/s.png diff --git a/Open-ILS/web/images/media/t.png b/Open-ILS/web/images/format_icons/mattype/t.png similarity index 100% rename from Open-ILS/web/images/media/t.png rename to Open-ILS/web/images/format_icons/mattype/t.png diff --git a/Open-ILS/web/images/media/v.png b/Open-ILS/web/images/format_icons/mattype/v.png similarity index 100% rename from Open-ILS/web/images/media/v.png rename to Open-ILS/web/images/format_icons/mattype/v.png diff --git a/Open-ILS/web/images/media/w.png b/Open-ILS/web/images/format_icons/mattype/w.png similarity index 100% rename from Open-ILS/web/images/media/w.png rename to Open-ILS/web/images/format_icons/mattype/w.png diff --git a/Open-ILS/web/images/media/x.png b/Open-ILS/web/images/format_icons/mattype/x.png similarity index 100% rename from Open-ILS/web/images/media/x.png rename to Open-ILS/web/images/format_icons/mattype/x.png diff --git a/Open-ILS/web/images/media/y.png b/Open-ILS/web/images/format_icons/mattype/y.png similarity index 100% rename from Open-ILS/web/images/media/y.png rename to Open-ILS/web/images/format_icons/mattype/y.png diff --git a/Open-ILS/web/images/media/z.png b/Open-ILS/web/images/format_icons/mattype/z.png similarity index 100% rename from Open-ILS/web/images/media/z.png rename to Open-ILS/web/images/format_icons/mattype/z.png diff --git a/Open-ILS/web/templates/default/opac/parts/misc_util.tt2 b/Open-ILS/web/templates/default/opac/parts/misc_util.tt2 index d309d82b09..8a9c0f3940 100644 --- a/Open-ILS/web/templates/default/opac/parts/misc_util.tt2 +++ b/Open-ILS/web/templates/default/opac/parts/misc_util.tt2 @@ -43,10 +43,14 @@ END; END; - # XXX get me from SVF attrs. If no "matttype" attr present, fall back to mods-esque item form/type - args.mattype = xml.findnodes('//*[@tag="998"]/*[@code="d"]').textContent; - args.format = ctx.find_citm(args.mattype).value; - args.format_icon = 'media/' _ args.mattype _ '.png'; + FOR icon_style IN ['mattype', 'item_type']; + node = xml.findnodes('//*[local-name()="attributes"]/*[local-name()="field"][@name="' _ icon_style _ '"]'); + IF node; + args.format_label = node.getAttribute('coded-value') + args.format_icon = ctx.media_prefix _ '/images/format_icons/' _ icon_style _ '/' _ node.textContent _ '.png'; + LAST; + END; + END; END; BLOCK get_hold_status; diff --git a/Open-ILS/web/templates/default/opac/parts/result/table.tt2 b/Open-ILS/web/templates/default/opac/parts/result/table.tt2 index 6dc5eb36bf..3ce5ffa4fd 100644 --- a/Open-ILS/web/templates/default/opac/parts/result/table.tt2 +++ b/Open-ILS/web/templates/default/opac/parts/result/table.tt2 @@ -154,39 +154,36 @@ - - - - [% IF attrs.format %] - [% attrs.format %] + + + + [% IF attrs.format_icon %] + [% attrs.format_label %] [% END %] - - [% l("Match Score: ") %] - - + + [% l("Browse in Google Books Search") %] +
place holdPlace Hold + alt="[% l('Place hold') %]"/>[% l('Place Hold') %]
[% operation = ctx.mylist.grep(rec.id).size ? "delete" : "add"; @@ -211,18 +208,10 @@ style="position:relative;top:-5px;">Reviews & More
-->
-
- [% key = attrs.mattype; - format_desc = ctx.find_citm(key).value; - icon_filename = icon_by_mattype.$key; - IF icon_filename; %] - [% format_desc %] - [% END %] -
+ diff --git a/Open-ILS/web/templates/default/opac/parts/searchbar.tt2 b/Open-ILS/web/templates/default/opac/parts/searchbar.tt2 index b99a3e2de0..4be2b14cb8 100644 --- a/Open-ILS/web/templates/default/opac/parts/searchbar.tt2 +++ b/Open-ILS/web/templates/default/opac/parts/searchbar.tt2 @@ -38,7 +38,7 @@ + onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/> -- 2.11.0