Skip to content

Commit 843f811

Browse files
brechtvlbrechtvl
authored
Projects: rename Board to Column in interface and improve consistency (#22767)
1 parent d827215 commit 843f811

File tree

5 files changed

+70
-68
lines changed

5 files changed

+70
-68
lines changed

‎options/locale/locale_en-US.ini

+16-16
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ new_mirror = New Mirror
5757
new_fork = New Repository Fork
5858
new_org = New Organization
5959
new_project = New Project
60-
new_project_board = New Project board
60+
new_project_column = New Column
6161
manage_org = Manage Organizations
6262
admin_panel = Site Administration
6363
account_settings = Account Settings
@@ -1203,35 +1203,35 @@ projects.description = Description (optional)
12031203
projects.description_placeholder = Description
12041204
projects.create = Create Project
12051205
projects.title = Title
1206-
projects.new = New project
1206+
projects.new = New Project
12071207
projects.new_subheader = Coordinate, track, and update your work in one place, so projects stay transparent and on schedule.
12081208
projects.create_success = The project '%s' has been created.
12091209
projects.deletion = Delete Project
12101210
projects.deletion_desc = Deleting a project removes it from all related issues. Continue?
12111211
projects.deletion_success = The project has been deleted.
1212-
projects.edit = Edit Projects
1212+
projects.edit = Edit Project
12131213
projects.edit_subheader = Projects organize issues and track progress.
1214-
projects.modify = Update Project
1214+
projects.modify = Edit Project
12151215
projects.edit_success = Project '%s' has been updated.
12161216
projects.type.none = "None"
12171217
projects.type.basic_kanban = "Basic Kanban"
12181218
projects.type.bug_triage = "Bug Triage"
1219-
projects.template.desc = "Project template"
1219+
projects.template.desc = "Template"
12201220
projects.template.desc_helper = "Select a project template to get started"
12211221
projects.type.uncategorized = Uncategorized
1222-
projects.board.edit = "Edit board"
1223-
projects.board.edit_title = "New Board Name"
1224-
projects.board.new_title = "New Board Name"
1225-
projects.board.new_submit = "Submit"
1226-
projects.board.new = "New Board"
1227-
projects.board.set_default = "Set Default"
1228-
projects.board.set_default_desc = "Set this board as default for uncategorized issues and pulls"
1229-
projects.board.delete = "Delete Board"
1230-
projects.board.deletion_desc = "Deleting a project board moves all related issues to 'Uncategorized'. Continue?"
1231-
projects.board.color = "Color"
1222+
projects.column.edit = "Edit Column"
1223+
projects.column.edit_title = "Name"
1224+
projects.column.new_title = "Name"
1225+
projects.column.new_submit = "Create Column"
1226+
projects.column.new = "New Column"
1227+
projects.column.set_default = "Set Default"
1228+
projects.column.set_default_desc = "Set this column as default for uncategorized issues and pulls"
1229+
projects.column.delete = "Delete Column"
1230+
projects.column.deletion_desc = "Deleting a project column moves all related issues to 'Uncategorized'. Continue?"
1231+
projects.column.color = "Color"
12321232
projects.open = Open
12331233
projects.close = Close
1234-
projects.board.assigned_to = Assigned to
1234+
projects.column.assigned_to = Assigned to
12351235
projects.card_type.desc = "Card Previews"
12361236
projects.card_type.images_and_text = "Images and Text"
12371237
projects.card_type.text_only = "Text Only"

‎templates/projects/new.tmpl

+13-11
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,16 @@
3131
</div>
3232

3333
{{if not .PageIsEditProjects}}
34-
<label>{{.locale.Tr "repo.projects.template.desc"}}</label>
35-
<div class="ui selection dropdown">
36-
<input type="hidden" name="board_type" value="{{.type}}">
37-
<div class="default text">{{.locale.Tr "repo.projects.template.desc_helper"}}</div>
38-
<div class="menu">
39-
{{range $element := .BoardTypes}}
40-
<div class="item" data-id="{{$element.BoardType}}" data-value="{{$element.BoardType}}">{{$.locale.Tr $element.Translation}}</div>
41-
{{end}}
34+
<div class="field">
35+
<label>{{.locale.Tr "repo.projects.template.desc"}}</label>
36+
<div class="ui selection dropdown">
37+
<input type="hidden" name="board_type" value="{{.type}}">
38+
<div class="default text">{{.locale.Tr "repo.projects.template.desc_helper"}}</div>
39+
<div class="menu">
40+
{{range $element := .ProjectTypes}}
41+
<div class="item" data-id="{{$element.BoardType}}" data-value="{{$element.BoardType}}">{{$.locale.Tr $element.Translation}}</div>
42+
{{end}}
43+
</div>
4244
</div>
4345
</div>
4446
{{end}}
@@ -47,14 +49,14 @@
4749
<div class="ui divider"></div>
4850
<div class="ui left">
4951
{{if .PageIsEditProjects}}
50-
<a class="ui primary basic button" href="{{.RepoLink}}/projects">
52+
<a class="ui cancel button" href="{{.RepoLink}}/projects">
5153
{{.locale.Tr "repo.milestones.cancel"}}
5254
</a>
53-
<button class="ui green button">
55+
<button class="ui primary button">
5456
{{.locale.Tr "repo.projects.modify"}}
5557
</button>
5658
{{else}}
57-
<button class="ui green button">
59+
<button class="ui primary button">
5860
{{.locale.Tr "repo.projects.create"}}
5961
</button>
6062
{{end}}

‎templates/projects/view.tmpl

+19-19
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
</div>
66
<div class="column right aligned">
77
{{if .CanWriteProjects}}
8-
<a class="ui green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_board"}}</a>
8+
<a class="ui green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_column"}}</a>
99
{{end}}
1010
<div class="ui small modal new-board-modal" id="new-board-item">
1111
<div class="header">
12-
{{$.locale.Tr "repo.projects.board.new"}}
12+
{{$.locale.Tr "repo.projects.column.new"}}
1313
</div>
1414
<div class="content">
1515
<form class="ui form">
1616
<div class="required field">
17-
<label for="new_board">{{$.locale.Tr "repo.projects.board.new_title"}}</label>
17+
<label for="new_board">{{$.locale.Tr "repo.projects.column.new_title"}}</label>
1818
<input class="new-board" id="new_board" name="title" required>
1919
</div>
2020

