diff options
author | blackst0ne <blackst0ne.ru@gmail.com> | 2017-05-16 19:52:17 +1100 |
---|---|---|
committer | blackst0ne <blackst0ne.ru@gmail.com> | 2017-05-16 19:52:17 +1100 |
commit | 5b0e086946155aa45b46ebf5010403af40634377 (patch) | |
tree | b16d5b2d32516fd1c7a924595067a2c02736aa21 /app/views/shared | |
parent | 20987f4fd2d6a5ab27e61a4afc038999937adade (diff) | |
download | gitlab-ce-5b0e086946155aa45b46ebf5010403af40634377.tar.gz |
Add an ability to cancel attaching file and redesign attaching files UI
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 |