diff options
| author | Sondre Nilsen <nilsen.sondre@gmail.com> | 2017-11-30 06:08:40 +0100 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-11-30 13:08:40 +0800 |
| commit | 86ee41ec033105bec50c1cc4eaf0181a37d71574 (patch) | |
| tree | eef6df636e02ec33a18da75d6f189b12bd9e2df8 /templates | |
| parent | 4cf90aa865c49110af38797b8901185ec072ab74 (diff) | |
| download | gitea-86ee41ec033105bec50c1cc4eaf0181a37d71574.tar.gz gitea-86ee41ec033105bec50c1cc4eaf0181a37d71574.zip | |
Expandable commit bodies (#2980)
* Initial working state of expandable commit bodies
* Fix all commits having showing button for multiline commits
* Refactor checking multiline messages method
* Force newlines with <br> in commit body
* Show multiple lines in the list view of repositories
* Fixed proper newlines and minor refactor
Use <pre> instead of <p>, this is so we can use \n instead of having to manually place <br> into the HTML. Makes it easier to display commit bodies.
* Fix commit list messages jumping around
* Fix indentation in view_list.tmpl
* Use vertical-align: baseline instead of top
* Refactor commit button toggle function
* Remove RenderCommitBodyLink function
* Add comments
* Add newline at the end of _repository.less
* Fix long commit bodies not properly wrapping inside <pre>
* Don't split on double newlines
* Show the commit body in commit view
* Update stylesheets
* Add/fix comments and run make fmt
* Fix spaces not being tabs
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/commits_table.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/diff/page.tmpl | 3 | ||||
| -rw-r--r-- | templates/repo/view_list.tmpl | 6 |
3 files changed, 13 insertions, 2 deletions
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 5550ad7493..326ce91e98 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -30,7 +30,7 @@ <th class="three wide right aligned">{{.i18n.Tr "repo.commits.date"}}</th> </tr> </thead> - <tbody> + <tbody class="commit-list"> {{ $r:= List .Commits}} {{range $r}} <tr> @@ -61,6 +61,10 @@ </td> <td class="message collapsing"> <span class="has-emoji{{if gt .ParentCount 1}} grey text{{end}}">{{RenderCommitMessage .Summary $.RepoLink $.Repository.ComposeMetas}}</span> + {{if IsMultilineCommitMessage .Message}} + <button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button> + <pre class="commit-body" style="display: none;">{{RenderCommitBody .Message $.RepoLink $.Repository.ComposeMetas}}</pre> + {{end}} {{template "repo/commit_status" .Status}} </td> <td class="grey text right aligned">{{TimeSince .Author.When $.Lang}}</td> diff --git a/templates/repo/diff/page.tmpl b/templates/repo/diff/page.tmpl index cb67b36f73..7600848118 100644 --- a/templates/repo/diff/page.tmpl +++ b/templates/repo/diff/page.tmpl @@ -10,6 +10,9 @@ {{.i18n.Tr "repo.diff.browse_source"}} </a> <h3>{{RenderCommitMessage .Commit.Message $.RepoLink $.Repository.ComposeMetas}}{{template "repo/commit_status" .CommitStatus}}</h3> + {{if IsMultilineCommitMessage .Commit.Message}} + <pre class="commit-body">{{RenderCommitBody .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre> + {{end}} </div> <div class="ui attached info segment {{if .Commit.Signature}} isSigned {{if .Verification.Verified }} isVerified {{end}}{{end}}"> {{if .Author}} diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index a2bb72c227..34c76fca88 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -1,6 +1,6 @@ <table id="repo-files-table" class="ui fixed single line table"> <thead> - <tr> + <tr class="commit-list"> <th class="four wide"> {{if .LatestCommitUser}} <img class="ui avatar image img-12" src="{{.LatestCommitUser.RelAvatarLink}}" /> @@ -28,6 +28,10 @@ {{end}} </a> <span class="grey has-emoji">{{RenderCommitMessage .LatestCommit.Summary .RepoLink $.Repository.ComposeMetas}} + {{if IsMultilineCommitMessage .LatestCommit.Message}} + <button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button> + <pre class="commit-body" style="display: none;">{{RenderCommitBody .LatestCommit.Message $.RepoLink $.Repository.ComposeMetas}}</pre> + {{end}} {{template "repo/commit_status" .LatestCommitStatus}}</span> </th> <th class="nine wide"> |