Răsfoiți Sursa

Fix missing maximize card.

Thanks to xet7 !
Lauri Ojansivu 1 an în urmă
părinte
comite
f10f80f655

+ 1 - 5
client/components/cards/attachments.jade

@@ -51,11 +51,7 @@ template(name="attachmentGallery")
 
 
   .attachment-gallery
   .attachment-gallery
 
 
-    if currentUser.isAdmin
-      a.attachment-item.add-attachment.js-add-attachment
-        i.fa.fa-plus.icon
-
-    if currentUser.isNormal
+    if canModifyCard
       a.attachment-item.add-attachment.js-add-attachment
       a.attachment-item.add-attachment.js-add-attachment
         i.fa.fa-plus.icon
         i.fa.fa-plus.icon
 
 

+ 3 - 18
client/components/cards/cardDetails.jade

@@ -13,27 +13,12 @@ template(name="cardDetails")
         unless isMiniScreen
         unless isMiniScreen
           unless isPopup
           unless isPopup
             a.fa.fa-times-thin.close-card-details.js-close-card-details(title="{{_ 'close-card'}}")
             a.fa.fa-times-thin.close-card-details.js-close-card-details(title="{{_ 'close-card'}}")
-            if isAdmin
-              if cardMaximized
-                a.fa.fa-window-minimize.minimize-card-details.js-minimize-card-details(title="{{_ 'minimize-card'}}")
-              else
-                a.fa.fa-window-maximize.maximize-card-details.js-maximize-card-details(title="{{_ 'maximize-card'}}")
-            if isNormal
-              if cardMaximized
-                a.fa.fa-window-minimize.minimize-card-details.js-minimize-card-details(title="{{_ 'minimize-card'}}")
-              else
-                a.fa.fa-window-maximize.maximize-card-details.js-maximize-card-details(title="{{_ 'maximize-card'}}")
-            if isWorker
-              if cardMaximized
-                a.fa.fa-window-minimize.minimize-card-details.js-minimize-card-details(title="{{_ 'minimize-card'}}")
-              else
-                a.fa.fa-window-maximize.maximize-card-details.js-maximize-card-details(title="{{_ 'maximize-card'}}")
-            if isNoComments
+            if canModifyCard
               if cardMaximized
               if cardMaximized
                 a.fa.fa-window-minimize.minimize-card-details.js-minimize-card-details(title="{{_ 'minimize-card'}}")
                 a.fa.fa-window-minimize.minimize-card-details.js-minimize-card-details(title="{{_ 'minimize-card'}}")
               else
               else
                 a.fa.fa-window-maximize.maximize-card-details.js-maximize-card-details(title="{{_ 'maximize-card'}}")
                 a.fa.fa-window-maximize.maximize-card-details.js-maximize-card-details(title="{{_ 'maximize-card'}}")
-          if currentUser.isBoardMember
+          if canModifyCard
             a.fa.fa-navicon.card-details-menu.js-open-card-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
             a.fa.fa-navicon.card-details-menu.js-open-card-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
             a.fa.fa-link.card-copy-button.js-copy-link(
             a.fa.fa-link.card-copy-button.js-copy-link(
               id="cardURL_copy"
               id="cardURL_copy"
@@ -45,7 +30,7 @@ template(name="cardDetails")
         else
         else
           unless isPopup
           unless isPopup
             a.fa.fa-times-thin.close-card-details.js-close-card-details(title="{{_ 'close-card'}}")
             a.fa.fa-times-thin.close-card-details.js-close-card-details(title="{{_ 'close-card'}}")
-          if currentUser.isBoardMember
+          if canModifyCard
             a.fa.fa-navicon.card-details-menu-mobile-web.js-open-card-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
             a.fa.fa-navicon.card-details-menu-mobile-web.js-open-card-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
             a.fa.fa-link.card-copy-mobile-button.js-copy-link(
             a.fa.fa-link.card-copy-mobile-button.js-copy-link(
               id="cardURL_copy"
               id="cardURL_copy"

+ 3 - 11
client/components/cards/minicard.jade

@@ -3,14 +3,7 @@ template(name="minicard")
     class="{{#if isLinkedCard}}linked-card{{/if}}"
     class="{{#if isLinkedCard}}linked-card{{/if}}"
     class="{{#if isLinkedBoard}}linked-board{{/if}}"
     class="{{#if isLinkedBoard}}linked-board{{/if}}"
     class="{{#if colorClass}}minicard-{{colorClass}}{{/if}}")
     class="{{#if colorClass}}minicard-{{colorClass}}{{/if}}")
-    if currentUser.isAdmin
-      if isTouchScreenOrShowDesktopDragHandles
-        a.fa.fa-navicon.minicard-details-menu-with-handle.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
-        .handle
-          .fa.fa-arrows
-      else
-        a.fa.fa-navicon.minicard-details-menu.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
-    if currentUser.isNormal
+    if canModifyCard
       if isTouchScreenOrShowDesktopDragHandles
       if isTouchScreenOrShowDesktopDragHandles
         a.fa.fa-navicon.minicard-details-menu-with-handle.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
         a.fa.fa-navicon.minicard-details-menu-with-handle.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
         .handle
         .handle
@@ -142,7 +135,7 @@ template(name="minicard")
         +userAvatar(userId=this.userId noRemove=true)
         +userAvatar(userId=this.userId noRemove=true)
 
 
     .badges
     .badges
-      unless currentUser.isNoComments
+      if canModifyCard
         if comments.length
         if comments.length
           .badge(title="{{_ 'card-comments-title' comments.length }}")
           .badge(title="{{_ 'card-comments-title' comments.length }}")
             span.badge-icon.fa.fa-comment-o.badge-comment.badge-text
             span.badge-icon.fa.fa-comment-o.badge-comment.badge-text
@@ -197,12 +190,11 @@ template(name="editCardSortOrderPopup")
 
 
 template(name="minicardDetailsActionsPopup")
 template(name="minicardDetailsActionsPopup")
   ul.pop-over-list
   ul.pop-over-list
-    if currentUser.isBoardAdmin
+    if canModifyCard
       li
       li
         a.js-move-card
         a.js-move-card
           i.fa.fa-arrow-right
           i.fa.fa-arrow-right
           | {{_ 'moveCardPopup-title'}}
           | {{_ 'moveCardPopup-title'}}
-    unless currentUser.isWorker
       li
       li
         a.js-copy-card
         a.js-copy-card
           i.fa.fa-copy
           i.fa.fa-copy