# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2011-03-05 22:02:15
# Node ID fcb5054937f693bb31efe5ae70c3126078283b5f
# Parent  4de3fa6290a737aabb1ddc34275494ad975d5f9a
# Parent  5351a3a32381d3f118720d3e9e1a48b4bdc8b85a

merge with optional gravatars

diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -49,6 +49,7 @@ app_instance_uuid = develop
 cut_off_limit = 256000
 force_https = false
 commit_parse_limit = 25
+use_gravatar = true
 
 ####################################
 ###        CELERY CONFIG        ####
diff --git a/production.ini b/production.ini
--- a/production.ini
+++ b/production.ini
@@ -48,6 +48,7 @@ index_dir = %(here)s/data/index
 cut_off_limit = 256000
 force_https = false
 commit_parse_limit = 250
+use_gravatar = true
 
 ####################################
 ###        CELERY CONFIG        ####
diff --git a/rhodecode/config/deployment.ini_tmpl b/rhodecode/config/deployment.ini_tmpl
--- a/rhodecode/config/deployment.ini_tmpl
+++ b/rhodecode/config/deployment.ini_tmpl
@@ -49,6 +49,7 @@ app_instance_uuid = ${app_instance_uuid}
 cut_off_limit = 256000
 force_https = false 
 commit_parse_limit = 50
+use_gravatar = true
 
 ####################################
 ###        CELERY CONFIG        ####
diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -10,7 +10,7 @@ import urllib
 
 from pygments.formatters import HtmlFormatter
 from pygments import highlight as code_highlight
-from pylons import url, request
+from pylons import url, request, config
 from pylons.i18n.translation import _, ungettext
 
 from webhelpers.html import literal, HTML, escape
@@ -35,6 +35,7 @@ from webhelpers.html.tags import _set_in
 
 from vcs.utils.annotate import annotate_highlight
 from rhodecode.lib.utils import repo_name_slug
