Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refactoring of modal api.

Browse source
This commit is contained in:
Martin Edenhofer 2014-09-16 20:38:13 +02:00
parent e07f703667
commit c043b8bcf8
23 changed files with 243 additions and 323 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
app/assets/javascripts/app/controllers/_application_controller.js.coffee
View file

@ -441,125 +441,91 @@ class App.ControllerModal extends App.Controller
className: 'modal fade' className: 'modal fade'
events: events:
'submit form': 'submit' 'submit form': 'onSubmit'
'click .js-submit': 'submit' 'click .js-submit': 'onSubmit'
'click .js-cancel': 'modalHide' 'click .js-cancel': 'hide'
'click .js-close': 'modalHide' 'click .js-close': 'hide'
constructor: (options) -> constructor: (options = {}) ->
defaults =
backdrop: true
keyboard: true
close: true
title: '?'
options = _.extend( options, defaults )
# do not use @el, because it's inserted by js # do not use @el, because it's inserted by js
if options delete options.el
delete options.el
# callbacks
# @callback = {}
# if options.success
# @callback.success = options.success
# if options.error
# @callback.error = options.error
super(options) super(options)
if options.show
@render()
render: -> @show()
show: (content) ->
console.log('M', @message)
if @button is true
@button = 'Submit'
@html App.view('modal')( @html App.view('modal')(
title: @title head: @head
message: @message message: @message
detail: @detail detail: @detail
close: @close close: @close
cancel: @cancel
button: @button
) )
@modalShow( if content
backdrop: @backdrop @el.find('.modal-body').html content
keyboard: @keyboard @el.modal('show')
)
modalShow: (params) ->
defaults = {
backdrop: true
keyboard: true
show: true
}
data = $.extend({}, defaults, params)
@el.modal(data)
@el.bind('hidden.bs.modal', =>
# navigate back to home page
# if @pageData && @pageData.home
# @navigate @pageData.home
# navigate back
if params && params.navigateBack
window.history.back()
# remove modal from dom
$('.modal').remove();
)
modalHide: (e) -> modalHide: (e) ->
if e if e
e.preventDefault() e.preventDefault()
@el.modal('hide') @el.modal('hide')
submit: (e) -> hide: (e) ->
if e
e.preventDefault()
@el.modal('hide')
onShow: ->
console.log('no nothing')
# do nothing
onHide: ->
console.log('no nothing')
# do nothing
onSubmit: (e) ->
e.preventDefault() e.preventDefault()
@log 'error', 'You need to implement your own "submit" method!' @log 'error', 'You need to implement your own "onSubmit" method!'
class App.ErrorModal extends App.ControllerModal class App.ErrorModal extends App.ControllerModal
constructor: -> constructor: ->
super super
@render() @show()
render: ->
@html App.view('modal')(
title: 'Error',
message: @message
detail: @detail
close: @close
)
@modalShow(
backdrop: false,
keyboard: false,
)
class App.SessionMessage extends App.ControllerModal class App.SessionMessage extends App.ControllerModal
constructor: -> constructor: ->
super super
@render()
render: -> console.log('SM', @)
@html App.view('modal')(
title: @title || '?'
message: @message || '?'
detail: @detail
close: @close
button: @button
)
@modalShow(
backdrop: @backdrop,
keyboard: @keyboard,
)
# reload page on modal hidden @show()
if @forceReload
@el.on('hidden', =>
@reload()
)
modalHide: (e) => # reload page on modal hidden
onHide: (e) =>
if @forceReload if @forceReload
@reload(e) @reload(e)
@el.modal('hide')
submit: (e) => onSubmit: (e) =>
if @forceReload if @forceReload
@reload(e) @reload(e)
reload: (e) -> reload: (e) ->
if e if e
e.preventDefault() e.preventDefault()
$('#app').hide().attr('style', 'display: none!important')
if window.location.reload if window.location.reload
window.location.reload() window.location.reload()
return true return true

6
app/assets/javascripts/app/controllers/_application_controller_form.js.coffee
View file

