From db090d90895a6ad49ee9ebbebf9b6ad4f2bf2873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 2 Jul 2014 10:37:25 +0200 Subject: [PATCH] Issue edition --- app/partials/issues-detail-edit.jade | 80 +++++++++++++++++++++++++ app/partials/issues-detail.jade | 1 - app/styles/dependencies/forms.scss | 4 ++ app/styles/layout/us-detail.scss | 4 ++ app/styles/modules/comments.scss | 2 +- app/styles/modules/project-details.scss | 2 +- 6 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 app/partials/issues-detail-edit.jade diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade new file mode 100644 index 00000000..59600f1c --- /dev/null +++ b/app/partials/issues-detail-edit.jade @@ -0,0 +1,80 @@ +extends layout + +block head + title Taiga Project management web application with scrum in mind! + +block content + div.wrapper(tg-issue-detail, ng-controller="IssueDetailController as ctrl", + ng-init="section='issues'") + div.main.us-detail + div.us-detail-header + include views/components/mainTitle + a.button.button-green(href="", title="Edit") Edit + section.us-story-main-data + div.us-title + // TODO Placeholder should be issue.subject + input(type="text", placeholder="issue.subject") + + // div.blocked-warning + // span.icon.icon-warning + // p.blocked Blocked! + // p We need Pilar to make a prototype out of this or we are not sure + // a.button.button-red.button-block(href="", title="Unblock US") Unblock + + div.user-story-tags(tg-tag-line="editable", ng-model="issue.tags") + span.tags-container + input.hidden(type="text", placeholder="Write tag...") + + section.us-content + // TODO Placeholder should be a WYSIWYG with issue.description + textarea(placeholder="Write a description of your issue") + + // include views/modules/attachments + section.us-activity + ul.us-activity-tabs + li + a.active(href="#") + span.icon.icon-bulk + span.tab-title Comments + + li + a(href="#") + span.icon.icon-issues + span.tab-title Activity + include views/modules/comments + // include views/modules/activity + sidebar.menu-secondary.sidebar + // TODO: should be replaced with correct html + // for issues detail + h1 + span Open + span.us-detail-status In progress + + div.us-detail-progress-bar + div.current-progress + span.tasks-completed 6/7 tasks completed + + ul.points-per-role + li.total + span.points 10 + span.role total + + li(ng-repeat="role in roles track by role.id") + span.points 10 + span.role UX + + include views/components/assigned-to + section.watchers + include views/components/watchers + + // NOTE: only for user story? + // section.us-detail-settings + // a.button.button-gray(href="", title="Client requirement") Client requirement + // a.button.button-gray(href="", title="Team requirement") Team requirement + // a.button.button-red(href="", title="Block") Block + + div.lightbox.lightbox_block.hidden + include views/modules/lightbox_block + + div.lightbox.lightbox_watchers.hidden + include views/modules/lightbox_watchers diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade index 23a77d8a..3d5db965 100644 --- a/app/partials/issues-detail.jade +++ b/app/partials/issues-detail.jade @@ -15,7 +15,6 @@ block content h2 span.us-number(tg-bo-html="issue.ref") span.us-name(ng-bind="issue.subject") - input(type="text", placeholder="Set title") // div.blocked-warning // span.icon.icon-warning diff --git a/app/styles/dependencies/forms.scss b/app/styles/dependencies/forms.scss index cc333df3..704fd2a1 100644 --- a/app/styles/dependencies/forms.scss +++ b/app/styles/dependencies/forms.scss @@ -28,3 +28,7 @@ textarea { input[type="password"] { @extend %title; } + +textarea { + max-height: 10rem; +} diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 0ab8a724..5267fba1 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -65,6 +65,10 @@ a { color: $green-taiga; } + textarea { + height: 10rem; + margin-bottom: 2rem; + } } .user-story-tags { diff --git a/app/styles/modules/comments.scss b/app/styles/modules/comments.scss index 059509ca..1a6490b9 100644 --- a/app/styles/modules/comments.scss +++ b/app/styles/modules/comments.scss @@ -4,7 +4,7 @@ @include transition(height .3s ease-in); &:focus { @include transition(height .3s ease-in); - height: 150px; + height: 6rem; +a { display: inline-block; } diff --git a/app/styles/modules/project-details.scss b/app/styles/modules/project-details.scss index c72d0355..6b8d1bf6 100644 --- a/app/styles/modules/project-details.scss +++ b/app/styles/modules/project-details.scss @@ -8,7 +8,7 @@ margin-bottom: 1rem; } textarea { - height: 300px; + height: 10rem; } .button-green { display: block;