mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-23 07:43:18 -05:00
Add Extra Info to Branches Page (#7461)
* Add branch protection information to branches page This change will add a tag on the ui that indicates whether a branch is protected on the repository branches page. Signed-off-by: Gary Kim <gary@garykim.dev> * Add last commit information to repo branches page This change adds the ID and commit message of the last commit on a branch to the branches page for repositories. Signed-off-by: Gary Kim <gary@garykim.dev> * Make branch page commit message truncate in css rather then template The truncating of commit messages shown under branches in the repository branches page has been moved to using css rather then the Go template as the template was causing some issues when the commit messaged had a link when rendered. This commit also makes the commit message paragraph itself use flex in order to make managing its elements easier. Signed-off-by: Gary Kim <gary@garykim.dev>
This commit is contained in:
parent
34516603ad
commit
c8aa46d27b
3 changed files with 26 additions and 5 deletions
|
@ -982,7 +982,8 @@ tbody.commit-list{vertical-align:baseline}
|
|||
.ui.repository.list .item .time{font-size:12px;color:grey}
|
||||
.ui.repository.list .item .ui.tags{margin-bottom:1em}
|
||||
.ui.repository.list .item .ui.avatar.image{width:24px;height:24px}
|
||||
.ui.repository.branches .time{font-size:12px;color:grey}
|
||||
.ui.repository.branches .info{font-size:12px;color:grey;display:flex;white-space:pre}
|
||||
.ui.repository.branches .info .commit-message{max-width:72em;overflow:hidden;text-overflow:ellipsis}
|
||||
.ui.user.list .item{padding-bottom:25px}
|
||||
.ui.user.list .item:not(:first-child){border-top:1px solid #eee;padding-top:25px}
|
||||
.ui.user.list .item .ui.avatar.image{width:40px;height:40px}
|
||||
|
|
|
@ -62,9 +62,16 @@
|
|||
}
|
||||
|
||||
.ui.repository.branches {
|
||||
.time {
|
||||
.info {
|
||||
font-size: 12px;
|
||||
color: #808080;
|
||||
display: flex;
|
||||
white-space: pre;
|
||||
.commit-message {
|
||||
max-width: 72em;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -12,7 +12,17 @@
|
|||
<table class="ui very basic striped fixed table single line">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>{{.DefaultBranch}}</td>
|
||||
<td>
|
||||
{{range $branch := .Branches}}
|
||||
{{if eq .Name $.DefaultBranch}}
|
||||
{{if .IsProtected}}
|
||||
<i class="octicon octicon-shield"></i>
|
||||
{{end}}
|
||||
{{$.DefaultBranch}}
|
||||
<p class="info"><i class="octicon octicon-git-commit"></i><a href="{{$.RepoLink}}/commit/{{.Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p>
|
||||
{{end}}
|
||||
{{end}}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
@ -41,10 +51,13 @@
|
|||
<td>
|
||||
{{if .IsDeleted}}
|
||||
<s><a href="{{$.RepoLink}}/src/branch/{{.Name | EscapePound}}">{{.Name}}</a></s>
|
||||
<p class="time">{{$.i18n.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.i18n.Lang}}</p>
|
||||
<p class="info">{{$.i18n.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.i18n.Lang}}</p>
|
||||
{{else}}
|
||||
{{if .IsProtected}}
|
||||
<i class="octicon octicon-shield"></i>
|
||||
{{end}}
|
||||
<a href="{{$.RepoLink}}/src/branch/{{.Name | EscapePound}}">{{.Name}}</a>
|
||||
<p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p>
|
||||
<p class="info"><i class="octicon octicon-git-commit"></i><a href="{{$.RepoLink}}/commit/{{.Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p>
|
||||
{{end}}
|
||||
</td>
|
||||
<td class="ui">
|
||||
|
|
Loading…
Reference in a new issue