X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/a9eef437702d5df7a2f97010e6798c689371808c..832ab5f1709152367418016e453dc8142a7ac476:/forum/skins/default/templates/user.html?ds=sidebyside

diff --git a/forum/skins/default/templates/user.html b/forum/skins/default/templates/user.html
index 5931f31..89fd69f 100644
--- 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,9 +13,13 @@
 	</style>
 {% endblock %}
 {% block forejs %}
-    {% if request.user|can_moderate_users %}
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.admin.js" %}'></script>
-        <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 src="{% media "/media/js/osqa.user.js" %}" type="text/javascript"></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}};
@@ -23,17 +29,17 @@
             {% else %}
                 $("#nav_users").attr('className',"on");
             {% endifequal %}
-        }); 
+        });
     </script>
     {% block userjs %}
     {% endblock %}
 {% endblock %}
 {% block content %}
     <div id="mainbar-full">
-        {% include "user_info.html" %}
-        {% include "user_tabs.html" %}
+        {% include "users/info.html" %}
+        {% include "users/tabs.html" %}
         {% block usercontent %}
         {% endblock %}
-        {%comment%}{% include "user_footer.html" %}{%endcomment%}
+        {%comment%}{% include "users/footer.html" %}{%endcomment%}
 	</div>
 {% endblock %}<!-- end user.html -->