Remove blocked column from kanban board

2026-08-02 12:52:08 +03:30
parent 0800487ddd
commit b0f486f026
6 changed files with 289 additions and 42 deletions
@@ -75,7 +75,7 @@
      </fieldset>
      <div class="form-row">
        <label>Importance<select name="importance"><option value="normal">Normal</option><option value="low">Low</option><option value="high">High</option><option value="urgent">Urgent</option></select></label>
-        <label>Column<select name="status"><option value="backlog">Backlog</option><option value="in_progress">In progress</option><option value="blocked">Blocked</option><option value="done">Done</option></select></label>
+        <label>Column<select name="status"><option value="backlog">Backlog</option><option value="todo">To do</option><option value="in_progress">In progress</option><option value="done">Done</option></select></label>
      </div>
      <label>Due date <small>Optional · Persian</small><span class="jalali-field"><input name="due_date" data-jalali-picker autocomplete="off" inputmode="numeric" placeholder="{{.TodayJalali}}" pattern="[0-9]{4}-[0-9]{2}-[0-9]{2}"><button type="button" class="jalali-trigger" aria-label="Choose due date" title="Open Persian calendar">▦</button></span></label>
      <button class="button dark full" type="submit">Create task</button>
@@ -96,8 +96,10 @@
      {{range .Tasks}}
      {{$task := .}}
      <article class="kanban-card" draggable="true" data-task-id="{{.ID}}">
-        {{if .Tags}}<div class="card-tags">{{range .Tags}}<span class="board-tag {{.Color}}">{{.Name}}</span>{{end}}</div>{{end}}
-        <div class="card-topline"><span class="task-id">#{{.ID}}</span><span class="card-signals"><span class="importance-badge {{.Importance}}">{{if eq .Importance "urgent"}}Urgent{{else if eq .Importance "high"}}High{{else if eq .Importance "low"}}Low{{else}}Normal{{end}}</span>{{if .DueDate}}<span class="task-due">Due {{dateFA .DueDate}}</span>{{end}}</span></div>
+        <div class="card-topline">
+          {{if .Tags}}<div class="card-tags">{{range .Tags}}<span class="board-tag {{.Color}}">{{.Name}}</span>{{end}}</div>{{else}}<span></span>{{end}}
+          <span class="card-signals">{{if .Todos}}<span class="todo-progress" title="To-do list">☑ {{.TodoDone}}/{{len .Todos}}</span>{{end}}<span class="importance-emoji {{.Importance}}" title="{{if eq .Importance "urgent"}}Urgent priority{{else if eq .Importance "high"}}High priority{{else if eq .Importance "low"}}Low priority{{else}}Normal priority{{end}}">{{if eq .Importance "urgent"}}🚨{{else if eq .Importance "high"}}🔶{{else if eq .Importance "low"}}🟢{{else}}⚪{{end}}</span>{{if .DueDate}}<span class="task-due">{{dateFA .DueDate}}</span>{{end}}</span>
+        </div>
        <h3>{{.Title}}</h3>
        {{if .Description}}<p>{{.Description}}</p>{{end}}
        <div class="task-meta">
@@ -105,8 +107,30 @@
          <span class="task-creator">by {{.CreatorName}}</span>
        </div>
        <details class="card-controls">
-          <summary><span>Card controls</span><i>⌄</i></summary>
+          <summary aria-label="Open card controls" title="Card controls"><i aria-hidden="true">⌄</i></summary>
          <div class="card-controls-body">
+            <details class="card-todo-editor">
+              <summary>To-do list <span>{{.TodoDone}}/{{len .Todos}}</span></summary>
+              <div class="todo-list">
+                {{range .Todos}}
+                <div class="todo-item {{if .Completed}}completed{{end}}">
+                  <form method="post" action="/board/tasks/{{$task.ID}}/todos/{{.ID}}/toggle" data-todo-toggle>
+                    <input type="hidden" name="csrf" value="{{$.CSRF}}">
+                    <label><input type="checkbox" name="completed" {{if .Completed}}checked{{end}}><span>{{.Body}}</span></label>
+                  </form>
+                  <form method="post" action="/board/tasks/{{$task.ID}}/todos/{{.ID}}/delete">
+                    <input type="hidden" name="csrf" value="{{$.CSRF}}">
+                    <button class="text-button" type="submit" aria-label="Delete to-do item" title="Delete">×</button>
+                  </form>
+                </div>
+                {{else}}<p class="todo-empty">No to-do items yet.</p>{{end}}
+              </div>
+              <form method="post" action="/board/tasks/{{.ID}}/todos" class="todo-add-form">
+                <input type="hidden" name="csrf" value="{{$.CSRF}}">
+                <input name="body" required maxlength="240" placeholder="Add a to-do item">
+                <button class="button secondary" type="submit">Add</button>
+              </form>
+            </details>
            <details class="card-detail-editor">
              <summary>People &amp; importance</summary>
              <form method="post" action="/board/tasks/{{.ID}}/details">
@@ -134,8 +158,8 @@
                <input type="hidden" name="csrf" value="{{$.CSRF}}">
                <select name="status" aria-label="Move task">
                  <option value="backlog" {{if eq .Status "backlog"}}selected{{end}}>Backlog</option>
+                  <option value="todo" {{if eq .Status "todo"}}selected{{end}}>To do</option>
                  <option value="in_progress" {{if eq .Status "in_progress"}}selected{{end}}>In progress</option>
-                  <option value="blocked" {{if eq .Status "blocked"}}selected{{end}}>Blocked</option>
                  <option value="done" {{if eq .Status "done"}}selected{{end}}>Done</option>
                </select>
                <button class="text-button task-move-button" type="submit">Move</button>
@@ -173,7 +197,7 @@
    <article class="archived-card">
      <div>
        {{if .Tags}}<div class="card-tags">{{range .Tags}}<span class="board-tag {{.Color}}">{{.Name}}</span>{{end}}</div>{{end}}
-        <span class="task-id">#{{.ID}} · {{.Status}}</span>
+        <span class="archived-status">{{.Status}}</span>
        <h3>{{.Title}}</h3>
        <small>Originally created by {{.CreatorName}}</small>
      </div>