diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-06-20 19:09:37 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-06-20 19:09:37 -0500 |
| commit | 1f047bd782e250cb9b112dd2c4324a2e50b0732a (patch) | |
| tree | 1fac2058733a4c9c478f0e99210356100456ddd3 | |
| parent | 99e32301f89496cd45ab8f50c6b3184b7fbe0f45 (diff) | |
| download | gitlab-ce-dm-svg-diff-viewer.tar.gz | |
Fix toggling diff viewersdm-svg-diff-viewer
| -rw-r--r-- | app/views/projects/diffs/_collapsed.html.haml | 10 | ||||
| -rw-r--r-- | app/views/projects/diffs/_render_error.html.haml | 14 |
2 files changed, 16 insertions, 8 deletions
diff --git a/app/views/projects/diffs/_collapsed.html.haml b/app/views/projects/diffs/_collapsed.html.haml index 9484fc5fe67..91e750da0a1 100644 --- a/app/views/projects/diffs/_collapsed.html.haml +++ b/app/views/projects/diffs/_collapsed.html.haml @@ -1,4 +1,8 @@ -.nothing-here-block.diff-collapsed - This diff is collapsed. +.file-loading.hidden + = render 'projects/blob/viewers/loading', viewer: viewer - = link_to('Click to expand it.', '#', class: 'js-blob-viewer-load-btn', data: { viewer: viewer.type }) +.file-content + .nothing-here-block.diff-collapsed + This diff is collapsed. + + = link_to('Click to expand it.', '#', class: 'js-diff-viewer-load-btn', data: { viewer: viewer.type }) diff --git a/app/views/projects/diffs/_render_error.html.haml b/app/views/projects/diffs/_render_error.html.haml index 47a9ac3ee6b..61a8c0eb52c 100644 --- a/app/views/projects/diffs/_render_error.html.haml +++ b/app/views/projects/diffs/_render_error.html.haml @@ -1,6 +1,10 @@ -.nothing-here-block - This #{viewer.switcher_title} could not be displayed because #{diff_render_error_reason(viewer)}. +.file-loading.hidden + = render 'projects/blob/viewers/loading', viewer: viewer - You can - = diff_render_error_options(viewer).to_sentence(two_words_connector: ' or ', last_word_connector: ', or ').html_safe - instead. +.file-content + .nothing-here-block + This #{viewer.switcher_title} could not be displayed because #{diff_render_error_reason(viewer)}. + + You can + = diff_render_error_options(viewer).to_sentence(two_words_connector: ' or ', last_word_connector: ', or ').html_safe + instead. |