Merge pull request #551 from liqd/ka-2017-10-link-co-workers-in-edit

Ka 2017 10 link co workers in edit
liqd · Oct 23, 2017 · 6d29b67 · 6d29b67
2 parents 681a41a + b98a527
commit 6d29b67
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/advocate_europe/assets/scss/components/_userpicker.scss b/advocate_europe/assets/scss/components/_userpicker.scss
@@ -31,6 +31,11 @@
  padding-left: rem(6px);
  font-size: rem(14px);
  font-weight: $demibold;
+
+ a {
+ color: $gray-dark;
+ text-decoration: none;
+ }
  }
 
  &-label-detail {

diff --git a/advocate_europe/templates/bootstrap3/user_checkboxselectmultiple.html b/advocate_europe/templates/bootstrap3/user_checkboxselectmultiple.html
@@ -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 %}