diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/markdown_area.js.coffee | 120 | ||||
| -rw-r--r-- | app/assets/stylesheets/generic/markdown_area.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/variables.scss | 8 | ||||
| -rw-r--r-- | app/controllers/projects_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/projects/issues/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_new_submit.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/milestones/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/_form.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/wikis/_form.html.haml | 4 |
11 files changed, 30 insertions, 130 deletions
diff --git a/.gitignore b/.gitignore index d151849b713..92ca729dc11 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ config/gitlab.yml config/database.yml config/initializers/omniauth.rb config/initializers/rack_attack.rb +config/initializers/smtp_settings.rb config/unicorn.rb config/resque.yml config/aws.yml diff --git a/app/assets/javascripts/markdown_area.js.coffee b/app/assets/javascripts/markdown_area.js.coffee index 67e8290bd57..def5d12a820 100644 --- a/app/assets/javascripts/markdown_area.js.coffee +++ b/app/assets/javascripts/markdown_area.js.coffee @@ -1,3 +1,6 @@ +formatLink = (str) -> + "![" + str.alt + "](" + str.url + ")" + $(document).ready -> alertClass = "alert alert-danger alert-dismissable div-dropzone-alert" alertAttr = "class=\"close\" data-dismiss=\"alert\"" + "aria-hidden=\"true\"" @@ -10,12 +13,15 @@ $(document).ready -> project_image_path_upload = window.project_image_path_upload or null $("textarea.markdown-area").wrap "<div class=\"div-dropzone\"></div>" + $(".div-dropzone").parent().addClass "div-dropzone-wrapper" + $(".div-dropzone").append divHover $(".div-dropzone-hover").append iconPicture $(".div-dropzone").append divSpinner $(".div-dropzone-spinner").append iconSpinner + dropzone = $(".div-dropzone").dropzone( url: project_image_path_upload dictDefaultMessage: "" @@ -30,7 +36,7 @@ $(document).ready -> previewContainer: false processing: -> - closeAlertMessage() + $(".div-dropzone-alert").alert "close" dragover: -> $(".div-dropzone > textarea").addClass "div-dropzone-focus" @@ -49,127 +55,31 @@ $(document).ready -> return success: (header, response) -> - appendToTextArea(formatLink(response.link)) + child = $(dropzone[0]).children("textarea") + $(child).val $(child).val() + formatLink(response.link) + "\n" return error: (temp, errorMessage) -> - showError(errorMessage) + checkIfMsgExists = $(".error-alert").children().length + if checkIfMsgExists is 0 + $(".error-alert").append divAlert + $(".div-dropzone-alert").append btnAlert + errorMessage return sending: -> - showSpinner() + $(".div-dropzone-spinner").css "opacity", 0.7 return complete: -> $(".dz-preview").remove() $(".markdown-area").trigger "input" - closeSpinner() + $(".div-dropzone-spinner").css "opacity", 0 return ) - child = $(dropzone[0]).children("textarea") - - formatLink = (str) -> - "![" + str.alt + "](" + str.url + ")" - - handlePaste = (e) -> - e.preventDefault() - my_event = e.originalEvent - - if my_event.clipboardData and my_event.clipboardData.items - i = 0 - while i < my_event.clipboardData.items.length - item = my_event.clipboardData.items[i] - processItem(my_event, item) - i++ - - processItem = (e, item) -> - if isImage(item) - filename = getFilename(e) or "image.png" - text = "{{" + filename + "}}" - pasteText(text) - uploadFile item.getAsFile(), filename - else if e.clipboardData.items.length == 1 - text = e.clipboardData.getData("text/plain") - pasteText(text) - - isImage = (item) -> - if item - item.type.indexOf("image") isnt -1 - - pasteText = (text) -> - caretStart = $(child)[0].selectionStart - caretEnd = $(child)[0].selectionEnd - textEnd = $(child).val().length - - beforeSelection = $(child).val().substring 0, caretStart - afterSelection = $(child).val().substring caretEnd, textEnd - $(child).val beforeSelection + text + afterSelection - $(".markdown-area").trigger "input" - - getFilename = (e) -> - if window.clipboardData and window.clipboardData.getData - value = window.clipboardData.getData("Text") - else if e.clipboardData and e.clipboardData.getData - value = e.clipboardData.getData("text/plain") - - value = value.split("\r") - value.first() - - uploadFile = (item, filename) -> - formData = new FormData() - formData.append "markdown_img", item, filename - $.ajax - url: project_image_path_upload - type: "POST" - data: formData - dataType: "json" - processData: false - contentType: false - headers: - "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content") - - beforeSend: -> - showSpinner() - closeAlertMessage() - - success: (e, textStatus, response) -> - insertToTextArea(filename, formatLink(response.responseJSON.link)) - - error: (response) -> - showError(response.responseJSON.message) - - complete: -> - closeSpinner() - - insertToTextArea = (filename, url) -> - $(child).val (index, val) -> - val.replace("{{" + filename + "}}", url + "\n") - - appendToTextArea = (url) -> - $(child).val (index, val) -> - val + url + "\n" - - showSpinner = (e) -> - $(".div-dropzone-spinner").css "opacity", 0.7 - - closeSpinner = -> - $(".div-dropzone-spinner").css "opacity", 0 - - showError = (message) -> - checkIfMsgExists = $(".error-alert").children().length - if checkIfMsgExists is 0 - $(".error-alert").append divAlert - $(".div-dropzone-alert").append btnAlert + message - - closeAlertMessage = -> - $(".div-dropzone-alert").alert "close" - $(".markdown-selector").click (e) -> e.preventDefault() $(".div-dropzone").click() return - $(".div-dropzone").on "paste", handlePaste - return
\ No newline at end of file diff --git a/app/assets/stylesheets/generic/markdown_area.scss b/app/assets/stylesheets/generic/markdown_area.scss index ae7ace61d49..fbfa72c5e5e 100644 --- a/app/assets/stylesheets/generic/markdown_area.scss +++ b/app/assets/stylesheets/generic/markdown_area.scss @@ -43,11 +43,6 @@ display: none; } } - - .hint { - padding: 0; - margin: 0; - } } .div-dropzone-alert { diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/main/variables.scss index 8bcdad35792..68f7f6b8581 100644 --- a/app/assets/stylesheets/main/variables.scss +++ b/app/assets/stylesheets/main/variables.scss @@ -14,8 +14,8 @@ $link_hover_color: #2FA0BB; /* * Success colors (green) */ -$border_success: #469408; -$bg_success: #469408; +$border_success: #019875; +$bg_success: #019875; /* * Danger colors (red) @@ -32,8 +32,8 @@ $bg_primary: #446e9b; /* * Warning colors (yellow) */ -$bg_warning: #d9831f; -$border_warning: #d9831f; +$bg_warning: #EB9532; +$border_warning: #EB9532; /** * Commit Diff Colors diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6ea9b2cf27d..b9af36a0c7e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -11,8 +11,6 @@ class ProjectsController < ApplicationController layout 'navless', only: [:new, :create, :fork] before_filter :set_title, only: [:new, :create] - rescue_from CarrierWave::IntegrityError, with: :invalid_file - def new @project = Project.new end @@ -187,10 +185,6 @@ class ProjectsController < ApplicationController %w(png jpg jpeg gif) end - def invalid_file(error) - render json: { message: error.message }, status: :internal_server_error - end - def set_title @title = 'New Project' end diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml index 120d70eaa6f..73cbb79665a 100644 --- a/app/views/projects/issues/_form.html.haml +++ b/app/views/projects/issues/_form.html.haml @@ -23,7 +23,7 @@ = f.text_area :description, class: 'form-control js-gfm-input markdown-area', rows: 14 .col-sm-12.hint .pull-left Issues are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}. - .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. + .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }. .clearfix .error-alert %hr diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml index 27ea53c006e..b0e7aa6084a 100644 --- a/app/views/projects/merge_requests/_form.html.haml +++ b/app/views/projects/merge_requests/_form.html.haml @@ -25,7 +25,7 @@ = f.text_area :description, class: "form-control js-gfm-input markdown-area", rows: 14 .col-sm-12.hint .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}. - .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. + .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }. .clearfix .error-alert %hr diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml index 553bc30ee08..01bc10421bd 100644 --- a/app/views/projects/merge_requests/_new_submit.html.haml +++ b/app/views/projects/merge_requests/_new_submit.html.haml @@ -26,7 +26,7 @@ = f.text_area :description, class: "form-control js-gfm-input markdown-area", rows: 10 .col-sm-12.hint .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}. - .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. + .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }. .clearfix .error-alert .form-group @@ -84,5 +84,5 @@ $('#merge_request_assignee_id').val("#{current_user.id}").trigger("change"); e.preventDefault(); }); - + window.project_image_path_upload = "#{upload_image_project_path @project}"; diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml index 9f3e0c44b25..979c27daa2b 100644 --- a/app/views/projects/milestones/_form.html.haml +++ b/app/views/projects/milestones/_form.html.haml @@ -24,7 +24,7 @@ = f.text_area :description, maxlength: 2000, class: "form-control markdown-area", rows: 10 .hint .pull-left Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}. - .pull-left Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. + .pull-left Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }. .clearfix .error-alert .col-md-6 diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index f6a21f79952..b62aada3a9a 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -16,10 +16,10 @@ .note-write-holder = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input markdown-area' - .light.clearfix.hint + .light.clearfix .pull-left Comments are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'} - .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. - .error-alert + .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }. + .note-preview-holder.hide .js-note-preview diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml index a0a56b84a10..0a24e36ae84 100644 --- a/app/views/projects/wikis/_form.html.haml +++ b/app/views/projects/wikis/_form.html.haml @@ -25,7 +25,7 @@ = 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_page_path("markdown", "markdown"), target: '_blank'} - .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping, #{link_to "selecting them", '#', class: 'markdown-selector' } or pasting from the clipboard. + .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }. .clearfix .error-alert .form-group @@ -39,7 +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}"; |