Reverting the merges due to unsuccessfull conflict resolvement.

[osqa.git] / forum / skins / default / templates / node / contributors_info.html

diff --git a/forum/skins/default/templates/node/contributors_info.html b/forum/skins/default/templates/node/contributors_info.html
index 54e0bbe2f0e8b6d5403f3164e78a7bfb5087dfdc..3ed461b95d51a68e31b87a8ea41f7d66164aac1a 100644 (file)
--- a/forum/skins/default/templates/node/contributors_info.html
+++ b/forum/skins/default/templates/node/contributors_info.html
@@ -1,15 +1,15 @@
 {% load extra_tags %}
 {% load extra_tags %}

-<div class='post-update-info'>
+<div class='post-update-info post-update-info-user'>

     <p style="line-height:12px;">
         {{ node_verb }}
         <strong>{% diff_date node.added_at %}</strong>
     </p>
     {% gravatar node.author 32 %}
     <p style="line-height:12px;">
         {{ node_verb }}
         <strong>{% diff_date node.added_at %}</strong>
     </p>
     {% gravatar node.author 32 %}

-    <p><a href="{{ node.author.get_profile_url }}">{{ node.author.username }}</a><br/>
+    <p><a {% if node.author.is_suspended %}class="suspended-user" {% endif %}href="{{ node.author.get_profile_url }}">{{ node.author.decorated_name }}</a><br/>

     {% get_score_badge node.author %}</p>
 </div>
 {% if node.last_edited %}
     {% get_score_badge node.author %}</p>
 </div>
 {% if node.last_edited %}

-    <div class='post-update-info'>
+    <div class='post-update-info post-update-info-edited'>

         <p style="line-height:12px;">
             <a href="{{ node.get_revisions_url }}">
                 {{ node.last_edited.verb }}
         <p style="line-height:12px;">
             <a href="{{ node.get_revisions_url }}">
                 {{ node.last_edited.verb }}


@@ -18,7 +18,7 @@
         </p>
         {% ifnotequal node.author node.last_edited.by %}
             {% gravatar node.last_edited.by 32 %}
         </p>
         {% ifnotequal node.author node.last_edited.by %}
             {% gravatar node.last_edited.by 32 %}

-            <p><a href="{{ node.last_edited.by.get_profile_url }}">{{ node.last_edited.by.username }}</a><br/>
+            <p><a {% if node.last_edited.by.is_suspended %}class="suspended-user" {% endif %}href="{{ node.last_edited.by.get_profile_url }}">{{ node.last_edited.by.decorated_name }}</a><br/>

             {% get_score_badge node.last_edited.by %}</p>
         {% endifnotequal %}
     </div>
             {% get_score_badge node.last_edited.by %}</p>
         {% endifnotequal %}
     </div>