@ -19,6 +19,9 @@ class App.ControllerForm extends App.Controller
@form.find('textarea').trigger('change') @form.find('textarea').trigger('change')
@form.find('select').trigger('change') @form.find('select').trigger('change')
@finishForm = true
@form
html: => html: =>
@form.html() @form.html()
@ -1594,6 +1597,9 @@ class App.ControllerForm extends App.Controller
else if form.parents('form')[0] else if form.parents('form')[0]
form = $( form.parents('form')[0] ) form = $( form.parents('form')[0] )
# use current content as form if form isn't already finished
else if !@finishForm
from = form
else else
App.Log.error 'ControllerForm', 'no form found!', form App.Log.error 'ControllerForm', 'no form found!', form

61
app/assets/javascripts/app/controllers/_application_controller_generic.js.coffee
View file

@ -1,21 +1,22 @@
class App.ControllerGenericNew extends App.ControllerModal class App.ControllerGenericNew extends App.ControllerModal
constructor: (params) -> constructor: (params) ->
super super
@render()
render: -> @head = App.i18n.translateContent( 'New' ) + ': ' + App.i18n.translateContent( @pageData.object )
@cancel = true
@button = true
@html App.view('generic/admin/new')( head: @pageData.object ) controller = new App.ControllerForm(
new App.ControllerForm(
el: @el.find('#object_new') el: @el.find('#object_new')
model: App[ @genericObject ] model: App[ @genericObject ]
params: @item params: @item
screen: @screen || 'edit' screen: @screen || 'edit'
autofocus: true autofocus: true
) )
@modalShow()
submit: (e) -> @show(controller.form)
onSubmit: (e) ->
e.preventDefault() e.preventDefault()
params = @formParam( e.target ) params = @formParam( e.target )
@ -39,32 +40,33 @@ class App.ControllerGenericNew extends App.ControllerModal
if ui.callback if ui.callback
item = App[ ui.genericObject ].fullLocal(@id) item = App[ ui.genericObject ].fullLocal(@id)
ui.callback( item ) ui.callback( item )
ui.modalHide() ui.hide()
fail: -> fail: ->
ui.log 'errors' ui.log 'errors'
ui.modalHide() ui.hide()
) )
class App.ControllerGenericEdit extends App.ControllerModal class App.ControllerGenericEdit extends App.ControllerModal
constructor: (params) -> constructor: (params) ->
super super
@item = App[ @genericObject ].find( params.id ) @item = App[ @genericObject ].find( params.id )
@render()
render: -> @head = App.i18n.translateContent( 'Edit' ) + ': ' + App.i18n.translateContent( @pageData.object )
@cancel = true
@button = true
@html App.view('generic/admin/edit')( head: @pageData.object ) controller = new App.ControllerForm(
new App.ControllerForm( el: @el.find('#object_new')
el: @el.find('#object_edit')
model: App[ @genericObject ] model: App[ @genericObject ]
params: @item params: @item
screen: @screen || 'edit' screen: @screen || 'edit'
autofocus: true autofocus: true
) )
@modalShow()
submit: (e) -> @show(controller.form)
onSubmit: (e) ->
e.preventDefault() e.preventDefault()
params = @formParam(e.target) params = @formParam(e.target)
@item.load(params) @item.load(params)
@ -86,11 +88,11 @@ class App.ControllerGenericEdit extends App.ControllerModal
if ui.callback if ui.callback
item = App[ ui.genericObject ].fullLocal(@id) item = App[ ui.genericObject ].fullLocal(@id)
ui.callback( item ) ui.callback( item )
ui.modalHide() ui.hide()
fail: => fail: =>
ui.log 'errors' ui.log 'errors'
ui.modalHide() ui.hide()
) )
class App.ControllerGenericIndex extends App.Controller class App.ControllerGenericIndex extends App.Controller
@ -186,22 +188,15 @@ class App.ControllerGenericIndex extends App.Controller
class App.ControllerGenericDestroyConfirm extends App.ControllerModal class App.ControllerGenericDestroyConfirm extends App.ControllerModal
constructor: -> constructor: ->
super super
@render() @head = 'Confirm'
@cancel = true
@button = 'Yes'
@message = 'Sure to delete this object?'
@show(@message)
render: -> onSubmit: (e) ->
@html App.view('modal')( e.preventDefault()
title: 'Confirm' @hide()
message: 'Sure to delete this object?'
cancel: true
button: 'Yes'
)
@modalShow(
backdrop: true
keyboard: true
)
submit: (e) =>
@modalHide()
@item.destroy() @item.destroy()
class App.ControllerDrox extends App.Controller class App.ControllerDrox extends App.Controller
@ -398,7 +393,7 @@ class App.GenericHistory extends App.ControllerModal
@historyListCache @historyListCache
) )
@modalShow() @hide()
# enable user popups # enable user popups
@userPopups() @userPopups()

