diff options
author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
---|---|---|
committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
commit | 8de2b9131ddcef647799cf8e1e79921284523073 (patch) | |
tree | 81e17d84530990e35a0accba3a7886266a601482 /templates/user.html | |
parent | 7e95e6481d1e81e43d4b442cbcf3fe37f20d89cc (diff) | |
parent | 9d1fb9890b97beb55461ca34f9757bc685461130 (diff) | |
download | askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.gz askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.bz2 askbot-8de2b9131ddcef647799cf8e1e79921284523073.zip |
Merge branch 'evgenyfadeev/master'
Conflicts:
.gitignore
INSTALL
TODO
cnprog.wsgi
django_authopenid/urls.py
django_authopenid/views.py
drop-all-tables.sh
forum/auth.py
forum/managers.py
forum/models.py
forum/templatetags/extra_tags.py
forum/views.py
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
settings.py
settings_local.py.dist
sql_scripts/update_2009_01_25_001.sql
sql_scripts/update_2009_02_26_001.sql
sql_scripts/update_2009_04_10_001.sql
templates/authopenid/confirm_email.txt
templates/authopenid/sendpw_email.txt
templates/content/js/compress.bat
templates/content/js/flot-build.bat
templates/content/style/style.css
templates/footer.html
templates/question.html
templates/user_reputation.html
templates/user_stats.html
templates/user_votes.html
templates/users_questions.html
urls.py
Diffstat (limited to 'templates/user.html')
-rw-r--r-- | templates/user.html | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/templates/user.html b/templates/user.html index efca80e6..6e4098e9 100644 --- a/templates/user.html +++ b/templates/user.html @@ -1,6 +1,7 @@ {% extends "base_content.html" %} <!-- user.html --> {% load extra_tags %} +{% load extra_filters %} {% load humanize %} {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %} {% block forestyle%} @@ -10,17 +11,22 @@ </style> {% endblock %} {% block forejs %} - <script type="text/javascript"> - $().ready(function(){ - {% ifequal view_user request.user%} - $("#nav_profile").attr('className',"on"); - {% else %} - $("#nav_users").attr('className',"on"); - {% endifequal %} - }); - </script> - {% block userjs %} - {% endblock %} + {% if request.user|can_moderate_users %} + <script type='text/javascript' src='{% href "/content/js/com.cnprog.admin.js" %}'></script> + <script type='text/javascript' src='{% href "/content/js/jquery.form.js" %}'></script> + {% 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 %} {% endblock %} {% block content %} <div id="mainbar-full"> @@ -28,6 +34,6 @@ {% include "user_tabs.html" %} {% block usercontent %} {% endblock %} - {% include "user_footer.html" %} + {%comment%}{% include "user_footer.html" %}{%endcomment%} </div> {% endblock %}<!-- end user.html --> |