From 881f902757e0d053b0dc9016055630b28c79c3b5 Mon Sep 17 00:00:00 2001
From: claycarpenter <claycarpenter@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Fri, 4 Feb 2011 18:37:34 +0000
Subject: [PATCH] Merge of branches/jambazov to trunk. Incoporating the new
 convert comment to answer icon.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@744 0cfe37f9-358a-4d5e-be75-b63607b5c754
---
 .../skins/default/media/images/convert-hover.png | Bin 0 -> 1567 bytes
 forum/skins/default/media/images/convert-off.png | Bin 0 -> 1455 bytes
 forum/skins/default/media/style/style.css        |  10 +++++++++-
 forum/skins/default/templates/node/comments.html |   4 ++--
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 forum/skins/default/media/images/convert-hover.png
 create mode 100644 forum/skins/default/media/images/convert-off.png

diff --git a/forum/skins/default/media/images/convert-hover.png b/forum/skins/default/media/images/convert-hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e973efbeaa97f01f6db02b87b85d26dab92a828
GIT binary patch
literal 1567
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W}skZsAp(w
zVs37(qhMrUXrOOkq;F`XYiMp|Y-D9%pa2C*K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mLM~XjC6r2bc-wVN)jt{^NN*WCb*;)Cl_TFlw{`TDS%8&Ov*1U
zu~h=P6yk;40=Thx#n4~^2AF<DVu8M)o&m^9FonLp_?717!c`ZS1f?R}i`C%bkjjEo
z{h-w1{L-RiV8o><gRCmBaxO|uEXgkl$<NP$g<?QPeo20DMt*^UbFis`Z(?$09*7TC
z@9S&jnO9trn3tUD>0+w{G(j&jGsVit$-vUY!qvpc!qVK((AB`v*uc^W81OF6<|a;V
zMy4>mF8Rr&xv6<2Fuf@Vy{0(zf|5dR0nlcb)S}F?)D*X({9FaFm#s2!yTu5nc~HG6
zxZPrmQ?EYIG5Vm0MT%&c5HR(CnDAr^<iHbtY927P7Xg#?#pDGC85o!*d%8G=RNM-g
zbk{q?QR3MAnZ<qS;pKll?uwq}zox3BeMm#gqgAQH<<OpvMGhUG_&a_{zgpM*!uyTd
zB5qM(<rl}g7X=AzDcKmnY=8Z0@?HP(b90O@&tdI;mey8&@BZ&Id)_-IZIrm<s#&@{
zDR%MoJ<AFM-?BR}+!otk)U*G2U&Y#Ylbt$h>~1o1D!x_ycZgl)*}_%}N0YT0nu1@L
zdsBtjB2*@xx;H(j?+^3RocrOg-uLH7KD*G<%W`?a<Qm(8=mY6iFKm(?6tte*Rvr}V
zmD*y}7rbnW+~1DC&nK7jY`e^KwUy`WL79?>Rm+;6=zaK+%r^P;5uMPTdd{U@d1^Za
zUrBrKwm-V^ugu-!7U!<rRNzXw)5yjy7wi0fx`>e0_0$#DlS_E~p9`GlxFQy9as7bd
z_LmP{?l=;4$&K;pj>0Jmm);9HC6vFsJaC1?-3wbkoRMl)R(bW8&tm$E`O6|axn@We
ztPE6mFm=TmwndyxQ+KdBn;+gK(xkFU=FFrGI~@8vmu!+MlROa8?Dkw$%9}-PG0WuD
zA+|FeIGO{}KHfhn*T}P3AaZ+RG52%nq7PXye|s0NobxpKvA5Z@avhNuOnQsoFEM(5
z%gI&u{&b@s+gvU_D83M-U+}$U)}*ZP#%HU7dUU-^SsSlS;Ma3jn&^?bU{Os{!m(9v
zf6r-H#&ab`wP1tOu44z!>o#?oaz%e#@Y{!T*Q_&3Z#=tJXk=~ude^ee%T|3l+r3`%
z@zn?!r$_r;Lt9^~pDuX5Wxl?<`8uudJd;+g)HF?bx$C)CtnY`1N$13?%yxC{<ek=j
zh*8)!_v(tTOT@*(uf5lt%BadB#KH0}EbMv0`M1$`=T5iQ6REUKG@o`V<vDwMo4w8Z
jx791(NZvjDSNQ;gN{s!Lg^d+gKt;BvtDnm{r-UW|?C@G#

literal 0
HcmV?d00001

diff --git a/forum/skins/default/media/images/convert-off.png b/forum/skins/default/media/images/convert-off.png
new file mode 100644
index 0000000000000000000000000000000000000000..a10dddd8dbbd80d9ab23cbf1972a32b5fffa6991
GIT binary patch
literal 1455
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W}skZsAp(w
zVs37(qhMrUXrOOkq;F`XYiMp|Y-D9%pa2C*K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mLM~XjC6r2bc-wVN)jt{^NN*WCb*;)Cl_TFlw{`TDS%8&Ov*1U
zu~h=P6yk;40=Thx#n4~^2AF<DVu8M)o&m^9FonLp_?717!c`ZS1f?R}i`C%bkjjEo
z{h-w1{L-RiV8o><gRCmBaxO|uEXgkl$<NP$g<?QPeo20DMt*^UbFis`Z(?$09*7TC
z@9S&jnO9trn3tUD>0+w{G(j&jGsVi>z|_&r%+T1#!qUyq(AB`v*uc^W81OF6<|a;V
zMy4>mF8Rr&xv6<2Fuf@Vy(T#If|5dR0nlcb)S}F?)D*X({9FaFm#s3fxW&lHz|zFR
z)eLB!Id-=|^rql;ixEz@=mQ<24~kf%h=vIPQxAv<Pqsh~JmIJ20aJSsFj)s$pQ~hG
zU{dyUaSW-r<r8#rm6W5%-mBX*&N-^~Y4jg+6^T_@(2@2~??XkmO7{d;JLSXbD%pQq
zKZtpT>8GSSxHwLlDxu<G{ix-$&4Oq5xK3$nbnPoWxA*y+EVJ2X8^n@(_?n#-R;&$L
zIghjH!Qw+7EB@@hn^!Nx*M9zorS)9D{~y11T#s7&O?h6w+GI{0G48nQFG~`PW-@Tr
zPdok8+UC8U%bTiP6RG_@$CE=>hBV#HD-UxhSLjk=VPZ6xefIXtl3zks?-;V!8%Xf%
zcUych)NVfe6wV)K%hz9T{#$omdd>Ch4i}|_tx>5m-&_uy%l|NGaz@wThYbN5EP2~!
zKZ)(|S}Mfh9Px<5;$hp9wPD&9UVnY?wJOm-!eL<m!zZuP@4tU`Gnu*}YwItzr`<uj
z?>>v`@DT1gsx+belbWYchKUr@XQ`;gyHpm*v}GPl+x&20!k0b9xs&2nhA=cY`z>c)
z8`f=pSkcF!U@DVh!uH!wg>B{dA5<6h&rn%!D#a_o*S^P3rqFJF{r8_W{;$7UT~OQU
z!qa~Ejyz*#*4nVgy&hJDGjvXebszmCUAxnGCeH)u#>+34+_0Ru%w)FjJVzV3_5_0)
zM?T1H&f4k~H}7`Nw%aj!%g>~3F8H_hT=$-1NroM6i>tSM=6b(>W6{ntjXUCZ#H{oG
zp%ebHWLCT5>AdaEN)s2Pr1Cu1HTzlhZ?ztGs-4f$p!dK3)=AZxWF$AwKbi80`QFWU
c$^SVG80r>Uw>`A4^#&E8p00i_>zopr09K<OMgRZ+

literal 0
HcmV?d00001

diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css
index 15155f4..e0b8052 100644
--- a/forum/skins/default/media/style/style.css
+++ b/forum/skins/default/media/style/style.css
@@ -1496,7 +1496,7 @@ a.accept-answer.on, a.accept-answer:hover {
     margin-left: 4px;
 }
 
-a.comment-like, a.comment-delete, a.comment-edit {
+a.comment-like, a.comment-delete, a.comment-edit, a.comment-convert {
     margin-left: 2px;
     width: 18px;
 }
@@ -1517,6 +1517,14 @@ a.comment-delete:hover {
     background: url("../images/comment-delete-hover.png") no-repeat scroll center center transparent;
 }
 
+a.comment-convert {
+    background: url("../images/convert-off.png") no-repeat scroll center center transparent;
+}
+
+a.comment-convert:hover {
+    background: url("../images/convert-hover.png") no-repeat scroll center center transparent;
+}
+
 a.comment-edit {
     background: url("../images/comment-edit.png") no-repeat scroll center center transparent;
 }
diff --git a/forum/skins/default/templates/node/comments.html b/forum/skins/default/templates/node/comments.html
index 5fea00c..49d529a 100644
--- a/forum/skins/default/templates/node/comments.html
+++ b/forum/skins/default/templates/node/comments.html
@@ -23,7 +23,7 @@
                 {% endif %}
                 {% if comment.can_convert %}
                     <a rel="nofollow" id="comment-{{ comment.id }}-convert" href="{% url convert_comment id=comment.id %}" title="{% trans "Convert comment to answer" %}"
-                        class="ajax-command comment-convert confirm" rel="nofollow">{% trans "Convert comment to answer" %}</a>
+                        class="ajax-command comment-convert confirm" rel="nofollow"> </a>
                 {% endif %}
                     
 
@@ -70,7 +70,7 @@
                     <a id="comment-%ID%-delete" href="%DELETE_URL%"
                         class="ajax-command comment-delete" rel="nofollow"> </a>
                     <a rel="nofollow" id="comment-%ID%-convert" href="%CONVERT_URL%" title="{% trans "Convert comment to answer" %}"
-                        class="ajax-command comment-convert confirm" rel="nofollow">{% trans "Convert comment to answer" %}</a>
+                        class="ajax-command comment-convert confirm" rel="nofollow"> </a>
 
                     <span class="comment-age">({% trans "just now" %})</span>
                     <a class="comment-user" href="%PROFILE_URL%">%USERNAME%</a>
-- 
2.39.5