From f22785dbcde42e425c9ead209ec224aef6e11c16 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Wed, 5 Feb 2020 19:47:08 +0200
Subject: - Fix adding comments. - Added some working layout changes from
 https://github.com/wekan/wekan/pull/2920. - Fixed Card Settings not working
 at Sandstorm.

Thanks to 2020product xet7 !

Closes #2918,
closes https://github.com/wekan/wekan/pull/2920
---
 client/components/activities/activities.styl |  2 +-
 client/components/activities/comments.styl   | 20 ++++++++++++++++++++
 client/components/cards/cardDetails.jade     | 25 +++++++++++--------------
 client/components/sidebar/sidebar.jade       | 12 ++++++------
 4 files changed, 38 insertions(+), 21 deletions(-)

(limited to 'client/components')

diff --git a/client/components/activities/activities.styl b/client/components/activities/activities.styl
index 380e7b40..f3b1acdd 100644
--- a/client/components/activities/activities.styl
+++ b/client/components/activities/activities.styl
@@ -9,7 +9,7 @@
   clear: both
 
   .activity
-    margin: 10px 0
+    margin: 0.5px 0
     display: flex
 
     .member
diff --git a/client/components/activities/comments.styl b/client/components/activities/comments.styl
index 22f9c482..ccf24b72 100644
--- a/client/components/activities/comments.styl
+++ b/client/components/activities/comments.styl
@@ -46,3 +46,23 @@
 
     &:is-open
       cursor: auto
+
+.comment-item
+  background-color: #fff
+  border: 0
+  box-shadow: 0 1px 2px rgba(0, 0, 0, .23)
+  color: #8c8c8c
+  height: 36px
+  margin: 4px 4px 6px 0
+  width: 92%
+
+  &:hover
+    background: darken(white, 12%)
+
+  &.add-comment
+    display: flex
+    margin: 5px
+
+    a
+      display: block
+      margin: auto
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 41ab8ca2..7a6ca7cf 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -9,7 +9,10 @@ template(name="cardDetails")
           if currentUser.isBoardMember
             a.fa.fa-navicon.card-details-menu.js-open-card-details-menu
             input.inline-input(type="hidden" id="cardURL_copy" value="{{ absoluteUrl }}")
-            a.fa.fa-link.card-copy-button.js-copy-link
+            a.fa.card-copy-button.js-copy-link(
+              class="fa-link"
+              title="{{_ 'copy-card-link-to-clipboard'}}"
+            )
         if isMiniScreen
           a.fa.fa-times-thin.close-card-details-mobile-web.js-close-card-details
           if currentUser.isBoardMember
@@ -157,9 +160,9 @@ template(name="cardDetails")
     //- XXX We should use "editable" to avoid repetiting ourselves
     if canModifyCard
       unless currentUser.isWorker
-        //h3
-        //  i.fa.fa-align-left
-        //  card-details-item-title {{_ 'description'}}
+        h3
+          i.fa.fa-align-left
+          card-details-item-title {{_ 'description'}}
         +inlinedCardDescription(classNames="card-description js-card-description")
           +editor(autofocus=true)
             | {{getUnsavedValue 'cardDescription' _id getDescription}}
@@ -167,16 +170,16 @@ template(name="cardDetails")
             button.primary(type="submit") {{_ 'save'}}
             a.fa.fa-times-thin.js-close-inlined-form
         else
-          a.description-item.add-description.js-open-inlined-form
+          a.js-open-inlined-form
             if getDescription
               +viewer
                 = getDescription
             else
-              | {{_ 'addmore-detail'}}
+              | {{_ 'edit'}}
           if (hasUnsavedValue 'cardDescription' _id)
             p.quiet
               | {{_ 'unsaved-description'}}
-              a.description-item.add-description.js-open-inlined-form {{_ 'view-it'}}
+              a.js-open-inlined-form {{_ 'view-it'}}
               = ' - '
               a.js-close-inlined-form {{_ 'discard'}}
     else if getDescription
@@ -257,13 +260,7 @@ template(name="cardDetails")
     if currentBoard.allowsComments
       if currentUser.isBoardMember
         unless currentUser.isNoComments
-          if canModifyCard
-            +inlinedForm(autoclose=false classNames="js-new-comment-form")
-              +commentForm
-            else
-              +userAvatar(userId=currentUser._id)
-              a.comment-item.add-comment.js-open-inlined-form
-                | {{_ 'Write Comment'}}
+          +commentForm
     unless currentUser.isNoComments
       if isLoaded.get
         if isLinkedCard
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade
index fe0810a5..51b09d72 100644
--- a/client/components/sidebar/sidebar.jade
+++ b/client/components/sidebar/sidebar.jade
@@ -321,15 +321,15 @@ template(name="boardMenuPopup")
     hr
     ul.pop-over-list
       li
-        a.js-subtask-settings
-          i.fa.fa-sitemap
-          | {{_ 'subtask-settings'}}
+        a.js-card-settings
+          i.fa.fa-id-card-o
+          | {{_ 'card-settings'}}
     hr
     ul.pop-over-list
       li
-        a.js-Date-settings
-          i.fa.fa-calendar
-          | {{_ 'Date-settings'}}
+        a.js-subtask-settings
+          i.fa.fa-sitemap
+          | {{_ 'subtask-settings'}}
 
 template(name="labelsWidget")
   .board-widget.board-widget-labels
-- 
cgit v1.2.3-1-g7c22