diff options
| author | Earle Bunao & Neil Calabroso <earle.bunao@gmail.com & nmcalabroso@gmail.com> | 2014-05-23 16:22:00 +0800 |
|---|---|---|
| committer | erbunao <earle.bunao@gmail.com> | 2014-05-23 16:22:42 +0800 |
| commit | 6a85cdf1627629ecaa762fa60a7abdbd092cc20a (patch) | |
| tree | ada8c5565fa6e336b3074b4e606273029c473d0a /app/views/projects/wikis | |
| parent | 696b9903f08011e37811dc8b8ff4f7da77201d13 (diff) | |
| download | gitlab-ce-6a85cdf1627629ecaa762fa60a7abdbd092cc20a.tar.gz | |
Implements drag and drop upload in creating issues
Diffstat (limited to 'app/views/projects/wikis')
| -rw-r--r-- | app/views/projects/wikis/_form.html.haml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml index 0c2e33f2282..a43e6f073e1 100644 --- a/app/views/projects/wikis/_form.html.haml +++ b/app/views/projects/wikis/_form.html.haml @@ -15,7 +15,6 @@ .col-sm-2 .col-sm-10 %p.cgray - Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. To link to a (new) page you can just type %code [Link Title](page-slug) \. @@ -23,8 +22,12 @@ .form-group = f.label :content, class: 'control-label' .col-sm-10 - = f.text_area :content, class: 'form-control js-gfm-input', rows: 18 - + = f.text_area :content, class: 'form-control js-gfm-input markdown-area', rows: 18 + .col-sm-12.hint + .pull-left Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. + .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }. + .clearfix + .error-alert .form-group = f.label :commit_message, class: 'control-label' .col-sm-10= f.text_field :message, class: 'form-control', rows: 18 @@ -36,3 +39,7 @@ - else = f.submit 'Create page', class: "btn-create btn" = link_to "Cancel", project_wiki_path(@project, :home), class: "btn btn-cancel" + +:javascript + window.project_image_path_upload = "#{upload_image_project_path @project}"; + |