97
app/assets/javascripts/app/controllers/_channel/email.js.coffee
View file

@ -73,31 +73,24 @@ class App.ChannelEmailFilter extends App.Controller
class App.ChannelEmailFilterEdit extends App.ControllerModal class App.ChannelEmailFilterEdit extends App.ControllerModal
constructor: -> constructor: ->
super super
@render(@object)
render: (data = {}) ->
if @object if @object
@html App.view('generic/admin/edit')(
head: 'Postmaster Filter'
)
@form = new App.ControllerForm( @form = new App.ControllerForm(
el: @el.find('#object_edit'),
model: App.PostmasterFilter, model: App.PostmasterFilter,
params: @object, params: @object,
autofocus: true, autofocus: true,
) )
else else
@html App.view('generic/admin/new')(
head: 'Postmaster Filter'
)
@form = new App.ControllerForm( @form = new App.ControllerForm(
el: @el.find('#object_new'),
model: App.PostmasterFilter, model: App.PostmasterFilter,
autofocus: true, autofocus: true,
) )
@modalShow() @head = 'Postmaster Filter'
@button = true
@close = true
@cancel = true
@show( @form.form )
submit: (e) => onSubmit: (e) =>
e.preventDefault() e.preventDefault()
# get params # get params
@ -122,9 +115,9 @@ class App.ChannelEmailFilterEdit extends App.ControllerModal
# save object # save object
object.save( object.save(
done: => done: =>
@modalHide() @hide()
fail: => fail: =>
@modalHide() @hide()
) )
@ -165,31 +158,24 @@ class App.ChannelEmailAddress extends App.Controller
class App.ChannelEmailAddressEdit extends App.ControllerModal class App.ChannelEmailAddressEdit extends App.ControllerModal
constructor: -> constructor: ->
super super
@render(@object)
render: (data = {}) ->
if @object if @object
@html App.view('generic/admin/edit')(
head: 'Email-Address'
)
@form = new App.ControllerForm( @form = new App.ControllerForm(
el: @el.find('#object_edit')
model: App.EmailAddress model: App.EmailAddress
params: @object params: @object
autofocus: true autofocus: true
) )
else else
@html App.view('generic/admin/new')(
head: 'Email-Address'
)
@form = new App.ControllerForm( @form = new App.ControllerForm(
el: @el.find('#object_new'),
model: App.EmailAddress, model: App.EmailAddress,
autofocus: true, autofocus: true,
) )
@modalShow() @head = 'Email-Address'
@button = true
@close = true
@cancel = true
@show( @form.form )
submit: (e) => onSubmit: (e) =>
e.preventDefault() e.preventDefault()
# get params # get params
@ -213,9 +199,9 @@ class App.ChannelEmailAddressEdit extends App.ControllerModal
# save object # save object
object.save( object.save(
done: => done: =>
@modalHide() @hide()
fail: => fail: =>
@modalHide() @hide()
) )
class App.ChannelEmailSignature extends App.Controller class App.ChannelEmailSignature extends App.Controller
@ -253,31 +239,24 @@ class App.ChannelEmailSignature extends App.Controller
class App.ChannelEmailSignatureEdit extends App.ControllerModal class App.ChannelEmailSignatureEdit extends App.ControllerModal
constructor: -> constructor: ->
super super
@render(@object)
render: (data = {}) ->
if @object if @object
@html App.view('generic/admin/edit')(
head: 'Signature'
)
@form = new App.ControllerForm( @form = new App.ControllerForm(
el: @el.find('#object_edit')
model: App.Signature model: App.Signature
params: @object params: @object
autofocus: true autofocus: true
) )
else else
@html App.view('generic/admin/new')(
head: 'Signature'
)
@form = new App.ControllerForm( @form = new App.ControllerForm(
el: @el.find('#object_new')
model: App.Signature model: App.Signature
autofocus: true autofocus: true
) )
@modalShow() @head = 'Signature'
@button = true
@close = true
@cancel = true
@show( @form.form )
submit: (e) => onSubmit: (e) =>
e.preventDefault() e.preventDefault()
# get params # get params
@ -301,9 +280,9 @@ class App.ChannelEmailSignatureEdit extends App.ControllerModal
# save object # save object
object.save( object.save(
done: => done: =>
@modalHide() @hide()
fail: => fail: =>
@modalHide() @hide()
) )
class App.ChannelEmailInbound extends App.Controller class App.ChannelEmailInbound extends App.Controller
@ -342,30 +321,24 @@ class App.ChannelEmailInbound extends App.Controller
class App.ChannelEmailInboundEdit extends App.ControllerModal class App.ChannelEmailInboundEdit extends App.ControllerModal
constructor: -> constructor: ->
super super
@render(@object)
render: (data = {}) ->
if @object if @object
@html App.view('generic/admin/edit')(
head: 'Email Channel'
)
@form = new App.ControllerForm( @form = new App.ControllerForm(
el: @el.find('#object_edit') model: App.Channel
model: App.Channel params: @object
autofocus: true autofocus: true
) )
else else
@html App.view('generic/admin/new')(
head: 'Email Channel'
)
@form = new App.ControllerForm( @form = new App.ControllerForm(
el: @el.find('#object_new') model: App.Channel
model: App.Channel
autofocus: true autofocus: true
) )
@modalShow() @head = 'Email Channel'
@button = true
@close = true
@cancel = true
@show( @form.form )
submit: (e) => onSubmit: (e) =>
e.preventDefault() e.preventDefault()
# get params # get params
@ -390,9 +363,9 @@ class App.ChannelEmailInboundEdit extends App.ControllerModal
# save object # save object
object.save( object.save(
done: => done: =>
@modalHide() @hide()
fail: => fail: =>
@modalHide() @hide()
) )
class App.ChannelEmailOutbound extends App.Controller class App.ChannelEmailOutbound extends App.Controller

