- 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

1 files changed, 11 insertions, 14 deletions

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