pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix issue participants (#13893)

Browse source 
* Fix issue participants

* use list class for margin

* remove wrapper and don't render on zero participants

* keep whitespace

* remove participants class

* add some margin for timetracking stuff

Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
silverwind 2020-12-08 04:20:12 +01:00 committed by GitHub
parent ab22ab4a37
commit b7b5c3368d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
templates/repo/issue/view_content/sidebar.tmpl
View file

@ -290,18 +290,16 @@
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="ui participants"> {{if .Participants}}
<span class="text"><strong>{{.i18n.Tr "repo.issues.num_participants" .NumParticipants}}</strong></span> <span class="text"><strong>{{.i18n.Tr "repo.issues.num_participants" .NumParticipants}}</strong></span>
<div> <div class="ui list df fw">
{{range .Participants}} {{range .Participants}}
<a {{if gt .ID 0}}href="{{.HomeLink}}"{{end}}> <a class="ui poping up" {{if gt .ID 0}}href="{{.HomeLink}}"{{end}} data-content="{{.GetDisplayName}}" data-position="top center" data-variation="small inverted">
<div class="ui poping up" data-content="{{.GetDisplayName}}" data-position="top center" data-variation="small inverted"> {{avatar . 28 "my-1 mr-2"}}
{{avatar .}}
</div>
</a> </a>
{{end}} {{end}}
</div> </div>
</div> {{end}}
{{if and $.IssueWatch (not .Repository.IsArchived)}} {{if and $.IssueWatch (not .Repository.IsArchived)}}
<div class="ui divider"></div> <div class="ui divider"></div>
@ -330,7 +328,7 @@
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="ui timetrack"> <div class="ui timetrack">
<span class="text"><strong>{{.i18n.Tr "repo.issues.tracker"}}</strong></span> <span class="text"><strong>{{.i18n.Tr "repo.issues.tracker"}}</strong></span>
<div> <div class="mt-3">
<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/times/stopwatch/toggle" id="toggle_stopwatch_form"> <form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/times/stopwatch/toggle" id="toggle_stopwatch_form">
{{$.CsrfTokenHtml}} {{$.CsrfTokenHtml}}
</form> </form>
@ -372,11 +370,11 @@
{{end}} {{end}}
{{if gt (len .WorkingUsers) 0}} {{if gt (len .WorkingUsers) 0}}
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="ui participants comments"> <div class="ui comments">
<span class="text"><strong>{{.i18n.Tr "repo.issues.time_spent_from_all_authors" ($.Issue.TotalTrackedTime | Sec2Time) | Safe}}</strong></span> <span class="text"><strong>{{.i18n.Tr "repo.issues.time_spent_from_all_authors" ($.Issue.TotalTrackedTime | Sec2Time) | Safe}}</strong></span>
<div> <div>
{{range $user, $trackedtime := .WorkingUsers}} {{range $user, $trackedtime := .WorkingUsers}}
<div class="comment"> <div class="comment mt-3">
<a class="avatar"> <a class="avatar">
{{avatar $user}} {{avatar $user}}
</a> </a>

7
web_src/less/_repository.less
View file

@ -1189,13 +1189,6 @@
} }
} }
.ui.participants {
img {
margin-top: 5px;
margin-right: 5px;
}
}
.ui.depending { .ui.depending {
.item.is-closed { .item.is-closed {
.title { .title {