diff options
author | Bwko <bouwko@gmail.com> | 2017-10-26 02:49:16 +0200 |
---|---|---|
committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-10-26 08:49:16 +0800 |
commit | 3ab580c8d6b8a2c063d848f8e3002347c9e5cebb (patch) | |
tree | 3f66f793be25db1ca8baac8d5333e39bfdd4f7e1 /templates/repo | |
parent | e86a0bf3feab82c1b3439806245083dffb2f37c9 (diff) | |
download | gitea-3ab580c8d6b8a2c063d848f8e3002347c9e5cebb.tar.gz gitea-3ab580c8d6b8a2c063d848f8e3002347c9e5cebb.zip |
Add branch overiew page (#2108)
* Add branch overiew page
* fix changed method name on sub menu
* remove unused code
Diffstat (limited to 'templates/repo')
-rw-r--r-- | templates/repo/branch/list.tmpl | 81 | ||||
-rw-r--r-- | templates/repo/commits.tmpl | 25 | ||||
-rw-r--r-- | templates/repo/header.tmpl | 6 | ||||
-rw-r--r-- | templates/repo/home.tmpl | 1 | ||||
-rw-r--r-- | templates/repo/sub_menu.tmpl | 14 |
5 files changed, 109 insertions, 18 deletions
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl new file mode 100644 index 0000000000..a1bbc17677 --- /dev/null +++ b/templates/repo/branch/list.tmpl @@ -0,0 +1,81 @@ +{{template "base/head" .}} +<div class="ui repository branches"> + {{template "repo/header" .}} + <div class="ui container"> + {{template "base/alert" .}} + {{template "repo/sub_menu" .}} + <h4 class="ui top attached header"> + {{.i18n.Tr "repo.default_branch"}} + </h4> + + <div class="ui attached table segment"> + <table class="ui very basic striped fixed table single line"> + <tbody> + <tr> + <td>{{.DefaultBranch}}</td> + </tr> + </tbody> + </table> + </div> + + {{if gt (len .Branches) 1}} + <h4 class="ui top attached header"> + {{.i18n.Tr "repo.branches"}} + </h4> + <div class="ui attached table segment"> + <table class="ui very basic striped fixed table single line"> + <thead> + <tr> + <th class="nine wide">{{.i18n.Tr "repo.branch.name"}}</th> + {{if and $.IsWriter (not $.IsMirror)}} + <th class="one wide right aligned">{{.i18n.Tr "repo.branch.delete_head"}}</th> + {{end}} + </tr> + </thead> + <tbody> + {{range $branch := .Branches}} + {{if ne .Name $.DefaultBranch}} + <tr> + <td> + {{if .IsDeleted}} + <s>{{.Name}}</s> + <p class="time">{{$.i18n.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSince .DeletedBranch.Deleted $.i18n.Lang}}</p> + {{else}} + {{.Name}} + <p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p> + </td> + {{end}} + {{if and $.IsWriter (not $.IsMirror)}} + <td class="right aligned"> + {{if .IsProtected}} + <i class="octicon octicon-shield"></i> + {{else if .IsDeleted}} + <a class="undo-button" href data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID | urlquery}}&name={{.DeletedBranch.Name | urlquery}}"><i class="octicon octicon-reply"></i></a> + {{else}} + <a class="delete-branch-button" href data-url="{{$.Link}}/delete?name={{.Name | urlquery}}" data-val="{{.Name}}"><i class="trash icon text red"></i></a> + {{end}} + </td> + {{end}} + </tr> + {{end}} + {{end}} + </tbody> + </table> + </div> + {{end}} + </div> +</div> + +<div class="ui small basic delete modal"> + <div class="ui icon header"> + <i class="trash icon"></i> + {{.i18n.Tr "repo.branch.delete_html"| Safe}} <span class="branch-name"></span> + </div> + <div class="content"> + <p>{{.i18n.Tr "repo.branch.delete_desc" | Safe}}</p> + {{.i18n.Tr "repo.branch.delete_notices_1" | Safe}}<br> + {{.i18n.Tr "repo.branch.delete_notices_html" | Safe}} <span class="branch-name"></span><br> + </div> + {{template "base/delete_modal_actions" .}} +</div> +{{template "base/footer" .}} diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 20ad9ad02f..418ac1a355 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -2,18 +2,19 @@ <div class="repository commits"> {{template "repo/header" .}} <div class="ui container"> - <div class="ui secondary menu"> - {{template "repo/branch_dropdown" .}} - <div class="fitted item"> - <a href="{{.RepoLink}}/graph" class="ui basic small button"> - <span class="text"> - <i class="octicon octicon-git-branch"></i> - </span> - {{.i18n.Tr "repo.commit_graph"}} - </a> - </div> - </div> - {{template "repo/commits_table" .}} + {{template "repo/sub_menu" .}} + <div class="ui secondary menu"> + {{template "repo/branch_dropdown" .}} + <div class="fitted item"> + <a href="{{.RepoLink}}/graph" class="ui basic small button"> + <span class="text"> + <i class="octicon octicon-git-branch"></i> + </span> + {{.i18n.Tr "repo.commit_graph"}} + </a> + </div> + </div> + {{template "repo/commits_table" .}} </div> </div> {{template "base/footer" .}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index ee6fcb388d..024a5b77b3 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -73,12 +73,6 @@ </a> {{end}} - {{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo)}} - <a class="{{if (or (.PageIsCommits) (.PageIsDiff))}}active{{end}} item" href="{{.RepoLink}}/commits/{{EscapePound .BranchName}}"> - <i class="octicon octicon-history"></i> {{.i18n.Tr "repo.commits"}} <span class="ui {{if not .CommitsCount}}gray{{else}}blue{{end}} small label">{{.CommitsCount}}</span> - </a> - {{end}} - {{if and (.Repository.UnitEnabled $.UnitTypeReleases) (not .IsBareRepo) }} <a class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases"> <i class="octicon octicon-tag"></i> {{.i18n.Tr "repo.releases"}} <span class="ui {{if not .Repository.NumReleases}}gray{{else}}blue{{end}} small label">{{.Repository.NumReleases}}</span> diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index f3feb149c6..4f31ffb96a 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -7,6 +7,7 @@ {{if .Repository.DescriptionHTML}}<span class="description has-emoji">{{.Repository.DescriptionHTML}}</span>{{else if .IsRepositoryAdmin}}<span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>{{end}} <a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a> </p> + {{template "repo/sub_menu" .}} <div class="ui secondary menu"> {{if .PullRequestCtx.Allowed}} <div class="fitted item"> diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl new file mode 100644 index 0000000000..03f6caa58f --- /dev/null +++ b/templates/repo/sub_menu.tmpl @@ -0,0 +1,14 @@ +<div class="ui segment sub-menu"> + <div class="ui two horizontal center link list"> + {{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo)}} + <div class="item{{if .PageIsCommits}} active{{end}}"> + <a href="{{.RepoLink}}/commits/{{EscapePound .BranchName}}"><i class="octicon octicon-history"></i> <b>{{.CommitsCount}}</b> {{.i18n.Tr "repo.commits"}}</a> + </div> + {{end}} + {{if and (.Repository.UnitEnabled $.UnitTypeCode) (not .IsBareRepo) }} + <div class="item{{if .PageIsBranches}} active{{end}}"> + <a href="{{.RepoLink}}/branches/"><i class="octicon octicon-git-branch"></i> <b>{{.BrancheCount}}</b> {{.i18n.Tr "repo.branches"}}</a> + </div> + {{end}} + </div> +</div> |