diff --git a/app/views/cards/stagings/_stages.html.erb b/app/views/cards/stagings/_stages.html.erb index a96930fa6..abfe4af08 100644 --- a/app/views/cards/stagings/_stages.html.erb +++ b/app/views/cards/stagings/_stages.html.erb @@ -1,16 +1,27 @@ <% if workflow = card.collection.workflow %> -
+
+ Choose a column for this card + <%= button_to "Not now", card_closure_path(card, reason: "Not now"), class: [ "workflow-stage btn", { "workflow-stage--current": card.closed? } ], + role: "radio", + aria: { checked: card.closed? }, form_class: "flex align-center gap-half" %> + <%= button_to "The Stream", card_engagement_path(card), method: :delete, class: [ "workflow-stage workflow-stage--stream btn", { "workflow-stage--current": card.considering? } ], + role: "radio", + aria: { checked: card.considering? }, form_class: "flex align-center gap-half" %> + <% workflow.stages.each do |stage| %> <%= button_to_set_stage card, stage %> <% end %> + <%= button_to "Closed", card_closure_path(card, reason: "Completed"), class: [ "workflow-stage btn", { "workflow-stage--current": card.closed? } ], + role: "radio", + aria: { checked: card.closed? }, form_class: "flex align-center gap-half" %>
<% end %> diff --git a/app/views/cards/triage/_columns.html.erb b/app/views/cards/triage/_columns.html.erb index 95fd4f95f..20bb4eaf8 100644 --- a/app/views/cards/triage/_columns.html.erb +++ b/app/views/cards/triage/_columns.html.erb @@ -1,17 +1,25 @@ -
- <%= button_to "Not now", card_not_now_path(card), - class: [ "workflow-stage btn", { "workflow-stage--current": card.postponed? } ], - form_class: "flex align-center gap-half" %> +
+ Choose a column for this card - <%= button_to "The Stream", card_triage_path(card), method: :delete, - class: [ "workflow-stage workflow-stage--stream btn", { "workflow-stage--current": card.awaiting_triage? } ], - form_class: "flex align-center gap-half" %> + <%= button_to "Not now", card_not_now_path(card), + class: [ "workflow-stage btn", { "workflow-stage--current": card.postponed? } ], + role: "radio", + aria: { checked: card.postponed? }, + form_class: "flex align-center gap-half" %> - <% card.collection.columns.each do |column| %> - <%= button_to_set_column card, column %> - <% end %> + <%= button_to "The Stream", card_triage_path(card), method: :delete, + class: [ "workflow-stage workflow-stage--stream btn", { "workflow-stage--current": card.awaiting_triage? } ], + role: "radio", + aria: { checked: card.awaiting_triage? }, + form_class: "flex align-center gap-half" %> - <%= button_to "Closed", card_closure_path(card, reason: "Completed"), - class: [ "workflow-stage btn", { "workflow-stage--current": card.closed? } ], - form_class: "flex align-center gap-half" %> -
+ <% card.collection.columns.each do |column| %> + <%= button_to_set_column card, column %> + <% end %> + + <%= button_to "Closed", card_closure_path(card, reason: "Completed"), + class: [ "workflow-stage btn", { "workflow-stage--current": card.closed? } ], + role: "radio", + aria: { checked: card.closed? }, + form_class: "flex align-center gap-half" %> +