tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Merge branch 'dev' of github.com:gogits/gogs into dev

Browse Source 
Conflicts:
	templates/status/500.tmpl
This commit is contained in:
Unknwon
2014-07-26 00:25:43 -04:00
parent 8dd07c0ddd 76f7ad45e6
commit 3f38ff6c09
3 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
templates/status/200.tmpl
View File

@@ -1,7 +0,0 @@
{{template "base/head" .}}
{{template "base/navbar" .}}
<div id="body" class="container">
<p>An error is occurred : {{.ErrorMsg}}</p>
<p>Application Version: {{AppVer}}</p>
</div>
{{template "base/footer" .}}

4
templates/status/500.tmpl
View File

@@ -4,7 +4,7 @@
<p style="margin-top: 100px"><img src="/img/500.png" alt="500"/></p>
<hr/>
<br>
{{if .ErrorMsg}}<p>An error is occurred : {{.ErrorMsg}}</p>{{end}}
{{if .ErrorMsg}}<p>An error has occurred : {{.ErrorMsg}}</p>{{end}}
<p>Application Version: {{AppVer}}</p>
</div>
{{template "ng/base/footer" .}}
{{template "ng/base/footer" .}}