2121
<div class="field color-field">
22-
<label for="new_board_color">{{$.locale.Tr "repo.projects.board.color"}}</label>
22+
<label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label>
2323
<div class="color picker column">
2424
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color_picker" name="color">
2525
<div class="column precolors">
@@ -30,7 +30,7 @@
3030

3131
<div class="text right actions">
3232
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
33-
<button data-url="{{$.Link}}" class="ui green button" id="new_board_submit">{{$.locale.Tr "repo.projects.board.new_submit"}}</button>
33+
<button data-url="{{$.Link}}" class="ui primary button" id="new_board_submit">{{$.locale.Tr "repo.projects.column.new_submit"}}</button>
3434
</div>
3535
</form>
3636
</div>
@@ -92,32 +92,32 @@
9292
<div class="menu user-menu" tabindex="-1">
9393
<a class="item show-modal button" data-modal="#edit-project-board-modal-{{.ID}}">
9494
{{svg "octicon-pencil"}}
95-
{{$.locale.Tr "repo.projects.board.edit"}}
95+
{{$.locale.Tr "repo.projects.column.edit"}}
9696
</a>
9797
{{if not .Default}}
9898
<a class="item show-modal button" data-modal="#set-default-project-board-modal-{{.ID}}">
9999
{{svg "octicon-pin"}}
100-
{{$.locale.Tr "repo.projects.board.set_default"}}
100+
{{$.locale.Tr "repo.projects.column.set_default"}}
101101
</a>
102102
{{end}}
103103
<a class="item show-modal button" data-modal="#delete-board-modal-{{.ID}}">
104104
{{svg "octicon-trash"}}
105-
{{$.locale.Tr "repo.projects.board.delete"}}
105+
{{$.locale.Tr "repo.projects.column.delete"}}
106106
</a>
107107

108108
<div class="ui small modal edit-project-board" id="edit-project-board-modal-{{.ID}}">
109109
<div class="header">
110-
{{$.locale.Tr "repo.projects.board.edit"}}
110+
{{$.locale.Tr "repo.projects.column.edit"}}
111111
</div>
112112
<div class="content">
113113
<form class="ui form">
114114
<div class="required field">
115-
<label for="new_board_title">{{$.locale.Tr "repo.projects.board.edit_title"}}</label>
115+
<label for="new_board_title">{{$.locale.Tr "repo.projects.column.edit_title"}}</label>
116116
<input class="project-board-title" id="new_board_title" name="title" value="{{.Title}}" required>
117117
</div>
118118

119119
<div class="field color-field">
120-
<label for="new_board_color">{{$.locale.Tr "repo.projects.board.color"}}</label>
120+
<label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label>
121121
<div class="color picker column">
122122
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color" name="color" value="{{.Color}}">
123123
<div class="column precolors">
@@ -128,39 +128,39 @@
128128

129129
<div class="text right actions">
130130
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
131-
<button data-url="{{$.Link}}/{{.ID}}" class="ui red button">{{$.locale.Tr "repo.projects.board.edit"}}</button>
131+
<button data-url="{{$.Link}}/{{.ID}}" class="ui primary button">{{$.locale.Tr "repo.projects.column.edit"}}</button>
132132
</div>
133133
</form>
134134
</div>
135135
</div>
136136

