Merging the experimental branch back to trunk.

[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 690fc7e35d07d43b0ee98feaad99c8e2b8b9bc03..a8b2175621b7d2cd7dfe5218f47a6a95ef04a8f2 100644 (file)
--- a/forum/skins/default/templates/users/info.html
+++ b/forum/skins/default/templates/users/info.html
@@ -4,6 +4,7 @@
 {% load humanize %}
 {% load smart_if %}
 {% load i18n %}
 {% load humanize %}
 {% load smart_if %}
 {% load i18n %}

+{% load user_tags %}

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


@@ -28,12 +29,8 @@
             <table class="user-details">
                 {% if view_user != request.user and request.user.is_superuser %}
                 <tr>
             <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 class="moderation" align="left" colspan="2">
+                        {% comment %}{% user_moderation request.user view_user %}{% endcomment %}

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


@@ -82,8 +79,10 @@
                 {% if view_user.date_of_birth%}
                 <tr>
                                        <!--todo  - redo this with blocktrans -->
                 {% if view_user.date_of_birth%}
                 <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 %}
                 {% if request.user.is_superuser %}
                 </tr>
                 {% endif %}
                 {% if request.user.is_superuser %}