From 37a0e59fd683b435be6dcd90f0455923112ebd7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Mon, 27 Apr 2015 09:55:51 +0200 Subject: [PATCH] Project list behaviour --- app/locales/locale-en.json | 1 + app/modules/home/projects/list.jade | 13 ++++++++----- app/modules/home/projects/styles/list.scss | 18 ++++++++++++++++-- app/modules/home/styles/home.scss | 4 ++++ app/modules/projects/listing/listing.jade | 2 +- app/svg/lock.svg | 7 +++++++ 6 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 app/svg/lock.svg diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json index 7209d745..19f7268e 100644 --- a/app/locales/locale-en.json +++ b/app/locales/locale-en.json @@ -524,6 +524,7 @@ "WELCOME": "Welcome", "SECTION_PROJECTS": "Projects", "HELP": "TODO. You can reorder your projects in your favorite way by drag&drop, Taiga will remember your order for every project list.\n Remember that the first ten projects will be shown in your rapid access menu in the top bar dropdown menu", + "PRIVATE": "Private project", "STATS": { "PROJECT": "project
points", "DEFINED": "defined
points", diff --git a/app/modules/home/projects/list.jade b/app/modules/home/projects/list.jade index 79500efb..a2d99f10 100644 --- a/app/modules/home/projects/list.jade +++ b/app/modules/home/projects/list.jade @@ -1,7 +1,10 @@ ul.home-project-list li.home-project-list-single(tg-bind-scope, ng-repeat="project in vm.projects.all") - h2.home-project-list-single-title - a(href="#", ng-bind="::project.name", tg-nav="project:project=project.slug") - span {{project.is_private}} - p {{ ::project.description | limitTo:150 }} - span(ng-if="::project.description.length > 150") ... + a(href="#", tg-nav="project:project=project.slug") + h2.home-project-list-single-title + span.project-name(ng-bind="::project.name", title="{{ ::project.name }}") + span.private(ng-if="project.is_private", title="{{'PROJECT.PRIVATE' | translate}}") + include ../../../svg/lock.svg + p {{ ::project.description | limitTo:150 }} + span(ng-if="::project.description.length > 150") ... +a.see-more-projects-btn.button-gray(href="#", tg-nav="projects", title="{{'PROJECT.NAVIGATION.SEE_MORE_PROJECTS' | translate}}", translate="PROJECT.NAVIGATION.SEE_MORE_PROJECTS") diff --git a/app/modules/home/projects/styles/list.scss b/app/modules/home/projects/styles/list.scss index 6b8fc7c5..64d0c401 100644 --- a/app/modules/home/projects/styles/list.scss +++ b/app/modules/home/projects/styles/list.scss @@ -12,6 +12,9 @@ p { color: $gray; } + .private path { + fill: $gray; + } } } h2 { @@ -21,12 +24,23 @@ line-height: 1.3; margin-bottom: 0; text-transform: none; - a { - display: block; + .project-name { + display: inline-block; + max-width: 90%; overflow: hidden; text-overflow: ellipsis; + vertical-align: middle; white-space: nowrap; } + .private { + display: inline-block; + margin-left: .3rem; + width: .5rem; + path { + fill: $gray-light; + transition: fill .3s linear; + } + } } p { @extend %text; diff --git a/app/modules/home/styles/home.scss b/app/modules/home/styles/home.scss index 0a77715e..a6aad27b 100644 --- a/app/modules/home/styles/home.scss +++ b/app/modules/home/styles/home.scss @@ -8,6 +8,10 @@ .project-list { width: 250px; } + .see-more-projects-btn { + display: block; + margin-top: 2rem; + } .title-bar { @extend %title; @extend %larger; diff --git a/app/modules/projects/listing/listing.jade b/app/modules/projects/listing/listing.jade index 46c1f9f3..513fd18d 100644 --- a/app/modules/projects/listing/listing.jade +++ b/app/modules/projects/listing/listing.jade @@ -14,7 +14,7 @@ div.project-list-wrapper.centered div.project-list-single-left div.project-list-single-title h1 - a(href="#", ng-bind="::project.name", tg-nav="project:project=project.slug") + a(href="#", ng-bind="::project.name", tg-nav="project:project=project.slug", title="{{ ::project.name }}") span {{project.is_private}} p {{ ::project.description | limitTo:300 }} span(ng-if="::project.description.length > 300") ... diff --git a/app/svg/lock.svg b/app/svg/lock.svg new file mode 100644 index 00000000..b2ee1e5a --- /dev/null +++ b/app/svg/lock.svg @@ -0,0 +1,7 @@ + + + + + + +