diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2017-08-18 14:26:11 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2017-08-18 14:26:11 +1100 |
| commit | 2047991363844b4f17216f94778b432ed198a412 (patch) | |
| tree | 6b90710c44dae00178ad323d796beb59737f47f1 /app/views/projects/blob/_upload.html.haml | |
| parent | 7a1c5ba7471b233c994f5b5b313085d0d1292b5d (diff) | |
| parent | f3203cbbc25586df622552153cc460d2f79f414e (diff) | |
| download | gitlab-ce-2047991363844b4f17216f94778b432ed198a412.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'app/views/projects/blob/_upload.html.haml')
| -rw-r--r-- | app/views/projects/blob/_upload.html.haml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/views/projects/blob/_upload.html.haml b/app/views/projects/blob/_upload.html.haml index e14885f264b..05b7dfe2872 100644 --- a/app/views/projects/blob/_upload.html.haml +++ b/app/views/projects/blob/_upload.html.haml @@ -9,16 +9,20 @@ .dropzone .dropzone-previews.blob-upload-dropzone-previews %p.dz-message.light - Attach a file by drag & drop or - = link_to 'click to upload', '#', class: "markdown-selector" + - upload_link = link_to s_('UploadLink|click to upload'), '#', class: "markdown-selector" + - dropzone_text = _('Attach a file by drag & drop or %{upload_link}') % { upload_link: upload_link } + #{ dropzone_text.html_safe } + %br .dropzone-alerts.alert.alert-danger.data{ style: "display:none" } = render 'shared/new_commit_form', placeholder: placeholder .form-actions - = button_tag button_title, class: 'btn btn-small btn-create btn-upload-file', id: 'submit-all' - = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal" + = button_tag class: 'btn btn-create btn-upload-file', id: 'submit-all', type: 'button' do + = icon('spin spinner', class: 'js-loading-icon hidden' ) + = button_title + = link_to _("Cancel"), '#', class: "btn btn-cancel", "data-dismiss" => "modal" - unless can?(current_user, :push_code, @project) .inline.prepend-left-10 |