Skip to content

Commit ed2ef04

Browse files
silverwindsilverwind
committed
Review enhancements, remove review box
1 parent 0d54395 commit ed2ef04

File tree

6 files changed

+213
-299
lines changed

6 files changed

+213
-299
lines changed

‎templates/repo/issue/new_form.tmpl

Lines changed: 123 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<form class="ui comment form stackable grid" id="new-issue" action="{{.Link}}" method="post">
1+
<form class="issue-content ui comment form" id="new-issue" action="{{.Link}}" method="post">
22
{{.CsrfTokenHtml}}
33
{{if .Flash}}
44
<div class="sixteen wide column">
55
{{template "base/alert" .}}
66
</div>
77
{{end}}
8-
<div class="twelve wide column">
8+
<div class="issue-content-left">
99
<div class="ui comments">
1010
<div class="comment">
11-
{{template "shared/user/avatarlink" dict "Context" $.Context "user" .SignedUser}}
12-
<div class="ui segment content">
11+
{{avatar $.Context .SignedUser 40}}
12+
<div class="ui segment content gt-my-0">
1313
<div class="field">
1414
<input name="title" id="issue_title" placeholder="{{.locale.Tr "repo.milestones.title"}}" value="{{if .TitleQuery}}{{.TitleQuery}}{{else if .IssueTemplateTitle}}{{.IssueTemplateTitle}}{{else}}{{.title}}{{end}}" tabindex="3" autofocus required maxlength="255" autocomplete="off">
1515
{{if .PageIsComparePull}}
@@ -48,147 +48,145 @@
4848
</div>
4949
</div>
5050

51-
<div class="four wide column">
52-
<div class="ui segment metas">
53-
{{template "repo/issue/branch_selector_field" .}}
51+
<div class="issue-content-right ui segment">
52+
{{template "repo/issue/branch_selector_field" .}}
5453

55-
<input id="label_ids" name="label_ids" type="hidden" value="{{.label_ids}}">
56-
{{template "repo/issue/labels/labels_selector_field" .}}
57-
{{template "repo/issue/labels/labels_sidebar" dict "root" $}}
54+
<input id="label_ids" name="label_ids" type="hidden" value="{{.label_ids}}">
55+
{{template "repo/issue/labels/labels_selector_field" .}}
56+
{{template "repo/issue/labels/labels_sidebar" dict "root" $}}
5857

59-
<div class="ui divider"></div>
58+
<div class="ui divider"></div>
6059

61-
<input id="milestone_id" name="milestone_id" type="hidden" value="{{.milestone_id}}">
62-
<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating jump select-milestone dropdown">
63-
<span class="text">
64-
<strong>{{.locale.Tr "repo.issues.new.milestone"}}</strong>
65-
{{if .HasIssuesOrPullsWritePermission}}
66-
{{svg "octicon-gear"}}
67-
{{end}}
68-
</span>
69-
<div class="menu">
70-
{{template "repo/issue/milestone/select_menu" .}}
71-
</div>
60+
<input id="milestone_id" name="milestone_id" type="hidden" value="{{.milestone_id}}">
61+
<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating jump select-milestone dropdown">
62+
<span class="text">
63+
<strong>{{.locale.Tr "repo.issues.new.milestone"}}</strong>
64+
{{if .HasIssuesOrPullsWritePermission}}
65+
{{svg "octicon-gear"}}
66+
{{end}}
67+
</span>
68+
<div class="menu">
69+
{{template "repo/issue/milestone/select_menu" .}}
7270
</div>
73-
<div class="ui select-milestone list">
74-
<span class="no-select item {{if .Milestone}}gt-hidden{{end}}">{{.locale.Tr "repo.issues.new.no_milestone"}}</span>
75-
<div class="selected">
76-
{{if .Milestone}}
77-
<a class="item muted sidebar-item-link" href="{{.RepoLink}}/issues?milestone={{.Milestone.ID}}">
78-
{{svg "octicon-milestone" 18 "gt-mr-3"}}
79-
{{.Milestone.Name}}
80-
</a>
81-
{{end}}
82-
</div>
71+
</div>
72+
<div class="ui select-milestone list">
73+
<span class="no-select item {{if .Milestone}}gt-hidden{{end}}">{{.locale.Tr "repo.issues.new.no_milestone"}}</span>
74+
<div class="selected">
75+
{{if .Milestone}}
76+
<a class="item muted sidebar-item-link" href="{{.RepoLink}}/issues?milestone={{.Milestone.ID}}">
77+
{{svg "octicon-milestone" 18 "gt-mr-3"}}
78+
{{.Milestone.Name}}
79+
</a>
80+
{{end}}
8381
</div>
82+
</div>
8483

