Skip to content

Commit fab7937

Browse files
lafrikslunny
lafriks
authored and
lunny
committed
Improve dependency UI (#4503)
1 parent fa4663e commit fab7937

File tree

5 files changed

+50
-53
lines changed

5 files changed

+50
-53
lines changed

‎options/locale/locale_en-US.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -794,6 +794,7 @@ issues.dependency.pr_no_dependencies = This pull request currently doesn't have
794794
issues.dependency.add = Add dependency...
795795
issues.dependency.cancel = Cancel
796796
issues.dependency.remove = Remove
797+
issues.dependency.remove_info = Remove this dependency
797798
issues.dependency.added_dependency = `<a href="%[1]s">%[2]s</a> added a new dependency %[3]s`
798799
issues.dependency.removed_dependency = `<a href="%[1]s">%[2]s</a> removed a dependency %[3]s`
799800
issues.dependency.issue_closing_blockedby = Closing this pull request is blocked by the following issues

‎public/css/index.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/less/_base.less‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ pre, code {
156156
z-index: 10;
157157
}
158158

159+
&.transparent.label {
160+
background-color: transparent;
161+
}
162+
159163
&.menu,
160164
&.vertical.menu,
161165
&.segment {

‎public/less/_repository.less‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,14 @@
743743
margin-right: 5px;
744744
}
745745
}
746+
747+
.ui.depending {
748+
.item.is-closed {
749+
.title {
750+
text-decoration: line-through;
751+
}
752+
}
753+
}
746754
}
747755
.comment.form {
748756
.ui.comments {

‎templates/repo/issue/view_content/sidebar.tmpl‎

Lines changed: 36 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -254,84 +254,68 @@
254254
<div class="ui divider"></div>
255255

256256
<div class="ui depending">
257-
<span class="text"><strong>{{.i18n.Tr "repo.issues.dependency.title"}}</strong></span>
258-
<br>
259-
{{if .BlockedByDependencies}}
257+
{{if (and (not .BlockedByDependencies) (not .BlockingDependencies))}}
258+
<span class="text"><strong>{{.i18n.Tr "repo.issues.dependency.title"}}</strong></span>
259+
<br>
260+
<p>{{if .Issue.IsPull}}
261+
{{.i18n.Tr "repo.issues.dependency.pr_no_dependencies"}}
262+
{{else}}
263+
{{.i18n.Tr "repo.issues.dependency.issue_no_dependencies"}}
264+
{{end}}</p>
265+
{{end}}
266+
267+
{{if .BlockingDependencies}}
260268
<span class="text" data-tooltip="{{if .Issue.IsPull}}
261-
{{.i18n.Tr "repo.issues.dependency.issue_closing_blockedby"}}
262-
{{else}}
263-
{{.i18n.Tr "repo.issues.dependency.pr_closing_blockedby"}}
264-
{{end}}" data-inverted="">
265-
{{.i18n.Tr "repo.issues.dependency.blocked_by_short"}}:
269+
{{.i18n.Tr "repo.issues.dependency.pr_close_blocks"}}
270+
{{else}}
271+
{{.i18n.Tr "repo.issues.dependency.issue_close_blocks"}}
272+
{{end}}" data-inverted="">
273+
<strong>{{.i18n.Tr "repo.issues.dependency.blocks_short"}}</strong>
266274
</span>
267275
<div class="ui relaxed divided list">
268-
{{range .BlockedByDependencies}}
269-
<div class="item">
270-
<div class="right floated content">
276+
{{range .BlockingDependencies}}
277+
<div class="item{{if .IsClosed}} is-closed{{end}}">
278+
<div class="ui black label">#{{.Index}}</div>
279+
<a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
280+
<div class="ui transparent label right floated">
271281
{{if $.CanCreateIssueDependencies}}
272-
<a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blockedBy');">
282+
<a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blocking');"
283+
data-tooltip="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
273284
<i class="delete icon text red"></i>
274285
</a>
275286
{{end}}
276-
{{if .IsClosed}}
277-
<div class="ui red mini label">
278-
<i class="octicon octicon-issue-closed"></i>
279-
</div>
280-
{{else}}
281-
<div class="ui green mini label">
282-
<i class="octicon octicon-issue-opened"></i>
283-
</div>
284-
{{end}}
285287
</div>
286-
<div class="ui black label">#{{.Index}}</div>
287-
<a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
288288
</div>
289289
{{end}}
290290
</div>
291291
{{end}}
292292

293-
{{if .BlockingDependencies}}
293+
{{if .BlockedByDependencies}}
294294
<span class="text" data-tooltip="{{if .Issue.IsPull}}
295-
{{.i18n.Tr "repo.issues.dependency.pr_close_blocks"}}
296-
{{else}}
297-
{{.i18n.Tr "repo.issues.dependency.issue_close_blocks"}}
298-
{{end}}" data-inverted="">
299-
{{.i18n.Tr "repo.issues.dependency.blocks_short"}}:
295+
{{.i18n.Tr "repo.issues.dependency.issue_closing_blockedby"}}
296+
{{else}}
297+
{{.i18n.Tr "repo.issues.dependency.pr_closing_blockedby"}}
298+
{{end}}" data-inverted="">
299+
<strong>{{.i18n.Tr "repo.issues.dependency.blocked_by_short"}}</strong>
300300
</span>
301301
<div class="ui relaxed divided list">
302-
{{range .BlockingDependencies}}
303-
<div class="item">
304-
<div class="right floated content">
302+
{{range .BlockedByDependencies}}
303+
<div class="item{{if .IsClosed}} is-closed{{end}}">
304+
<div class="ui black label">#{{.Index}}</div>
305+
<a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
306+
<div class="ui transparent label right floated">
305307
{{if $.CanCreateIssueDependencies}}
306-
<a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blocking');">
308+
<a class="delete-dependency-button" onclick="deleteDependencyModal({{.ID}}, 'blockedBy');"
309+
data-tooltip="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
307310
<i class="delete icon text red"></i>
308311
</a>
309312
{{end}}
310-
{{if .IsClosed}}
311-
<div class="ui red tiny label">
312-
<i class="octicon octicon-issue-closed"></i>
313-
</div>
314-
{{else}}
315-
<div class="ui green mini label">
316-
<i class="octicon octicon-issue-opened"></i>
317-
</div>
318-
{{end}}
319313
</div>
320-
<div class="ui black label">#{{.Index}}</div>
321-
<a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a>
322314
</div>
323315
{{end}}
324316
</div>
325317
{{end}}
326318

327-
{{if (and (not .BlockedByDependencies) (not .BlockingDependencies))}}
328-
<p>{{if .Issue.IsPull}}
329-
{{.i18n.Tr "repo.issues.dependency.pr_no_dependencies"}}
330-
{{else}}
331-
{{.i18n.Tr "repo.issues.dependency.issue_no_dependencies"}}
332-
{{end}}</p>
333-
{{end}}
334-
335319
{{if .CanCreateIssueDependencies}}
336320
<div>
337321
<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/dependency/add" id="addDependencyForm">

0 commit comments

Comments
 (0)