diff options
author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-15 23:18:02 -0600 |
---|---|---|
committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-15 23:18:02 -0600 |
commit | 1e7bd132df5f56f397b555c7481a635c9d66a56a (patch) | |
tree | 54aac7789eb445d3d01eaea36f2956e386bb0086 /forum/skins/default/templates/user.html | |
parent | d276802efa5899ccb568de1b4c445d54ea72c42d (diff) | |
parent | 89131389eb631456a0bdaa3a705488d43d0ced9b (diff) | |
download | askbot-1e7bd132df5f56f397b555c7481a635c9d66a56a.tar.gz askbot-1e7bd132df5f56f397b555c7481a635c9d66a56a.tar.bz2 askbot-1e7bd132df5f56f397b555c7481a635c9d66a56a.zip |
Merge commit 'osqa/master'
Conflicts:
forum/skins/default/media/js/wmd/wmd.js
forum/skins/default/templates/base.html
forum/skins/default/templates/base_content.html
forum/views.py
locale/en/LC_MESSAGES/django.mo
locale/en/LC_MESSAGES/django.po
settings_local.py.dist
Diffstat (limited to 'forum/skins/default/templates/user.html')
-rw-r--r-- | forum/skins/default/templates/user.html | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/forum/skins/default/templates/user.html b/forum/skins/default/templates/user.html new file mode 100644 index 00000000..5931f31c --- /dev/null +++ b/forum/skins/default/templates/user.html @@ -0,0 +1,39 @@ +{% extends "base_content.html" %} +<!-- user.html --> +{% load extra_tags %} +{% load extra_filters %} +{% load humanize %} +{% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %} +{% block forestyle%} + <style type="text/css"> + .history-table td { padding: 5px; } + .user-stats-table { margin-left:50px; } + </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> + {% 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"> + {% include "user_info.html" %} + {% include "user_tabs.html" %} + {% block usercontent %} + {% endblock %} + {%comment%}{% include "user_footer.html" %}{%endcomment%} + </div> +{% endblock %}<!-- end user.html --> |