diff options
| author | Kjell Kvinge <kjell@kvinge.biz> | 2016-12-29 00:44:32 +0100 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2016-12-29 07:44:32 +0800 |
| commit | 22e1bd31c68586e963262db964d6a83f6115e56f (patch) | |
| tree | 39d669cd4b982063512320e91ed359357a518f1f /templates | |
| parent | 35d9378e4e1b3b1c15db3a7e7237a55fa96919a1 (diff) | |
| download | gitea-22e1bd31c68586e963262db964d6a83f6115e56f.tar.gz gitea-22e1bd31c68586e963262db964d6a83f6115e56f.zip | |
commithgraph / timeline (#428)
* Add model and tests for graph
* Add route and router for graph
* Add assets for graph
* Add template for graph
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base/head.tmpl | 7 | ||||
| -rw-r--r-- | templates/repo/commits.tmpl | 16 | ||||
| -rw-r--r-- | templates/repo/graph.tmpl | 44 |
3 files changed, 65 insertions, 2 deletions
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 2c45932a7e..a114b8dac5 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -31,6 +31,13 @@ </script> {{end}} + {{if .RequireGitGraph}} + <!-- graph --> + <script src="{{AppSubUrl}}/js/libs/gitgraph.js"></script> + <script src="{{AppSubUrl}}/js/draw.js"></script> + <link rel="stylesheet" href="{{AppSubUrl}}/css/gitgraph.css"> + {{end}} + <!-- Stylesheet --> <link rel="stylesheet" href="{{AppSubUrl}}/css/semantic-2.2.1.min.css"> <link rel="stylesheet" href="{{AppSubUrl}}/css/index.css?v={{MD5 AppVer}}"> diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 88a87ef8ce..198f3cc08d 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -2,8 +2,20 @@ <div class="repository commits"> {{template "repo/header" .}} <div class="ui container"> - {{template "repo/branch_dropdown" .}} - {{template "repo/commits_table" .}} + <div class="ui secondary menu"> + {{template "repo/branch_dropdown" .}} + <div class="fitted item"> + <div class="ui breadcrumb"> + <a href="{{.RepoLink}}/graph"> + <span class="text"> + <i class="octicon octicon-git-branch"></i> + </span> + commit graph + </a> + </div> + </div> + </div> + {{template "repo/commits_table" .}} </div> </div> {{template "base/footer" .}} diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl new file mode 100644 index 0000000000..622234cdea --- /dev/null +++ b/templates/repo/graph.tmpl @@ -0,0 +1,44 @@ +{{template "base/head" .}} +<div class="repository commits"> + {{template "repo/header" .}} + <div class="ui container"> + + + <div id="git-graph-container"> + <div id="rel-container"> + <canvas id="graph-canvas"> + <ul id="graph-raw-list"> + {{ range .Graph }} + <li><span class="node-relation">{{ .GraphAcii -}}</span></li> + {{ end }} + </ul> + </canvas> + </div> + <div id="rev-container"> + <ul id="rev-list"> + {{ range .Graph }} + <li> + {{ if .OnlyRelation }} + <span /> + {{ else }} + <code id="{{.ShortRev}}"> + <a href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.Rev}}">{{ .ShortRev}}</a> + </code> + <strong> {{.Branch}}</strong> + <em>{{.Subject}}</em> by + <span class="author"> + {{.Author}} + </span> + <span class="time">{{.Date}}</span> + {{ end }} + </li> + {{ end }} + </ul> + </div> + </div> + + + + </div> +</div> +{{template "base/footer" .}} |