diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-21 13:22:04 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-27 12:23:26 -0500 |
| commit | c69a0779fb499fb3c8352eede0b5c6d7bb1117d1 (patch) | |
| tree | 99e84300670eb85e7b414fc6f6891d3779f69b4e /app/views | |
| parent | fed9dcd9ed2f064e887332b4e45f2e65465e74c0 (diff) | |
| download | gitlab-ce-c69a0779fb499fb3c8352eede0b5c6d7bb1117d1.tar.gz | |
Address feedback
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/blob/_content.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/blob/_render_error.html.haml | 13 |
2 files changed, 5 insertions, 14 deletions
diff --git a/app/views/projects/blob/_content.html.haml b/app/views/projects/blob/_content.html.haml index 7bbc8627a2b..cd4d85591ae 100644 --- a/app/views/projects/blob/_content.html.haml +++ b/app/views/projects/blob/_content.html.haml @@ -1,8 +1,8 @@ - simple_viewer = blob.simple_viewer - rich_viewer = blob.rich_viewer -- active_viewer = rich_viewer && params[:viewer] != 'simple' ? :rich : :simple +- rich_viewer_active = rich_viewer && params[:viewer] != 'simple' -= render 'projects/blob/viewer_wrapper', viewer: simple_viewer, hidden: (active_viewer != :simple) += render 'projects/blob/viewer_wrapper', viewer: simple_viewer, hidden: rich_viewer_active - if rich_viewer - = render 'projects/blob/viewer_wrapper', viewer: rich_viewer, hidden: (active_viewer != :rich) + = render 'projects/blob/viewer_wrapper', viewer: rich_viewer, hidden: !rich_viewer_active diff --git a/app/views/projects/blob/_render_error.html.haml b/app/views/projects/blob/_render_error.html.haml index 56bcc2b018c..026b7c95163 100644 --- a/app/views/projects/blob/_render_error.html.haml +++ b/app/views/projects/blob/_render_error.html.haml @@ -1,16 +1,7 @@ -- reason = blob_render_error_reason(viewer, error) - -- options = [] -- if error == :too_large && viewer.can_override_max_size? - - options << link_to('load it anyway', url_for(params.merge(viewer: viewer.type, override_max_size: true, format: nil))) -- if viewer.rich? && viewer.blob.rendered_as_text?(override_max_size: true) - - options << link_to('view the source', '#', class: 'js-blob-viewer-switcher', data: { viewer: 'simple' }) -- options << link_to('download it', blob_raw_url, target: '_blank', rel: 'noopener noreferrer') - .file-content.code .nothing-here-block - The #{viewer.switcher_title} could not be displayed because #{reason}. + The #{viewer.switcher_title} could not be displayed because #{blob_render_error_reason(viewer, error)}. You can - = options.to_sentence(two_words_connector: ' or ', last_word_connector: ', or ').html_safe + = blob_render_error_options(viewer, error).to_sentence(two_words_connector: ' or ', last_word_connector: ', or ').html_safe instead. |