From 295bf68738080b29ab4930affc9a121dd8bc47c1 Mon Sep 17 00:00:00 2001 From: Zambom Date: Thu, 9 Feb 2017 13:08:00 -0200 Subject: [PATCH] Adding comment mark users --- amadeus/static/css/base/amadeus.css | 21 ++++++++++++++++++++- amadeus/static/css/themes/green.css | 6 +++++- mural/templates/mural/_form_comment.html | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- mural/templates/mural/_user_suggestions_list.html | 18 ++++++++++++++++++ mural/templates/mural/_view_comment.html | 2 +- mural/urls.py | 1 + mural/views.py | 14 +++++++++++++- 7 files changed, 178 insertions(+), 6 deletions(-) create mode 100644 mural/templates/mural/_user_suggestions_list.html diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css index 56f4ea4..458a820 100755 --- a/amadeus/static/css/base/amadeus.css +++ b/amadeus/static/css/base/amadeus.css @@ -975,7 +975,7 @@ li.item .notify_badge { .mural .post_make .panel-body { padding: 0; } -.mural .post_make .user-img, .post .post-img { +.mural .post_make .user-img, .post .post-img, .suggestions .suggested-user .user-img { padding: 0; display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */ display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */ @@ -1097,6 +1097,25 @@ li.item .notify_badge { font-size: 15px; } +#adduser_field { + margin-bottom: 0px; +} + +.suggestions { + position: absolute; + width: 100%; + z-index: 9; +} + +.suggestions .suggested-user { + padding-bottom: 5px; + padding-top: 5px; +} + +.marked_user { + font-weight: 700; +} + .btn:focus, .btn:active:focus, .btn.active:focus, .btn.focus, .btn:active.focus, .btn.active.focus { outline: none; } \ No newline at end of file diff --git a/amadeus/static/css/themes/green.css b/amadeus/static/css/themes/green.css index 24a2aef..7ce5e80 100644 --- a/amadeus/static/css/themes/green.css +++ b/amadeus/static/css/themes/green.css @@ -512,7 +512,7 @@ a.add-row { color: #1d8fe0; } -.post .post-user, .comment .comment-user { +.post .post-user, .comment .comment-user, .marked_user { color: #4caf50; } @@ -570,6 +570,10 @@ a.add-row { color: #FF0000; } +.suggestions { + background: #FFFFFF; +} + .btn:not(.btn-raised):not(.btn-link):focus, .btn:not(.btn-raised):not(.btn-link):hover, .input-group-btn .btn:not(.btn-raised):not(.btn-link):focus, .input-group-btn .btn:not(.btn-raised):not(.btn-link):hover { background-color: initial; } diff --git a/mural/templates/mural/_form_comment.html b/mural/templates/mural/_form_comment.html index 9c37af6..8c51f91 100644 --- a/mural/templates/mural/_form_comment.html +++ b/mural/templates/mural/_form_comment.html @@ -70,16 +70,87 @@ + +