From 27be19f68c2da8bbad78e72b13fcc98217b09278 Mon Sep 17 00:00:00 2001 From: Linus Degen Date: Tue, 9 Dec 2025 16:53:38 +0100 Subject: [PATCH 1/3] Mark positions as closed in order plannings --- app/assets/stylesheets/components/_plannings.scss | 4 ++++ app/views/plannings/orders/_board.html.haml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/app/assets/stylesheets/components/_plannings.scss b/app/assets/stylesheets/components/_plannings.scss index bf4f26537..fd26e26aa 100644 --- a/app/assets/stylesheets/components/_plannings.scss +++ b/app/assets/stylesheets/components/_plannings.scss @@ -219,6 +219,10 @@ body.order_plannings { text-overflow: ellipsis; margin-right: 0.5em; } +.planning-calendar-inner .groupheader-wrapper > .groupheader-title > span > span.small { + color: $gray; + line-height: 21.8px; +} .planning-calendar-inner > .groupheader > .sticky-wrapper, .planning-calendar-inner > .actions > .sticky-wrapper, .planning-calendar-days > .sticky-wrapper { diff --git a/app/views/plannings/orders/_board.html.haml b/app/views/plannings/orders/_board.html.haml index e161c88c1..17e4f7ce3 100644 --- a/app/views/plannings/orders/_board.html.haml +++ b/app/views/plannings/orders/_board.html.haml @@ -33,6 +33,8 @@ %span{ title: post } %strong #{post.work_item.path_shortnames}: =post.work_item.name + - if post.work_item.closed + %span.small geschlossen %i.glyphicon.glyphicon-chevron-down %small.text-muted{ id: "group_header_times_#{dom_id(post)}" } = render 'accounting_post_total', post: post From 79a11278e92425665bd780cc01c32efa46a069be Mon Sep 17 00:00:00 2001 From: Linus Degen Date: Wed, 10 Dec 2025 12:30:38 +0100 Subject: [PATCH 2/3] Change format of closed work_items in planning (64952) --- app/views/plannings/orders/_board.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/plannings/orders/_board.html.haml b/app/views/plannings/orders/_board.html.haml index 17e4f7ce3..31fce066f 100644 --- a/app/views/plannings/orders/_board.html.haml +++ b/app/views/plannings/orders/_board.html.haml @@ -34,7 +34,7 @@ %strong #{post.work_item.path_shortnames}: =post.work_item.name - if post.work_item.closed - %span.small geschlossen + %span.small (geschlossen) %i.glyphicon.glyphicon-chevron-down %small.text-muted{ id: "group_header_times_#{dom_id(post)}" } = render 'accounting_post_total', post: post From abb858ff7602532fd7722307e9daf745b1ee61f9 Mon Sep 17 00:00:00 2001 From: Linus Degen Date: Wed, 10 Dec 2025 12:34:15 +0100 Subject: [PATCH 3/3] Normalize style for labels of closed work items (64952) --- app/assets/stylesheets/_orders.scss | 5 ----- app/assets/stylesheets/components/_plannings.scss | 4 ---- app/assets/stylesheets/puzzletime.scss | 5 +++++ .../_cockpit_accounting_post_row_head.html.haml | 2 +- app/views/plannings/orders/_board.html.haml | 4 ++-- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/_orders.scss b/app/assets/stylesheets/_orders.scss index da72ae6ea..0e6f9b89b 100644 --- a/app/assets/stylesheets/_orders.scss +++ b/app/assets/stylesheets/_orders.scss @@ -175,11 +175,6 @@ h1.top { .title, .subtitle { height: $row-line-height; - - .small { - color: $gray; - line-height: 21.8px; - } } td > * { diff --git a/app/assets/stylesheets/components/_plannings.scss b/app/assets/stylesheets/components/_plannings.scss index fd26e26aa..bf4f26537 100644 --- a/app/assets/stylesheets/components/_plannings.scss +++ b/app/assets/stylesheets/components/_plannings.scss @@ -219,10 +219,6 @@ body.order_plannings { text-overflow: ellipsis; margin-right: 0.5em; } -.planning-calendar-inner .groupheader-wrapper > .groupheader-title > span > span.small { - color: $gray; - line-height: 21.8px; -} .planning-calendar-inner > .groupheader > .sticky-wrapper, .planning-calendar-inner > .actions > .sticky-wrapper, .planning-calendar-days > .sticky-wrapper { diff --git a/app/assets/stylesheets/puzzletime.scss b/app/assets/stylesheets/puzzletime.scss index 8425b469d..c29fe5f36 100644 --- a/app/assets/stylesheets/puzzletime.scss +++ b/app/assets/stylesheets/puzzletime.scss @@ -239,6 +239,11 @@ a.disabled:hover { color: $btn-link-disabled-color; } +span.subtle-hint { + color: $gray; + line-height: 21.8px; +} + .form-action { @extend .form-control; width: auto; diff --git a/app/views/accounting_posts/_cockpit_accounting_post_row_head.html.haml b/app/views/accounting_posts/_cockpit_accounting_post_row_head.html.haml index 41caec63f..5d371f8ca 100644 --- a/app/views/accounting_posts/_cockpit_accounting_post_row_head.html.haml +++ b/app/views/accounting_posts/_cockpit_accounting_post_row_head.html.haml @@ -11,7 +11,7 @@ row.shortnames, edit_order_accounting_post_path(@order, row.accounting_post)) - if row.accounting_post.closed? - %span.small geschlossen + %span.subtle-hint geschlossen - unless row.accounting_post.billable %i.options-icon.icon-dollar-stroke - if Settings.meal_compensation.active diff --git a/app/views/plannings/orders/_board.html.haml b/app/views/plannings/orders/_board.html.haml index 31fce066f..2e2603126 100644 --- a/app/views/plannings/orders/_board.html.haml +++ b/app/views/plannings/orders/_board.html.haml @@ -33,8 +33,8 @@ %span{ title: post } %strong #{post.work_item.path_shortnames}: =post.work_item.name - - if post.work_item.closed - %span.small (geschlossen) + - if post.work_item.closed? + %span.subtle-hint (geschlossen) %i.glyphicon.glyphicon-chevron-down %small.text-muted{ id: "group_header_times_#{dom_id(post)}" } = render 'accounting_post_total', post: post