diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-07-26 00:25:43 -0400 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-07-26 00:25:43 -0400 |
| commit | 3f38ff6c09f0497980ad13fda9803907cee6d612 (patch) | |
| tree | d3a6c571a8b14ebe6cedf24c2e685d62604e100b /templates | |
| parent | 8dd07c0ddd99ae626a1ec8c06f75f27fed51269f (diff) | |
| parent | 76f7ad45e6ad5d2417084b81798802c126b8c6cb (diff) | |
| download | gitea-3f38ff6c09f0497980ad13fda9803907cee6d612.tar.gz gitea-3f38ff6c09f0497980ad13fda9803907cee6d612.zip | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts:
templates/status/500.tmpl
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/status/200.tmpl | 7 | ||||
| -rw-r--r-- | templates/status/500.tmpl | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/templates/status/200.tmpl b/templates/status/200.tmpl deleted file mode 100644 index 0846ad7951..0000000000 --- a/templates/status/200.tmpl +++ /dev/null @@ -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" .}}
\ No newline at end of file diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl index 692525aa40..b887532d7c 100644 --- a/templates/status/500.tmpl +++ b/templates/status/500.tmpl @@ -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" .}}
\ No newline at end of file +{{template "ng/base/footer" .}} |