+from rhodecode.lib import str2bool
 
 def _reset(name, value=None, id=NotGiven, type="reset", **attrs):
     """Reset button
@@ -565,6 +566,9 @@ HasRepoPermissionAny, HasRepoPermissionA
 #==============================================================================
 
 def gravatar_url(email_address, size=30):
+    if not str2bool(config['app_conf'].get('use_gravatar')):
+        return "/images/user%s.png" % size
+
     ssl_enabled = 'https' == request.environ.get('wsgi.url_scheme')
     default = 'identicon'
     baseurl_nossl = "http://www.gravatar.com/avatar/"
diff --git a/rhodecode/public/images/user14.png b/rhodecode/public/images/user14.png
new file mode 100644
index 0000000000000000000000000000000000000000..45b48c12ee114b33ee2cab79481e293ee6157616
GIT binary patch
literal 329
zc$@)A0k-~$P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0003HNkl<ZD3N`T
zv8ux`3`LKOTqld6WY5$N-tzx@{~<pR(y??2v>|#!v5C`11s-%IS?5Y_x0~@J%nT9v
z%GK=WTxmY$x)($QGsAn&`FsZ8@p$lhy-F>I?lAyjjHHxM{rtJEE8{rwd_F5=cf`6}
zE@cQnRk>cTU--_<$j^IE(=_ZgGvjnR5kjc6YU8@DY};1+W;8S7{eD-saJeCypXa&q
zA|l-HceZV-Jsz><d1hIb(y%NG(=?TOCa6$jj10q2`D~hoVHk)p*2l@1Ap}xNc<<Tc
ziwNF(Qc8pnidHuEeUGYENEyq_P*wWAuRV$gUDy3Pu+O`$D@SwyZQJ6U`?}^ach1qa
bEh54n&x)pUxy3q~00000NkvXXu0mjf6?T`8

diff --git a/rhodecode/public/images/user20.png b/rhodecode/public/images/user20.png
new file mode 100644
index 0000000000000000000000000000000000000000..84d4529800990935466575494b2ca4e1c5d7db48
GIT binary patch
literal 432
zc$@*S0Z;ykP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0004ZNkl<ZIE}4S
z!485j41FCKoDpI|Vn7$fJOBR&{(~Moc;jj&CpGibu??mdn=Ev+@2&0I=yW<6{L#ce
z$p9cV=C1`J{gtp-EU;d$K}676<N17kCnO>OfH4N_vmFix)O8IZ1dK5-#-Q(e+-^6!
z2LK|ncw1pec03+Y*EQTY5n;F6AxRQkuU8MlzToQIS!P*=s;Z)GZMR!UDLowfp2{5D
zY&Kp}xZIr3M5yxIEW@?{K!~vxmqYMu7(hfAh9OGC`^V!ki4)P-vJ28$Lu-xjFqiCp
zzt6@!QQXommy1^g+b|3`pU)G_tSGK6mrK0g?};F<*9%#e#b8rW0ARo0qw6{pMKOsL
zMS-sCpp=69C@f)kIjgEd(=;B*+#H*xv3GSM3J+IGiMDO+J|+r(+qT7OwetRZq9~=j
z`}NC&5Kv0lwmnhOG(}mK(bo}MWmzIglJO88XrAZM7xK-B2zj25giIo(v<Y)BWA4ko
ai~RsKsNO~D;Rdt-0000<MNUMnLSTZOLA~w(

diff --git a/rhodecode/public/images/user24.png b/rhodecode/public/images/user24.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae8aad4f41279802ca71ec097d9bc102b40b415b
GIT binary patch
literal 512
zc$@(M0{{JqP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0005UNkl<ZNQt$R
zORs`35QWb)C{WUXV!}eB!AEq-|6ltj3^BUa=tfzHSnk3=kW$3OZPIY)^l|3vl(yS#
zj(=<h5&h@>V0r#dAkTAj(baDkZT!06*F!oXVvND}eK?K-07#Mq*XtFp*X!$ABhPaX
zQF(G*d!C2oa*2MwkLuhk%dp??ak*Sjm@MK|&Dv5FLSVDmpx5gual<gMUa#SKUhADP
zB7&~Z=W{T|N>@#D7K?>;JrU`vh;t6dalTfOX_^p1DC33JBC>6}@zR<MS(c?mq^+W&
zLaK4yTq&hCrbTqW-yx;!^w4g%TjMx@_aztZs`~kS;&eJG<Mm9==QGkY)n?oJ4vxno
zIOpXh)?1P!I2;Zi&J{%32;OYtIL71gP~4|!irsF9EX$NEt6GbQh%g?H5k(O!%Tf@T
zrimzuFqupgEME~35mu`eeBTEEEds_Erqd}L$3Yy&kWzL-6ow&u-*0r(l<{aZLKueK
z5Df+c1VNx>szVV30fxh&GS2F?J)6zS|6jUp?FS;)b-_7TTzo@RXxp~ox~?8kkz!lf
z=?-q%1E^Jz5Tf<bbZPZHJ`h=!)#|SPZPL{}hzNg^x^n`6-p1_!0000<MNUMnLSTZ6
Cc=9U%

diff --git a/rhodecode/public/images/user30.png b/rhodecode/public/images/user30.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c526a09f59fd86a1e763f6d46e4e59e387ee21f
GIT binary patch
literal 677
zc$@*H0$TlvP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I0007PNkl<ZNQtFa
zQR})e6g|_SR-jT6L>UxF(D(leeT3?v=qY+DiVBm`{U2g6=bZEZJ1{ioJ!kjs-n%5L
z)rv93KnQ^d{!BGj2iZo)K^bE|BNb8IoK9SK<*<wy4Iz707cI-=CDTy1f!5={2sYVL
z`9*$}_k<^jZQBTf0NrjE0Fb6BZnqoqJlEzzCAs)bQ*sePFqup+9*<$$cImyMC~!KR
za6BGS6h*~W#ZOJbNeIDWu|U7ySI*nEjW~|s`#!eY?N3|>i!oMNjrfc)hUs)#D=H!g
z0?cN!MsESYQh6*sb6pps(Wp_BV>lfC_Fo4}7LvuID1v2~mpdT@Q52OpYK3(WS8v+E
zdc9s{F|CD7y%iT_Vnam(UaR8oEX$09MPym_<B>Uki<27%A*2+V>-7qt8fH23MO?2}
zWzQBzV@z(h8y=5GNw5x#F{EjV%jMEU`>kWq1KAVC820-;@;q0Hi}yuQV7J?$C<<jQ
zi^C{$p3f)N>$P^j-|sgzn+@*wy9uRP%LKk{@%4Ja^E~Bznx>Wf&<fX0@PmO;iurtw
z!C;^z4T1o^@8f(v<8V0O^Z981Hq{CfLg2bCmdhnNosN+gyleG(J#01`?bcZGrt?85
zZ6zwA)9GNjT!PZCUn+h}t}i~4B!TC7N+Xluc^;A^DMh1H$10;JiV%ijYfoi_VfZ^R
z8q0|gf;f)<EXonbvDqOJhGA{V{0}_OQ%0{+$59m3mOz`Y3YnAle2$98zVEjt=8LL>
zinEkllv22^+v=0W1g`6XQd%u1;G0yA<J5Z4=2(>H0l;ybQaSwtM+(9%b`#6I00000
LNkvXXu0mjff(AGK