137137
<div class="ui basic modal" id="set-default-project-board-modal-{{.ID}}">
138138
<div class="ui icon header">
139-
{{$.locale.Tr "repo.projects.board.set_default"}}
139+
{{$.locale.Tr "repo.projects.column.set_default"}}
140140
</div>
141141
<div class="content center">
142142
<label>
143-
{{$.locale.Tr "repo.projects.board.set_default_desc"}}
143+
{{$.locale.Tr "repo.projects.column.set_default_desc"}}
144144
</label>
145145
</div>
146146
<div class="text right actions">
147147
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
148-
<button class="ui red button set-default-project-board" data-url="{{$.Link}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.board.set_default"}}</button>
148+
<button class="ui primary button set-default-project-board" data-url="{{$.Link}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button>
149149
</div>
150150
</div>
151151

152152
<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
153153
<div class="ui icon header">
154-
{{$.locale.Tr "repo.projects.board.delete"}}
154+
{{$.locale.Tr "repo.projects.column.delete"}}
155155
</div>
156156
<div class="content center">
157157
<label>
158-
{{$.locale.Tr "repo.projects.board.deletion_desc"}}
158+
{{$.locale.Tr "repo.projects.column.deletion_desc"}}
159159
</label>
160160
</div>
161161
<div class="text right actions">
162162
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
163-
<button class="ui red button delete-project-board" data-url="{{$.Link}}/{{.ID}}">{{$.locale.Tr "repo.projects.board.delete"}}</button>
163+
<button class="ui red button delete-project-board" data-url="{{$.Link}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button>
164164
</div>
165165
</div>
166166
</div>
@@ -238,7 +238,7 @@
238238
{{end}}
239239
<div class="right floated">
240240
{{range .Assignees}}
241-
<a class="tooltip" target="_blank" href="{{.HomeLink}}" data-content="{{$.locale.Tr "repo.projects.board.assigned_to"}} {{.Name}}">{{avatar . 28 "mini gt-mr-3"}}</a>
241+
<a class="tooltip" target="_blank" href="{{.HomeLink}}" data-content="{{$.locale.Tr "repo.projects.column.assigned_to"}} {{.Name}}">{{avatar . 28 "mini gt-mr-3"}}</a>
242242
{{end}}
243243
</div>
244244
</div>

‎templates/repo/projects/new.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@
7171
<div class="ui divider"></div>
7272
<div class="ui left">
7373
{{if .PageIsEditProjects}}
74-
<a class="ui primary basic button" href="{{.RepoLink}}/projects">
74+
<a class="ui cancel button" href="{{.RepoLink}}/projects">
7575
{{.locale.Tr "repo.milestones.cancel"}}
7676
</a>
77-
<button class="ui green button">
77+
<button class="ui primary button">
7878
{{.locale.Tr "repo.projects.modify"}}
7979
</button>
8080
{{else}}
81-
<button class="ui green button">
81+
<button class="ui primary button">
8282
{{.locale.Tr "repo.projects.create"}}
8383
</button>
8484
{{end}}

‎templates/repo/projects/view.tmpl

+19-19
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
<div class="column right aligned">
1010
{{if and .CanWriteProjects (not .Repository.IsArchived)}}
1111
<a class="ui green button show-modal item" href="{{$.RepoLink}}/issues/new/choose?project={{$.Project.ID}}">{{.locale.Tr "repo.issues.new"}}</a>
12-
<a class="ui green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_board"}}</a>
12+
<a class="ui green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_column"}}</a>
1313
{{end}}
1414
<div class="ui small modal new-board-modal" id="new-board-item">
1515
<div class="header">
16-
{{$.locale.Tr "repo.projects.board.new"}}
16+
{{$.locale.Tr "repo.projects.column.new"}}
1717
</div>
1818
<div class="content">
1919
<form class="ui form">
2020
<div class="required field">
21-
<label for="new_board">{{$.locale.Tr "repo.projects.board.new_title"}}</label>
21+
<label for="new_board">{{$.locale.Tr "repo.projects.column.new_title"}}</label>
2222
<input class="new-board" id="new_board" name="title" required>
2323
</div>
2424

2525
<div class="field color-field">
26-
<label for="new_board_color">{{$.locale.Tr "repo.projects.board.color"}}</label>
26+
<label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label>
2727
<div class="color picker column">
2828
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color_picker" name="color">
2929
<div class="column precolors">
@@ -34,7 +34,7 @@
3434

