summaryrefslogtreecommitdiffstats
path: root/askbot/skins/default
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-03-20 12:10:13 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-03-20 12:10:13 -0400
commit0cb6156c843686c4fbbbe1225cfa55c4c488eb89 (patch)
treed72f57991b600c7b4b42c6282edb35825cb08c3e /askbot/skins/default
parent0880dd09962294723a167dd924bedb78cc7d3660 (diff)
downloadaskbot-0cb6156c843686c4fbbbe1225cfa55c4c488eb89.tar.gz
askbot-0cb6156c843686c4fbbbe1225cfa55c4c488eb89.tar.bz2
askbot-0cb6156c843686c4fbbbe1225cfa55c4c488eb89.zip
assigning users to groups works
Diffstat (limited to 'askbot/skins/default')
-rw-r--r--askbot/skins/default/templates/macros.html2
-rw-r--r--askbot/skins/default/templates/user_profile/user.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html
index 71db477f..40293ac5 100644
--- a/askbot/skins/default/templates/macros.html
+++ b/askbot/skins/default/templates/macros.html
@@ -175,7 +175,7 @@ poor design of the data or methods on data objects #}
{%- endmacro -%}
{%- macro user_group(group) -%}
- {{ group.name }}
+ {{ group.name|replace('-', ' ') }}
{%- endmacro -%}
{# todo: remove the extra content argument to make its usage more explicit #}
diff --git a/askbot/skins/default/templates/user_profile/user.html b/askbot/skins/default/templates/user_profile/user.html
index a6fe614a..f204d338 100644
--- a/askbot/skins/default/templates/user_profile/user.html
+++ b/askbot/skins/default/templates/user_profile/user.html
@@ -24,6 +24,7 @@
askbot['data']['viewUserName'] = '{{ view_user.username }}';
askbot['data']['viewUserId'] = {{view_user.id}};
askbot['urls']['add_user_to_group'] = '{% url add_user_to_group %}';
+ askbot['urls']['get_groups_list'] = '{% url get_groups_list %}';
</script>
{% if request.user|can_moderate_user(view_user) %}
<script type='text/javascript' src='{{"/js/jquery.form.js"|media}}'></script>