Merge branch 'master' of github.com:gogits/gogs

Conflicts:
	templates/repo/single_file.tmpl
tokarchuk/v1.17
Unknown 11 years ago
commit 6ef3e8b3c9
  1. 1
      routers/repo/repo.go
  2. 8
      templates/repo/single_file.tmpl

@ -156,6 +156,7 @@ func Single(ctx *middleware.Context, params martini.Params) {
} }
if readmeFile != nil { if readmeFile != nil {
ctx.Data["ReadmeInSingle"] = true
ctx.Data["ReadmeExist"] = true ctx.Data["ReadmeExist"] = true
if blob, err := readmeFile.LookupBlob(); err != nil { if blob, err := readmeFile.LookupBlob(); err != nil {
ctx.Handle(404, "repo.Single(readmeFile.LookupBlob)", err) ctx.Handle(404, "repo.Single(readmeFile.LookupBlob)", err)

@ -2,11 +2,16 @@
<div class="panel-heading file-head"> <div class="panel-heading file-head">
{{if .ReadmeExist}} {{if .ReadmeExist}}
<i class="icon fa fa-book"></i> <i class="icon fa fa-book"></i>
{{if .ReadmeInSingle}}
{{.FileName}} {{.FileName}}
{{else}}
{{.FileName}} <span class="file-size">{{FileSize .FileSize}}</span>
{{end}}
{{else}} {{else}}
<i class="icon fa fa-file-text-o"></i> <i class="icon fa fa-file-text-o"></i>
{{.FileName}} <span class="file-size">{{FileSize .FileSize}}</span> {{.FileName}} <span class="file-size">{{FileSize .FileSize}}</span>
{{end}} {{end}}
{{if not .ReadmeInSingle}}
<div class="btn-group pull-right"> <div class="btn-group pull-right">
<a class="btn btn-default hidden" href="#">Edit</a> <a class="btn btn-default hidden" href="#">Edit</a>
<a class="btn btn-default" href="{{.FileLink}}">Raw</a> <a class="btn btn-default" href="{{.FileLink}}">Raw</a>
@ -14,10 +19,11 @@
<a class="btn btn-default hidden" href="#">History</a> <a class="btn btn-default hidden" href="#">History</a>
<a class="btn btn-danger hidden" href="#">Delete</a> <a class="btn btn-danger hidden" href="#">Delete</a>
</div> </div>
{{end}}
</div> </div>
{{if not .FileIsText}} {{if not .FileIsText}}
<div class="panel-footer text-center"> <div class="panel-footer text-center">
<a href="{{.FileLink}}" class="btn btn-default btn-lg">View Raw</a> <a href="{{.FileLink}}" class="btn btn-default">View Raw</a>
</div> </div>
{{else}} {{else}}
{{if .ReadmeExist}} {{if .ReadmeExist}}

Loading…
Cancel
Save