diff options
| author | Unknwon <u@gogs.io> | 2015-08-31 16:24:28 +0900 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-08-31 16:24:28 +0900 |
| commit | 1ca257ad9f90084f4140bd1df4692f9a56c83ad4 (patch) | |
| tree | 124a621e8f2d60eea02215e949142bcdd684b791 /templates | |
| parent | cb381078ffa9f9a6178110be304dfcac5715e323 (diff) | |
| download | gitea-1ca257ad9f90084f4140bd1df4692f9a56c83ad4.tar.gz gitea-1ca257ad9f90084f4140bd1df4692f9a56c83ad4.zip | |
rename fields
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/commits_table.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/diff.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/issue/new_form.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/view_file.tmpl | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index eefdf8c824..56ec2da375 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -10,7 +10,7 @@ </form> </div> {{else if .IsDiffCompare}} - <a href="{{$.RepoLink}}/commit/{{.BeforeCommitId}}" class="ui green sha label">{{ShortSha .BeforeCommitId}}</a> ... <a href="{{$.RepoLink}}/commit/{{.AfterCommitId}}" class="ui green sha label">{{ShortSha .AfterCommitId}}</a> + <a href="{{$.RepoLink}}/commit/{{.BeforeCommitID}}" class="ui green sha label">{{ShortSha .BeforeCommitID}}</a> ... <a href="{{$.RepoLink}}/commit/{{.AfterCommitID}}" class="ui green sha label">{{ShortSha .AfterCommitID}}</a> {{end}} </h4> <div class="ui attached table segment"> diff --git a/templates/repo/diff.tmpl b/templates/repo/diff.tmpl index 8b10cc8808..932a109e42 100644 --- a/templates/repo/diff.tmpl +++ b/templates/repo/diff.tmpl @@ -24,6 +24,7 @@ <span class="text grey" id="authored-time">{{TimeSince .Commit.Author.When $.Lang}}</span> <div class="ui right"> <div class="ui horizontal list"> + {{if .Parents}} <div class="item"> {{.i18n.Tr "repo.diff.parent"}} </div> @@ -32,8 +33,9 @@ <a class="ui blue sha label" href="{{$.RepoLink}}/commit/{{.}}">{{ShortSha .}}</a> {{end}} </div> + {{end}} <div class="item">{{.i18n.Tr "repo.diff.commit"}}</div> - <div class="item"><span class="ui blue sha label">{{ShortSha .CommitId}}</span></div> + <div class="item"><span class="ui blue sha label">{{ShortSha .CommitID}}</span></div> </div> </div> </div> diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index ddfe59bc6b..b3cf99257b 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -18,7 +18,11 @@ {{template "repo/issue/comment_tab" .}} <div class="text right"> <button class="ui green button"> + {{if .PageIsComparePull}} + {{.i18n.Tr "repo.pulls.create"}} + {{else}} {{.i18n.Tr "repo.issues.create"}} + {{end}} </button> </div> </div> diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 274c7df22e..a0d6781cbc 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -13,7 +13,7 @@ {{end}} {{if not .ReadmeInList}} {{if not .IsCommit}} - <a class="right" href="{{.RepoLink}}/src/{{.CommitId}}/{{EscapePound .TreeName}}"> + <a class="right" href="{{.RepoLink}}/src/{{.CommitID}}/{{EscapePound .TreeName}}"> <button class="btn btn-medium btn-gray btn-right-radius btn-comb">{{.i18n.Tr "repo.file_permalink"}}</button> </a> {{end}} |