Skip to content

Commit cfe923c

Browse files
dongrentianyudongrentianyu
committed
change priority to task state
1 parent 0297abc commit cfe923c

File tree

11 files changed

+69
-60
lines changed

11 files changed

+69
-60
lines changed

‎src/taskhub/language/en-GB/index.multids

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Options/Hint: Options
4848
Or: or
4949
OtherTasks: Other tasks
5050
Overdue: Overdue
51-
Priority/Hint: Priority
51+
taskState/Hint: taskState
5252
ProjectArchived: This project is archived.
5353
Projects: Projects
5454
QuickAddTodo: Quick add todo

‎src/taskhub/styles/stylesheet.tid

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ title: $:/plugins/mabuqian/TaskHub/styles/stylesheet
106106
float: right;
107107
}
108108

109-
.TH-todo .TH-btn.TH-priority {
109+
.TH-todo .TH-btn.TH-taskState {
110110
border: none;
111111
}
112112

@@ -135,7 +135,7 @@ title: $:/plugins/mabuqian/TaskHub/styles/stylesheet
135135
}
136136

137137
.TH-todo-actions .TH-btn,
138-
.TH-todo .TH-btn.TH-priority {
138+
.TH-todo .TH-btn.TH-taskState {
139139
color: #999;
140140
fill: #999;
141141
padding: 4px 8px;
@@ -162,7 +162,7 @@ title: $:/plugins/mabuqian/TaskHub/styles/stylesheet
162162

163163
@media (min-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) {
164164
.TH-todo .TH-todo-actions .TH-btn.TH-not-scheduled,
165-
.TH-todo .TH-todo-actions .TH-btn.TH-priority- {
165+
.TH-todo .TH-todo-actions .TH-btn.TH-taskState- {
166166
opacity: 0;
167167
transition: opacity ease-in .14s;
168168
}
@@ -247,26 +247,26 @@ title: $:/plugins/mabuqian/TaskHub/styles/stylesheet
247247
text-align: center;
248248
}
249249

250-
.TH-priority-3, .TH-priority-3 svg,
251-
.TH-drop-down .TH-priority-3,
252-
.TH-drop-down .TH-priority-3 svg,
253-
.TH-btn.TH-priority-3 {
250+
.TH-taskState-breakdown, .TH-taskState-breakdown svg,
251+
.TH-drop-down .TH-taskState-breakdown,
252+
.TH-drop-down .TH-taskState-breakdown svg,
253+
.TH-btn.TH-taskState-breakdown {
254254
fill: #e73939;
255255
color: #e73939;
256256
}
257257

258-
.TH-priority-2, .TH-priority-2 svg,
259-
.TH-drop-down .TH-priority-2,
260-
.TH-drop-down .TH-priority-2 svg,
261-
.TH-btn.TH-priority-2 {
258+
.TH-taskState-closed, .TH-taskState-closed svg,
259+
.TH-drop-down .TH-taskState-closed,
260+
.TH-drop-down .TH-taskState-closed svg,
261+
.TH-btn.TH-taskState-closed {
262262
fill: #e77a39;
263263
color: #e77a39;
264264
}
265265

266-
.TH-priority-1, .TH-priority-1 svg,
267-
.TH-drop-down .TH-priority-1,
268-
.TH-drop-down .TH-priority-1 svg,
269-
.TH-btn.TH-priority-1 {
266+
.TH-taskState-done, .TH-taskState-done svg,
267+
.TH-drop-down .TH-taskState-done,
268+
.TH-drop-down .TH-taskState-done svg,
269+
.TH-btn.TH-taskState-done {
270270
fill: #24cd5e;
271271
color: #24cd5e;
272272
}

‎src/taskhub/ui/buttons/TodoActions.tid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ title: $:/plugins/mabuqian/TaskHub/ui/buttons/TodoActions
1515

1616
<$reveal state=<<popupTiddler>> type="popup" position="belowleft" animate="no">
1717
<div class="tc-drop-down TH-drop-down TH-date-picker TH-todo-actions-drop-down">
18-
{{||$:/plugins/mabuqian/TaskHub/ui/forms/TodoPriority}}
18+
{{||$:/plugins/mabuqian/TaskHub/ui/forms/TodoTaskState}}
1919
<hr/>
2020
{{||$:/plugins/mabuqian/TaskHub/ui/forms/TodoDueDate}}
2121
<hr/>

‎src/taskhub/ui/buttons/TodoPriority.tid

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/taskhub/ui/buttons/TodoTaskState.tid

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
title: $:/plugins/mabuqian/TaskHub/ui/buttons/TodoTaskState
2+
3+
<$vars
4+
popupTiddler=<<qualify "$:/state/TaskHub/due-taskState-dropdown">>
5+
cssClass={{{ [[TH-btn TH-taskState TH-taskState-]addsuffix{!!tmo_taskState}] }}}
6+
>
7+
<$button
8+
class=<<cssClass>>
9+
popup=<<popupTiddler>>
10+
tooltip={{$:/language/TaskHub/taskState/Hint}}
11+
aria-label={{$:/language/TaskHub/taskState/Hint}}
12+
>
13+
{{$:/plugins/mabuqian/TaskHub/images/flag}}
14+
</$button>
15+
16+
<$reveal state=<<popupTiddler>> type="popup" position="belowleft" animate="no">
17+
<div class="tc-drop-down TH-drop-down">
18+
{{||$:/plugins/mabuqian/TaskHub/ui/forms/TodoTaskState}}
19+
</div>
20+
</$reveal>
21+
</$vars>

‎src/taskhub/ui/forms/TodoPriority.tid

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/taskhub/ui/forms/TodoTaskState.tid

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
title: $:/plugins/mabuqian/TaskHub/ui/forms/TodoTaskState
2+
3+
<div class="TH-priorities">
4+
<$list filter="done closed breakdown" variable="taskState">
5+
<$button class={{{ [[tc-btn-invisible TH-taskState-]addsuffix<taskState>] }}}>
6+
{{$:/plugins/mabuqian/TaskHub/images/flag}}
7+
<$action-setfield tmo_taskState=<<taskState>>/>
8+
</$button>
9+
</$list>
10+
11+
<$button class="tc-btn-invisible">
12+
{{$:/plugins/mabuqian/TaskHub/images/slash-circle}}
13+
<$action-setfield tmo_taskState="todo"/>
14+
</$button>
15+
</div>

‎src/taskhub/ui/todo/TodoHeading.tid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ title: $:/plugins/mabuqian/TaskHub/ui/todo/TodoHeading
77
<$list filter=<<TH-is-todo>>>
88
<div class="TH-todo-heading">
99
{{||$:/plugins/mabuqian/TaskHub/ui/buttons/TodoDueDate}}
10-
{{||$:/plugins/mabuqian/TaskHub/ui/buttons/TodoPriority}}
10+
{{||$:/plugins/mabuqian/TaskHub/ui/buttons/TodoTaskState}}
1111

1212
<$vars popupTiddler=<<qualify "$:/state/TaskHub/todo-heading-dropdown">>>
1313
<$button

‎src/taskhub/ui/todo/TodoItem.tid

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ title: $:/plugins/mabuqian/TaskHub/ui/todo/TodoItem
33
<div class={{{ [all[current]tag[done]then[TH-todo TH-completed]else[TH-todo]] }}}>
44
<$checkbox field="tmo_taskState" checked="done" unchecked="todo" >
55
{{||$:/plugins/mabuqian/TaskHub/ui/buttons/Checkbox}}
6-
<$reveal type="nomatch" state="!!priority" text="">
7-
{{||$:/plugins/mabuqian/TaskHub/ui/buttons/TodoPriority}}
8-
</$reveal>
96
<$link to={{!!title}}>
107
{{||$:/plugins/mabuqian/TaskHub/ui/todo/TodoCaption}}
118
<$list filter=<<TH-has-todos>> variable="ignore">
@@ -18,6 +15,10 @@ title: $:/plugins/mabuqian/TaskHub/ui/todo/TodoItem
1815
</$list>
1916
</$link>
2017
</$checkbox>
21-
22-
{{||$:/plugins/mabuqian/TaskHub/ui/todo/TodoActions}}
18+
{{||$:/plugins/mabuqian/TaskHub/ui/todo/TodoActions}}
19+
<$reveal type="nomatch" state="!!tmo_taskState" text="">
20+
<span class="TH-todo-actions">
21+
{{||$:/plugins/mabuqian/TaskHub/ui/buttons/TodoTaskState}}
22+
</span>
23+
</$reveal>
2324
</div>

‎src/taskhub/ui/viewtemplate/taskTemplate.tid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ code-body: yes
66
<$list filter=<<TH-is-todo>>>
77
<div class="TH-todo-heading">
88
{{||$:/plugins/mabuqian/TaskHub/ui/buttons/TodoDueDate}}
9-
{{||$:/plugins/mabuqian/TaskHub/ui/buttons/TodoPriority}}
9+
{{||$:/plugins/mabuqian/TaskHub/ui/buttons/TodoTaskState}}
1010

1111
<$vars popupTiddler=<<qualify "$:/state/TaskHub/todo-heading-dropdown">>>
1212
<$button

0 commit comments

Comments
 (0)