Skip to content
This repository has been archived by the owner on May 5, 2021. It is now read-only.

Ka 2017 10 link co workers in edit #551

Merged
merged 3 commits into from
Oct 23, 2017
Merged

Ka 2017 10 link co workers in edit #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31bb721
add link to userprofile to co-worker edit
fuzzylogic2000 Oct 20, 2017
1ab78da
add indicator to co-worker self
fuzzylogic2000 Oct 20, 2017
b98a527
change checked/unchecked text for co-worker self
fuzzylogic2000 Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions advocate_europe/assets/scss/components/_userpicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@
padding-left: rem(6px);
font-size: rem(14px);
font-weight: $demibold;

a {
color: $gray-dark;
text-decoration: none;
}
}

&-label-detail {
Expand Down
15 changes: 14 additions & 1 deletion advocate_europe/templates/bootstrap3/user_checkboxselectmultiple.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,25 @@
{% if user.avatar %}
<span class="avatar-round-small" style="background-image: url({{ user.avatar }});"></span>
{% endif %}
<span class="user-picker-label-text">{{ user.username|unlocalize }}</span>
<span class="user-picker-label-text">
{% if not user.detail %}
<a href="{% url 'profile' user.username %}">{{ user.username|unlocalize }}</a>
{% else %}
{{ user.username|unlocalize }}
{% endif %}
</span>
{% if user.detail %}
<span class="user-picker-label-text user-picker-label-detail">{{ user.detail|unlocalize }}</span>
{% elif user.username == request.user.username %}
<span class="user-picker-label-text user-picker-label-detail">This is you!</span>
{% endif %}
{% if user.username == request.user.username %}
<div class="user-picker-cta user-picker-cta-checked btn-link">Leave team</div>
<div class="user-picker-cta user-picker-cta-unchecked btn-link">You will be removed on save</div>
{% else %}
<div class="user-picker-cta user-picker-cta-checked btn-link">{{ user.cta_checked }}</div>
<div class="user-picker-cta user-picker-cta-unchecked btn-link">{{ user.cta_unchecked }}</div>
{% endif %}
</div>
</label>
{% if not inline_class %}</div>{% endif %}
Expand Down