Skip to content

Commit 6d22ca1

Browse files
GiteaBotdenyskon
GiteaBot
and
denyskon
authored
Use full width for project boards (#28225) (#28245)
Backport #28225 by @denyskon Inspired by #28182 Co-authored-by: Denys Konovalov <[email protected]>
1 parent ea9f5a5 commit 6d22ca1

File tree

3 files changed

+59
-53
lines changed

3 files changed

+59
-53
lines changed

‎templates/org/projects/view.tmpl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
<div role="main" aria-label="{{.Title}}" class="page-content repository projects view-project">
33
{{template "shared/user/org_profile_avatar" .}}
44
<div class="ui container">
5-
{{template "user/overview/header" .}}
6-
{{template "projects/view" .}}
5+
{{template "user/overview/header" .}}
6+
</div>
7+
<div class="ui container fluid padded">
8+
{{template "projects/view" .}}
79
</div>
810
</div>
911
{{template "base/footer" .}}

‎templates/projects/view.tmpl‎

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,67 @@
11
{{$canWriteProject := and .CanWriteProjects (or (not .Repository) (not .Repository.IsArchived))}}
22

3-
<div class="gt-df gt-sb gt-ac gt-mb-4">
4-
<h2 class="gt-mb-0">{{.Project.Title}}</h2>
5-
{{if $canWriteProject}}
6-
<div class="ui compact mini menu">
7-
<a class="item" href="{{.Link}}/edit?redirect=project">
8-
{{svg "octicon-pencil"}}
9-
{{ctx.Locale.Tr "repo.issues.label_edit"}}
10-
</a>
11-
{{if .Project.IsClosed}}
12-
<button class="item btn link-action" data-url="{{.Link}}/open">
13-
{{svg "octicon-check"}}
14-
{{ctx.Locale.Tr "repo.projects.open"}}
3+
<div class="ui container">
4+
<div class="gt-df gt-sb gt-ac gt-mb-4">
5+
<h2 class="gt-mb-0">{{.Project.Title}}</h2>
6+
{{if $canWriteProject}}
7+
<div class="ui compact mini menu">
8+
<a class="item" href="{{.Link}}/edit?redirect=project">
9+
{{svg "octicon-pencil"}}
10+
{{ctx.Locale.Tr "repo.issues.label_edit"}}
11+
</a>
12+
{{if .Project.IsClosed}}
13+
<button class="item btn link-action" data-url="{{.Link}}/open">
14+
{{svg "octicon-check"}}
15+
{{ctx.Locale.Tr "repo.projects.open"}}
16+
</button>
17+
{{else}}
18+
<button class="item btn link-action" data-url="{{.Link}}/close">
19+
{{svg "octicon-skip"}}
20+
{{ctx.Locale.Tr "repo.projects.close"}}
21+
</button>
22+
{{end}}
23+
<button class="item btn delete-button" data-url="{{.Link}}/delete" data-id="{{.Project.ID}}">
24+
{{svg "octicon-trash"}}
25+
{{ctx.Locale.Tr "repo.issues.label_delete"}}
1526
</button>
16-
{{else}}
17-
<button class="item btn link-action" data-url="{{.Link}}/close">
18-
{{svg "octicon-skip"}}
19-
{{ctx.Locale.Tr "repo.projects.close"}}
27+
<button class="item btn show-modal" data-modal="#new-project-column-item">
28+
{{svg "octicon-plus"}}
29+
{{ctx.Locale.Tr "new_project_column"}}
2030
</button>
21-
{{end}}
22-
<button class="item btn delete-button" data-url="{{.Link}}/delete" data-id="{{.Project.ID}}">
23-
{{svg "octicon-trash"}}
24-
{{ctx.Locale.Tr "repo.issues.label_delete"}}
25-
</button>
26-
<button class="item btn show-modal" data-modal="#new-project-column-item">
27-
{{svg "octicon-plus"}}
28-
{{ctx.Locale.Tr "new_project_column"}}
29-
</button>
30-
</div>
31-
<div class="ui small modal new-project-column-modal" id="new-project-column-item">
32-
<div class="header">
33-
{{ctx.Locale.Tr "repo.projects.column.new"}}
3431
</div>
35-
<div class="content">
36-
<form class="ui form">
37-
<div class="required field">
38-
<label for="new_project_column">{{ctx.Locale.Tr "repo.projects.column.new_title"}}</label>
39-
<input class="new-project-column" id="new_project_column" name="title" required>
40-
</div>
32+
<div class="ui small modal new-project-column-modal" id="new-project-column-item">
33+
<div class="header">
34+
{{ctx.Locale.Tr "repo.projects.column.new"}}
35+
</div>
36+
<div class="content">
37+
<form class="ui form">
38+
<div class="required field">
39+
<label for="new_project_column">{{ctx.Locale.Tr "repo.projects.column.new_title"}}</label>
40+
<input class="new-project-column" id="new_project_column" name="title" required>
41+
</div>
4142

42-
<div class="field color-field">
43-
<label for="new_project_column_color">{{ctx.Locale.Tr "repo.projects.column.color"}}</label>
44-
<div class="color picker column">
45-
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_project_column_color_picker" name="color">
46-
{{template "repo/issue/label_precolors"}}
43+
<div class="field color-field">
44+
<label for="new_project_column_color">{{ctx.Locale.Tr "repo.projects.column.color"}}</label>
45+
<div class="color picker column">
46+
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_project_column_color_picker" name="color">
47+
{{template "repo/issue/label_precolors"}}
48+
</div>
4749
</div>
48-
</div>
4950

50-
<div class="text right actions">
51-
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
52-
<button data-url="{{$.Link}}" class="ui primary button" id="new_project_column_submit">{{ctx.Locale.Tr "repo.projects.column.new_submit"}}</button>
53-
</div>
54-
</form>
51+
<div class="text right actions">
52+
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
53+
<button data-url="{{$.Link}}" class="ui primary button" id="new_project_column_submit">{{ctx.Locale.Tr "repo.projects.column.new_submit"}}</button>
54+
</div>
55+
</form>
56+
</div>
5557
</div>
56-
</div>
57-
{{end}}
58-
</div>
58+
{{end}}
59+
</div>
5960

60-
<div class="content">{{$.Project.RenderedContent|Str2html}}</div>
61+
<div class="content">{{$.Project.RenderedContent|Str2html}}</div>
6162

62-
<div class="divider"></div>
63+
<div class="divider"></div>
64+
</div>
6365

6466
<div id="project-board">
6567
<div class="board {{if .CanWriteProjects}}sortable{{end}}">

‎templates/repo/projects/view.tmpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
{{template "repo/issue/navbar" .}}
77
<a class="ui small primary button" href="{{.RepoLink}}/issues/new/choose?project={{.Project.ID}}">{{ctx.Locale.Tr "repo.issues.new"}}</a>
88
</div>
9+
</div>
10+
<div class="ui container fluid padded">
911
{{template "projects/view" .}}
1012
</div>
1113
</div>

0 commit comments

Comments
 (0)