3535
<div class="text right actions">
3636
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
37-
<button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}" class="ui green button" id="new_board_submit">{{$.locale.Tr "repo.projects.board.new_submit"}}</button>
37+
<button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}" class="ui primary button" id="new_board_submit">{{$.locale.Tr "repo.projects.column.new_submit"}}</button>
3838
</div>
3939
</form>
4040
</div>
@@ -96,32 +96,32 @@
9696
<div class="menu user-menu" tabindex="-1">
9797
<a class="item show-modal button" data-modal="#edit-project-board-modal-{{.ID}}">
9898
{{svg "octicon-pencil"}}
99-
{{$.locale.Tr "repo.projects.board.edit"}}
99+
{{$.locale.Tr "repo.projects.column.edit"}}
100100
</a>
101101
{{if not .Default}}
102102
<a class="item show-modal button" data-modal="#set-default-project-board-modal-{{.ID}}">
103103
{{svg "octicon-pin"}}
104-
{{$.locale.Tr "repo.projects.board.set_default"}}
104+
{{$.locale.Tr "repo.projects.column.set_default"}}
105105
</a>
106106
{{end}}
107107
<a class="item show-modal button" data-modal="#delete-board-modal-{{.ID}}">
108108
{{svg "octicon-trash"}}
109-
{{$.locale.Tr "repo.projects.board.delete"}}
109+
{{$.locale.Tr "repo.projects.column.delete"}}
110110
</a>
111111

112112
<div class="ui small modal edit-project-board" id="edit-project-board-modal-{{.ID}}">
113113
<div class="header">
114-
{{$.locale.Tr "repo.projects.board.edit"}}
114+
{{$.locale.Tr "repo.projects.column.edit"}}
115115
</div>
116116
<div class="content">
117117
<form class="ui form">
118118
<div class="required field">
119-
<label for="new_board_title">{{$.locale.Tr "repo.projects.board.edit_title"}}</label>
119+
<label for="new_board_title">{{$.locale.Tr "repo.projects.column.edit_title"}}</label>
120120
<input class="project-board-title" id="new_board_title" name="title" value="{{.Title}}" required>
121121
</div>
122122

123123
<div class="field color-field">
124-
<label for="new_board_color">{{$.locale.Tr "repo.projects.board.color"}}</label>
124+
<label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label>
125125
<div class="color picker column">
126126
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color" name="color" value="{{.Color}}">
127127
<div class="column precolors">
@@ -132,39 +132,39 @@
132132

133133
<div class="text right actions">
134134
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
135-
<button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}" class="ui red button">{{$.locale.Tr "repo.projects.board.edit"}}</button>
135+
<button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}" class="ui primary button">{{$.locale.Tr "repo.projects.column.edit"}}</button>
136136
</div>
137137
</form>
138138
</div>
139139
</div>
140140

141141
<div class="ui basic modal" id="set-default-project-board-modal-{{.ID}}">
142142
<div class="ui icon header">
143-
{{$.locale.Tr "repo.projects.board.set_default"}}
143+
{{$.locale.Tr "repo.projects.column.set_default"}}
144144
</div>
145145
<div class="content center">
146146
<label>
147-
{{$.locale.Tr "repo.projects.board.set_default_desc"}}
147+
{{$.locale.Tr "repo.projects.column.set_default_desc"}}
148148
</label>
149149
</div>
150150
<div class="text right actions">
151151
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
152-
<button class="ui red button set-default-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.board.set_default"}}</button>
152+
<button class="ui primary button set-default-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button>
153153
</div>
154154
</div>
155155

156156
<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
157157
<div class="ui icon header">
158-
{{$.locale.Tr "repo.projects.board.delete"}}
158+
{{$.locale.Tr "repo.projects.column.delete"}}
159159
</div>
160160
<div class="content center">
161161
<label>
162-
{{$.locale.Tr "repo.projects.board.deletion_desc"}}
162+
{{$.locale.Tr "repo.projects.column.deletion_desc"}}
163163
</label>
164164
</div>
165165
<div class="text right actions">
166166
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
167-
<button class="ui red button delete-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">{{$.locale.Tr "repo.projects.board.delete"}}</button>
167+
<button class="ui red button delete-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button>
168168
</div>
169169
</div>
170170
</div>
@@ -249,7 +249,7 @@
249249
{{end}}
250250
<div class="right floated">
251251
{{range .Assignees}}
252-
<a class="tooltip" target="_blank" href="{{.HomeLink}}" data-content="{{$.locale.Tr "repo.projects.board.assigned_to"}} {{.Name}}">{{avatar $.Context . 28 "mini gt-mr-3"}}</a>
252+
<a class="tooltip" target="_blank" href="{{.HomeLink}}" data-content="{{$.locale.Tr "repo.projects.column.assigned_to"}} {{.Name}}">{{avatar $.Context . 28 "mini gt-mr-3"}}</a>
253253
{{end}}
254254
</div>
255255
</div>

0 commit comments

Comments
 (0)