Fixes OSQA-663, the user.username property should pass through the smart_unicode...

[osqa.git] / forum / skins / default / templates / user.html

diff --git a/forum/skins/default/templates/user.html b/forum/skins/default/templates/user.html
index c1998f82060582153f94679165e25a7b17e8f8b1..61c63a0d3cb6dac88fb9c9b432153380ea32fe24 100644 (file)
--- a/forum/skins/default/templates/user.html
+++ b/forum/skins/default/templates/user.html
@@ -3,6 +3,8 @@
 {% load extra_tags %}
 {% load extra_filters %}
 {% load humanize %}
 {% load extra_tags %}
 {% load extra_filters %}
 {% load humanize %}

+{% load smart_if %}
+

 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
 {% block forestyle%}
     <style type="text/css">
 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
 {% block forestyle%}
     <style type="text/css">


@@ -11,35 +13,25 @@
        </style>
 {% endblock %}
 {% block forejs %}
        </style>
 {% endblock %}
 {% block forejs %}

-    {% if request.user.is_superuser %}
-        <script type='text/javascript' src='{% media  "/media/js/jquery.form.js" %}'></script>
+    {% if request.user.is_superuser or request.user == view_user %}
+        <script type="text/javascript">google.load("jquery", "1.4.2");google.load("jqueryui", "1.8.1");</script>
+        <script type="text/javascript">
+            response_commands['update_profile_karma'] = function(new_karma) {
+                $('#user-reputation').css('background', 'yellow');
+                $('#user-reputation').html(new_karma);
+                $('#user-reputation').animate({ backgroundColor: "transparent" }, 1000);
+            }
+        </script>
+        <link rel="stylesheet" href="http://jquery-ui.googlecode.com/svn/tags/latest/themes/base/jquery-ui.css" type="text/css" media="all" />
+        <link rel="stylesheet" href="http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css" type="text/css" media="all" />
+        <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/user.css" %}"/>

     {% endif %}
     {% endif %}

-    <script type="text/javascript">
-        var viewUserID = {{view_user.id}};
-        $().ready(function(){
-            {% ifequal view_user request.user%}
-                $("#nav_profile").attr('className',"on");
-            {% else %}
-                $("#nav_users").attr('className',"on");
-            {% endifequal %}
-        });
-
-        $(document).ready( function(){
-            var options = {
-                           success: function(a,b){$('.admin #action_status').html($.i18n._('changes saved'));},
-                           dataType:'json',
-                           timeout:5000,
-                           url: scriptUrl + $.i18n._('moderate-user/') + viewUserID +  '/'
-                            };
-            var form = $('.admin #moderate_user_form').ajaxForm(options);
-            var box = $('.admin input#id_is_approved').click(function(){
-                $('.admin #action_status').html($.i18n._('sending data...'));
-                form.ajaxSubmit(options);
-            });
-        });
-    </script>
-    {% block userjs %}
-    {% endblock %}
+    <style type="text/css">
+        #room {
+            border: 0;
+        }
+    </style>
+    {% block userjs %}{% endblock %}

 {% endblock %}
 {% block content %}
     <div id="mainbar-full">
 {% endblock %}
 {% block content %}
     <div id="mainbar-full">


@@ -47,6 +39,5 @@
         {% include "users/tabs.html" %}
         {% block usercontent %}
         {% endblock %}
         {% include "users/tabs.html" %}
         {% block usercontent %}
         {% endblock %}

-        {%comment%}{% include "users/footer.html" %}{%endcomment%}

        </div>
 {% endblock %}<!-- end user.html -->
        </div>
 {% endblock %}<!-- end user.html -->