27
app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
View file

@ -479,22 +479,20 @@ class Sidebar extends App.Controller
class UserNew extends App.ControllerModal class UserNew extends App.ControllerModal
constructor: -> constructor: ->
super super
@render() @head = 'New User'
@cancel = true
@button = true
render: -> controller = new App.ControllerForm(
@html App.view('agent_user_create')( head: 'New User' )
new App.ControllerForm(
el: @el.find('#form-user') el: @el.find('#form-user')
model: App.User model: App.User
screen: 'edit' screen: 'edit'
autofocus: true autofocus: true
) )
@modalShow() @show( controller.form )
submit: (e) -> onSubmit: (e) ->
e.preventDefault() e.preventDefault()
params = @formParam(e.target) params = @formParam(e.target)
@ -503,12 +501,13 @@ class UserNew extends App.ControllerModal
if !params.login && params.email if !params.login && params.email
params.login = params.email params.login = params.email
user = new App.User
# find role_id # find role_id
role = App.Role.findByAttribute( 'name', 'Customer' ) if !params.role_ids || _.isEmpty( params.role_ids )
params.role_ids = role.id role = App.Role.findByAttribute( 'name', 'Customer' )
params.role_ids = role.id
@log 'notice', 'updateAttributes', params @log 'notice', 'updateAttributes', params
user = new App.User
user.load(params) user.load(params)
errors = user.validate() errors = user.validate()
@ -532,11 +531,11 @@ class UserNew extends App.ControllerModal
# start customer info controller # start customer info controller
ui.userInfo( user_id: user.id ) ui.userInfo( user_id: user.id )
ui.modalHide() ui.hide()
App.User.full( @id, callbackReload , true ) App.User.full( @id, callbackReload , true )
fail: -> fail: ->
ui.modalHide() ui.hide()
) )
class Router extends App.ControllerPermanent class Router extends App.ControllerPermanent

