aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--options/locale/locale_en-US.ini32
-rw-r--r--templates/projects/new.tmpl24
-rw-r--r--templates/projects/view.tmpl38
-rw-r--r--templates/repo/projects/new.tmpl6
-rw-r--r--templates/repo/projects/view.tmpl38
5 files changed, 70 insertions, 68 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index fbd3068053..c818b0dcc5 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -57,7 +57,7 @@ new_mirror = New Mirror
new_fork = New Repository Fork
new_org = New Organization
new_project = New Project
-new_project_board = New Project board
+new_project_column = New Column
manage_org = Manage Organizations
admin_panel = Site Administration
account_settings = Account Settings
@@ -1203,35 +1203,35 @@ projects.description = Description (optional)
projects.description_placeholder = Description
projects.create = Create Project
projects.title = Title
-projects.new = New project
+projects.new = New Project
projects.new_subheader = Coordinate, track, and update your work in one place, so projects stay transparent and on schedule.
projects.create_success = The project '%s' has been created.
projects.deletion = Delete Project
projects.deletion_desc = Deleting a project removes it from all related issues. Continue?
projects.deletion_success = The project has been deleted.
-projects.edit = Edit Projects
+projects.edit = Edit Project
projects.edit_subheader = Projects organize issues and track progress.
-projects.modify = Update Project
+projects.modify = Edit Project
projects.edit_success = Project '%s' has been updated.
projects.type.none = "None"
projects.type.basic_kanban = "Basic Kanban"
projects.type.bug_triage = "Bug Triage"
-projects.template.desc = "Project template"
+projects.template.desc = "Template"
projects.template.desc_helper = "Select a project template to get started"
projects.type.uncategorized = Uncategorized
-projects.board.edit = "Edit board"
-projects.board.edit_title = "New Board Name"
-projects.board.new_title = "New Board Name"
-projects.board.new_submit = "Submit"
-projects.board.new = "New Board"
-projects.board.set_default = "Set Default"
-projects.board.set_default_desc = "Set this board as default for uncategorized issues and pulls"
-projects.board.delete = "Delete Board"
-projects.board.deletion_desc = "Deleting a project board moves all related issues to 'Uncategorized'. Continue?"
-projects.board.color = "Color"
+projects.column.edit = "Edit Column"
+projects.column.edit_title = "Name"
+projects.column.new_title = "Name"
+projects.column.new_submit = "Create Column"
+projects.column.new = "New Column"
+projects.column.set_default = "Set Default"
+projects.column.set_default_desc = "Set this column as default for uncategorized issues and pulls"
+projects.column.delete = "Delete Column"
+projects.column.deletion_desc = "Deleting a project column moves all related issues to 'Uncategorized'. Continue?"
+projects.column.color = "Color"
projects.open = Open
projects.close = Close
-projects.board.assigned_to = Assigned to
+projects.column.assigned_to = Assigned to
projects.card_type.desc = "Card Previews"
projects.card_type.images_and_text = "Images and Text"
projects.card_type.text_only = "Text Only"
diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl
index 19bf503692..c96f948ded 100644
--- a/templates/projects/new.tmpl
+++ b/templates/projects/new.tmpl
@@ -31,14 +31,16 @@
</div>
{{if not .PageIsEditProjects}}
- <label>{{.locale.Tr "repo.projects.template.desc"}}</label>
- <div class="ui selection dropdown">
- <input type="hidden" name="board_type" value="{{.type}}">
- <div class="default text">{{.locale.Tr "repo.projects.template.desc_helper"}}</div>
- <div class="menu">
- {{range $element := .BoardTypes}}
- <div class="item" data-id="{{$element.BoardType}}" data-value="{{$element.BoardType}}">{{$.locale.Tr $element.Translation}}</div>
- {{end}}
+ <div class="field">
+ <label>{{.locale.Tr "repo.projects.template.desc"}}</label>
+ <div class="ui selection dropdown">
+ <input type="hidden" name="board_type" value="{{.type}}">
+ <div class="default text">{{.locale.Tr "repo.projects.template.desc_helper"}}</div>
+ <div class="menu">
+ {{range $element := .ProjectTypes}}
+ <div class="item" data-id="{{$element.BoardType}}" data-value="{{$element.BoardType}}">{{$.locale.Tr $element.Translation}}</div>
+ {{end}}
+ </div>
</div>
</div>
{{end}}
@@ -47,14 +49,14 @@
<div class="ui divider"></div>
<div class="ui left">
{{if .PageIsEditProjects}}
- <a class="ui primary basic button" href="{{.RepoLink}}/projects">
+ <a class="ui cancel button" href="{{.RepoLink}}/projects">
{{.locale.Tr "repo.milestones.cancel"}}
</a>
- <button class="ui green button">
+ <button class="ui primary button">
{{.locale.Tr "repo.projects.modify"}}
</button>
{{else}}
- <button class="ui green button">
+ <button class="ui primary button">
{{.locale.Tr "repo.projects.create"}}
</button>
{{end}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index b25cf2526e..3d0bea35d5 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -5,21 +5,21 @@
</div>
<div class="column right aligned">
{{if .CanWriteProjects}}
- <a class="ui green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_board"}}</a>
+ <a class="ui green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_column"}}</a>
{{end}}
<div class="ui small modal new-board-modal" id="new-board-item">
<div class="header">
- {{$.locale.Tr "repo.projects.board.new"}}
+ {{$.locale.Tr "repo.projects.column.new"}}
</div>
<div class="content">
<form class="ui form">
<div class="required field">
- <label for="new_board">{{$.locale.Tr "repo.projects.board.new_title"}}</label>
+ <label for="new_board">{{$.locale.Tr "repo.projects.column.new_title"}}</label>
<input class="new-board" id="new_board" name="title" required>
</div>
<div class="field color-field">
- <label for="new_board_color">{{$.locale.Tr "repo.projects.board.color"}}</label>
+ <label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label>
<div class="color picker column">
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color_picker" name="color">
<div class="column precolors">
@@ -30,7 +30,7 @@
<div class="text right actions">
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
- <button data-url="{{$.Link}}" class="ui green button" id="new_board_submit">{{$.locale.Tr "repo.projects.board.new_submit"}}</button>
+ <button data-url="{{$.Link}}" class="ui primary button" id="new_board_submit">{{$.locale.Tr "repo.projects.column.new_submit"}}</button>
</div>
</form>
</div>
@@ -92,32 +92,32 @@
<div class="menu user-menu" tabindex="-1">
<a class="item show-modal button" data-modal="#edit-project-board-modal-{{.ID}}">
{{svg "octicon-pencil"}}
- {{$.locale.Tr "repo.projects.board.edit"}}
+ {{$.locale.Tr "repo.projects.column.edit"}}
</a>
{{if not .Default}}
<a class="item show-modal button" data-modal="#set-default-project-board-modal-{{.ID}}">
{{svg "octicon-pin"}}
- {{$.locale.Tr "repo.projects.board.set_default"}}
+ {{$.locale.Tr "repo.projects.column.set_default"}}
</a>
{{end}}
<a class="item show-modal button" data-modal="#delete-board-modal-{{.ID}}">
{{svg "octicon-trash"}}
- {{$.locale.Tr "repo.projects.board.delete"}}
+ {{$.locale.Tr "repo.projects.column.delete"}}
</a>
<div class="ui small modal edit-project-board" id="edit-project-board-modal-{{.ID}}">
<div class="header">
- {{$.locale.Tr "repo.projects.board.edit"}}
+ {{$.locale.Tr "repo.projects.column.edit"}}
</div>
<div class="content">
<form class="ui form">
<div class="required field">
- <label for="new_board_title">{{$.locale.Tr "repo.projects.board.edit_title"}}</label>
+ <label for="new_board_title">{{$.locale.Tr "repo.projects.column.edit_title"}}</label>
<input class="project-board-title" id="new_board_title" name="title" value="{{.Title}}" required>
</div>
<div class="field color-field">
- <label for="new_board_color">{{$.locale.Tr "repo.projects.board.color"}}</label>
+ <label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label>
<div class="color picker column">
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color" name="color" value="{{.Color}}">
<div class="column precolors">
@@ -128,7 +128,7 @@
<div class="text right actions">
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
- <button data-url="{{$.Link}}/{{.ID}}" class="ui red button">{{$.locale.Tr "repo.projects.board.edit"}}</button>
+ <button data-url="{{$.Link}}/{{.ID}}" class="ui primary button">{{$.locale.Tr "repo.projects.column.edit"}}</button>
</div>
</form>
</div>
@@ -136,31 +136,31 @@
<div class="ui basic modal" id="set-default-project-board-modal-{{.ID}}">
<div class="ui icon header">
- {{$.locale.Tr "repo.projects.board.set_default"}}
+ {{$.locale.Tr "repo.projects.column.set_default"}}
</div>
<div class="content center">
<label>
- {{$.locale.Tr "repo.projects.board.set_default_desc"}}
+ {{$.locale.Tr "repo.projects.column.set_default_desc"}}
</label>
</div>
<div class="text right actions">
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
- <button class="ui red button set-default-project-board" data-url="{{$.Link}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.board.set_default"}}</button>
+ <button class="ui primary button set-default-project-board" data-url="{{$.Link}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button>
</div>
</div>
<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
<div class="ui icon header">
- {{$.locale.Tr "repo.projects.board.delete"}}
+ {{$.locale.Tr "repo.projects.column.delete"}}
</div>
<div class="content center">
<label>
- {{$.locale.Tr "repo.projects.board.deletion_desc"}}
+ {{$.locale.Tr "repo.projects.column.deletion_desc"}}
</label>
</div>
<div class="text right actions">
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
- <button class="ui red button delete-project-board" data-url="{{$.Link}}/{{.ID}}">{{$.locale.Tr "repo.projects.board.delete"}}</button>
+ <button class="ui red button delete-project-board" data-url="{{$.Link}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button>
</div>
</div>
</div>
@@ -238,7 +238,7 @@
{{end}}
<div class="right floated">
{{range .Assignees}}
- <a class="tooltip" target="_blank" href="{{.HomeLink}}" data-content="{{$.locale.Tr "repo.projects.board.assigned_to"}} {{.Name}}">{{avatar . 28 "mini gt-mr-3"}}</a>
+ <a class="tooltip" target="_blank" href="{{.HomeLink}}" data-content="{{$.locale.Tr "repo.projects.column.assigned_to"}} {{.Name}}">{{avatar . 28 "mini gt-mr-3"}}</a>
{{end}}
</div>
</div>
diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl
index c90fa4369c..b65601c158 100644
--- a/templates/repo/projects/new.tmpl
+++ b/templates/repo/projects/new.tmpl
@@ -71,14 +71,14 @@
<div class="ui divider"></div>
<div class="ui left">
{{if .PageIsEditProjects}}
- <a class="ui primary basic button" href="{{.RepoLink}}/projects">
+ <a class="ui cancel button" href="{{.RepoLink}}/projects">
{{.locale.Tr "repo.milestones.cancel"}}
</a>
- <button class="ui green button">
+ <button class="ui primary button">
{{.locale.Tr "repo.projects.modify"}}
</button>
{{else}}
- <button class="ui green button">
+ <button class="ui primary button">
{{.locale.Tr "repo.projects.create"}}
</button>
{{end}}
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index a4ada87353..1450fdac1c 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -9,21 +9,21 @@
<div class="column right aligned">
{{if and .CanWriteProjects (not .Repository.IsArchived)}}
<a class="ui green button show-modal item" href="{{$.RepoLink}}/issues/new/choose?project={{$.Project.ID}}">{{.locale.Tr "repo.issues.new"}}</a>
- <a class="ui green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_board"}}</a>
+ <a class="ui green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_column"}}</a>
{{end}}
<div class="ui small modal new-board-modal" id="new-board-item">
<div class="header">
- {{$.locale.Tr "repo.projects.board.new"}}
+ {{$.locale.Tr "repo.projects.column.new"}}
</div>
<div class="content">
<form class="ui form">
<div class="required field">
- <label for="new_board">{{$.locale.Tr "repo.projects.board.new_title"}}</label>
+ <label for="new_board">{{$.locale.Tr "repo.projects.column.new_title"}}</label>
<input class="new-board" id="new_board" name="title" required>
</div>
<div class="field color-field">
- <label for="new_board_color">{{$.locale.Tr "repo.projects.board.color"}}</label>
+ <label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label>
<div class="color picker column">
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color_picker" name="color">
<div class="column precolors">
@@ -34,7 +34,7 @@
<div class="text right actions">
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
- <button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}" class="ui green button" id="new_board_submit">{{$.locale.Tr "repo.projects.board.new_submit"}}</button>
+ <button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}" class="ui primary button" id="new_board_submit">{{$.locale.Tr "repo.projects.column.new_submit"}}</button>
</div>
</form>
</div>
@@ -96,32 +96,32 @@
<div class="menu user-menu" tabindex="-1">
<a class="item show-modal button" data-modal="#edit-project-board-modal-{{.ID}}">
{{svg "octicon-pencil"}}
- {{$.locale.Tr "repo.projects.board.edit"}}
+ {{$.locale.Tr "repo.projects.column.edit"}}
</a>
{{if not .Default}}
<a class="item show-modal button" data-modal="#set-default-project-board-modal-{{.ID}}">
{{svg "octicon-pin"}}
- {{$.locale.Tr "repo.projects.board.set_default"}}
+ {{$.locale.Tr "repo.projects.column.set_default"}}
</a>
{{end}}
<a class="item show-modal button" data-modal="#delete-board-modal-{{.ID}}">
{{svg "octicon-trash"}}
- {{$.locale.Tr "repo.projects.board.delete"}}
+ {{$.locale.Tr "repo.projects.column.delete"}}
</a>
<div class="ui small modal edit-project-board" id="edit-project-board-modal-{{.ID}}">
<div class="header">
- {{$.locale.Tr "repo.projects.board.edit"}}
+ {{$.locale.Tr "repo.projects.column.edit"}}
</div>
<div class="content">
<form class="ui form">
<div class="required field">
- <label for="new_board_title">{{$.locale.Tr "repo.projects.board.edit_title"}}</label>
+ <label for="new_board_title">{{$.locale.Tr "repo.projects.column.edit_title"}}</label>
<input class="project-board-title" id="new_board_title" name="title" value="{{.Title}}" required>
</div>
<div class="field color-field">
- <label for="new_board_color">{{$.locale.Tr "repo.projects.board.color"}}</label>
+ <label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label>
<div class="color picker column">
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color" name="color" value="{{.Color}}">
<div class="column precolors">
@@ -132,7 +132,7 @@
<div class="text right actions">
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
- <button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}" class="ui red button">{{$.locale.Tr "repo.projects.board.edit"}}</button>
+ <button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}" class="ui primary button">{{$.locale.Tr "repo.projects.column.edit"}}</button>
</div>
</form>
</div>
@@ -140,31 +140,31 @@
<div class="ui basic modal" id="set-default-project-board-modal-{{.ID}}">
<div class="ui icon header">
- {{$.locale.Tr "repo.projects.board.set_default"}}
+ {{$.locale.Tr "repo.projects.column.set_default"}}
</div>
<div class="content center">
<label>
- {{$.locale.Tr "repo.projects.board.set_default_desc"}}
+ {{$.locale.Tr "repo.projects.column.set_default_desc"}}
</label>
</div>
<div class="text right actions">
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
- <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>
+ <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>
</div>
</div>
<div class="ui basic modal" id="delete-board-modal-{{.ID}}">
<div class="ui icon header">
- {{$.locale.Tr "repo.projects.board.delete"}}
+ {{$.locale.Tr "repo.projects.column.delete"}}
</div>
<div class="content center">
<label>
- {{$.locale.Tr "repo.projects.board.deletion_desc"}}
+ {{$.locale.Tr "repo.projects.column.deletion_desc"}}
</label>
</div>
<div class="text right actions">
<div class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</div>
- <button class="ui red button delete-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">{{$.locale.Tr "repo.projects.board.delete"}}</button>
+ <button class="ui red button delete-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">{{$.locale.Tr "repo.projects.column.delete"}}</button>
</div>
</div>
</div>
@@ -249,7 +249,7 @@
{{end}}
<div class="right floated">
{{range .Assignees}}
- <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>
+ <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>
{{end}}
</div>
</div>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 19:53:23 +0000