Merge branch 'main' of https://github.com/walster001/wekan-atlanz

client/components/activities/activities.jade

@@ -242,5 +242,3 @@ template(name="activity")
         = ' @'
       else if(currentData.timeValue)
         | {{_ activity.activityType currentData.timeValue}}
-
-      span(title=activity.createdAt).activity-meta {{ moment activity.createdAt }}

client/components/boards/boardHeader.jade

@@ -12,8 +12,9 @@ template(name="boardHeaderBar")
       if currentBoard
         if currentUser
           with currentBoard
-            a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}" title="{{_ 'edit'}}" value=title)
-              i.fa.fa-pencil-square-o
+            if currentUser.isBoardAdmin
+              a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}" title="{{_ 'edit'}}" value=title)
+                i.fa.fa-pencil-square-o
 
           a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
             title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")

client/components/cards/cardDetails.css

@@ -272,7 +272,7 @@
     box-sizing: border-box;
     top: 97px;
     left: 0px;
-    height: calc(100% - 20px);
+    height: calc(100% - 100px);
     width: calc(100% - 20px);
     float: left;
   }

client/components/cards/cardDetails.jade

@@ -525,7 +525,7 @@ template(name="cardDetails")
                 a.fa.fa-times-thin.js-close-inlined-form
             else
               if currentBoard.allowsDescriptionText
-                a.js-open-inlined-form.right(title="{{_ 'edit'}}" value=title)
+                a.js-open-inlined-form(title="{{_ 'edit'}}" value=title)
                   i.fa.fa-pencil-square-o
                 if getDescription
                   +viewer

client/components/cards/labels.jade

@@ -37,5 +37,4 @@ template(name="cardLabelsPopup")
               = name
             if(isLabelSelected ../_id)
               i.card-label-selectable-icon.fa.fa-check
-  if currentUser.isBoardAdmin
-    a.quiet-button.full.js-add-label {{_ 'label-create'}}
+  a.quiet-button.full.js-add-label {{_ 'label-create'}}

client/components/lists/list.css

@@ -84,13 +84,17 @@
 }
 .list-rotated {
   width: 10px;
-  margin-top: 10px;
-  margin-left: 0;
+  height: 250px;
+  margin-top: -90px;
+  margin-left: -110px;
   margin-right: 0;
   transform: rotate(90deg);
   position: relative;
   text-overflow: ellipsis;
   white-space: nowrap;
+}
+.list-header .list-rotated {
+
 }
 .list-header .list-header-watch-icon {
   padding-left: 10px;

client/components/settings/adminReports.jade

@@ -138,7 +138,6 @@ template(name="boardsReport")
           th Members
           th Organizations
           th Teams
-
       each board in results
         tbody
           tr
@@ -148,5 +147,7 @@ template(name="boardsReport")
             td
               = yesOrNo(board.archived)
             td {{userNames board.members }}
+            td {{orgs board.orgs }}
+            td {{teams board.teams }}
   else
     div {{_ 'no-results' }}

client/components/settings/adminReports.js

@@ -170,8 +170,27 @@ class AdminReport extends BlazeComponent {
       .join(", ");
     return ret;
   }
+  teams(memberTeams) {
+    const ret = (memberTeams || [])
+      .map(_memberTeam => {
+        const _ret = ReactiveCache.getTeam(_memberTeam.teamId)?.teamDisplayName || _memberTeam.teamId;
+        return _ret;
+      })
+      .join(", ");
+    return ret;
+  }
+  orgs(orgs) {
+    const ret = (orgs || [])
+      .map(_orgs => {
+        const _ret = ReactiveCache.getOrg(_orgs.orgId)?.orgDisplayName || _orgs.orgId;
+        return _ret;
+      })
+      .join(", ");
+    return ret;
+  }
 }.register('boardsReport'));
 
+
 (class extends AdminReport {
   collection = Cards;
 

client/components/settings/peopleBody.jade

@@ -86,8 +86,8 @@ template(name="orgGeneral")
           +newOrgRow
     tbody
       tr
-        each org in orgList
-          +orgRow(orgId=org._id)
+      each org in orgList
+        +orgRow(orgId=org._id)
 
 template(name="teamGeneral")
   table
@@ -103,8 +103,8 @@ template(name="teamGeneral")
           +newTeamRow
     tbody
       tr
-        each team in teamList
-          +teamRow(teamId=team._id)
+      each team in teamList
+        +teamRow(teamId=team._id)
 
 template(name="peopleGeneral")
   #divAddOrRemoveTeamContainer

client/components/swimlanes/swimlaneHeader.jade

@@ -24,8 +24,7 @@ template(name="swimlaneFixedHeader")
           | {{isTitleDefault title}}
   .swimlane-header-menu
     unless currentUser.isCommentOnly
-      if currentUser.isBoardAdmin
-        a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon(title="{{_ 'add-swimlane'}}")
+      a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon(title="{{_ 'add-swimlane'}}")
       a.fa.fa-navicon.js-open-swimlane-menu(title="{{_ 'swimlaneActionPopup-title'}}")
       //// TODO: Collapse Swimlane: make button working, etc.
       //unless collapsed

client/components/swimlanes/swimlanes.css

@@ -11,7 +11,8 @@
   background: #dedede;
   display: flex;
   flex-direction: row;
-  overflow: 0;
+  overflow: auto;
+  max-height: 100%;
 }
 .swimlane-header-menu .swimlane-header-collapse-down {
   font-size: 50%;

client/components/swimlanes/swimlanes.jade

@@ -46,8 +46,8 @@ template(name="listsGroup")
 
 template(name="addListForm")
   unless currentUser.isWorker
-    .list.list-composer.js-list-composer(class="{{#if isMiniScreen}}mini-list{{/if}}")
-      if currentUser.isBoardAdmin
+    unless currentUser.isCommentOnly
+      .list.list-composer.js-list-composer(class="{{#if isMiniScreen}}mini-list{{/if}}")
         .list-header-add
           +inlinedForm(autoclose=false)
             input.list-name-input.full-line(type="text" placeholder="{{_ 'add-list'}}"

client/components/users/userAvatar.jade

@@ -26,9 +26,9 @@ template(name="orgAvatar")
 template(name="boardOrgRow")
   tr
     if orgData.orgIsActive
-      td <s>{{ orgData.orgDisplayName }}</s>
-    else
       td {{ orgData.orgDisplayName }}
+    else
+      td <s>{{ orgData.orgDisplayName }}</s>
     td
       if currentUser.isBoardAdmin
         a.member.orgOrTeamMember.add-member.js-manage-board-removeOrg(title="{{_ 'remove-from-board'}}")
@@ -39,9 +39,9 @@ template(name="boardOrgRow")
 template(name="boardTeamRow")
   tr
     if teamData.teamIsActive
-      td <s>{{ teamData.teamDisplayName }}</s>
-    else
       td {{ teamData.teamDisplayName }}
+    else
+      td <s>{{ teamData.teamDisplayName }}</s>
     td
       if currentUser.isBoardAdmin
         a.member.orgOrTeamMember.add-member.js-manage-board-removeTeam(title="{{_ 'remove-from-board'}}")