From e2e2fbfcbf7e81611367213a1a9a84eb6d84658a Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Mon, 27 Feb 2006 18:09:19 +0000 Subject: [PATCH] . Fix for AWC-564 - Issue where non-ASCII characters not correctly handled for a filename when the file is download as an "attachment" - This affects the download file link on the Checkout and Edit pages . New icons and UI design in grey status area for navigation in the Space, Document and Forums details pages . A few UI fix up and improvements git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2497 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/webclient.properties | 1 + .../app/servlet/DownloadContentServlet.java | 8 +++---- .../ui/common/renderer/ModeListRenderer.java | 9 +------- .../ui/repo/component/UISpaceSelector.java | 20 ------------------ source/web/images/icons/nav_file.gif | Bin 0 -> 797 bytes source/web/images/icons/nav_forum.gif | Bin 0 -> 1247 bytes source/web/images/icons/nav_next.gif | Bin 0 -> 826 bytes source/web/images/icons/nav_prev.gif | Bin 0 -> 820 bytes source/web/images/icons/nav_space.gif | Bin 0 -> 1229 bytes source/web/jsp/browse/browse.jsp | 4 ++-- source/web/jsp/dialog/advanced-search.jsp | 4 ++-- source/web/jsp/dialog/document-details.jsp | 16 ++++++-------- source/web/jsp/dialog/space-details.jsp | 8 +++---- source/web/jsp/forums/forum-details.jsp | 8 +++---- source/web/jsp/forums/forums-details.jsp | 8 +++---- source/web/jsp/forums/topic-details.jsp | 8 +++---- 16 files changed, 32 insertions(+), 62 deletions(-) create mode 100644 source/web/images/icons/nav_file.gif create mode 100644 source/web/images/icons/nav_forum.gif create mode 100644 source/web/images/icons/nav_next.gif create mode 100644 source/web/images/icons/nav_prev.gif create mode 100644 source/web/images/icons/nav_space.gif diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index cd8fbc7dcc..008ead0554 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -165,6 +165,7 @@ filter=Filter choose_icon=Choose icon security=Security all_formats=All Formats +rules_count=Number of rules applied to this Space # Properties username=User Name diff --git a/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java b/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java index a3356af2c0..1bae92e281 100644 --- a/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java +++ b/source/java/org/alfresco/web/app/servlet/DownloadContentServlet.java @@ -172,11 +172,11 @@ public class DownloadContentServlet extends BaseServlet if (attachment == true) { // set header based on filename - will force a Save As from the browse if it doesn't recognise it - // this is better than the default response of the browse trying to display the contents! - // TODO: make this configurable - and check it does not prevent streaming of large files - res.setHeader("Content-Disposition", "attachment;filename=\"" + URLDecoder.decode(filename, "UTF-8") + '"'); + // this is better than the default response of the browser trying to display the contents + String encname = filename.replace('%', '='); + res.setHeader("Content-Disposition", "attachment;filename=\"=?ISO-8859-1?Q?" + encname + "?=\""); } - + // get the content reader ContentReader reader = contentService.getReader(nodeRef, propertyQName); // ensure that it is safe to use diff --git a/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java index 0669c5354b..9e8260b0d0 100644 --- a/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java +++ b/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java @@ -136,14 +136,7 @@ public class ModeListRenderer extends BaseRenderer String selectedImage = (String)attrs.get("selectedImage"); if (selectedImage != null) { - out.write(""); out.write(Utils.buildImageTag(context, selectedImage, null, "absmiddle")); out.write(""); } diff --git a/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java b/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java index aca038c64f..cce1ce3fd5 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java +++ b/source/java/org/alfresco/web/ui/repo/component/UISpaceSelector.java @@ -86,26 +86,6 @@ public class UISpaceSelector extends AbstractItemSelector return id; } - - /** - * @see org.alfresco.web.ui.repo.component.AbstractItemSelector#parentAccessable() - */ - /*public boolean parentAccessable(FacesContext context) - { - boolean accessable = false; - try - { - ChildAssociationRef parentRef = getNodeService(context).getPrimaryParent( - new NodeRef(Repository.getStoreRef(), this.navigationId)); - parentRef.getParentRef().getId(); - accessable = true; - } - catch (AccessDeniedException accessErr) - { - // cannot navigate to parent id - not accessable - } - return accessable; - }*/ /** * Returns the child spaces of the current space diff --git a/source/web/images/icons/nav_file.gif b/source/web/images/icons/nav_file.gif new file mode 100644 index 0000000000000000000000000000000000000000..837fda08243609383fe4c768c38c9d344dc8d742 GIT binary patch literal 797 zcmZ?wbhEHblwgoxc*el+@87?_fB*jZ^XK>P-@ktS`uX$cj~_q2fB*jN+qbV@zkd1h z<@4vypFVy1`0?Y14B5Bz=g*%%ckbNTvuDqoIdl5-=~JgpojiH+#EBEfj~_pF?AXzxM~@sia`^D! zLx&C>Jb3WHfdl*Z@87p?-`>4@_w3oTd-v`gJ9cc_wr%Uyt(!M*-nen&h7B9muV24z z-MY1F*REN!X7%dTt5&UAxpL)-6)To6U%qtd(#4AxFIu!{;lhOr7A%-GYZlN)38-P1p}}^Rv&m&q;ov(QWo!r@6R!-wBBd+qx+)H0Jnmn)A&RK7Ii~g*OY*^$*&y za)^KVt)A%A()d;GV#I=iAbWNOWuFBGj>iQB7v@+jcyg|BKf9n(OxJW~&J*tD3UmHU zFFbUNOHAudf#fSU2M)o3zaY&<4ar`m2UYbheHNSZ_jZCUtBAUUgPSjp;Z0nP~Q2t?t-`-!{MH@F|*Nbp4SOWm93ujsY literal 0 HcmV?d00001 diff --git a/source/web/images/icons/nav_forum.gif b/source/web/images/icons/nav_forum.gif new file mode 100644 index 0000000000000000000000000000000000000000..678f48725274103c9c3e62eccb8578d285d2021d GIT binary patch literal 1247 zcmV<51R(oINk%w1VHf}y0QUd@=jrS1?(f{>=}M2a)#2#h=C@on>g??X zbEOV>sUw50CWf*ohOj4qt1E-8Es3)&hp;V$uP%nLFNm@)g|9G)vN4FUFov%(iL*0| zwKR#bHjTA5i?cY7wl;~eIgPbDkhVFBu{@EtJBzVBjajeI5 zuE~3^$d$g*tkvhA!qcnB*0<2y)Z^;ggo54k$!bqOOQmD&Qr^!;J z##N`uRinjNsmfZc%~`0)U8~Gvve9O=(`T{IYPQsCwbO04)N8ZQZnxEOxYcmC({sAk zbi3Dcw$XRH)_lI$dAQPkzuAVv+lR#5iNxHE$KH*`-HgN9kjLJU$ljF7;FQVVmdoIo z%;BBTXA z>%8CXz257<-|WNT?at@%&F1jTla zZ@AQUyw`ZW*m=I#d%)Uzzu9`d*MGp-fx+5?#N2_w*@MH|g~Qv1#M_F++>OcKi^koM z%HWU4-jvPalF8ne&EcKUtk&kM)#a|&=dal4uh{3X*yps{ z>ayABw%zQt+v&F3>ABnJzu)V@;OxcZ@5bZq$K>zI*6j4u>hjj>^V;q7 z-{h137?Ct03>+bpd`Tzg!?(XjH?f?J)00000 z0000000000A^8LW008;`EC2ui02lxm000R80QCtRNU)&6g9Zz+J#=fr8tBH^OGSQNm)TenV~xpAnriTdQkq$@7pR_Sat4xBe?o1Q@# z$if}~07e0v(ZWd;IaT3Mb+gt9lcgpC3uJ)cP)Zag4I1#6;>naZQe>)1TDC;sg)s9t z-iwE>-6>F59$1?eYSX1jj*cA>=-?g8b?I2CDm5xoGaHXGU7`fZ*sx$i1R`-)juoqN zs!U<)R7n{TM3j*g`{j$54}nI+p-PnsRVi!IFhybnq)?+p!VVcC#0Q7KA>6WU+jgxQ zG)$6=0n^j$TmY)K;LmYo|M1PILGjFNpy%p58D zmCH{N6KR+cLoI4-K+ixkB(sPy#xO!maD?=c2M{XgV}KQF(2xQ_G6*tEB8eQ*i!Ous zp$8l}%%V>KBe-zID+Gnm!ySPHf(ssRxX}h1G<-173JQ#n4?*>mvA`U*#PLHHUw~18 z2rLjJ1_1|=00S**fFMgf^c-Li0tg|n!x}-HVA4e_XwZTe0i20YJ}4wmf}0ny(?OJU J=1FHj06Y08%N+m! literal 0 HcmV?d00001 diff --git a/source/web/images/icons/nav_next.gif b/source/web/images/icons/nav_next.gif new file mode 100644 index 0000000000000000000000000000000000000000..8747626f1c66386b81337d59cd876fc8b34bc7fb GIT binary patch literal 826 zcmZ?wbhEHblwgoxc*ekxm6?-~o|BfEotBoJo}QhVnNw6$l9iQHTwK!H+Sbz2`uFeO zKY#xG{{8#cuU|iZ{`~Rd$M^5wzkU1m_3PI!U%q_){Q1+TPai*i{P5w!`}gnPy?gie z?b|nR-n@SO`qisfFJHcV@#4kv=g*%#d-n9{(IL5Yinz5Z3WuPFf@VUPZmZ71}6p`kn=%t!odE&!Kta) zNlw$q#K6GBNK>w5LbIH{zAQg4pMapKvY~$e#3prP32ts4K7IiqVG&UU6ZM7KdIG#W zyfgR(*NBRVOB-lUP}k$l2V47n&iwx1O)hR-Pj`|yZ^kjocRJHSs@`o z!C8COm^#RdUyznnHEJ~!5f*;&_qT{CmkP(k#Ab7T6Pq;(feV>fr34hOtw>CEXJB%4 zx$yae<54b2DZPjl1qux(C#$h@9Pn7w%r2lTka(crArk|mMe(bcl?RTn3n=ECxiCSI zxox)fWT797Auhd=(k23~vqF|LN-MhbtSD?|Zs(O=5hhw-`kF(?BBkcVgQ@M&+ij;m z`o-ZOwmM8mEoF>>*mM&wU&0*8XvS>+pOwygF(@S zjZ0vGb30!l^YOb!)FSQ(GaWkCA+RAieXkGGR!$Lf3vMfuMc<#^OBYVJGt^>TB5stW zy*^fHGv_0Xv^_IQlU<9StIeD5aPd*w$AC40TNU_Zk9JELl{Aa9ENbnMHp{tlVfDNK H1qN#X)LS(h literal 0 HcmV?d00001 diff --git a/source/web/images/icons/nav_prev.gif b/source/web/images/icons/nav_prev.gif new file mode 100644 index 0000000000000000000000000000000000000000..9e27e5b20c1ea08d8ee26876d07d9e353cb06053 GIT binary patch literal 820 zcmZ?wbhEHblwgoxc*ekxm6?-~o|BfEotBoJo}QhVnNw6$l9iQHTwK!H+Sbz2`uFeO zKY#xG{{8#cuU|iZ{`~Rd$M^5wzkU1m_3PI!U%q_){Q1+TPai*i{P5w!`}gnPy?gie z?b|nR-n@SO`qisfFJHcV@#4kv=g*%#d-n9{(IL5Yinz5Z3WuPFf@VUPZmZ71}6p`kn=%t!odE&!Kta) zNlw$q#K6GBNK>w5LbIH{p|Yr;03R>EtiFE##3pqU1yK=UApw3q9&T<4WA%mF2GZhU zqALVf^YZfW3g~H1P&bs4l-RL+#%jKEeEfQwn&iyoq)%*@l@Xe;il1LVK*Vf;k*cip zadCME(-n7T2nq@b$r`nq$lbo7$jNHzcW||O;vp6;Lz^`L9~1Ah2|9AH+(=yP#w#UZ z7_=gw@d%fsvcnr?!N3Cz3>v|UYyu7*V&yf;X<_(yu!V_DBcGDFQKk+3as?AB zPfX3;c9>mKH)=|R^rN;$21}bauN`)5ND$F=xM8rdyyc2CM@h|$I{^ky`IoeuNH{p- zNR*6uT9brtl?hjklfxZ{#6`v7D_xyW%(Fej*5Rm`G&f<-_pQk*_e(og88RR3yt~I% z`@7C#*A*h>Q4;R=cC~yJHE(P6(p`LvTjX;8_Joq^-wFb{DR(v`GUq-DXk=ip1^|AH BH3k3x literal 0 HcmV?d00001 diff --git a/source/web/images/icons/nav_space.gif b/source/web/images/icons/nav_space.gif new file mode 100644 index 0000000000000000000000000000000000000000..92a0ff0f609f5ed9d2bcfceff62203a554d0ca18 GIT binary patch literal 1229 zcmV;;1TygnpYwYqa}e(dY-wY0l|e~@8cdSzsE&CK21-0a}r z?%v(<+uHAymE*p?_*7JFQ&VYWWqqfo#%^wco13P@#LnjC@#yIC-QDHP%+u-V@Z{v{ z$H&d;>hQ$G$?56s?d|W~-QVQo<>TYzl$Fa$OJtv*(`#&rx47rl*Z8Te?y9WM%gyt< zz2LF4)2yz|x4GG~wbX}*pxWE<*xB#k;r8O=_0ZAbSXy$$$^B(#fqZ_Py};+9rN*$c z)~Kt?n3}k&uFkHp(U+OE%+KhwYb)}yV=^@?y|GIq^sn+!~U3` z&9JxXU}S)?x97LM?1+u8xxekh%J`O>yu`}%k(IT<$M3hi;;pjPrK-%n!|AKA(Z34dL&C>J2#^%1l;@RE!p`){w zn5N+4_ut|0yS&7?y27@;@w&qEu(;&A!|}Pm?ZL_R#?Jc0%lEm!=*Z9c#?AM`%JaR% z?7znCp{K~2pTEh__{Gfg#LM!zzvQd2)6LZU%+vbH(fGK&;T{K?Pp)Y|>b()8Ed{F|Mr#Kp^( zpwF_r@U_0}o~F;f$M(a_`?bC3#LfA>#_`9{{KwGyr>@hVrpU?C{K?V$!O8NoyWq*u z`o+!lsQY^78WX?d|R9 z>FML+V6A^8LW00930EC2ui02lxm000R80RIUbNU)&6g9j}jTsTnPg&HXsd|;q} zAwhZWCK)4kMT&_A4lMoyaS2kMJfN<13nj-16dU*uf^cIqg4dxnyxH9h?D&lc#7%rCC$gZCf91@0#Q|*a6S8Xr<6iTdI!Ts#AWv zF;hX~APYO#NNH2|s@5xT;R3bFw(bdvgA1gvQU$A)E?u_B{n{lf-8X6^5acVU0ZXY^ zwZ@ej=SwoLTeJSSx>Mj@K@ey5h|?uZ7-@2bcyS@*3Q)BO0q7M}5{g_qM2O5KDrRU= zAzXrJq1qvU-#&uwss!7TDA5^3!yFx|=>n`*u2gyq5ST}B0Fgn86oDbr$dDK#jD-B? z;f>FU3Goz!gcWFnQHB|jh*1O#F}M&!7E?S>0uFB!lmHKrL^6gXM;Nij8fvW1o4xE4{gA(Mhrku@kk}e`14Oa_AGS6 r3NE}bgbYhyBEpg){eyu7Lr{`Q2=?fc8@j;ZEB0RaFza^DX& literal 0 HcmV?d00001 diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp index 0d0867d19f..4ab048a89e 100644 --- a/source/web/jsp/browse/browse.jsp +++ b/source/web/jsp/browse/browse.jsp @@ -89,7 +89,7 @@ <%-- Additional summary info --%> - + @@ -97,7 +97,7 @@ <%-- Quick upload action --%> - + diff --git a/source/web/jsp/dialog/advanced-search.jsp b/source/web/jsp/dialog/advanced-search.jsp index ed3944bbc7..8313ea0be6 100644 --- a/source/web/jsp/dialog/advanced-search.jsp +++ b/source/web/jsp/dialog/advanced-search.jsp @@ -86,10 +86,10 @@ - + - + <%-- Available Saved Searches --%>
- - @@ -200,18 +200,14 @@ - - <%-- TODO: FINISH --%> - - <%-- Navigation --%> - -
- + + - + + diff --git a/source/web/jsp/dialog/space-details.jsp b/source/web/jsp/dialog/space-details.jsp index 7ed5cf156e..146accc0bf 100644 --- a/source/web/jsp/dialog/space-details.jsp +++ b/source/web/jsp/dialog/space-details.jsp @@ -141,12 +141,12 @@ <%-- Navigation --%> - -
- + + - + + diff --git a/source/web/jsp/forums/forum-details.jsp b/source/web/jsp/forums/forum-details.jsp index 4dd50ddd58..813872a888 100644 --- a/source/web/jsp/forums/forum-details.jsp +++ b/source/web/jsp/forums/forum-details.jsp @@ -95,12 +95,12 @@ <%-- Navigation --%> - -
- + + - + + diff --git a/source/web/jsp/forums/forums-details.jsp b/source/web/jsp/forums/forums-details.jsp index 6ea8ce0547..0469529cdc 100644 --- a/source/web/jsp/forums/forums-details.jsp +++ b/source/web/jsp/forums/forums-details.jsp @@ -95,12 +95,12 @@ <%-- Navigation --%> - -
- + + - + + diff --git a/source/web/jsp/forums/topic-details.jsp b/source/web/jsp/forums/topic-details.jsp index f87b5e6167..744726ff1e 100644 --- a/source/web/jsp/forums/topic-details.jsp +++ b/source/web/jsp/forums/topic-details.jsp @@ -95,12 +95,12 @@ <%-- Navigation --%> - -
- + + - + +