0001-contacts-display-user-roles-in-contact-zone-12630.patch
welco/contacts/templates/contacts/contact_detail_fragment.html | ||
---|---|---|
2 | 2 |
<div class="contact"> |
3 | 3 |
<input type="hidden" id="current-selected-user" name="current-selected-user" value="{{user_id}}"/> |
4 | 4 |
<h3>{{user_display_name}}</h3> |
5 |
<ul> |
|
5 | 6 |
{% if user_var_address or user_var_city %} |
6 |
<p>{{user_var_address}} / {{user_var_zipcode}} {{user_var_city}}</p>
|
|
7 |
<li>{% trans 'Address:' %} {{user_var_address}} / {{user_var_zipcode}} {{user_var_city}}</li>
|
|
7 | 8 |
{% endif %} |
8 |
{% if user_var_phone or user_var_mobile or user_var_email %} |
|
9 |
<p> |
|
10 |
{% if user_var_phone %}{% trans 'Phone:' %} {{user_var_phone}}{% endif %} |
|
11 |
{% if user_var_mobile %}{% trans 'Mobile:' %} {{user_var_mobile}}{% endif %} |
|
12 |
{% if user_var_email %}{% trans 'Email:' %} {{user_var_email}}{% endif %} |
|
13 |
</p> |
|
9 |
{% if user_var_phone %}<li>{% trans 'Phone:' %} {{user_var_phone}}</li>{% endif %} |
|
10 |
{% if user_var_mobile %}<li>{% trans 'Mobile:' %} {{user_var_mobile}}</li>{% endif %} |
|
11 |
{% if user_var_email %}<li>{% trans 'Email:' %} {{user_var_email}}</li>{% endif %} |
|
12 |
{% if user_roles %} |
|
13 |
<li>{% trans 'Roles:' %} {% for role in user_roles %}{{ role.text }}{% if not forloop.last %}, {% endif %}{% endfor %}</li> |
|
14 | 14 |
{% endif %} |
15 |
</ul> |
|
15 | 16 | |
16 | 17 |
{% if forms %} |
17 | 18 |
<ul class="formdatas"> |
welco/contacts/views.py | ||
---|---|---|
86 | 86 |
more = [user.get('user_var_address'), user.get('user_var_phone'), |
87 | 87 |
user.get('user_var_birthdate'), user.get('user_var_email')] |
88 | 88 |
user['more'] = ' / '.join([x for x in more if x]) |
89 |
if user.get('user_roles'): |
|
90 |
user['roles'] = ' / '.join([r['text'] for r in user['user_roles']]) |
|
89 | 91 |
user['slug'] = 'user-%s' % user['user_id'] |
90 | 92 |
else: |
91 | 93 |
result = {'data': []} |
welco/static/css/style.css | ||
---|---|---|
251 | 251 |
color: #3c3c33; |
252 | 252 |
} |
253 | 253 | |
254 |
ul.result li a span.roles, |
|
254 | 255 |
ul.result li a span.more { |
255 | 256 |
display: block; |
256 | 257 |
color: #666; |
welco/static/js/welco.js | ||
---|---|---|
298 | 298 |
if (elem.more) { |
299 | 299 |
new_elem = new_elem + ' <span class="more">' + elem.more + '</span>'; |
300 | 300 |
} |
301 |
if (elem.roles) { |
|
302 |
new_elem = new_elem + ' <span class="roles">' + elem.roles + '</span>'; |
|
303 |
} |
|
301 | 304 |
new_elem = new_elem + '</a></li>' |
302 | 305 |
$(new_elem).appendTo(search_result_ul); |
303 | 306 |
}); |
304 |
- |