equal
deleted
inserted
replaced
66 <td><input type="checkbox" class="user_check" name="check-{{ user.get_profile.key }}"/></td> |
66 <td><input type="checkbox" class="user_check" name="check-{{ user.get_profile.key }}"/></td> |
67 <td> |
67 <td> |
68 {% include "site/macros/user_actions.html" %} |
68 {% include "site/macros/user_actions.html" %} |
69 </td> |
69 </td> |
70 <td> |
70 <td> |
71 {% if userrole.role and user.get_profile.global_role %}<a class="tip" href="#" title="{% blocktrans with userrole.role.name_i18n as rolename %}This role has been overriden on this text by a local role: {{ rolename }}{% endblocktrans %}">{% endif %} |
71 {% if userrole.role and user.get_profile.global_userrole.role %}<a class="tip" href="#" title="{% blocktrans with userrole.role.name_i18n as rolename %}This role has been overriden on this text by a local role: {{ rolename }}{% endblocktrans %}">{% endif %} |
72 |
72 |
73 <span {% if userrole.role %}class="non_active"{% endif %}> |
73 <span {% if userrole.role %}class="non_active"{% endif %}> |
74 {% if user.get_profile.global_role %}{{ user.get_profile.global_role.name_i18n}}{% else %}-{% endif %} |
74 {% if user.get_profile.global_userrole.role %}{{ user.get_profile.global_userrole.role.name_i18n}}{% else %}-{% endif %} |
75 </span> |
75 </span> |
76 |
76 |
77 {% if userrole.role and user.get_profile.global_role %}</a>{% endif %} |
77 {% if userrole.role and user.get_profile.global_userrole.role %}</a>{% endif %} |
78 </td> |
78 </td> |
79 <td> |
79 <td> |
80 <select name="user-role-{{ user.get_profile.key }}" {% ifequal user request.user %}disabled="disabled"{% endifequal %}> |
80 <select name="user-role-{{ user.get_profile.key }}" {% ifequal user request.user %}disabled="disabled"{% endifequal %}> |
81 <option {% if userrole.role %}{% else %}selected="selected"{% endif %} value="">---------</option> |
81 <option {% if userrole.role %}{% else %}selected="selected"{% endif %} value="">---------</option> |
82 {% for role in all_roles %} |
82 {% for role in all_roles %} |