diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-17 02:11:03 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-17 02:11:03 +0300 |
| commit | 83aa0235ab54d27bbdfaa26185a064c154fa676c (patch) | |
| tree | f37b146e51fbf08ef5d1a7bbedbf89152f5d4668 /app/views/shared | |
| parent | a14d75ff59b2803452b5ede9498514545303ff1e (diff) | |
| parent | 5b0e086946155aa45b46ebf5010403af40634377 (diff) | |
Merge branch 'ability_to_cancel_attaching_file' into 'master'
Add an ability to cancel attaching file and redesign attaching files UI
Closes #15611, #24270, and #28905
See merge request !9431
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/notes/_hints.html.haml | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/app/views/shared/notes/_hints.html.haml b/app/views/shared/notes/_hints.html.haml index 81d97eabe65..7ce6130de60 100644 --- a/app/views/shared/notes/_hints.html.haml +++ b/app/views/shared/notes/_hints.html.haml @@ -9,6 +9,27 @@ - else is supported - %button.toolbar-button.markdown-selector{ type: 'button', tabindex: '-1' } - = icon('file-image-o', class: 'toolbar-button-icon') - Attach a file + + %span.uploading-container + %span.uploading-progress-container.hide + = icon('file-image-o', class: 'toolbar-button-icon') + %span.attaching-file-message + -# Populated by app/assets/javascripts/dropzone_input.js + %span.uploading-progress 0% + %span.uploading-spinner + = icon('spinner spin', class: 'toolbar-button-icon') + + %span.uploading-error-container.hide + %span.uploading-error-icon + = icon('file-image-o', class: 'toolbar-button-icon') + %span.uploading-error-message + -# Populated by app/assets/javascripts/dropzone_input.js + %button.retry-uploading-link{ type: 'button' } Try again + or + %button.attach-new-file.markdown-selector{ type: 'button' } attach a new file + + %button.markdown-selector.button-attach-file{ type: 'button', tabindex: '-1' } + = icon('file-image-o', class: 'toolbar-button-icon') + Attach a file + + %button.btn.btn-default.btn-xs.hide.button-cancel-uploading-files{ type: 'button' } Cancel |