Merge branch 'helioguardabaxo-master'

client/components/cards/cardCustomFields.jade

@@ -4,8 +4,7 @@ template(name="cardCustomFieldsPopup")
             li.item(class="")
                 a.name.js-select-field(href="#")
                     span.full-name
-                      +viewer
+                      = name
-                        = name
                     if hasCustomField
                       i.fa.fa-check
     hr

client/components/cards/cardDetails.jade

@@ -42,12 +42,28 @@ template(name="cardDetails")
       else
         p.warning {{_ 'card-archived'}}
 
-    .card-details-items
+    .card-details-items 
+      if currentBoard.allowsLabels
+        .card-details-item.card-details-item-labels
+          h3.card-details-item-title
+            i.fa.fa-tags
+            | {{_ 'labels'}}        
+          a(class="{{#if canModifyCard}}js-add-labels{{else}}is-disabled{{/if}}" title="{{_ 'card-labels-title'}}")
+            each labels
+              span.card-label(class="card-label-{{color}}" title=name)
+                +viewer
+                  = name
+          if canModifyCard
+            unless currentUser.isWorker
+              a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}")
+                i.fa.fa-plus
+      
       if currentBoard.allowsReceivedDate
+        hr
         .card-details-item.card-details-item-received
-          h3
+          h3.card-details-item-title
             i.fa.fa-sign-out
-            card-details-item-title {{_ 'card-received'}}
+            | {{_ 'card-received'}}
           if getReceived
             +cardReceivedDate
           else
@@ -58,9 +74,9 @@ template(name="cardDetails")
 
       if currentBoard.allowsStartDate
         .card-details-item.card-details-item-start
-          h3
+          h3.card-details-item-title
             i.fa.fa-hourglass-start
-            card-details-item-title {{_ 'card-start'}}
+            | {{_ 'card-start'}}
           if getStart
             +cardStartDate
           else
@@ -71,9 +87,9 @@ template(name="cardDetails")
 
       if currentBoard.allowsDueDate
         .card-details-item.card-details-item-due
-          h3
+          h3.card-details-item-title
             i.fa.fa-sign-in
-            card-details-item-title {{_ 'card-due'}}
+            | {{_ 'card-due'}}
           if getDue
             +cardDueDate
           else
@@ -84,9 +100,9 @@ template(name="cardDetails")
 
       if currentBoard.allowsEndDate
         .card-details-item.card-details-item-end
-          h3
+          h3.card-details-item-title
             i.fa.fa-hourglass-end
-            card-details-item-title {{_ 'card-end'}}
+            | {{_ 'card-end'}}
           if getEnd
             +cardEndDate
           else
@@ -97,10 +113,11 @@ template(name="cardDetails")
 
       //.card-details-items
       if currentBoard.allowsMembers
+        hr
         .card-details-item.card-details-item-members
-          h3
+          h3.card-details-item-title
             i.fa.fa-users
