summaryrefslogtreecommitdiff
path: root/app/views/projects/blob/new.html.haml
diff options
context:
space:
mode:
authorliyakun <liyakun127@gmail.com>2015-09-10 16:18:40 +0200
committerliyakun <liyakun127@gmail.com>2015-09-15 02:12:56 +0200
commite2ece2bc350bf881e9716e51c01a59eecac65fc9 (patch)
tree422d043e1cd6bc09c62fd726958384c320c483d8 /app/views/projects/blob/new.html.haml
parent7abb744eb961d95ef9f34e8b64c47084d3f620b6 (diff)
downloadgitlab-ce-e2ece2bc350bf881e9716e51c01a59eecac65fc9.tar.gz
Add "Replace" and "Upload" features
Refactor upload and replace functionality Rename file and move CSS Fix typo Make dropzone a div Remove unnecessary file Change color of "upload existing one" Add missing changes
Diffstat (limited to 'app/views/projects/blob/new.html.haml')
-rw-r--r--app/views/projects/blob/new.html.haml10
1 files changed, 8 insertions, 2 deletions
diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml
index 7c2a4fece94..6fb46ea2040 100644
--- a/app/views/projects/blob/new.html.haml
+++ b/app/views/projects/blob/new.html.haml
@@ -1,5 +1,11 @@
-- page_title "New File", @ref
-%h3.page-title New file
+%h3.page-title<
+ Create new file or&nbsp;
+ %a.upload-link{href: '#modal-upload-blob', 'data-target' => '#modal-upload-blob', 'data-toggle' => 'modal'}>upload existing one
+
+.file-title
+ = render 'projects/blob/upload'
+ %br
+
.file-editor
= form_tag(namespace_project_create_blob_path(@project.namespace, @project, @id), method: :post, class: 'form-horizontal form-new-file js-requires-input') do
= render 'projects/blob/editor', ref: @ref