removing the edit_user_email_feeds_form.html file, revision 695

[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 5ff0d80946f27c86bbecbc2dfe28e0dde9f98e84..ec852cc3896fea4a62387a63522d753bd89c69b4 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 smart_if %}
+
 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
 {% block forestyle%}
     <style type="text/css">
@@ -11,21 +13,21 @@
        </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 %}
-    <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 %}
-        });
-    </script>
-    {% block userjs %}
-    {% endblock %}
+    {% block userjs %}{% endblock %}
 {% endblock %}
 {% block content %}
     <div id="mainbar-full">
@@ -33,6 +35,5 @@
         {% include "users/tabs.html" %}
         {% block usercontent %}
         {% endblock %}
-        {%comment%}{% include "users/footer.html" %}{%endcomment%}
        </div>
 {% endblock %}<!-- end user.html -->