Merge of branches/jambazov to trunk. Incoporating the new convert comment to answer...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@744 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/skins/default/media/images/convert-hover.png b/forum/skins/default/media/images/convert-hover.png
new file mode 100644 (file)
index 0000000..9e973ef
Binary files /dev/null and b/forum/skins/default/media/images/convert-hover.png differ

diff --git a/forum/skins/default/media/images/convert-off.png b/forum/skins/default/media/images/convert-off.png
new file mode 100644 (file)
index 0000000..a10dddd
Binary files /dev/null and b/forum/skins/default/media/images/convert-off.png differ

diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css
index 15155f4727205f40c29eccc42f2067b99a34dea8..e0b805220504ab446420aa8830622098941fe060 100644 (file)
--- 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;
 }
 
     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;
 }
     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;
 }
 
     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;
 }
 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 5fea00c030dca680d5ba7bc4fc1025b86ded234f..49d529a0aded38e532ead3e1afb282781781ebb4 100644 (file)
--- a/forum/skins/default/templates/node/comments.html
+++ b/forum/skins/default/templates/node/comments.html
@@ -23,7 +23,7 @@
                 {% endif %}\r
                 {% if comment.can_convert %}\r
                     <a rel="nofollow" id="comment-{{ comment.id }}-convert" href="{% url convert_comment id=comment.id %}" title="{% trans "Convert comment to answer" %}"\r
                 {% endif %}\r
                 {% if comment.can_convert %}\r
                     <a rel="nofollow" id="comment-{{ comment.id }}-convert" href="{% url convert_comment id=comment.id %}" title="{% trans "Convert comment to answer" %}"\r

-                        class="ajax-command comment-convert confirm" rel="nofollow">{% trans "Convert comment to answer" %}</a>\r
+                        class="ajax-command comment-convert confirm" rel="nofollow"> </a>\r

                 {% endif %}\r
                     \r
 \r
                 {% endif %}\r
                     \r
 \r


@@ -70,7 +70,7 @@
                     <a id="comment-%ID%-delete" href="%DELETE_URL%"\r
                         class="ajax-command comment-delete" rel="nofollow"> </a>\r
                     <a rel="nofollow" id="comment-%ID%-convert" href="%CONVERT_URL%" title="{% trans "Convert comment to answer" %}"\r
                     <a id="comment-%ID%-delete" href="%DELETE_URL%"\r
                         class="ajax-command comment-delete" rel="nofollow"> </a>\r
                     <a rel="nofollow" id="comment-%ID%-convert" href="%CONVERT_URL%" title="{% trans "Convert comment to answer" %}"\r

-                        class="ajax-command comment-convert confirm" rel="nofollow">{% trans "Convert comment to answer" %}</a>\r
+                        class="ajax-command comment-convert confirm" rel="nofollow"> </a>\r

 \r
                     <span class="comment-age">({% trans "just now" %})</span>\r
                     <a class="comment-user" href="%PROFILE_URL%">%USERNAME%</a>\r
 \r
                     <span class="comment-age">({% trans "just now" %})</span>\r
                     <a class="comment-user" href="%PROFILE_URL%">%USERNAME%</a>\r