4
app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
View file

@ -63,7 +63,7 @@ class App.TicketMerge extends App.ControllerModal
$(e.target).parents().find('[name="master_ticket_number"]').val( ticket.number ) $(e.target).parents().find('[name="master_ticket_number"]').val( ticket.number )
) )
@modalShow() @hide()
submit: (e) => submit: (e) =>
e.preventDefault() e.preventDefault()
@ -91,7 +91,7 @@ class App.TicketMerge extends App.ControllerModal
App.Collection.load( type: 'Ticket', data: [data.slave_ticket] ) App.Collection.load( type: 'Ticket', data: [data.slave_ticket] )
# hide dialog # hide dialog
@modalHide() @hide()
# view ticket # view ticket
@log 'notice', 'nav...', App.Ticket.find( data.master_ticket['id'] ) @log 'notice', 'nav...', App.Ticket.find( data.master_ticket['id'] )

1
app/assets/javascripts/app/controllers/getting_started.js.coffee
View file

@ -130,7 +130,6 @@ class Index extends App.ControllerContent
msg: App.i18n.translateContent( 'Can\'t create user!' ) msg: App.i18n.translateContent( 'Can\'t create user!' )
timeout: 2500 timeout: 2500
} }
# @modalHide()
) )
relogin: (data, status, xhr) => relogin: (data, status, xhr) =>

42
app/assets/javascripts/app/controllers/layout_ref.js.coffee
View file

@ -41,6 +41,48 @@ class ContentSidebarRightSidebarOptional extends App.ControllerContent
App.Config.set( 'layout_ref/content_sidebar_right_sidebar_optional', ContentSidebarRightSidebarOptional, 'Routes' ) App.Config.set( 'layout_ref/content_sidebar_right_sidebar_optional', ContentSidebarRightSidebarOptional, 'Routes' )
class ModalForm extends App.ControllerModal
constructor: ->
super
@head = '123 some title'
@cancel = true
@button = true
controller = new App.ControllerForm(
model: App.User
autofocus: true
)
@show(controller.form)
onHide: =>
window.history.back()
onSubmit: (e) =>
e.preventDefault()
params = App.ControllerForm.params( $(e.target).closest('form') )
console.log('params', params)
App.Config.set( 'layout_ref/modal_form', ModalForm, 'Routes' )
class ModalText extends App.ControllerModal
constructor: ->
super
@head = '123 some title'
form = App.view('layout_ref/content')()
@show(form)
onHide: =>
window.history.back()
App.Config.set( 'layout_ref/modal_text', ModalText, 'Routes' )
class ContentSidebarTabsRight extends App.ControllerContent class ContentSidebarTabsRight extends App.ControllerContent
elements: elements:

2
app/assets/javascripts/app/controllers/signup.js.coffee
View file

@ -70,8 +70,6 @@ class Index extends App.ControllerContent
success: @success success: @success
error: @error error: @error
) )
# fail: =>
# @modalHide()
) )
success: (data, status, xhr) => success: (data, status, xhr) =>

26
app/assets/javascripts/app/controllers/taskbar_widget.js.coffee
View file

@ -75,7 +75,7 @@ class App.TaskbarWidget extends App.Controller
remove: (e, key = false, force = false) => remove: (e, key = false, force = false) =>
e.preventDefault() e.preventDefault()
if !key if !key
key = $(e.target).parent().parent().data('key') key = $(e.target).parents('a').data('key')
if !key if !key
throw "No such key attributes found for task item" throw "No such key attributes found for task item"
@ -117,20 +117,14 @@ class App.TaskbarWidget extends App.Controller
class Remove extends App.ControllerModal class Remove extends App.ControllerModal
constructor: -> constructor: ->
super super
@render() @head = 'Confirm'
@message = 'Tab has changed, you really want to close it?'
@cancel = true
@close = true
@button = 'Close'
@show()
render: -> onSubmit: (e) =>
@html App.view('modal')( e.preventDefault()
title: 'Confirm' @hide()
message: 'Tab has changed, you really want to close it?'
close: true
button: 'Close'
)
@modalShow(
backdrop: true,
keyboard: true,
)
submit: (e) =>
@modalHide()
@ui.remove(e, @key, true) @ui.remove(e, @key, true)

