From 6eddec46aed722c31c63f74c7f482eeb9a9e409c Mon Sep 17 00:00:00 2001 From: plt Date: Thu, 19 Jul 2012 12:24:07 +0800 Subject: [PATCH] Improve file type icons --- media/css/seahub.css | 2 +- media/img/{ => file}/file-icon-24.png | Bin media/img/file/ms-excel.png | Bin 0 -> 1185 bytes media/img/file/ms-ppt.png | Bin 0 -> 1239 bytes media/img/file/ms-word.png | Bin 0 -> 1307 bytes media/img/{ => file}/music-icon-24.png | Bin media/img/file/odf.png | Bin 0 -> 1186 bytes media/img/file/pdf.png | Bin 0 -> 1319 bytes media/img/{ => file}/pic-icon-24.png | Bin media/img/file/txt.png | Bin 0 -> 1167 bytes settings.py | 15 +++++++++------ templates/repo.html | 2 +- 12 files changed, 11 insertions(+), 8 deletions(-) rename media/img/{ => file}/file-icon-24.png (100%) create mode 100644 media/img/file/ms-excel.png create mode 100644 media/img/file/ms-ppt.png create mode 100644 media/img/file/ms-word.png rename media/img/{ => file}/music-icon-24.png (100%) create mode 100644 media/img/file/odf.png create mode 100644 media/img/file/pdf.png rename media/img/{ => file}/pic-icon-24.png (100%) create mode 100644 media/img/file/txt.png diff --git a/media/css/seahub.css b/media/css/seahub.css index facf1c7acc..018645343b 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -59,7 +59,7 @@ table { margin:8px 0 20px; } td, th { - padding:4px 3px; + padding:5px 3px; word-wrap:break-word; } th { text-align:left; border-top:1px solid #f8f8f8; } diff --git a/media/img/file-icon-24.png b/media/img/file/file-icon-24.png similarity index 100% rename from media/img/file-icon-24.png rename to media/img/file/file-icon-24.png diff --git a/media/img/file/ms-excel.png b/media/img/file/ms-excel.png new file mode 100644 index 0000000000000000000000000000000000000000..fd23d2a341d708e9d8bd1af3de499a5519054522 GIT binary patch literal 1185 zcmV;S1YY}zP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk} z0y8>jM>=@`00bdPL_t(Y$DNkViyTE5#(!^B_0;rq&yKqxMgyxPLi~Wei6;-@Nl`%q z`VSZoOd>>*i{c?iS@GaOJct*;v*IBHq6;2kPGJ+3uwWo0tJ!3eU3cfBzpA@DOwa62 z)=h%d6jenx&r{FyzWr7Sqo$-qgeG-~D*;UXLR0w{=H7et1AJ9%q#Lxu zh+e*lD4}6AomPy9M-+&7R6UB`S|boxtLy(lj(pAh&tLJ` zn;(-DDHs2`%%=-q&}!NtnD!`DlPS=8H1}vD07piW%yxb4NI2Np$LGI%$?fze$9_1) z?DT#&1qPTXi%!|HLy~kMG#SFr6xR^SZP~vw_IcXjZfI~NW@BZot5+kB4Aq; zw&k&*$A(~=U>k~NplND@)d5XqXsTd>U_wC<77WyYw9I&N&tn*yGuzn@Yym0+C4!*P z$S@YDT7jTN?@rLP!i?#A2-(5iP|kZ9;rbBF@!;g)VmxJ3?GK02zXFh@$!M!r-6TVC^-DoJ0xksU@)Mn zDzs3i;}FK9#w1%?6!61eCk#X4INsf&+~us^S*5$VK|7AQo;=EGF^v+4=yEW+iB^y# z35`Yrr4(tJ(r7dQh~t(7S~C^5xUpf`>}$L>Jh!hxDHvcRw$*$1X^pX zwRrCdf?!hJy#(4Ars9ZII%GMtRi6XJb&Q67F~GDs7-MkG5d;BRYs#`D2!^Stwcb%X zCJ06}i&qM@4gT4D6M{CXU@-m%H2Wu_;exEQ5(OQq^0BM@upFnF(JC0dj zTO-X&O7BS16r~hV6yco1dry{S!<^T80<`bQBYMCo12?saAS=0`~4+guzMCwP2rr|VbREU5g|zuvMeJ> z5*8O13Bwk%Pt3|-F!=k-nKN$##eZ9r=VOantrphW9Ttttuu^opUFPQI{GmgKWNB$> zFs(e*de$JPhu?IbZZStBbO>00000NkvXXu0mjf`%)-b literal 0 HcmV?d00001 diff --git a/media/img/file/ms-ppt.png b/media/img/file/ms-ppt.png new file mode 100644 index 0000000000000000000000000000000000000000..d983489fc8605979594829c16ac62680739bd4e3 GIT binary patch literal 1239 zcmV;|1StE7P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk} z0yGf(y=7; zLN~Q7)`fIcg+gss;-WiUbX&S`Y5#$OC~cu26;T9R5UOLWwrB&IA2XVylbK0o=KZ)` zyvaCeOq5=@+{@!}&i$V6IrlxGGqjR?oLB=`{{IjlF62~mxtYWOW(_}1?8wibzBL&o zHnhzuVnakM2#7IAK0qWv1n91S*v{U9Slo=#?|gITGoac_Ab|JoYu<-pvrgvFY4q?2 zh=8@&>0gP?eT8KE5XCwYQMLn~?u{0JBWop@-ul9J*5Q4xu2*V6|SS**b!Z6B0C=>C4Oak^0}LyoQX6&P0$|JGFo)L@5vr zqChDu8nrb+oBn7S1a$FL$bz&N;oK3F=YcjzFQ8~3-FJ!fI!M$yi5$h8yB+o5Dr)~p z)Zy=u7lu*$zeY$9lLeCnlLMVY=^V<*p&YlnVsaa7wN}YQ>*}{ZEG;e3U+__45d_Kl z5Vw$QA(c)#@`w;87K_leln6!}uo zLV>ZdF_cnR`y@KaRy~NqHjf`wxP7a{#KZ)y>k`K?Ns@Hewb^JiXw+*I3I)JEA-Boq z1V(E-&qG9T^LfG~A+eSO5Uo=wltNiczON5s47%sUy_GzbKpTVa`xs+bESLG~>{;CY zeyX#xT)%mfg-V4aiU?aRh7W$ii?6&)KA%sUDZ-vTdl(uT+Df93a=DC%;2`XD9CAug z^*rq8DDNFTiWMPA5~604D2lq0tx33b1zO{K9smw7&}eYu$`$JK^9&q1M3^K*VMt;v z)>^FABqAg#4V{Ui4Ki&c@O?xCoy}tQ?W0twu>(@EFb0@V{i&7NxdM-!bzyLM~Xf7u_ zYZt9jiK64!Ry&l3OAqe?E1SB=^E`qeV0C2$FOx|Fs5Qnyes~yDEW+w4c5skp5b*oG zdnB&Qw()UkRLZkIoj-pN2%j!dyUonZ4CCYD)M~X(k_BrmkE>Op;bEe78+;#|&+~Y3 zk!^eT+M&@=`Sb4G>Tee>esSv5snRo>3=jlC*WW37NO^3mYefNOXJ_qT5XhaWsphq7 z*N%NTIeG5cHue3~f<1QAS|cLlL=a=Tsm&=R?PhcN(xpou9Y22jm#2NCd#`I7h9Prv zb13!Xv53&u*T=}n2!%oc*L6`!(Q37@*3MkMeEEaTzwhB%0@WdU-YL(6`!D^B(p7Ra-1qk BI`#kn literal 0 HcmV?d00001 diff --git a/media/img/file/ms-word.png b/media/img/file/ms-word.png new file mode 100644 index 0000000000000000000000000000000000000000..226e46e6a334a56a5e89f255f9963ea82a7a97c1 GIT binary patch literal 1307 zcmV+$1?2jPP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk} z0yH75V`WkR00f&!L_t(Y$DNisTxv_gqsv|3iPWdQ9*B(0RZZ@ATP+-fL-X^V*9 z=Sz5bA2qK)D}^XQD?tk=0i_-U$dwQ;;{9V6NNtV{gC*AXg#hG&0zu$)gDF8P<^#*( zxT`?l8xZ94 ze;oO`K0Qs4kI4I)X2+tn!c#&arx6j9fGFwKT|jV%5(E$tjM2RCR9_jGUZG&m*45le zB65BXQG&G=tu%qa}K5Mvj(kphpDL=BO@bdrFd@JHm+U0%FN6R z{r&yaYBfC1BMd|8^*Uh~5{4n|cAF$gC>Dzh3=G^GV6-L-Lwe#Etu;7@HU{7KnVp?Q zL=X|uG{qQ0nx<&2xqbUKaUA1$URT)?Tc$@FL#bG#)oRgbG`Ml&2CZguF<2Bu3=R$w z$1&^Ht;0FT^z<}CLqik_1zN4vir%qIL8skje0-cun>KZw#xOoUPLd?Vag0(5-}h-W z8q{hvs?{n0qoboJrReMHyFWl{O(~8U8yln9Y!ULa5&UMTB_nA|~cShM*m|(|ap&J^k$RFn~q`&<7 z+y4Cr4t({%Z5l-p0M=UO=H@WQP$(4eeIJ0gcWq|<-~iP%k8o>N%bm7A^TUbbyWTx? z==l8(YXiKRrm4Gf<%-L)%w<{TthH{bWm)Dj=iFSG zUB7;PzqPh)tzG`nd=CQXbUJi89RN2xJp9?gg9pz()O{n4V>J(Y*hd~F?!U4nw>NK3 RReAsb002ovPDHLkV1lW`T1x-` literal 0 HcmV?d00001 diff --git a/media/img/music-icon-24.png b/media/img/file/music-icon-24.png similarity index 100% rename from media/img/music-icon-24.png rename to media/img/file/music-icon-24.png diff --git a/media/img/file/odf.png b/media/img/file/odf.png new file mode 100644 index 0000000000000000000000000000000000000000..393ab9404e955e13c6efe20b485088829cf20040 GIT binary patch literal 1186 zcmV;T1YP@yP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk} z0|gGjEj5k+00bgQL_t(Y$DNf=Y*bYg#((GB_uiDY6o>)D3POyck{C@B|HMR1AaSb% zS1t^0SnJBfWhF5YUAXE(LogT@Zb(QWL6J2J6KGhFVnU=vs7gzq&dlq(_Z$~*X4)x( zF}~#H&OLA5_kHKw@7ycL&(Cpq|4xpdzmZqb-mH>;Qbv2Fiq>wH_G1~-r++oenXiw$ z==_gI5AWZ}iSzRfccw%*2fTqx!<|izA2Q=o13m^6$bkGmj116;i3tSY#Lsgdn)??q znMA|gk(HQet(ccpl2%!j{^ynNw=+NIhye7aj#76=das0~rKO9LlapuV+Y57JIOmf4 z%T+QS9aCP~os$JYRS^-YBwW2!^4#MiWI9R8s^|oTpf$WANyLa!A zOkjhN0glhrnAP*MJEJwhRaMJvD@?uz5H` zMX9W&FY91#bh$dsE)ksEhPp58GGA~=E~WI>UR2~-sU zLTBBL0qBXJZgBa2un!LGdh7nZrOB1DY`032yUoZi*PAT26R$tJx%W{_kY$Rh5>$Im zOAaBdu6vF4{()WW87cwz=+Fya#@{baCl}n6=bsp1-_8-D)#}OwWpp-f$osmr-h)+( z_U!?{;r&l^<3k%7dDuFZgVe4uua&ndqe`%4H17e_17fPdMWnCc*4ni9IN%}(f_3V> z+)g0E=8?QlU3achVz|ga9(?xzK}^spt>&hw8z>AC5X~`z zA}DS~N{N(G4^%`*Dak;BwJO)I9Vja!sE}uZn^9F2F-B5K#2AS&dI&*Ut=2uj1`>2L zmCnhS%t=-U8+kxgunu@tRV*wlu(-JBt#+Hy(NT#jE0^9mcXCLq)ym?%q>emL)SYGmMXqvuF2iX}4NeCXXI{`}XbIcj#P${dcGed8XuVUDDJ7cCCPh*B*w~oN&(HsQ`t<2{&rDDM_RvNXSbHPlzWTc_Q!~ummzV#R z$HvEHc6RpqsZ*y89XodH>e~MevT0y|=LfsWrO_x@y1R7YyOSr6OifK)TaUM%;O@3< z+s>Mqi--?$(pry)5G18^`ONh6S5s3{cLo{e9|}Y2kAo@O;Q#;t07*qoM6N<$f_G{w A6951J literal 0 HcmV?d00001 diff --git a/media/img/file/pdf.png b/media/img/file/pdf.png new file mode 100644 index 0000000000000000000000000000000000000000..2110a9264860a61879c12c84be7ddfe0a2b168d5 GIT binary patch literal 1319 zcmV+?1=#wDP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk} z0yH;Sx6lIs00gH=L_t(Y$BmU+XcSi%$A90P+1YG%(h#(%_r#Eg(hEfh1}u~+DiNzt zsVEh1kD||FAU=r()E5OGM2b}KAt*xd!4k3F9xPS2#R!%pMWt9TF{`V4nVp$)P9HWK zH&z$_aF{b^X1@RT{lCiyZ_w1-+}r?I0IUTO#C0)I1Rzt-CSk1=5ve^B5z)C^E(hr9 zM*s@=_Ug53y+IH}B7%tEI1a(nr=;8430}QIMDP*`EZ~R`l*{6Io)wV_yR|enHoD#2 z-9G@iS^^j7$-R1YzEmnvB`A!I;rc$0hlW_VZ5u(Ugzx)^_pgfO9=g-s7+Ddx%j12nd^@#WsVe7tB8jV&#eey|q$ z`|C(l<2``mx;(#ii}aj1WDXwWj{^tr7c8Lb$PwDtt-}TZI*us^fwk7+dET_K?!G;o zrg^Uv4ls7+49{=gB;DRl_u<2ItY44o`-J&CLAgw+RH77=X-IlfC=_l2`S(gxyAQ_4 z`E~PVp5MOB7kl>b`S$IkX3QXpBEn*k7cX<%y*rHOd9=2+N_OJ;$l&1MkJX>e+sXdU z7-NGVuwfM0?C7XH)752vYH6{z4j#0jwN`6wqbRb4LcwOUS$pTsu)Q-pYzl>f&15p; z{r&w*>yB$CM@9JZC6~8s;jxjs`d-t+eu3XvH z+uM8jU7k;8OeDB_>=<7kJxY|%^U3n%G|!oXvKDLK{C?vovc?!G7K{H54Gn$Y*Vp$u zb>IT4wbr&AMdqLD*UjtkadYd?A(Nk&FmW6kt+k2c*aSgfa=Dy&^5lulWHMvDy}e)6 zGb}Yyb&iaTY!A!jDB=6$Mn_Sui$8B3W>Ovitu=8RBO+#CVBqKd`}g1HLoj>xY^iO9 d4_F_B{{TAz3z{9K*+u{W002ovPDHLkV1h_`ahw1E literal 0 HcmV?d00001 diff --git a/media/img/pic-icon-24.png b/media/img/file/pic-icon-24.png similarity index 100% rename from media/img/pic-icon-24.png rename to media/img/file/pic-icon-24.png diff --git a/media/img/file/txt.png b/media/img/file/txt.png new file mode 100644 index 0000000000000000000000000000000000000000..b4c8d96e083ccb5ebead5edae195540a56a9f42d GIT binary patch literal 1167 zcmV;A1aSL_P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyk} z0|pQf4_ht(00a+7L_t(Y$CZ}9Zxlxq$3JgocW3Wz?+)MD2x5K}X&ga9gCJd`G>Out zN)ahtI_gN2NcecUoK0q{I1Jo{GzWjArmh-tNHC?P^4k&K{7L_kR5XbR5pVR^S zxPSjX+uPfRl&cwlnkkpX@j^Q&(LsPKSFVs{8O}qVj~NX|L~(@oo~o=^S~|gCI3!6D zY-NdJ&2o1crS%k8srLgYrTF{VGtOVQKs`HwN$bQ(ic)GC@DPY1ML?0J2AEl(G$DYf z>G-_>0BdV&#Bq#{6lGZwyrU{B8d*jXCs=C{6A?!Wtu@|zihM+~*+eOI$W8BBAi~zx z7OQ8@kk(raMg`VcTvahHDwdX(*nPE2tJUJw-YbkT(`q#t4u=?H z2*D#FSZj%+m`=CD%E}5LXeHJ6wX{Y+_-Fe$`FPBvD9~DCOpMkM)>@Pjl$r*4lINT~cb0Ca^8o-6 z_FlgxO%0JwSY2J6Q8ZwkMQcr@HKG)Q!5h-FMv}yc2;K*ds$7R?nq?VEY0_9RB}70( zNaAE+BZ1C|7W24<;L&n)^-~8E?eXKs3X*8`3!M7!HRtvn&84Ng|8BIt0*r`jqqM&QWW$ zu?|Lg!JFZDRwgvHTAk5oNL5*eg8`xxlSxjy-KJ)YOeW($fZ=-qK3iKOiXuQrvKl5< zG@H$Zk{@W)5<-AI6Y=MxM;K#hG-~p1e{b`*J9mDVA2x?sq!jDx>s-8ek6nZE@lJ+3@+LOY-E&lbwwR4}QLN>sId|_2)p}c<=A- z?Cg+b8KNSTR?0^_0BnOt@V@1#P|Ds z|MKO_@bKZo-i;eKzBu+4uwcojo12?Im1S8Sbp+1eopaMOLB!v_ef!s&H*fy+QTL70 hr%%fa@MGIY$$z9Mza3eU%D?~s002ovPDHLkV1keoAs_$% literal 0 HcmV?d00001 diff --git a/settings.py b/settings.py index 47619b4903..6eda4e7e13 100644 --- a/settings.py +++ b/settings.py @@ -124,13 +124,16 @@ ACCOUNT_ACTIVATION_DAYS = 7 # Icons will show in repo page. FILEEXT_ICON_MAP = { # pdf file - 'pdf' : 'pdf-icon-24.png', + 'pdf' : 'pdf.png', # document file - 'doc' : 'word-icon-24.png', - 'docx' : 'word-icon-24.png', - # ppt file - 'ppt' : 'ppt-icon-24.png', - 'pptx' : 'ppt-icon-24.png', + 'doc' : 'ms-word.png', + 'docx' : 'ms-word.png', + 'ppt' : 'ms-ppt.png', + 'pptx' : 'ms-ppt.png', + 'xls' : 'ms-excel.png', + 'xlsx' : 'ms-excel.png', + 'txt' : 'txt.png', + 'odf' : 'odf.png', # music file 'mp3' : 'music-icon-24.png', # picture file diff --git a/templates/repo.html b/templates/repo.html index 46c30de988..5ba8b7d356 100644 --- a/templates/repo.html +++ b/templates/repo.html @@ -151,7 +151,7 @@ {% for dirent in file_list %} - 文件 + 文件 {% if view_history %} {{ dirent.props.obj_name }} {% else %}