From e8c2506c5b2f6dd5f12d08b52b9f877f32a3cf41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 14 Oct 2015 11:00:03 +0200
Subject: [PATCH] Edit placeholder text in taskboard task

---
 app/coffee/modules/kanban/main.coffee               |  2 +-
 app/locales/locale-en.json                          |  4 +++-
 .../common/components/kanban-placeholder.jade       |  7 +++++++
 ...-placeholder.jade => taskboard-placeholder.jade} |  0
 app/partials/includes/modules/kanban-table.jade     | 13 ++++++-------
 app/partials/includes/modules/taskboard-table.jade  |  5 +++--
 app/styles/components/card-placeholder.scss         |  1 -
 7 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 app/partials/common/components/kanban-placeholder.jade
 rename app/partials/common/components/{card-placeholder.jade => taskboard-placeholder.jade} (100%)

diff --git a/app/coffee/modules/kanban/main.coffee b/app/coffee/modules/kanban/main.coffee
index fc98e66b..a3f76cf5 100644
--- a/app/coffee/modules/kanban/main.coffee
+++ b/app/coffee/modules/kanban/main.coffee
@@ -438,7 +438,7 @@ KanbanUserstoryDirective = ($rootscope, $loading, $rs) ->
 
         $scope.getTemplateUrl = () ->
             if $scope.us.isPlaceholder
-                return "common/components/card-placeholder.html"
+                return "common/components/kanban-placeholder.html"
             else
                 return "kanban/kanban-task.html"
 
diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json
index c663b509..d0c9a6ee 100644
--- a/app/locales/locale-en.json
+++ b/app/locales/locale-en.json
@@ -1124,7 +1124,9 @@
         "ACTION_HIDE_ARCHIVED": "Hide archived",
         "HIDDEN_USER_STORIES": "The user stories in this status are hidden by default",
         "ARCHIVED": "You have archived",
-        "UNDO_ARCHIVED": "Drag & drop again to undo"
+        "UNDO_ARCHIVED": "Drag & drop again to undo",
+        "PLACEHOLDER_CARD_TITLE": "Find Here User Stories",
+        "PLACEHOLDER_CARD_TEXT": "Stories might also have subtasks to separate requirements"
     },
     "SEARCH": {
         "PAGE_TITLE": "Search - {{projectName}}",
diff --git a/app/partials/common/components/kanban-placeholder.jade b/app/partials/common/components/kanban-placeholder.jade
new file mode 100644
index 00000000..551fcbe8
--- /dev/null
+++ b/app/partials/common/components/kanban-placeholder.jade
@@ -0,0 +1,7 @@
+.placeholder-avatar
+    .image
+    .text
+        .line
+        .line
+p.title {{'KANBAN.PLACEHOLDER_CARD_TITLE' | translate}}
+p {{'KANBAN.PLACEHOLDER_CARD_TEXT' | translate}}
diff --git a/app/partials/common/components/card-placeholder.jade b/app/partials/common/components/taskboard-placeholder.jade
similarity index 100%
rename from app/partials/common/components/card-placeholder.jade
rename to app/partials/common/components/taskboard-placeholder.jade
diff --git a/app/partials/includes/modules/kanban-table.jade b/app/partials/includes/modules/kanban-table.jade
index 23c55db8..ba98f484 100644
--- a/app/partials/includes/modules/kanban-table.jade
+++ b/app/partials/includes/modules/kanban-table.jade
@@ -40,12 +40,12 @@ div.kanban-table(tg-kanban-squish-column)
     div.kanban-table-body
         div.kanban-table-inner
             div.kanban-uses-box.task-column(ng-class='{vfold:folds[s.id]}',
-                                            ng-repeat="s in usStatusList track by s.id",
-                                            tg-kanban-sortable,
-                                            tg-kanban-wip-limit="s",
-                                            tg-kanban-column-height-fixer,
-                                            tg-bind-scope)
-
+                ng-repeat="s in usStatusList track by s.id",
+                tg-kanban-sortable,
+                tg-kanban-wip-limit="s",
+                tg-kanban-column-height-fixer,
+                tg-bind-scope
+            )
                 div.kanban-task(
                     ng-repeat="us in usByStatus[s.id] track by us.id",
                     tg-kanban-userstory,
@@ -55,5 +55,4 @@ div.kanban-table(tg-kanban-squish-column)
                     ng-class="{'kanban-task-maximized': ctrl.isMaximized(s.id), 'kanban-task-minimized': ctrl.isMinimized(s.id), 'card-placeholder': us.isPlaceholder}"
                     placeholder="{{us.isPlaceholder}}"
                 )
-
                 div.kanban-column-intro(ng-if="s.is_archived", tg-kanban-archived-status-intro="s")
diff --git a/app/partials/includes/modules/taskboard-table.jade b/app/partials/includes/modules/taskboard-table.jade
index a832b449..37a5fcc5 100644
--- a/app/partials/includes/modules/taskboard-table.jade
+++ b/app/partials/includes/modules/taskboard-table.jade
@@ -37,7 +37,8 @@ div.taskboard-table(tg-taskboard-squish-column)
                             include ../components/taskboard-task
                         
                         div(ng-if="task.isPlaceholder")
-                            include ../../common/components/card-placeholder
+                            - var card = 'task'
+                            include ../../common/components/taskboard-placeholder
 
             div.task-row(ng-init="us = null", ng-class="{'row-fold':usFolded[null]}")
                 div.taskboard-userstory-box.task-column
@@ -58,4 +59,4 @@ div.taskboard-table(tg-taskboard-squish-column)
                             include ../components/taskboard-task
                         
                         div(ng-if="task.isPlaceholder")
-                            include ../../common/components/card-placeholder
+                            include ../../common/components/taskboard-placeholder
diff --git a/app/styles/components/card-placeholder.scss b/app/styles/components/card-placeholder.scss
index ce334a12..27691a88 100644
--- a/app/styles/components/card-placeholder.scss
+++ b/app/styles/components/card-placeholder.scss
@@ -26,7 +26,6 @@
         }
     }
     .title {
-        @extend %large;
         text-transform: uppercase;
     }
     p {