From 097e33768377eb82e932b5e06022ddbf4b08e197 Mon Sep 17 00:00:00 2001 From: llj Date: Thu, 23 Mar 2017 16:33:09 +0800 Subject: [PATCH] [favicon] fix & modification for customization --- media/img/favicon.ico | Bin 0 -> 1150 bytes media/img/favicon.png | Bin 3222 -> 0 bytes seahub/base/context_processors.py | 4 +++- seahub/settings.py | 4 ++++ seahub/templates/base.html | 5 +---- seahub/templates/base_for_backbone.html | 6 +----- seahub/templates/sysadmin/sysadmin_backbone.html | 6 +----- 7 files changed, 10 insertions(+), 15 deletions(-) create mode 100644 media/img/favicon.ico delete mode 100644 media/img/favicon.png diff --git a/media/img/favicon.ico b/media/img/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..23d89537062aee4b54d751c23ce2f2424e978f38 GIT binary patch literal 1150 zcmd6m&r4KM6vwX^jWr=NlZ>+{Qu?74JX}OSu&~U?Op20J1`ApgwTV_ytL6`A;i96T zsnIELDj0hZ%+SIaGn}c$$wea?l(mx(T(pqhIp=ond)}F8R_^LvKKK0ie$Rb(^Mt74 z?ePdc8^o10LimLc%?!7=fk^rm)*q$co;TD9hl z(hu)2-K~q#MXlEkldOA6H?+rygFi4r%k?89HCvw3A*FAM(WT}%87dFNXi4jvV{~2h zcC5T}+bBM0jH4{4$;7kD(-=edP7|*+u-^0vlUqm8G)!EpG`)-j-rSu)S&5Ov31(9F zTap;kGY8Vxxi5use;VY$ak#~~xi^Iid&cks=Q+-$%@{b5>(&$m^}LElGcedT39>B% zvONn^T_2&ZBMT3YXQ4;+$~lsOZ)&Ff9jIWhbJI}WJq5v&d6+nn2dU}$1j_@{;P1{u zg7XEAcTVNNCGMAI?F$B+y0-wGXFglfreMjQ0%TV{Q4AfqirJ##B*8iBa^I}=o_T%Y z%Wrr83{+KER$X5GYOUJ)uZ)s^ArkY>Hgj^2u>|MHD@~gQ&UB^Ff literal 0 HcmV?d00001 diff --git a/media/img/favicon.png b/media/img/favicon.png deleted file mode 100644 index 379988d7e8ed5cac828587e472a7e1abdf913da0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3222 zcmV;H3~BR;P)Oz@Z0f2-7z;ux~O9+4z06=<WDR*FRcSTFz- zW=q650N5=6FiBTtNC2?60Km==3$g$R3;-}uh=nNt1bYBr$Ri_o0EC$U6h`t_Jn<{8 z5a%iY0C<_QJh>z}MS)ugEpZ1|S1ukX&Pf+56gFW3VVXcL!g-k)GJ!M?;PcD?0HBc- z5#WRK{dmp}uFlRjj{U%*%WZ25jX z{P*?XzTzZ-GF^d31o+^>%=Ap99M6&ogks$0k4OBs3;+Bb(;~!4V!2o<6ys46agIcq zjPo+3B8fthDa9qy|77CdEc*jK-!%ZRYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S z1Au6Q;m>#f??3%Vpd|o+W=WE9003S@Bra6Svp>fO002awfhw>;8}z{#EWidF!3EsG z3;bXU&9EIRU@z1_9W=mEXoiz;4lcq~xDGvV5BgyU zp1~-*fe8db$Osc*A=-!mVv1NJjtCc-h4>-CNCXm#Bp}I%6j35eku^v$Qi@a{RY)E3 zJ#qp$hg?Rwkvqr$GJ^buyhkyVfwECO)C{#lxu`c9ghrwZ&}4KmnvWKso6vH!8a<3Q zq36)6Xb;+tK10Vaz~~qUGsJ8#F2=(`u{bOVlVi)VBCHIn#u~6ztOL7=^<&SmcLWlF zMZgI*1b0FpVIDz9SWH+>*hr`#93(Um+6gxa1B6k+CnA%mOSC4s5&6UzVlpv@SV$}* z))J2sFA#f(L&P^E5{W}HC%KRUNwK6<(h|}}(r!{C=`5+6G)NjFlgZj-YqAG9lq?`C z$c5yc>d>VnA`E_*3F2Qp##d8RZb=H01_mm@+|Cqnc9PsG(F5HIG_C zt)aG3uTh7n6Et<2In9F>NlT@zqLtGcXcuVrX|L#Xx)I%#9!{6gSJKPrN9dR61N3(c z4Tcqi$B1Vr8Jidf7-t!G7_XR2rWwr)$3XQ?}=hpK0&Z&W{| zep&sA23f;Q!%st`QJ}G3cbou<7-yIK2z4nfCCCtN2-XOGSWo##{8Q{ATurxr~;I`ytDs%xbip}RzP zziy}Qn4Z2~fSycmr`~zJ=lUFdFa1>gZThG6M+{g7vkW8#+YHVaJjFF}Z#*3@$J_By zLtVo_L#1JrVVB{Ak-5=4qt!-@Mh}c>#$4kh<88)m#-k<%CLtzEP3leVno>={htGUuD;o7bD)w_sX$S}eAxwzy?UvgBH(S?;#HZiQMoS*2K2 zT3xe7t(~nU*1N5{rxB;QPLocnp4Ml>u<^FZwyC!nu;thW+pe~4wtZn|Vi#w(#jeBd zlf9FDx_yoPJqHbk*$%56S{;6Kv~mM9!g3B(KJ}#RZ#@)!hR|78Dq|Iq-afF%KE1Brn_fm;Im z_u$xr8UFki1L{Ox>G0o)(&RAZ;=|I=wN2l97;cLaHH6leTB-XXa*h%dBOEvi`+x zi?=Txl?TadvyiL>SuF~-LZ;|cS}4~l2eM~nS7yJ>iOM;atDY;(?aZ^v+mJV$@1Ote z62cPUlD4IWOIIx&SmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~pu715HdQEGA zUct(O!LkCy1<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$+<4_1hi}Ti zncS4LsjI}fWY1>OX6feMEuLErma3QLmkw?X+1j)X-&VBk_4Y;EFPF_I+q;9dL%E~B zJh;4Nr^(LEJ3myURP{Rblsw%57T)g973R8o)DE9*xN#~;4_o$q%o z4K@u`jhx2fBXC4{U8Qn{*%*B$Ge=nny$HAYq{=vy|sI0 z_vss+H_qMky?OB#|JK!>IX&II^LlUh#rO5!7TtbwC;iULyV-Xq?ybB}ykGP{?LpZ? z-G|jbTmIbG@7#ZCz;~eY(cDM(28Dyq{*m>M4?_iynUBkc4TkHUI6gT!;y-fz>HMcd z&t%Ugo)`Y2{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M!p0uH$#^p{Ui4P` z?ZJ24cOCDe-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&GcDTy000JJOGiWi{{a60 z|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RY3=9f84m;1V0RR92$Vo&& zR5;7clg(>WK@`P*Gw&rWA{2@g7b1!v=pvvXHngbJf<+J%F%_#TKfr8?J5l@t+!cy~ zE5V{z3@F)HTvVhyw2LBkA)+8QxDbUBsL4y_&CGR?m}gt0+YSuO<=%7eIcH{IQ?KOf z^$ly(I?(3}*ARCF_$9ilpslHg`<}}G8fXA}u@%^lg%OhY0oEMCnUgxH&8`L8h2ixK z?1ys!E*?cm5&S@!RZUdyPJHzd${#@V6kgwEzT6Cp|2BAcd;+oKC_n}83A*p%%n$^x zkVa_@>2G2G>)kdQA{>}Sxi|R{#J?1!K!vxIPx2s#5nn+C8ss2=2&lGWLS`&H7Ciw7 zgQIU}{xWehxtrilwMX@(Qi4c9fVlpavdrF9Cc08PZq#=X*IBiVJsX@@9HhE3jPc{d zHE6_n_hL`km2=t7HQML7KHdCT0qIKRb|2A&r8z&n<0{#$^ZLxEML)g0ibzk3S@uTQ zsr~)^G2W)&aLb@RzZ3yrYIkVX%6@9w0*!i4$A0ayx&!c;BF=unCKW`V)?+^+SK8mo zIWChlMlmasShGxGma%pY>+h%dhrQ|f68LAi4WF^x+YBG>4@Q8(5+|1O{r~^~07*qo IM6N<$f~zkGCjbBd diff --git a/seahub/base/context_processors.py b/seahub/base/context_processors.py index 10ac828b3b..5b1b086266 100644 --- a/seahub/base/context_processors.py +++ b/seahub/base/context_processors.py @@ -15,7 +15,8 @@ from constance import config from seahub.settings import SEAFILE_VERSION, SITE_TITLE, SITE_NAME, \ MAX_FILE_NAME, BRANDING_CSS, LOGO_PATH, LOGO_WIDTH, LOGO_HEIGHT,\ - SHOW_REPO_DOWNLOAD_BUTTON, SITE_ROOT, ENABLE_GUEST_INVITATION + SHOW_REPO_DOWNLOAD_BUTTON, SITE_ROOT, ENABLE_GUEST_INVITATION, \ + FAVICON_PATH try: from seahub.settings import SEACLOUD_MODE @@ -60,6 +61,7 @@ def base(request): 'seafile_version': SEAFILE_VERSION, 'site_title': SITE_TITLE, 'branding_css': BRANDING_CSS, + 'favicon_path': FAVICON_PATH, 'logo_path': LOGO_PATH, 'logo_width': LOGO_WIDTH, 'logo_height': LOGO_HEIGHT, diff --git a/seahub/settings.py b/seahub/settings.py index 5dbd3bd194..8f46f72162 100644 --- a/seahub/settings.py +++ b/seahub/settings.py @@ -390,6 +390,10 @@ SITE_TITLE = 'Private Seafile' # Base name used in email sending SITE_NAME = 'Seafile' +# Path to the favicon file (relative to the media path) +# tip: use a different name when modify it. +FAVICON_PATH = 'img/favicon.ico' + # Path to the Logo Imagefile (relative to the media path) LOGO_PATH = 'img/seafile-logo.png' # logo size. the unit is 'px' diff --git a/seahub/templates/base.html b/seahub/templates/base.html index 0a69d42da1..9e84bbba22 100644 --- a/seahub/templates/base.html +++ b/seahub/templates/base.html @@ -10,10 +10,7 @@ {% block viewport %} {% endblock %} - - + {% block extra_style %}{% endblock %} diff --git a/seahub/templates/base_for_backbone.html b/seahub/templates/base_for_backbone.html index e5759d4969..fe8d6d063a 100644 --- a/seahub/templates/base_for_backbone.html +++ b/seahub/templates/base_for_backbone.html @@ -9,11 +9,7 @@ - - - + {% compress css %} diff --git a/seahub/templates/sysadmin/sysadmin_backbone.html b/seahub/templates/sysadmin/sysadmin_backbone.html index 3a5b95aff6..db04ca0a37 100644 --- a/seahub/templates/sysadmin/sysadmin_backbone.html +++ b/seahub/templates/sysadmin/sysadmin_backbone.html @@ -8,11 +8,7 @@ - - - + {% compress css %}