4
app/assets/javascripts/app/controllers/ticket_customer.js.coffee
View file

@ -18,7 +18,7 @@ class App.TicketCustomer extends App.ControllerModal
}, },
autofocus: true, autofocus: true,
) )
@modalShow() @hide()
submit: (e) => submit: (e) =>
e.preventDefault() e.preventDefault()
@ -30,7 +30,7 @@ class App.TicketCustomer extends App.ControllerModal
callback = => callback = =>
# close modal # close modal
@modalHide() @hide()
# update ticket # update ticket
@ticket.updateAttributes( @ticket.updateAttributes(

23
app/assets/javascripts/app/controllers/ticket_overview.js.coffee
View file

@ -437,13 +437,7 @@ class App.OverviewSettings extends App.ControllerModal
constructor: -> constructor: ->
super super
@overview = App.Overview.find(@overview_id) @overview = App.Overview.find(@overview_id)
@render()
render: ->
@html App.view('dashboard/ticket_settings')(
overview: @overview,
)
@configure_attributes_article = [] @configure_attributes_article = []
if @view_mode is 'd' if @view_mode is 'd'
@configure_attributes_article.push({ @configure_attributes_article.push({
@ -593,15 +587,20 @@ class App.OverviewSettings extends App.ControllerModal
class: 'medium' class: 'medium'
}) })
new App.ControllerForm( form = App.view('dashboard/ticket_settings')(
el: @el.find('#form-setting') overview: @overview,
)
@head = App.i18n.translateContent( 'Edit' ) + ': ' + App.i18n.translateContent( @overview.name )
@close = true
@cancel = true
@button = true
controller = new App.ControllerForm(
model: { configure_attributes: @configure_attributes_article } model: { configure_attributes: @configure_attributes_article }
autofocus: false autofocus: false
) )
@show( controller.form )
@modalShow() onSubmit: (e) =>
submit: (e) =>
e.preventDefault() e.preventDefault()
params = @formParam(e.target) params = @formParam(e.target)
@ -627,7 +626,7 @@ class App.OverviewSettings extends App.ControllerModal
else else
@overview.trigger('local:rerender') @overview.trigger('local:rerender')
) )
@modalHide() @hide()
class Navbar extends App.Controller class Navbar extends App.Controller
constructor: -> constructor: ->

13
app/assets/javascripts/app/controllers/widget/link.js.coffee
View file

@ -83,17 +83,18 @@ class App.WidgetLink extends App.Controller
class App.LinkAdd extends App.ControllerModal class App.LinkAdd extends App.ControllerModal
constructor: -> constructor: ->
super super
@render() @head = 'Links'
@button = true
@cancel = true
render: => form = App.view('link/add')(
@html App.view('link/add')(
link_object: @link_object, link_object: @link_object,
link_object_id: @link_object_id, link_object_id: @link_object_id,
object: @object, object: @object,
) )
@modalShow() @show( form )
submit: (e) => onSubmit: (e) =>
e.preventDefault() e.preventDefault()
params = @formParam(e.target) params = @formParam(e.target)
@ -111,6 +112,6 @@ class App.LinkAdd extends App.ControllerModal
} }
processData: true, processData: true,
success: (data, status, xhr) => success: (data, status, xhr) =>
@modalHide() @hide()
@parent.fetch() @parent.fetch()
) )

13
app/assets/javascripts/app/controllers/widget/maintenance.js.coffee
View file

