From 31bb7213f549a031fc9721ea3d06379dce25dceb Mon Sep 17 00:00:00 2001 From: fuzzylogic2000 Date: Fri, 20 Oct 2017 15:12:45 +0200 Subject: [PATCH 1/3] add link to userprofile to co-worker edit --- advocate_europe/assets/scss/components/_userpicker.scss | 5 +++++ .../templates/bootstrap3/user_checkboxselectmultiple.html | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/advocate_europe/assets/scss/components/_userpicker.scss b/advocate_europe/assets/scss/components/_userpicker.scss index ebb754250..736159b4d 100644 --- 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 index aa6f4394f..72d4daa75 100644 --- a/advocate_europe/templates/bootstrap3/user_checkboxselectmultiple.html +++ b/advocate_europe/templates/bootstrap3/user_checkboxselectmultiple.html @@ -19,7 +19,13 @@ {% if user.avatar %} {% endif %} - {{ user.username|unlocalize }} + + {% if not user.detail %} + {{ user.username|unlocalize }} + {% else %} + {{ user.username|unlocalize }} + {% endif %} + {% if user.detail %} {{ user.detail|unlocalize }} {% endif %} From 1ab78dafbcc86c9c50edb933c393a28c2873b167 Mon Sep 17 00:00:00 2001 From: fuzzylogic2000 Date: Fri, 20 Oct 2017 15:21:10 +0200 Subject: [PATCH 2/3] add indicator to co-worker self --- .../templates/bootstrap3/user_checkboxselectmultiple.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/advocate_europe/templates/bootstrap3/user_checkboxselectmultiple.html b/advocate_europe/templates/bootstrap3/user_checkboxselectmultiple.html index 72d4daa75..0f239f9a0 100644 --- a/advocate_europe/templates/bootstrap3/user_checkboxselectmultiple.html +++ b/advocate_europe/templates/bootstrap3/user_checkboxselectmultiple.html @@ -28,6 +28,8 @@ {% if user.detail %} {{ user.detail|unlocalize }} + {% elif user.username == request.user.username %} + This is you! {% endif %} From b98a527fc6ae2efd9e52d0caafc696b4b94a8bf5 Mon Sep 17 00:00:00 2001 From: fuzzylogic2000 Date: Fri, 20 Oct 2017 15:32:08 +0200 Subject: [PATCH 3/3] change checked/unchecked text for co-worker self --- .../templates/bootstrap3/user_checkboxselectmultiple.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/advocate_europe/templates/bootstrap3/user_checkboxselectmultiple.html b/advocate_europe/templates/bootstrap3/user_checkboxselectmultiple.html index 0f239f9a0..a034c885b 100644 --- a/advocate_europe/templates/bootstrap3/user_checkboxselectmultiple.html +++ b/advocate_europe/templates/bootstrap3/user_checkboxselectmultiple.html @@ -31,8 +31,13 @@ {% elif user.username == request.user.username %} This is you! {% endif %} + {% if user.username == request.user.username %} + + + {% else %} + {% endif %} {% if not inline_class %}{% endif %}