diff --git a/app/assets/javascripts/app/controllers/_application_controller.coffee b/app/assets/javascripts/app/controllers/_application_controller.coffee index 7dd9a85bf..d73b90ef3 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.coffee @@ -590,12 +590,14 @@ class App.ControllerModalNice extends App.Controller backdrop: true keyboard: true large: false + small: false head: '?' container: null buttonClass: 'btn--success' centerButtons: [] buttonClose: true buttonCancel: false + buttonCancelClass: 'btn--text btn--subtle' buttonSubmit: true headPrefix: '' shown: true @@ -609,7 +611,6 @@ class App.ControllerModalNice extends App.Controller className: 'modal fade' constructor: -> - @className += ' modal--large' if @large super # rerender view, e. g. on langauge change @@ -631,15 +632,16 @@ class App.ControllerModalNice extends App.Controller else content = @content() modal = $(App.view('modal') - head: @head - headPrefix: @headPrefix - message: @message - detail: @detail - buttonClose: @buttonClose - buttonCancel: @buttonCancel - buttonSubmit: @buttonSubmit - buttonClass: @buttonClass - centerButtons: @centerButtons + head: @head + headPrefix: @headPrefix + message: @message + detail: @detail + buttonClose: @buttonClose + buttonCancel: @buttonCancel + buttonCancelClass: @buttonCancelClass + buttonSubmit: @buttonSubmit + buttonClass: @buttonClass + centerButtons: @centerButtons ) modal.find('.modal-body').html content if !@initRenderingDone @@ -662,6 +664,10 @@ class App.ControllerModalNice extends App.Controller if @container @el.addClass('modal--local') + if @large + @el.addClass('modal--large') + if @small + @el.addClass('modal--small') @el.modal keyboard: @keyboard diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.coffee index 961e66824..0ae59037f 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.coffee @@ -571,10 +571,19 @@ class App.TicketZoom extends App.Controller # check if attachment exists but no body attachmentCount = @$('.article-add .textBubble .attachments .attachment').length if !articleParams['body'] && attachmentCount > 0 - if !confirm( App.i18n.translateContent('Please fill also some text in!') ) - @formEnable(e) - @autosaveStart() - return + new App.ControllerModalNice( + head: 'Text missing' + buttonCancel: 'Cancel' + buttonCancelClass: 'btn--danger' + buttonSubmit: false + message: 'Please fill also some text in!' + shown: true + small: true + container: @el.closest('.content') + ) + @formEnable(e) + @autosaveStart() + return if articleParams['body'] articleParams.from = @Session.get().displayName() diff --git a/app/assets/javascripts/app/views/modal.jst.eco b/app/assets/javascripts/app/views/modal.jst.eco index f7def8931..db7be63ab 100644 --- a/app/assets/javascripts/app/views/modal.jst.eco +++ b/app/assets/javascripts/app/views/modal.jst.eco @@ -15,7 +15,7 @@