diff options
author | zeripath <art27@cantab.net> | 2020-10-21 19:54:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-21 14:54:19 -0400 |
commit | 198e57bc37c62635b4546b859a56b94a824aa1f3 (patch) | |
tree | 6961dbbd8e40bbcc2f8d353605163c949088baca /templates | |
parent | ba97c0e98bc97957d6fd9bfd3db5768813c58ff3 (diff) | |
download | gitea-198e57bc37c62635b4546b859a56b94a824aa1f3.tar.gz gitea-198e57bc37c62635b4546b859a56b94a824aa1f3.zip |
Return the full rejection message and errors in flash errors (#13221) (#13237)
* Return the full rejection message and errors in flash errors (#13221)
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Update routers/repo/pull.go
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Diffstat (limited to 'templates')
-rw-r--r-- | templates/base/alert.tmpl | 6 | ||||
-rw-r--r-- | templates/base/alert_details.tmpl | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/templates/base/alert.tmpl b/templates/base/alert.tmpl index 61b99486e2..cf886f529c 100644 --- a/templates/base/alert.tmpl +++ b/templates/base/alert.tmpl @@ -1,15 +1,15 @@ {{if .Flash.ErrorMsg}} - <div class="ui negative message"> + <div class="ui negative message flash-error"> <p>{{.Flash.ErrorMsg | Str2html}}</p> </div> {{end}} {{if .Flash.SuccessMsg}} - <div class="ui positive message"> + <div class="ui positive message flash-success"> <p>{{.Flash.SuccessMsg | Str2html}}</p> </div> {{end}} {{if .Flash.InfoMsg}} - <div class="ui info message"> + <div class="ui info message flash-info"> <p>{{.Flash.InfoMsg | Str2html}}</p> </div> {{end}} diff --git a/templates/base/alert_details.tmpl b/templates/base/alert_details.tmpl new file mode 100644 index 0000000000..38a2721bf8 --- /dev/null +++ b/templates/base/alert_details.tmpl @@ -0,0 +1,7 @@ +{{.Message}} +<details> + <summary>{{.Summary}}</summary> + <code> + {{.Details | Str2html}} + </code> +</details> |