Visual indication of community wiki, and made the markddown_help use base_content...

[osqa.git] / forum / skins / default / templates / users / info.html

diff --git a/forum/skins/default/templates/users/info.html b/forum/skins/default/templates/users/info.html
index fb6fcde2ad2751e04b579668b020309e5d88e2f7..efe2b43822f03f5a24f8655f43085cda30ee32d2 100644 (file)
--- a/forum/skins/default/templates/users/info.html
+++ b/forum/skins/default/templates/users/info.html
@@ -4,6 +4,9 @@
 {% load humanize %}
 {% load smart_if %}
 {% load i18n %}
 {% load humanize %}
 {% load smart_if %}
 {% load i18n %}

+{% load markup %}
+{% load user_tags %}
+

 <div id="subheader" class="headUser">
     {{view_user.username}}
 </div>
 <div id="subheader" class="headUser">
     {{view_user.username}}
 </div>


@@ -18,36 +21,15 @@
                 </tr>
                 <tr>
                     <td align="center">
                 </tr>
                 <tr>
                     <td align="center">

-                        <div class="scoreNumber">{{view_user.reputation|intcomma}}</div>
+                        <div class="scoreNumber" id="user-reputation">{{view_user.reputation|intcomma}}</div>

                         <p><b style="color:#777;">{% trans "reputation" %}</b></p>
                     </td>
                 </tr>
             </table>
         </td>
         <td width="360" style="vertical-align: top;">
                         <p><b style="color:#777;">{% trans "reputation" %}</b></p>
                     </td>
                 </tr>
             </table>
         </td>
         <td width="360" style="vertical-align: top;">

+        {% if can_view_private %}{% user_menu request.user view_user %}{% endif %}

             <table class="user-details">
             <table class="user-details">

-                {% if view_user != request.user and request.user.is_superuser %}
-                <tr>
-                    <td class="admin" align="left" colspan="2">
-                        <h3>{% trans "Moderate this user" %}</h3>
-                        <form id="moderate_user_form" method="post">
-                            {{moderate_user_form.as_p}}
-                        </form>
-                        <p id="action_status"></p>
-                    </td>
-                </tr>
-                {% endif %}
-                {% ifequal request.user view_user %}
-                <tr>
-                    <td class="user-profile-tool-links" align="left" colspan="2">
-                        {% joinitems using ' | ' %}
-                            <span class="user-edit-link"><a href="{% url users %}{{ view_user.id }}/{% trans "edit/" %}">{% trans "update profile" %}</a></span>
-                        {% separator %}
-                            <a href="{% url user_authsettings %}">authentication settings</a>
-                        {% endjoinitems %}
-                    </td>
-                </tr>  
-                {% endifequal %}

                 <tr>
                     <th colspan="2" align="left"><h3>{% trans "Registered user" %}</h3></th>
                 </tr>
                 <tr>
                     <th colspan="2" align="left"><h3>{% trans "Registered user" %}</h3></th>
                 </tr>


@@ -83,8 +65,8 @@
                 <tr>
                                        <!--todo  - redo this with blocktrans -->
                     {% if view_user.date_of_birth.year != 1900%}
                 <tr>
                                        <!--todo  - redo this with blocktrans -->
                     {% if view_user.date_of_birth.year != 1900%}

-                        <td>{% trans "age" %}</td>
-                        <td>{% get_age view_user.date_of_birth %} {% trans "age unit" %}</td>
+                    <td>{% trans "age" %}</td>
+                    <td>{% get_age view_user.date_of_birth %} {% trans "age unit" %}</td>

                     {% endif %}
                 </tr>
                 {% endif %}
                     {% endif %}
                 </tr>
                 {% endif %}


@@ -107,7 +89,7 @@
         <td width="380">
             <div class="user-about">
             {% if view_user.about %}
         <td width="380">
             <div class="user-about">
             {% if view_user.about %}

-                {{view_user.about|safe|linebreaks}}
+                {{view_user.about|markdown}}

             {% endif %}
             </div>
         </td>
             {% endif %}
             </div>
         </td>