diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json index 42a49964..240b1791 100644 --- a/app/locales/locale-en.json +++ b/app/locales/locale-en.json @@ -328,6 +328,7 @@ "HOME": { "PAGE_TITLE": "Home - Taiga", "PAGE_DESCRIPTION": "The Taiga home page with your main projects and all your assigned and watched user stories, tasks and issues", + "EMPTY_WORKING_ON": "It feels empty, doesn't it? Start working with Taiga and you'll see here the stories, tasks and issues you are workin on.", "EMPTY_WATCHING": "Follow the projects, User Stories, Tasks, Issues... that you want to know about :)", "EMPTY_PROJECT_LIST": "You don't have any projects yet", "WORKING_ON_SECTION": "Working on", diff --git a/app/modules/external-apps/external-app.controller.coffee b/app/modules/external-apps/external-app.controller.coffee index 6c963753..21561f9a 100644 --- a/app/modules/external-apps/external-app.controller.coffee +++ b/app/modules/external-apps/external-app.controller.coffee @@ -12,8 +12,8 @@ class ExternalAppController extends taiga.Controller "tgLoader" ] - constructor: (@routeParams, @externalAppsService, @window, @currentUserService, @location, - @navUrls, @xhrError, @loader) -> + constructor: (@routeParams, @externalAppsService, @window, @currentUserService, @location, @navUrls, + @xhrError, @loader) -> @loader.start(false) @._applicationId = @routeParams.application @._state = @routeParams.state diff --git a/app/modules/home/duties/duty.scss b/app/modules/home/duties/duty.scss index c4a2804b..8cb9d689 100644 --- a/app/modules/home/duties/duty.scss +++ b/app/modules/home/duties/duty.scss @@ -58,18 +58,3 @@ margin: 2rem 30%; } } -.watching-empty { - padding: 5vh; - text-align: center; - svg { - margin: 2rem auto; - max-width: 160px; - text-align: center; - path { - fill: $whitish; - } - } - p { - @extend %small; - } -} diff --git a/app/modules/home/projects/home-project-list.scss b/app/modules/home/projects/home-project-list.scss index abdaed0d..b443e4d4 100644 --- a/app/modules/home/projects/home-project-list.scss +++ b/app/modules/home/projects/home-project-list.scss @@ -63,6 +63,7 @@ } p { @extend %small; + @extend %light; } .create-project-button { display: block; diff --git a/app/modules/home/working-on/empty.jade b/app/modules/home/working-on/empty.jade new file mode 100644 index 00000000..c9193b9a --- /dev/null +++ b/app/modules/home/working-on/empty.jade @@ -0,0 +1,6 @@ +- for (var x = 0; x < 2; x++) + .empty-ticket + .avatar + .data + .line + .line diff --git a/app/modules/home/working-on/empty.scss b/app/modules/home/working-on/empty.scss new file mode 100644 index 00000000..26fe4c83 --- /dev/null +++ b/app/modules/home/working-on/empty.scss @@ -0,0 +1,42 @@ +.working-on-empty, +.watching-empty { + margin-bottom: 4rem; + p { + @extend %light; + margin: 1rem 0 0; + } +} + +.empty-ticket { + display: flex; + &:not(:last-child) { + border-bottom: 1px solid $whitish; + padding: 1rem 0; + } + &:last-child { + padding: 1rem 0 0; + } + .avatar { + background: darken($whitish, 5%); + flex-basis: 48px; + height: 48px; + margin-right: 1rem; + width: 48px; + } + + .data { + display: flex; + flex-direction: column; + } + + .line { + background: $whitish; + height: 1rem; + margin-bottom: 1rem; + width: 40vw; + &:last-child { + margin: 0; + width: 20vw; + } + } +} diff --git a/app/modules/home/working-on/working-on.jade b/app/modules/home/working-on/working-on.jade index 34e287ef..4777e130 100644 --- a/app/modules/home/working-on/working-on.jade +++ b/app/modules/home/working-on/working-on.jade @@ -1,12 +1,17 @@ -div.title-bar.working-on-title(ng-show="vm.assignedTo.size", translate="HOME.WORKING_ON_SECTION") +div.title-bar.working-on-title(translate="HOME.WORKING_ON_SECTION") + section.working-on(ng-show="vm.assignedTo.size") div.duty-single(tg-duty="duty", tg-repeat="duty in vm.assignedTo", ng-class="{blocked: duty.is_blocked}") +section.working-on-empty(ng-show="!vm.assignedTo.size") + p(translate="HOME.EMPTY_WORKING_ON") + include empty.jade + div.title-bar.watching-title(translate="HOME.WATCHING_SECTION") -section.watching-empty(ng-show="!vm.watching.size") - include ../../../svg/hide.svg - p(translate="HOME.EMPTY_WATCHING") - section.watching(ng-show="vm.watching.size") - div.duty-single(tg-duty="duty", tg-repeat="duty in vm.watching", ng-class="{blocked: duty.is_blocked}") \ No newline at end of file + div.duty-single(tg-duty="duty", tg-repeat="duty in vm.watching", ng-class="{blocked: duty.is_blocked}") + +section.watching-empty(ng-show="!vm.watching.size") + p(translate="HOME.EMPTY_WATCHING") + include empty.jade