Merge lp:~rpadovani/ubuntu-it-ask/1169700 into lp:ubuntu-it-ask

[Riccardo Padovani]

[Giuseppe Terrasi (giuseppeterrasi-deactivatedaccount)]

review: Approve

=== modified file 'forum/skins/light/media/style/style.css'
--- forum/skins/light/media/style/style.css	2013-03-26 17:45:38 +0000
+++ forum/skins/light/media/style/style.css	2013-04-16 21:18:26 +0000
@@ -1589,7 +1589,7 @@
 
 #close-notify:hover {
     text-decoration: none;
-    background-position: right 0;
+    background-position: right center;
 }
 
 .big {
@@ -1890,7 +1890,11 @@
 a.comment-like {background-position: 0 -52px;}
 a.comment-convert {background-position: 0 -69px;}
 a.comment-convert-to-question {background-position: 0 -86px;}
-a.comment-delete:hover, a.comment-edit:hover, a.comment-like:hover, a.comment-like.on, a.comment-convert:hover, a.comment-convert-to-question:hover {background-position: -19px 0;}
+a.comment-delete:hover {background-position: -19px -18px;}
+a.comment-edit:hover {background-position: -19px -36px;}
+a.comment-like:hover, a.comment-like.on {background-position: -19px -52px;} 
+a.comment-convert:hover {background-position: -19px -69px;}
+a.comment-convert-to-question:hover {background-position: -19px -86px;}
 
 img.subscription-remove {
     float:right;

=== added directory 'forum/skins/light/templates/node'
=== added file 'forum/skins/light/templates/node/accept_button.html'
--- forum/skins/light/templates/node/accept_button.html	1970-01-01 00:00:00 +0000
+++ forum/skins/light/templates/node/accept_button.html	2013-04-16 21:18:26 +0000
@@ -0,0 +1,18 @@
+{% load i18n %}
+
+{% if can_accept %}
+    <a id="accept-answer-{{ answer.id }}" class="ajax-command accept-answer{% if answer.nis.accepted %} on{% endif %}"
+      title="{% if answer.nis.accepted %}{% blocktrans with answer.nstate.accepted.by.username as who %}{{ who }} has selected this answer as the correct answer{% endblocktrans %}{% else %}{% trans "mark this answer as the accepted answer" %}{% endif %}"
+              bn:on="{% blocktrans with answer.nstate.accepted.by.username as who %}{{ who }} has selected this answer as the correct answer{% endblocktrans %}"
+              bn:off="{% trans "mark this answer as the accepted answer" %}"
+       href="{% url accept_answer id=answer.id %}" rel="nofollow"> 
+    </a>
+{% else %}
+    {% if answer.nis.accepted %}
+      <a class="accept-answer on"
+        title="{% blocktrans with answer.nstate.accepted.by.username as who %}{{ who }} has selected this answer as the correct answer{% endblocktrans %}"
+        href="{% url accept_answer id=answer.id %}" rel="nofollow"> 
+      </a>
+    {% endif %}
+{% endif %}
+