From f9b3b74dea47062c29a2a5200c6ac0dbf0c4fc5e Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Thu, 2 Mar 2006 22:33:32 +0000 Subject: [PATCH] Changed forums icons to use browse bean's small icon resolver and required patch git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2513 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/web-client-config.xml | 12 +++--- .../org/alfresco/web/bean/ForumsBean.java | 35 ++---------------- source/web/images/icons/forum-16.gif | Bin 0 -> 1009 bytes source/web/images/icons/forum.gif | Bin 1009 -> 1511 bytes source/web/images/icons/forum_large.gif | Bin 1511 -> 0 bytes source/web/images/icons/forums-16.gif | Bin 0 -> 648 bytes source/web/images/icons/forums.gif | Bin 648 -> 1613 bytes source/web/images/icons/forums_large.gif | Bin 1613 -> 0 bytes source/web/images/icons/topic-16.gif | Bin 0 -> 581 bytes .../web/images/icons/topic_exclamation-16.gif | Bin 0 -> 591 bytes source/web/images/icons/topic_exclamation.gif | Bin 591 -> 1428 bytes .../images/icons/topic_exclamation_large.gif | Bin 1428 -> 0 bytes source/web/images/icons/topic_large.gif | Bin 1400 -> 0 bytes source/web/images/icons/topic_question-16.gif | Bin 0 -> 594 bytes source/web/images/icons/topic_question.gif | Bin 594 -> 1435 bytes .../web/images/icons/topic_question_large.gif | Bin 1435 -> 0 bytes source/web/jsp/forums/forum.jsp | 2 +- source/web/jsp/forums/forums.jsp | 2 +- 18 files changed, 11 insertions(+), 40 deletions(-) create mode 100644 source/web/images/icons/forum-16.gif delete mode 100644 source/web/images/icons/forum_large.gif create mode 100644 source/web/images/icons/forums-16.gif delete mode 100644 source/web/images/icons/forums_large.gif create mode 100644 source/web/images/icons/topic-16.gif create mode 100644 source/web/images/icons/topic_exclamation-16.gif delete mode 100644 source/web/images/icons/topic_exclamation_large.gif delete mode 100644 source/web/images/icons/topic_large.gif create mode 100644 source/web/images/icons/topic_question-16.gif delete mode 100644 source/web/images/icons/topic_question_large.gif diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml index cb0321da5c..6e23c9a6bf 100644 --- a/config/alfresco/web-client-config.xml +++ b/config/alfresco/web-client-config.xml @@ -143,7 +143,7 @@ - + @@ -200,21 +200,21 @@ - + - + - - - + + + diff --git a/source/java/org/alfresco/web/bean/ForumsBean.java b/source/java/org/alfresco/web/bean/ForumsBean.java index 99f9afcb6f..f650fa8ee2 100644 --- a/source/java/org/alfresco/web/bean/ForumsBean.java +++ b/source/java/org/alfresco/web/bean/ForumsBean.java @@ -58,7 +58,6 @@ import org.alfresco.web.app.context.UIContextService; import org.alfresco.web.bean.repository.MapNode; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.NodePropertyResolver; -import org.alfresco.web.bean.repository.QNameNodeMap; import org.alfresco.web.bean.repository.Repository; import org.alfresco.web.config.ViewsConfigElement; import org.alfresco.web.ui.common.Utils; @@ -69,7 +68,6 @@ import org.alfresco.web.ui.common.component.data.UIRichList; import org.alfresco.web.ui.common.renderer.data.IRichListRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.util.StringUtils; /** * Bean providing properties and behaviour for the forums screens. @@ -472,7 +470,7 @@ public class ForumsBean implements IContextListener, NodeEventListener // create our Node representation MapNode node = new MapNode(nodeRef, this.nodeService, true); node.addPropertyResolver("icon", this.browseBean.resolverSpaceIcon); - node.addPropertyResolver("smallIcon", this.resolverSmallIcon); + node.addPropertyResolver("smallIcon", this.browseBean.resolverSmallIcon); this.forums.add(node); } @@ -481,7 +479,7 @@ public class ForumsBean implements IContextListener, NodeEventListener // create our Node representation MapNode node = new MapNode(nodeRef, this.nodeService, true); node.addPropertyResolver("icon", this.browseBean.resolverSpaceIcon); - node.addPropertyResolver("smallIcon", this.resolverSmallIcon); + node.addPropertyResolver("smallIcon", this.browseBean.resolverSmallIcon); node.addPropertyResolver("replies", this.resolverReplies); this.topics.add(node); @@ -492,7 +490,7 @@ public class ForumsBean implements IContextListener, NodeEventListener MapNode node = new MapNode(nodeRef, this.nodeService, true); this.browseBean.setupCommonBindingProperties(node); - node.addPropertyResolver("smallIcon", this.resolverSmallIcon); + node.addPropertyResolver("smallIcon", this.browseBean.resolverSmallIcon); node.addPropertyResolver("message", this.resolverContent); node.addPropertyResolver("replyTo", this.resolverReplyTo); @@ -612,15 +610,6 @@ public class ForumsBean implements IContextListener, NodeEventListener // add the forums specific action resolver node.addPropertyResolver("beingDiscussed", this.resolverBeingDiscussed); - - // override the small icon resolver if it's a forum model type - if (type.equals(ForumModel.TYPE_FORUMS) || - type.equals(ForumModel.TYPE_FORUM) || - type.equals(ForumModel.TYPE_TOPIC)) - { - // override icon handling for forum objects - as we have a specific small icon set - node.addPropertyResolver("smallIcon", resolverSmallIcon); - } } @@ -915,24 +904,6 @@ public class ForumsBean implements IContextListener, NodeEventListener } }; - public NodePropertyResolver resolverSmallIcon = new NodePropertyResolver() { - public Object get(Node node) { - QNameNodeMap props = (QNameNodeMap)node.getProperties(); - String icon = (String)props.getRaw("app:icon"); - - if (icon != null) - { - icon = StringUtils.replace(icon, "_large", ""); - } - else - { - icon = BrowseBean.SPACE_SMALL_DEFAULT; - } - - return icon; - } - }; - public NodePropertyResolver resolverBeingDiscussed = new NodePropertyResolver() { public Object get(Node node) { return node.hasAspect(ForumModel.ASPECT_DISCUSSABLE); diff --git a/source/web/images/icons/forum-16.gif b/source/web/images/icons/forum-16.gif new file mode 100644 index 0000000000000000000000000000000000000000..7ed3b5d93316e8491ba52c5b9b50ab1c8341e7ca GIT binary patch literal 1009 zcmZ?wbhEHb6krfw_|5lw3tTru}VO}`Hv1);9%|egbMV@tw0-Kg9rA^YvoMKus$Es2i=DqmnxzudijwO7ZQS^F+Ibgc83xYcjU_TUAFBIoTt^Yp{H zN3X+|pGetsF=@@|yzN&i_FS*uf3xY}t+vCrr=5N<_0;|8rytBb^Kk01+q2F-oO|xk z!V8a=UV5_p^3zpUpKZMHV(YD!JMX;OefRZ|NAC_le0%=+$15*C-F)-q{`+qaKYYvI zaiw6#mEv7j%lBNX-gl$nz|F>kH=7ULYB_YPy^-s^q$Umtt??$p!wXP$jH z_x!`9m!B@a_;}~t*C(I81H&I252M5Ygn;5t7Dfh!Mg|>_-Jm?dz;TX&nNvn1v4NRQ z(y3;LLgIqMERkFOybN~jn#{+?-gMz`yZcnl;#+e#LMAY@uuJJAY;bHnH%Beoi^b~# z^93=TutgdR8Cd&fo2DkPFl{`3eyUCBqYau9pLontN{C|ll)!#o)+%7e9L2!4GZXY3 zBUqe1vUJTc_rB0k_;Hb&fPxYai_u25PC?VOLlu#N8cltYyv)4<#%(7A6l3aEaHuF8 zZE57sD0#R^nVnBknnh3J!G#07@?3l}9A_jP-S`YW($CyjaOl literal 0 HcmV?d00001 diff --git a/source/web/images/icons/forum.gif b/source/web/images/icons/forum.gif index 7ed3b5d93316e8491ba52c5b9b50ab1c8341e7ca..96e3b3b5b5b6989683207df1dac2809a515d60aa 100644 GIT binary patch delta 1347 zcmV-J1-$z42j>faM@dFFIbk3GAOQCO00000|Ns90W|;(PoCj;232dDUZ=efpo)B=K z5p$y%cBCMArXzf)E`zNwgRDS|vrv|~Z>q;}tH^Mv#&)mEf3nPvywab=*{{#v&*JP4 zbD|M)p%itb6?di=c%~S6rx|>z8hNK1eybaLs2qE!9($;NAAG4GeybsZt|5J?C4{dj zi?%I>ur!aiF@>%*kGMLJw>y!zNR_%xnZ07C#$ceoZ>`FIx6zZq*T322*Xi-!?DFXI z`0e)kAce6xmc2oo!AhmcNutI}qQ*;~!%U#VP@~3DrpQsD!&IckSgg%jtW3tg`w9;g(%4)UKZMW2Hw$pC6)N8NIZLrO9xz%y9&Un1n zd%f6xzuAJp+JU^)hQr&1!rF|+-HpZDkjUPX$={aC;FieUnatsu&EcKS;-JvupU>i> z(d4Gn<*C%=tJUVO*XOa==(O7Dx7+Hw-Rr&H>%QNA?7rRV#p3SA}w9;?5)N#4hbGp@ayViHS z*LJ(sd%oCuz1Mxe*nz>?fWX;bTtMzTfM@;qAfT?8M^j z%H{9R=<(3#@zUw?*6Z`t>hjp^^W5(B+wJt(>+;_3_2BUKlS3n;8&H7R;dFmaag(dIi#TtClQ~bmF`*BS5D? z7k>WS!iDSBA3wD8ysC3*6dQjuO`QtN;X)Q4KYnWY>2nkot5l@kr12D1Y>ozaV$Iq+ zD;6GCZ{vtsgQip13rP8ehCXE>?NQ+dR(P~!)D6?IdMwCanmLg8c%)Z<*r88fSD8 zh6z=SK}HyuY&Z!QS5SXJ!~(+zfC?R~*kMO2tVA~1S7nevNeNO|LP;fFM8ZWDRxn}& z0T%QKM;vm@;iVj}vt0tvuI8=|T zlCO1?uP0-VNqL@HhNoSKsA7t$WsIveaF{o7m_d4=MSP)uNPVJ7exgx=r6OjMC~1^6 zbeuMEm^pTyJ9nNvc%MIcpDuc&GIyXjf2T)>t4fHhn!eINh^|PHwN8|`Q=r0Gp1;iH z@Xq4vSEtBive9C!%Wk*Sc)ZttzuAJp+J?j1mdoIk%HNmE;F-+fmB!ne&EcKS;-S#v zrPAc5)8(pv)#kC-=(XDEx!mfz-Rs2S?!)2j&*$;f>GIj^^xyCH;qdlvxYTgC)N{Jk zcf8hnzSw}k*@3~?gTmT`!rF+$+ls~9jmO=O$li{}-I2-Ol*-?i%;25R;-1gqq|)T2 z)8wes<*C)>tk&kW+v&L6>bl+Pyx!}+-|NQX?#ksB@66`#&gbyb>GIL&@!an9grok>p64B4Ans@?Zzg9Xe2$oFP$$%#dX-L0AMr@dS#TH%rin zaq*%?5FjE91TwJ(i4iqs!gyH`D1wd|4Fio3Gls|zAzXf_2qYlIgneq}9z@AMzP(T1XwtiiW diff --git a/source/web/images/icons/forum_large.gif b/source/web/images/icons/forum_large.gif deleted file mode 100644 index 96e3b3b5b5b6989683207df1dac2809a515d60aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1511 zcmdUu{W}u~0LRC+v*D3EEU%eHBrdMHxZJflZ%Z;u>1EZZxW`N0HIic@E@|X+D$LuM zjd?p$-Zq=r*vw|wyqkBUvh;S(J?GA!ai8b=2Yi0`e!S6MF0R3F037fcu*dH1E+Di7 z6#hypq7)igsuNAti7L~NDc>JoWs+14Po^MJ>%PrwaLS}3^I9>*ucPY+Vrl#sDldsK z^lOXoX_vITU%?R1iItoC;w$&ZRTw5#8{MNEAW)2xYfVz?O_OWQ(r9KWb>{c$4&JY` zOr^rpXja5Vs|Qq@hm0eS+a0r;PCR8gXEmOD+VKO4dAgv(=l3^$CEX#lJUqEKx?%8F zrsNrWqF1pzvA#XGsb2f=W$V*l@T_Ln;%?L{_SqT%x{~Mn-^w}X$Q(=+4@=<(RB!^T zd6(&;s|~}~>W8jT1vePt>kT4&(@043$c;Mwtrp2IZPMHH!SFvvqnNVD_R+gcSp-8E z)g+30Jr>(COz4`p-z`t;RS?;e8C_%9oT;q7$voc7lm00ZfA*PRu6Ss^m_Jh@TzDZ` zC>>UkM;6P)$|}hcWptS;Tc(YzFeX-;&&T*&KXtrtg2^jvu9?bU-@=m@vUI# zooMB~cy(K`xug2{)xCn}OA%nHLlp?UP>~VGg)DsIZ!hj1$5|5#X1c<6ewXeY~NybN# zP?cP;3qeB%rfbZ=wf`+7Ui8j?X`+7)CM3@nHzK=Jz|urou>&bV+2xEt)}jui{WIN{ zr5d+9)3(!9A0KXLcEYbzTe#p3vpka){&hXx5Jn5Eo~_uu>GqS-DW+>~|cVL;e}F55*>|f2aNU{1H=dBpqvXMeo(A z2xPJ}fw~UV?o5N~9Nx4c|CEBOA#y^8G+blPvSUXN8=CsR?8AiH}1KRZm=;0VPq_YJ*{sl54PxYpg5{-xLiG*H_w<@{}YUl~HS?5yMXz}jcX zfgmp^!j zPik)ZJi{3Zb>Qj)b^UO`o(TU`I1;Q0WqFxZc2w9VM^sCc#(2UuA96AfqXDvYFvvRO z=mrQV4NEWdva6^r;MuN673SI$x`p&>x$0W8_WPO_vcMo{6WaC;L0O;m0>t$ZSm$4M z2G;?{$nI81IEDnk;|ifB+|W3vagmQE8W!l0;iFlhUBm{Ua-2{o9r%K$%}tCNT!h66 zAci@*0nd?obSG97Fc^t6$ag!$KwQD2z=#0r%7^-35LtM2gFwgkKr1^LOD!}?cj5zV hL|tk<%`fn#VTUvD^nT=H<(^u-qM~uNDY!`d>dJqvrqs diff --git a/source/web/images/icons/forums-16.gif b/source/web/images/icons/forums-16.gif new file mode 100644 index 0000000000000000000000000000000000000000..c5864c242bd8948f3e2910849f46e95eeab50eb0 GIT binary patch literal 648 zcmV;30(bpKNk%w1VGsZi0OkMy00030|Nkpheq4N2KsId+|}$=McVlP-FsIEk=8pvFg^!&a-!Sgg%i zt7mdoIu&*Gubh)8e<=>bczNXSC93wbF06 z)Nr`ehs4{C$K905->B5(!QkxB=<(a_^!@$){QUg;`}_L(`uX|!`1ttu_xJYp_VxAk z^z`)e^YiiX@$c{N?(XjG?d|OB?Cb06>gww0>FMa`=;!C>=H}+*<>ln$U0P#l*zK!^6YE!otD9 z!N0%1zP`S_y}i7=yt=x&xw*Oj|Nj6000000000000000000000A^8LW004OaEC2ui z01yBW000N&fO&#>U2Sh_YjAE|gN<`%M@ULcPEcudjd^rbNl8jeO;1r$UUq|YS4>Mw z4F?bp78Md;m|bX2PEAb+B}PR!G#yrKU2ajW2L}TaIX5;yBv)B)a#FlTL^UxULNYHR zSXy*%Qw2IZLqRShFg+|GSzB{(RR%&rGcYY187LqMTe!@bbA^D9A3Rp1&~SwVg@9h_ zyvZT~gNhR$E-1*dAVC)|U)~hc!oWlXEn2n&{P-mfBRXTa2ynoKOBa@4%3u<7hs;ec iK)-+qV+KzqI&g#z4I@TQolJtdys1Ogj>txV002AeAzCN^ literal 0 HcmV?d00001 diff --git a/source/web/images/icons/forums.gif b/source/web/images/icons/forums.gif index c5864c242bd8948f3e2910849f46e95eeab50eb0..e562606d5e60cc07f7a0ec5bd58da265f368a090 100644 GIT binary patch delta 1587 zcmV-32F&@01)$ zmbO=yw^x?7bf>{}sKRxq!HK%kfv&`nx5|>Z%bvc@puf+5vC7x5$=2E5;stD;2X3GW zaiR=#r4M(f4|JpvccvGAtr>u>7g|0M*uQ-XYaIwySxY4f2)ZFd$%Gce@+2709-WGta9f-9Zg|Z@!x-6E! zG?%|NmAyNEp2aztz&xG9KA*)tp2R?)#zLXTN~Ot3qQy#|!%nBlP^imTtj$@i&R3GIg@^w;b2=kxg5;pF7&?k$(VFPOnHn!-1n!#$tHMx@9`q{vC7 z$xWxqQK`#Ps>@ZY%vY?ubak?g~Qu~!rF(#+lj^8ipAWF#@vm^-I2-Olgi(f%iovG;F!$d zozLQ*(Bq-eb&0TzTfM>;OxZW?ab!z%jNIT z=<(F*^4jh6W+}qpR+S=OL+1c3G*w@$B*4Eb5)z#G0)YH?` z($dn;&(F@z&dtru%*@RH|Nj60000000000X`2+y~0Q>+f00000AOIi$00{p8`3W3I zkY6`-^Y$s+H&0!+f)FF}yQXfRJ8{~iL5n7>n>l#<)LoMpe^DJia?+SJbM|bbv}x3; zZBv&|9Z7=s+(Bcea%D@7FsoU+)=l2MoBZ&NbLOnsN|r9C1s#elTRMCs@r8r->>1Op z(4xkqnoZj_bXXzYD;F(VSg;#`PQ6yuEVp$>395rPOWzQh8SIFApw5kh*OS2+iY{=0)6=5M<0C9;>sy!XrhA`X^_zg z7?(^!e}x3$%s5VW`*6cel?dFCM;>?7!AcvTgki}IS!|LC7nDd6g$pIPNzRn}d?P0} zHmuT0E32SV$|qu6A_)x*P+-6lRyg56qT;+sjyVjO)6J?gjG~4bqlEwB2^f}K@kk6N zcyq!Fjldv+qKmTA5Ifp=LqHgua1zEBTxUeeEGV&o#!*H&j;V`!e9k)h zf2_ujI`xdxG6O3Z(eleLZyPhi=b(emJ;M!j&pYJ29D)Ww!yNO%=6r0lQ4!(ej?i3B zO?A~pqmvFiX=M#hIcTT-HP~UNla4%POLUJt=`d{f$5tEdHaqv^Dut9f`h<+P(R%Ma lk3LBwHBm+O#M6#CZmZ*tQ6br^I6(&`3A9i{58V_H06Xt*Ui<(6 delta 585 zcmV-P0=E6l42T7PM@dFFIbje05CG-?00000|Ns9hReoH2oOX|?c#*4jkg9u>u6dHI zp02*2u)v?MzplH;<>>3!+un4Nt$CHNbdIOK$k9e~m`-?_V~MD2j;b42g)?Z7M0J`( zbeSh(jwxe}H*lCebDAG%mLY1EAZ3v+aho)BoH=%#u*unD7G;wzdZajsut1>3N1wx1 ztIb%f%~`F^ZnxBOxz%*K)^xSehQr&5#N3w4;GfUpq0r;B+Ud30>9Et{x7+Hu-0Ekv z(rLBQZ@AQOxYUQl+m6TGl*-?z)aAk8?9k}(+wJs|aRMO&@$vDKn*uO@+}zyT+uPXK z*w@$B(b3V&%*@Nn%gV~i$;rvb$H&IT#>K_O#KgqI!^6VD!ok78zrVk}zP`P^y}Z1< zy1Kf#xw-%U{{R300000000000000000000X`2+y~0C@l`000005C9MW00-rOd4hRe zZEtF8aBf|LjdN#5NJ>n9PEcudjd^rbNl8jeO;1r$UUq|YS4>Mw4F?bp78Md;m|bX2 zPEAb+B}PR!G#yrKU2ajW2L}TaIX5;yBv)B)a#FlTL^UxULNYHRSXy*%Qw2IZLqRSh zFg+|GSzB{(RR%&rGcYY187LqMTe!@bbA^D9A3Rp1&~SwVg@9gE>b%J!0fUMYA1)}! zvLHbhFJImi)55?+1T9*&1pN3V4kJ2axCn5-g-aKfV9H<;bcf7MFF?P531bFNCOUA0 X4hhpbBxK40NRr zcc%|@q!D+f7k{l8fUX#Kr5$^yAA_$TfUF^XsU(H5CW*BsfU7BpvMq|UD}t;ngRL-& zv@nIPG>5M^iLh|7&VabluE^Bf?e)sn-OSnF%h=u)fUX^gwH<}BB96K&mcTTZzc!V< zJD$ZknZP`q!#$4aHiNutF{pTkb4%224wSgg%itOTFkjUPW$={aC;F-+foX+B%&f=WR;GxjtqtWE6)#k6)=dsx6x7+Hv-0H#L?a1Ws z$K&qP>GIg@^w;b2=kxg5;pF7&?k$(VFPOnHn!-1n!#$tHMx@9`q{vC7$xWxqQK`#P zs>@ZY%vY?ubak+>OWGk;&eZ%HNgC-x zqS51~)8wes<*wJ~t=8tU+32?0>A2kLyx!}+-|N8O?8M^j%;xaR+0(2>FMd{=;-I?=jP_-<>lq%>1Op(4xkqnoZj_bXXzYD;F(VSg;#` zPQ6yuEVp$>395rPOVP&Wb*(pf(QakFS*PThZ>#iFvc6EkaC6?U1%Wz ze&UEzjzZgPbK?Si_~Az%e9+>`DQ9S+gBNL#(FqurOhSbO;mkNrcl&U|O_d1Tkw+eP z)WJ#{poC$`4OwiG2^W+|5`_yTxJk~G`+OrOH#V%&N-L|NQpzV{Tp|e#4Nzdf6IM9k zK%(NjNsc)TnbXaxGmN5!8l!~&;t3d*T=7T@CU|qg3yr`af})GE(-1q_c|$-LoNyAx z7hG%s2^5U9aKbm=NWer2D3nUhq8~X#54GQTPy-f~P%=p*RXDOp5)M!Z4iPGFpe?uN z*z?dnUeeEGV&o#!*H&j;V`!e9k)htj3Qz^^DUp11lKO^2;x88#BY_po7jm z!wq!LJLJ3^f(Agt9P`5Fd~CE)5#i&G&|FVVb=5_qlMXy-Wera`Xs7)(*kPxWjyz>c zbdNphFl_h7RvYa$JNM)&g_Jt_gp9Y*dhb1tK1m}rQAPH|(~dfBtK*JQA=#`rK?fzY LP(u&h6c7MACLMwo diff --git a/source/web/images/icons/topic-16.gif b/source/web/images/icons/topic-16.gif new file mode 100644 index 0000000000000000000000000000000000000000..e36e8c7ac73f9008387c538bc4db0ac1d980494d GIT binary patch literal 581 zcmbV}>q}E%0LD+Yw6(HXRwkj&n&xHNv}|5lP{Ui~lKVZp*9@K51=fyE*Gd zKZXBaGC{P0Va!aTf5QI>6Li1H+-#_>IaX0#TvVuUZaIEXZre$vAJw<>h7@3n|37!C(3i!qsr6$Pqt^Xhmu1=q)CdkvEo1t zo4?NZuFohsz-lFNaXVwytd0@|s9Bv%EZz|v6uEL+cqMB-k+&)`LUXW5^}0=4&=wqU dJv6Z*=6zs_M3N!glN;12BE>mdm{Q7Q{srmP6LSCn literal 0 HcmV?d00001 diff --git a/source/web/images/icons/topic_exclamation-16.gif b/source/web/images/icons/topic_exclamation-16.gif new file mode 100644 index 0000000000000000000000000000000000000000..005b4752d74c2023d35d71ffb623db502e600450 GIT binary patch literal 591 zcmaKp`%6=C0L5=Lnk&m`R%$6TADKGSG@H7%N}E}jlYEt$&rC|&Orz+B%vD4ngIW(C zSA~YttOyGVLAD-nEBMlIsncdTZ7vsAQOjUIowojf4u|v8fdikDo*@$@mGLP)WvASN zOGXKXWH24Za5hGAF_H&!F~-Vasl`MczFmg3304)Ru4C#3rf=c98n)Y*xrdqiu(x6M zAspRs=)m@4?j;u9;J1k#h*~nl;FH+-QOxQk_?(5|9QLgoqeU>6z+8&)YJ91IMFEQv z6ZOu~I!s)^*Nd2Jg!LM%uC1GxZiY<*dk1E<`1u&@3(UR3{2&(IVevf{KVXUAml4Zm zERW%j1H4LF2k$(k>wF+Xx-TJP0Qpk)$(*bj6u^l8IJIx(_+$hnN14l zpiSh*?vT@kB7eWl=amVbYqn?6If=f$8+PyVjN+}%q>rulieIOVN{SFh~z<4WwWeF O5pcz3%dQYmDSrWM{xAFh literal 0 HcmV?d00001 diff --git a/source/web/images/icons/topic_exclamation.gif b/source/web/images/icons/topic_exclamation.gif index 005b4752d74c2023d35d71ffb623db502e600450..87410f57356319f79baeb53b0a64c983e9921800 100644 GIT binary patch literal 1428 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 arW~De8D-1E%NY@CxOL{6N~u)JwtoR<3>~Wg diff --git a/source/web/images/icons/topic_question-16.gif b/source/web/images/icons/topic_question-16.gif new file mode 100644 index 0000000000000000000000000000000000000000..96da7d9b64da7c046491f24b504e14517350d08d GIT binary patch literal 594 zcmZvZZ7|bu0LTAn7c12YgR>~!A>uFv%{_j{M)*m z4PCcWSDmhFSMg8ocR35Qrmzt1&&8#?z4}J4`@HzP`M&#nW8$KN#05NxN6k=cV3mO| z3`WBgkD(L{r(-w+=3I;x!di;4a(usqiCRo3FZ(u+OpZ3X5;>>jRcPVyO?y1S@8&jN*?K_MfoNF=}_x z55~f2&x^9wZ)s}aStZks9HmWMlO%}>s4g9b4f8=B5tfMFe6}Yyo zeL^`JY7|P@wX*z+x!IW+rApP6)Kd}RlAz-|wh1q&6z9FdLJO}Kc)0NnouhNaA;Fb~ zitVC+vvl@}leZGv zALKf6qUrQa0zsfW*=aAwA(FnjkIUWf>&RcfC-~81MNER)fgkBDj;!mCP%2C{ym}75 bM|@h+)8*9AUoZ0FGF9%4F0rawiVFD)5WF<< literal 0 HcmV?d00001 diff --git a/source/web/images/icons/topic_question.gif b/source/web/images/icons/topic_question.gif index 96da7d9b64da7c046491f24b504e14517350d08d..f0d7003fcf7f8a2e2e3b9f556dab7d8e2a07a67f 100644 GIT binary patch literal 1435 zcmc(e`#;lr9LK*-d$`8KeVW_G$dOJe73$>DjG^OF=j1qb3`Z&FbVlcNB;_s+wM}?% zRMy#)q?%h7U5s37jK!GShLN=uK2hnM$K!oY=bt#QAD%xye|Wz9X;gQQXd*_$-eaEz z01}?QjBh8tMwHb#qE;8w=DO0c1$wumr*6>a0ezmR-5qu8f&o7mprS565Ywa$-l#hO z2E$O#UKk9Ap|4^15Db5hgx|tQH0q0j(W5YW42j}k>?asI4&#YvAOXgc(7=x{@hcK1 zqQT_pP6o&`U@8};^I@hC4d=`X(_rQTDA=GVg4xoA;qx$8jz-yNtOQG(6fCo6akX&)SdgsAB4g%9Y$hd zdN3Lkfnh<3*^~o=&Z8u3``fm3=54EfT9Fu z%V4eo<}NA4OnAvrOG;s$3-eW=ypATWfU+81-2~MgP&XiX4XB&o^*wlfAKpA%klled zk71z&76h>P6c#&RsSB2R&}<8!=YWLpRs?VRVPzOrM&P{+-pk>`41839)*hA~VL3dnSOJ_7yiRl;Ne55@?(fyzcN;jNzrn@Yeq~x&PAp|3O;CX<(Qb zbNQt5=@XbXU{yL+5oG2?vbKry{&{i;JHwFlCLn1pjAgsqb)}3qqxmO3JDfu#T@Ng> zHX@Ya@3%Jj9^fX3#>AApL*{6&F!N4Exw9kr;zewN=$J# zi|FOR3$}3HNYl5gDarG;7!0qN{@ zllIdFIsHZ#AKmBCUR;}ebaJQ&_c>lp-@rdxZKAQGot*8w#HU>LcL-!#DP!Ihme+da zEyRQCOe(#|lx0VYwACrHr#53d{(9oi)G|oyF2hzF4}@I zZJAOS+E#8qPx94H*XR0JSu|#JuA#dyIvGIP z7_CE;*m!R(tzY6fKAMSwuz5nfcW5rYAUx6dfLOt9#|{goaxE=PN2vtkA-P!j1ImvE*bC&g8^m!fPL2o!Xna7YMZp PMwgw`{M#BD*v@|djSk5h literal 594 zcmZvZZ7|bu0LTAn7c12YgR>~!A>uFv%{_j{M)*m z4PCcWSDmhFSMg8ocR35Qrmzt1&&8#?z4}J4`@HzP`M&#nW8$KN#05NxN6k=cV3mO| z3`WBgkD(L{r(-w+=3I;x!di;4a(usqiCRo3FZ(u+OpZ3X5;>>jRcPVyO?y1S@8&jN*?K_MfoNF=}_x z55~f2&x^9wZ)s}aStZks9HmWMlO%}>s4g9b4f8=B5tfMFe6}Yyo zeL^`JY7|P@wX*z+x!IW+rApP6)Kd}RlAz-|wh1q&6z9FdLJO}Kc)0NnouhNaA;Fb~ zitVC+vvl@}leZGv zALKf6qUrQa0zsfW*=aAwA(FnjkIUWf>&RcfC-~81MNER)fgkBDj;!mCP%2C{ym}75 bM|@h+)8*9AUoZ0FGF9%4F0rawiVFD)5WF<< diff --git a/source/web/images/icons/topic_question_large.gif b/source/web/images/icons/topic_question_large.gif deleted file mode 100644 index f0d7003fcf7f8a2e2e3b9f556dab7d8e2a07a67f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1435 zcmc(e`#;lr9LK*-d$`8KeVW_G$dOJe73$>DjG^OF=j1qb3`Z&FbVlcNB;_s+wM}?% zRMy#)q?%h7U5s37jK!GShLN=uK2hnM$K!oY=bt#QAD%xye|Wz9X;gQQXd*_$-eaEz z01}?QjBh8tMwHb#qE;8w=DO0c1$wumr*6>a0ezmR-5qu8f&o7mprS565Ywa$-l#hO z2E$O#UKk9Ap|4^15Db5hgx|tQH0q0j(W5YW42j}k>?asI4&#YvAOXgc(7=x{@hcK1 zqQT_pP6o&`U@8};^I@hC4d=`X(_rQTDA=GVg4xoA;qx$8jz-yNtOQG(6fCo6akX&)SdgsAB4g%9Y$hd zdN3Lkfnh<3*^~o=&Z8u3``fm3=54EfT9Fu z%V4eo<}NA4OnAvrOG;s$3-eW=ypATWfU+81-2~MgP&XiX4XB&o^*wlfAKpA%klled zk71z&76h>P6c#&RsSB2R&}<8!=YWLpRs?VRVPzOrM&P{+-pk>`41839)*hA~VL3dnSOJ_7yiRl;Ne55@?(fyzcN;jNzrn@Yeq~x&PAp|3O;CX<(Qb zbNQt5=@XbXU{yL+5oG2?vbKry{&{i;JHwFlCLn1pjAgsqb)}3qqxmO3JDfu#T@Ng> zHX@Ya@3%Jj9^fX3#>AApL*{6&F!N4Exw9kr;zewN=$J# zi|FOR3$}3HNYl5gDarG;7!0qN{@ zllIdFIsHZ#AKmBCUR;}ebaJQ&_c>lp-@rdxZKAQGot*8w#HU>LcL-!#DP!Ihme+da zEyRQCOe(#|lx0VYwACrHr#53d{(9oi)G|oyF2hzF4}@I zZJAOS+E#8qPx94H*XR0JSu|#JuA#dyIvGIP z7_CE;*m!R(tzY6fKAMSwuz5nfcW5rYAUx6dfLOt9#|{goaxE=PN2vtkA-P!j1ImvE*bC&g8^m!fPL2o!Xna7YMZp PMwgw`{M#BD*v@|djSk5h diff --git a/source/web/jsp/forums/forum.jsp b/source/web/jsp/forums/forum.jsp index 14bdb9ef49..2804320886 100644 --- a/source/web/jsp/forums/forum.jsp +++ b/source/web/jsp/forums/forum.jsp @@ -68,7 +68,7 @@ <%-- actions for topics --%> -