85-
{{if .IsProjectsEnabled}}
86-
<div class="ui divider"></div>
84+
{{if .IsProjectsEnabled}}
85+
<div class="ui divider"></div>
8786

88-
<input id="project_id" name="project_id" type="hidden" value="{{.project_id}}">
89-
<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating jump select-project dropdown">
87+
<input id="project_id" name="project_id" type="hidden" value="{{.project_id}}">
88+
<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating jump select-project dropdown">
89+
<span class="text">
90+
<strong>{{.locale.Tr "repo.issues.new.projects"}}</strong>
91+
{{if .HasIssuesOrPullsWritePermission}}
92+
{{svg "octicon-gear"}}
93+
{{end}}
94+
</span>
95+
<div class="menu">
96+
<div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_project_title"}}</div>
97+
{{if or .OpenProjects .ClosedProjects}}
98+
<div class="ui icon search input">
99+
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
100+
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_projects"}}">
101+
</div>
102+
{{end}}
103+
<div class="no-select item">{{.locale.Tr "repo.issues.new.clear_projects"}}</div>
104+
{{if and (not .OpenProjects) (not .ClosedProjects)}}
105+
<div class="header" style="text-transform: none;font-size:14px;">
106+
{{.locale.Tr "repo.issues.new.no_items"}}
107+
</div>
108+
{{else}}
109+
{{if .OpenProjects}}
110+
<div class="divider"></div>
111+
<div class="header">
112+
{{.locale.Tr "repo.issues.new.open_projects"}}
113+
</div>
114+
{{range .OpenProjects}}
115+
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link}}">
116+
{{svg .IconName 18 "gt-mr-3"}}{{.Title}}
117+
</a>
118+
{{end}}
119+
{{end}}
120+
{{if .ClosedProjects}}
121+
<div class="divider"></div>
122+
<div class="header">
123+
{{.locale.Tr "repo.issues.new.closed_projects"}}
124+
</div>
125+
{{range .ClosedProjects}}
126+
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link}}">
127+
{{svg .IconName 18 "gt-mr-3"}}{{.Title}}
128+
</a>
129+
{{end}}
130+
{{end}}
131+
{{end}}
132+
</div>
133+
</div>
134+
<div class="ui select-project list">
135+
<span class="no-select item {{if .Project}}gt-hidden{{end}}">{{.locale.Tr "repo.issues.new.no_projects"}}</span>
136+
<div class="selected">
137+
{{if .Project}}
138+
<a class="item muted sidebar-item-link" href="{{.Project.Link}}">
139+
{{svg .Project.IconName 18 "gt-mr-3"}}{{.Project.Title}}
140+
</a>
141+
{{end}}
142+
</div>
143+
</div>
144+
{{end}}
145+
<div class="ui divider"></div>
146+
<input id="assignee_ids" name="assignee_ids" type="hidden" value="{{.assignee_ids}}">
147+
<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating jump select-assignees dropdown">
90148
<span class="text">
91-
<strong>{{.locale.Tr "repo.issues.new.projects"}}</strong>
149+
<strong>{{.locale.Tr "repo.issues.new.assignees"}}</strong>
92150
{{if .HasIssuesOrPullsWritePermission}}
93151
{{svg "octicon-gear"}}
94152
{{end}}
95153
</span>
96-
<div class="menu">
97-
<div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_project_title"}}</div>
98-
{{if or .OpenProjects .ClosedProjects}}
154+
<div class="filter menu" data-id="#assignee_ids">
155+
<div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_assignees_title"}}</div>
99156
<div class="ui icon search input">
100157
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
101-
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_projects"}}">
158+
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_assignees"}}">
102159
</div>
103-
{{end}}
104-
<div class="no-select item">{{.locale.Tr "repo.issues.new.clear_projects"}}</div>
105-
{{if and (not .OpenProjects) (not .ClosedProjects)}}
106-
<div class="header" style="text-transform: none;font-size:14px;">
107-
{{.locale.Tr "repo.issues.new.no_items"}}
108-
</div>
109-
{{else}}
110-
{{if .OpenProjects}}
111-
<div class="divider"></div>
112-
<div class="header">
113-
{{.locale.Tr "repo.issues.new.open_projects"}}
114-
</div>
115-
{{range .OpenProjects}}
116-
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link}}">
117-
{{svg .IconName 18 "gt-mr-3"}}{{.Title}}
118-
</a>
119-
{{end}}
120-
{{end}}
121-
{{if .ClosedProjects}}
122-
<div class="divider"></div>
123-
<div class="header">
124-
{{.locale.Tr "repo.issues.new.closed_projects"}}
125-
</div>
126-
{{range .ClosedProjects}}
127-
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link}}">
128-
{{svg .IconName 18 "gt-mr-3"}}{{.Title}}
129-
</a>
130-
{{end}}
131-
{{end}}
132-
{{end}}
133-
</div>
134-
</div>
135-
<div class="ui select-project list">
136-
<span class="no-select item {{if .Project}}gt-hidden{{end}}">{{.locale.Tr "repo.issues.new.no_projects"}}</span>
137-
<div class="selected">
138-
{{if .Project}}
139-
<a class="item muted sidebar-item-link" href="{{.Project.Link}}">
140-
{{svg .Project.IconName 18 "gt-mr-3"}}{{.Project.Title}}
160+
<div class="no-select item">{{.locale.Tr "repo.issues.new.clear_assignees"}}</div>
161+
{{range .Assignees}}
162+
<a class="item muted" href="#" data-id="{{.ID}}" data-id-selector="#assignee_{{.ID}}">
163+
<span class="octicon-check invisible">{{svg "octicon-check"}}</span>
164+
<span class="text">
165+
{{avatar $.Context . 28 "gt-mr-3"}}{{template "repo/search_name" .}}
166+
</span>
141167
</a>
142168
{{end}}
143169
</div>
144170
</div>
145-
{{end}}
171+
<div class="ui assignees list">
172+
<span class="no-select item {{if .HasSelectedLabel}}gt-hidden{{end}}">
173+
{{.locale.Tr "repo.issues.new.no_assignees"}}
174+
</span>
175+
{{range .Assignees}}
176+
<a class="item gt-p-2 muted gt-hidden" id="assignee_{{.ID}}" href="{{$.RepoLink}}/issues?assignee={{.ID}}">
177+
{{avatar $.Context . 28 "gt-mr-3 gt-vm"}}{{.GetDisplayName}}
178+
</a>
179+
{{end}}
180+
</div>
181+
{{if and .PageIsComparePull (not (eq .HeadRepo.FullName .BaseCompareRepo.FullName)) .CanWriteToHeadRepo}}
146182
<div class="ui divider"></div>
147-
<input id="assignee_ids" name="assignee_ids" type="hidden" value="{{.assignee_ids}}">
148-
<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating jump select-assignees dropdown">
149-
<span class="text">
150-
<strong>{{.locale.Tr "repo.issues.new.assignees"}}</strong>
151-
{{if .HasIssuesOrPullsWritePermission}}
152-
{{svg "octicon-gear"}}
153-
{{end}}
154-
</span>
155-
<div class="filter menu" data-id="#assignee_ids">
156-
<div class="header" style="text-transform: none;font-size:16px;">{{.locale.Tr "repo.issues.new.add_assignees_title"}}</div>
157-
<div class="ui icon search input">
158-
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
159-
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_assignees"}}">
160-
</div>
161-
<div class="no-select item">{{.locale.Tr "repo.issues.new.clear_assignees"}}</div>
162-
{{range .Assignees}}
163-
<a class="item muted" href="#" data-id="{{.ID}}" data-id-selector="#assignee_{{.ID}}">
164-
<span class="octicon-check invisible">{{svg "octicon-check"}}</span>
165-
<span class="text">
166-
{{avatar $.Context . 28 "gt-mr-3"}}{{template "repo/search_name" .}}
167-
</span>
168-
</a>
169-
{{end}}
170-
</div>
183+
<div class="inline field">
184+
<div class="ui checkbox">
185+
<label data-tooltip-content="{{.locale.Tr "repo.pulls.allow_edits_from_maintainers_desc"}}"><strong>{{.locale.Tr "repo.pulls.allow_edits_from_maintainers"}}</strong></label>
186+
<input name="allow_maintainer_edit" type="checkbox" {{if .AllowMaintainerEdit}}checked{{end}}>
171187
</div>
172-
<div class="ui assignees list">
173-
<span class="no-select item {{if .HasSelectedLabel}}gt-hidden{{end}}">
174-
{{.locale.Tr "repo.issues.new.no_assignees"}}
175-
</span>
176-
{{range .Assignees}}
177-
<a class="item gt-p-2 muted gt-hidden" id="assignee_{{.ID}}" href="{{$.RepoLink}}/issues?assignee={{.ID}}">
178-
{{avatar $.Context . 28 "gt-mr-3 gt-vm"}}{{.GetDisplayName}}
179-
</a>
180-
{{end}}
181-
</div>
182-
{{if and .PageIsComparePull (not (eq .HeadRepo.FullName .BaseCompareRepo.FullName)) .CanWriteToHeadRepo}}
183-
<div class="ui divider"></div>
184-
<div class="inline field">
185-
<div class="ui checkbox">
186-
<label data-tooltip-content="{{.locale.Tr "repo.pulls.allow_edits_from_maintainers_desc"}}"><strong>{{.locale.Tr "repo.pulls.allow_edits_from_maintainers"}}</strong></label>
187-
<input name="allow_maintainer_edit" type="checkbox" {{if .AllowMaintainerEdit}}checked{{end}}>
188-
</div>
189-
</div>
190-
{{end}}
191-
</div>
192-
<input type="hidden" name="redirect_after_creation" value="{{.redirect_after_creation}}">
188+
</div>
189+
{{end}}
193190
</div>
191+
<input type="hidden" name="redirect_after_creation" value="{{.redirect_after_creation}}">
194192
</form>

‎templates/repo/issue/view_content.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="ui stackable grid">
1+
<div class="issue-content">
22
<!-- I know, there is probably a better way to do this (moved from sidebar.tmpl, original author: 6543 @ 2021-02-28) -->
33
<!-- Agree, there should be a better way, eg: introduce window.config.pageData (original author: wxiaoguang @ 2021-09-05) -->
44
<input type="hidden" id="repolink" value="{{$.RepoRelPath}}">
@@ -7,7 +7,7 @@
77
<input type="hidden" id="type" value="{{.IssueType}}">
88

99
{{$createdStr:= TimeSinceUnix .Issue.CreatedUnix $.locale}}
10-
<div class="twelve wide column comment-list prevent-before-timeline">
10+
<div class="issue-content-left comment-list prevent-before-timeline">
1111
<div class="ui timeline">
1212
<div id="{{.Issue.HashTag}}" class="timeline-item comment first">
1313
{{if .Issue.OriginalAuthor}}

0 commit comments

Comments
 (0)