-            card-details-item-title {{_ 'members'}}
+            | {{_ 'members'}}
           each getMembers
             +userAvatar(userId=this cardId=../_id)
             | {{! XXX Hack to hide syntaxic coloration /// }}
@@ -112,9 +129,9 @@ template(name="cardDetails")
       //if assigneeSelected
       if currentBoard.allowsAssignee
         .card-details-item.card-details-item-assignees
-          h3
+          h3.card-details-item-title
             i.fa.fa-user
-            card-details-item-title {{_ 'assignee'}}
+            | {{_ 'assignee'}}
           each getAssignees
             +userAvatarAssignee(userId=this cardId=../_id)
             | {{! XXX Hack to hide syntaxic coloration /// }}
@@ -126,44 +143,23 @@ template(name="cardDetails")
               a.assignee.add-assignee.card-details-item-add-button.js-add-assignees(title="{{_ 'assignee'}}")
                 i.fa.fa-plus
 
-      if currentBoard.allowsLabels
-        .card-details-item.card-details-item-labels
-          h3
-            i.fa.fa-tags
-            card-details-item-title {{_ 'labels'}}
-          a(class="{{#if canModifyCard}}js-add-labels{{else}}is-disabled{{/if}}" title="{{_ 'card-labels-title'}}")
-            each labels
-              span.card-label(class="card-label-{{color}}" title=name)
-                +viewer
-                  = name
-          if canModifyCard
-            unless currentUser.isWorker
-              a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}")
-                i.fa.fa-plus
-
-      //.card-details-items
-      each customFieldsWD
-        .card-details-item.card-details-item-customfield
-          h3.card-details-item-title
-            +viewer
-              = definition.name
-          +cardCustomField
-
       //.card-details-items
       if getSpentTime
         .card-details-item.card-details-item-spent
           if getIsOvertime
-            h3.card-details-item-title {{_ 'overtime-hours'}}
+            h3.card-details-item-title
+              | {{_ 'overtime-hours'}}
           else
-            h3.card-details-item-title {{_ 'spent-time-hours'}}
+            h3.card-details-item-title
+              | {{_ 'spent-time-hours'}}
           +cardSpentTime
 
       //.card-details-items
       if currentBoard.allowsRequestedBy
         .card-details-item.card-details-item-name
-          h3
+          h3.card-details-item-title
             i.fa.fa-shopping-cart
-            card-details-item-title {{_ 'requested-by'}}
+            | {{_ 'requested-by'}}
           if canModifyCard
             unless currentUser.isWorker
               +inlinedForm(classNames="js-card-details-requester")
@@ -181,9 +177,9 @@ template(name="cardDetails")
 
       if currentBoard.allowsAssignedBy
         .card-details-item.card-details-item-name
-          h3
+          h3.card-details-item-title
             i.fa.fa-user-plus
-            card-details-item-title {{_ 'assigned-by'}}
+            | {{_ 'assigned-by'}}
           if canModifyCard
             unless currentUser.isWorker
               +inlinedForm(classNames="js-card-details-assigner")
@@ -199,6 +195,16 @@ template(name="cardDetails")
             +viewer
               = getAssignedBy
 
+      //.card-details-items
+      if customFieldsWD
+        hr
+        each customFieldsWD
+          .card-details-item.card-details-item-customfield
+            h3.card-details-item-title
+              i.fa.fa-list-alt
+              = definition.name
+            +cardCustomField
+
     if getVoteQuestion
       hr
       .vote-title
@@ -234,9 +240,9 @@ template(name="cardDetails")
       unless currentUser.isWorker
         if currentBoard.allowsDescriptionTitle
           hr
-          h3
+          h3.card-details-item-title
             i.fa.fa-align-left
-            card-details-item-title {{_ 'description'}}
+            | {{_ 'description'}}
         if currentBoard.allowsDescriptionText
           +inlinedCardDescription(classNames="card-description js-card-description")
             +editor(autofocus=true)
@@ -276,7 +282,7 @@ template(name="cardDetails")
           +subtasks(cardId = _id)
       if currentBoard.allowsAttachments
         hr
-        h3
+        h3.card-details-item-title
           i.fa.fa-paperclip
           | {{_ 'attachments'}}
         .card-checklist-attachmentGalery.card-attachmentGalery
@@ -285,7 +291,7 @@ template(name="cardDetails")
     hr
     unless currentUser.isNoComments
       .activity-title
-        h3
+        h3.card-details-item-title
           i.fa.fa-history
           | {{ _ 'activity'}}
         if currentUser.isBoardMember

client/components/cards/cardDetails.styl

@@ -89,7 +89,7 @@ avatar-radius = 50%
 .card-details
   padding: 0
   flex-shrink: 0
-  flex-basis: 510px
+  flex-basis: 600px
   will-change: flex-basis
   overflow-y: scroll
   overflow-x: hidden
@@ -198,23 +198,32 @@ avatar-radius = 50%
       margin-right: 0.5em
       &:last-child
         margin-right: 0
-      &.card-details-item-labels,
+      &.card-details-item-labels
+        display: block
+        word-wrap: break-word
+        max-width: 95%
+        flex-grow: 1
       &.card-details-item-members,
       &.card-details-item-assignees,
-      &.card-details-item-received,
-      &.card-details-item-start,
-      &.card-details-item-due,
-      &.card-details-item-end,
       &.card-details-item-customfield,
       &.card-details-item-name
         display: block
         word-wrap: break-word
-        max-width: 48%
+        max-width: 36%
+        flex-grow: 1
+      &.card-details-item-received,
+      &.card-details-item-start,
+      &.card-details-item-due,
+      &.card-details-item-end
+        display: block
+        word-wrap: break-word
+        max-width: 28%
         flex-grow: 1
 
   .card-details-item-title
     font-size: 16px
-    color: #000
+    font-weight: bold
+    color: #4d4d4d
 
   .card-label
     padding-top: 5px

client/components/cards/checklists.jade

@@ -1,6 +1,6 @@
 template(name="checklists")
   .checklists-title
-    h3
+    h3.card-details-item-title
       i.fa.fa-check
       | {{_ 'checklists'}}
     if currentUser.isBoardMember

client/components/cards/subtasks.jade

@@ -1,5 +1,5 @@
 template(name="subtasks")
-  h3
+  h3.card-details-item-title
     i.fa.fa-sitemap
     | {{_ 'subtasks'}}
   if toggleDeleteDialog.get

client/components/lists/listBody.jade

@@ -105,6 +105,8 @@ template(name="searchElementPopup")
         each boards
           option(value="{{_id}}") {{title}}
   form.js-search-term-form
+    label
+      | {{_ 'template'}}
     input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
   .list-body.search-card-results
     .minicards.clearfix.js-minicards

i18n/en.i18n.json

@@ -465,7 +465,7 @@
   "search": "Search",
   "rules": "Rules",
   "search-cards": "Search from card/list titles, descriptions and custom fields on this board",
-  "search-example": "Text to search for?",
+  "search-example": "Write text you search and press Enter",
   "select-color": "Select Color",
   "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
   "setWipLimitPopup-title": "Set WIP Limit",