@ -6,23 +6,18 @@ class Widget extends App.Controller
App.Event.bind( App.Event.bind(
'session:maintenance' 'session:maintenance'
(data) => (data) =>
new Message( message: data ) console.log('session:maintenance', data)
@showMessage( data )
'maintenance' 'maintenance'
) )
class Message extends App.ControllerModal showMessage: (message = {}) =>
constructor: ->
super
@render(@message)
render: (message = {}) ->
if message.reload if message.reload
@disconnectClient() @disconnectClient()
button = 'Reload application' button = 'Reload application'
new App.SessionMessage( new App.SessionMessage(
title: message.title head: message.head
message: message.message message: message.message
keyboard: false keyboard: false
backdrop: true backdrop: true

2
app/assets/javascripts/app/controllers/widget/session_taken_over.js.coffee
View file

@ -39,7 +39,7 @@ class Widget extends App.Controller
# only if new client id isnt own client id # only if new client id isnt own client id
if data.taskbar_id isnt App.TaskManager.TaskbarId() if data.taskbar_id isnt App.TaskManager.TaskbarId()
@error = new App.SessionMessage( @error = new App.SessionMessage(
title: 'Session' head: 'Session'
message: 'Session taken over... please reload page or work with other browser window.' message: 'Session taken over... please reload page or work with other browser window.'
keyboard: false keyboard: false
backdrop: true backdrop: true

4
app/assets/javascripts/app/lib/app_post/browser.coffee
View file

@ -42,9 +42,9 @@ class App.Browser
@message: (data) -> @message: (data) ->
new App.ControllerModal( new App.ControllerModal(
title: 'Browser too old!' head: 'Browser too old!'
message: "Your Browser is not supported (#{data.browser} #{data.version} #{data.OS}). Please use a newer one." message: "Your Browser is not supported (#{data.browser} #{data.version} #{data.OS}). Please use a newer one."
show: true close: false
backdrop: false backdrop: false
keyboard: false keyboard: false
) )

4
app/assets/javascripts/app/lib/app_post/websocket.js.coffee
View file

@ -194,7 +194,7 @@ class _webSocketSingleton extends App.Controller
# close error message show up (because try so connect again) if exists # close error message show up (because try so connect again) if exists
App.Delay.clear('websocket-no-connection-try-reconnect-message', 'ws') App.Delay.clear('websocket-no-connection-try-reconnect-message', 'ws')
if @error if @error
@error.modalHide() @error.hide()
@error = false @error = false
@tryToConnect = false @tryToConnect = false
@ -242,7 +242,7 @@ class _webSocketSingleton extends App.Controller
message: 'Lost network connection to system, trying to reconnect...' message: 'Lost network connection to system, trying to reconnect...'
backdrop: false backdrop: false
keyboard: false keyboard: false
show: true close: false
) )
if !@tryToConnect if !@tryToConnect
App.Delay.set message, 7000, 'websocket-no-connection-try-reconnect-message', 'ws' App.Delay.set message, 7000, 'websocket-no-connection-try-reconnect-message', 'ws'

17
app/assets/javascripts/app/views/generic/admin/edit.jst.eco
View file

@ -1,17 +0,0 @@
<form>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<div class="modal-close js-close">
<div class="close icon"></div>
</div>
<h1 class="modal-title"><%- @T( 'Edit' ) %>: <%- @T( @head ) %></h1>
</div>
<div class="modal-body" id="object_edit"></div>
<div class="modal-footer horizontal">
<a class="subtle-link standalone js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
<button type="submit" class="btn btn-create js-submit align-right"><%- @T( 'Submit' ) %></button>
</div>
</div>
</div>
</form>

17
app/assets/javascripts/app/views/generic/admin/new.jst.eco
View file

@ -1,17 +0,0 @@
<form>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<div class="modal-close js-close">
<div class="close icon"></div>
</div>
<h1 class="modal-title"><%- @T( 'Neu' ) %>: <%- @T( @head ) %></h1>
</div>
<div class="modal-body" id="object_new"></div>
<div class="modal-footer horizontal">
<a class="subtle-link standalone js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
<button type="submit" class="btn btn-create js-submit align-right"><%- @T('Submit') %></button>
</div>
</div>
</div>
</form>

1
app/assets/javascripts/app/views/layout_ref/index.jst.eco
View file

@ -9,6 +9,7 @@
<li>Content + Sidebar Right not shown if screen resulution is lower then 1280px <a href="#layout_ref/content_sidebar_right_sidebar_optional">Example</a></li> <li>Content + Sidebar Right not shown if screen resulution is lower then 1280px <a href="#layout_ref/content_sidebar_right_sidebar_optional">Example</a></li>
<li>Content + Sidebar Left <a href="#layout_ref/content_sidebar_left">Example</a></li> <li>Content + Sidebar Left <a href="#layout_ref/content_sidebar_left">Example</a></li>
<li>Content + Sidebar Tabs Right <a href="#layout_ref/content_sidebar_tabs_right">Example</a></li> <li>Content + Sidebar Tabs Right <a href="#layout_ref/content_sidebar_tabs_right">Example</a></li>
<li>Modal Dialog <a href="#layout_ref/modal_form">Example with From</a> / <a href="#layout_ref/modal_text">Example with Text</a></li>
</ul> </ul>
</div> </div>

20
app/assets/javascripts/app/views/link/add.jst.eco
View file

@ -1,13 +1,4 @@
<form> <fieldset>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<div class="modal-close js-close">
<div class="close icon"></div>
</div>
<h1 class="modal-title"><%- @T( 'Link' ) %></h1>
</div>
<div class="modal-body">
<%- @T( 'Link' ) %> <%- @T( 'Link' ) %>
<%- @T( @link_object ) %> <%- @T( @link_object ) %>
<input type="text" name="ticket_number" value="" class="span2" required/> <input type="text" name="ticket_number" value="" class="span2" required/>
@ -28,11 +19,4 @@
<li>Recent Customer Tickets</li> <li>Recent Customer Tickets</li>
</ul> </ul>
--> -->
</div> </fieldset>
<div class="modal-footer horizontal">
<a class="subtle-link standalone js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
<button type="submit" class="btn btn-create js-submit align-right"><%- @T('Submit') %></button>
</div>
</div>
</div>
</form>

2
app/assets/javascripts/app/views/maintenance.jst.eco
View file

@ -6,7 +6,7 @@
<div class="form-group"> <div class="form-group">
<label for="title"><%- @T('Title') %></label> <label for="title"><%- @T('Title') %></label>
<div class="controls"> <div class="controls">
<input type="text" name="title" class="form-control" placeholder="<%- @Ti('some title') %>" required> <input type="text" name="head" class="form-control" placeholder="<%- @Ti('some title') %>" required>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

50
app/assets/javascripts/app/views/modal.jst.eco
View file

@ -1,28 +1,30 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <form>
<div class="modal-header"> <div class="modal-content">
<% if @close: %> <div class="modal-header">
<div class="modal-close js-close"> <% if @close: %>
<div class="close icon"></div> <div class="modal-close js-close">
<div class="close icon"></div>
</div>
<% end %>
<h1 class="modal-title"><%- @T( @head ) %></h1>
</div>
<div class="modal-body">
<% if @message: %>
<p><%= @message %></p>
<% end %>
<% if @detail: %>
<pre><%= @detail %></p>
<% end %>
</div>
<div class="modal-footer horizontal">
<% if @cancel: %>
<a class="subtle-link standalone js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
<% end %>
<% if @button: %>
<button type="submit" class="btn btn-create js-submit align-right"><%- @T( @button ) %></button>
<% end %>
</div> </div>
<% end %>
<h1 class="modal-title"><%- @T( @title ) %></h1>
</div> </div>
<div class="modal-body"> </form>
<form>
<p><%= @message %></p>
<% if @detail: %>
<pre><%= @detail %></p>
<% end %>
</form>
</div>
<div class="modal-footer horizontal">
<% if @cancel: %>
<a class="subtle-link standalone js-cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
<% end %>
<% if @button: %>
<button type="submit" class="btn btn-create js-submit align-right"><%- @T( @button ) %></button>
<% end %>
</div>
</div>
</div> </div>