Browse Source

Init move to BS3.

Martin Edenhofer 11 years ago
parent
commit
a062370869

+ 3 - 3
app/assets/javascripts/app/controllers/_application_controller.js.coffee

@@ -426,7 +426,7 @@ class App.ControllerContent extends App.Controller
     $('#content_permanent').hide()
 
 class App.ControllerModal extends App.Controller
-  className: 'modal hide fade',
+  className: 'modal fade',
   tag: 'div',
 
   events:
@@ -476,8 +476,8 @@ class App.ControllerModal extends App.Controller
     @el.bind('hidden', =>
 
       # navigate back to home page
-      if @pageData && @pageData.home
-        @navigate @pageData.home
+#      if @pageData && @pageData.home
+#        @navigate @pageData.home
 
       # navigate back
       if params && params.navigateBack

+ 8 - 8
app/assets/javascripts/app/controllers/_application_controller_form.js.coffee

@@ -362,10 +362,10 @@ class App.ControllerForm extends App.Controller
               params:
                 form_id: @form_id
             text:
-              uploadButton: '<i class="icon-attachment"></i>'
+              uploadButton: '<i class="glyphicon glyphicon-upload"></i>'
             template: '<div class="qq-uploader">' +
                         '<pre class="btn qq-upload-icon qq-upload-drop-area"><span>{dragZoneText}</span></pre>' +
-                        '<div class="btn qq-upload-icon qq-upload-button pull-right" style="">{uploadButtonText}</div>' +
+                        '<div class="btn btn-default qq-upload-icon2 qq-upload-button pull-right" style="">{uploadButtonText}</div>' +
                         '<ul class="qq-upload-list span5" style="margin-top: 10px;"></ul>' +
                       '</div>',
             classes:
@@ -1051,14 +1051,14 @@ class App.ControllerForm extends App.Controller
     if !_.isArray(name)
       name = [name]
     for key in name
-      el.find('[name="' + key + '"]').parents('.control-group').removeClass('hide')
+      el.find('[name="' + key + '"]').parents('.form-group').removeClass('hide')
       el.find('[name="' + key + '"]').removeClass('is-hidden')
 
   _hide: (name, el = @el) ->
     if !_.isArray(name)
       name = [name]
     for key in name
-      el.find('[name="' + key + '"]').parents('.control-group').addClass('hide')
+      el.find('[name="' + key + '"]').parents('.form-group').addClass('hide')
       el.find('[name="' + key + '"]').addClass('is-hidden')
 
   # sort attribute.options
@@ -1347,18 +1347,18 @@ class App.ControllerForm extends App.Controller
   @validate: (data) ->
 
     # remove all errors
-    $(data.form).parents().find('.error').removeClass('error')
+    $(data.form).parents().find('.has-error').removeClass('has-error')
     $(data.form).parents().find('.help-inline').html('')
 
     # show new errors
     for key, msg of data.errors
-      $(data.form).parents().find('[name*="' + key + '"]').parents('div .control-group').addClass('error')
+      $(data.form).parents().find('[name*="' + key + '"]').parents('div .form-group').addClass('has-error')
       $(data.form).parents().find('[name*="' + key + '"]').parent().find('.help-inline').html(msg)
 
     # set autofocus
-    $(data.form).parents().find('.error').find('input, textarea').first().focus()
+    $(data.form).parents().find('.has-error').find('input, textarea').first().focus()
 
 #    # enable form again
-#    if $(data.form).parents().find('.error').html()
+#    if $(data.form).parents().find('.has-error').html()
 #      @formEnable(data.form)
 

+ 0 - 3
app/assets/javascripts/app/controllers/_channel/facebook.js.coffee

@@ -1,7 +1,4 @@
 class App.ChannelFacebook extends App.Controller
-  events:
-    'click [data-toggle="tabnav"]': 'toggle',
-    
   constructor: ->
     super
 

+ 0 - 5
app/assets/javascripts/app/controllers/_channel/twitter.js.coffee

@@ -1,7 +1,4 @@
 class App.ChannelTwitter extends App.Controller
-  events:
-    'click [data-toggle="tabnav"]': 'toggle',
-    
   constructor: ->
     super
 
@@ -9,8 +6,6 @@ class App.ChannelTwitter extends App.Controller
     @render()
 
   render: ->
-    
     @html App.view('channel/twitter')(
       head: 'some header'
     )
-    

+ 1 - 1
app/assets/javascripts/app/controllers/_channel/web.js.coffee

@@ -10,4 +10,4 @@ class App.ChannelWeb extends App.ControllerTabs
       },
     ]
 
-    @render()      
+    @render()

+ 1 - 2
app/assets/javascripts/app/controllers/_default_navbar.js.coffee

@@ -9,6 +9,5 @@ App.Config.set( 'User', {
   role:   [ 'Agent', 'Customer' ]
 }, 'NavBarRight' )
 
-App.Config.set( 'Admin', { prio: 10000, parent: '', name: 'Manage', target: '#admin', role: ['Admin'] }, 'NavBar' )
-App.Config.set( 'Setting', { prio: 20000, parent: '', name: 'Settings', target: '#settings', role: ['Admin'] }, 'NavBar' )
+App.Config.set( 'Admin', { prio: 10000, parent: '', name: 'Admin', target: '#manage', role: ['Admin'] }, 'NavBar' )
 App.Config.set( 'Misc', { prio: 90000, parent: '', name: 'Tools', target: '#tools', child: true }, 'NavBar' )

+ 9 - 26
app/assets/javascripts/app/controllers/channel.js.coffee

@@ -1,30 +1,13 @@
-class Index extends App.ControllerLevel2
-#  toggleable: true
-  toggleable: false
+#App.Config.set( 'channels/:target', Index, 'Routes' )
+#App.Config.set( 'channels', Index, 'Routes' )
 
-  menu: [
-    { name: 'Web',      target: 'web',      controller: App.ChannelWeb },
-    { name: 'Mail',     target: 'email',    controller: App.ChannelEmail },
-    { name: 'Chat',     target: 'chat',     controller: App.ChannelChat },
-    { name: 'Twitter',  target: 'twitter',  controller: App.ChannelTwitter },
-    { name: 'Facebook', target: 'facebook', controller: App.ChannelFacebook },
-  ] 
-  page: {
-    title:     'Channels',
-    head:      'Channels',
-    sub_title: 'Management'
-    nav:       '#channels',
-  }
+#App.Config.set( 'Channels', { prio: 2500, name: 'Channels', target: '#channels', role: ['Admin'] }, 'NavBarLevel4' )
 
-  constructor: ->
-    super
+#App.Config.set( 'Channels', { prio: 2500, parent: '#admin', name: 'Channels', target: '#channels', role: ['Admin'] }, 'NavBar' )
 
-    return if !@authenticate()
+App.Config.set( 'Web', { prio: 1000, name: 'Web', parent: '#channels', target: '#channels/web', controller: App.ChannelWeb, role: ['Admin'] }, 'NavBarLevel44' )
+App.Config.set( 'Email', { prio: 2000, name: 'Email', parent: '#channels', target: '#channels/email', controller: App.ChannelEmail, role: ['Admin'] }, 'NavBarLevel44' )
+App.Config.set( 'Chat', { prio: 3000, name: 'Chat', parent: '#channels', target: '#channels/chat', controller: App.ChannelChat, role: ['Admin'] }, 'NavBarLevel44' )
+App.Config.set( 'Twitter', { prio: 4000, name: 'Twitter', parent: '#channels', target: '#channels/twitter', controller: App.ChannelTwitter, role: ['Admin'] }, 'NavBarLevel44' )
+App.Config.set( 'Facebook', { prio: 5000, name: 'Facebook', parent: '#channels', target: '#channels/facebook', controller: App.ChannelFacebook, role: ['Admin'] }, 'NavBarLevel44' )
 
-    # render page
-    @render()
-
-App.Config.set( 'channels/:target', Index, 'Routes' )
-App.Config.set( 'channels', Index, 'Routes' )
-
-App.Config.set( 'Channels', { prio: 2500, parent: '#admin', name: 'Channels', target: '#channels', role: ['Admin'] }, 'NavBar' )

+ 2 - 0
app/assets/javascripts/app/controllers/chat_widget.js.coffee

@@ -130,6 +130,7 @@ class App.ChatWidget extends App.Controller
         'chat-message-new'
       )
     @el.find('#chat_content').show(100)
+    @el.find('#chat_content').removeClass('hide')
     @newMessage = false
 
     # hide
@@ -142,6 +143,7 @@ class App.ChatWidget extends App.Controller
   hide: =>
     @isShown = false
     @el.find('#chat_content').hide(100)
+    @el.find('#chat_content').addClass('hide')
     @el.find('#chat_toogle').html('&diams;');
 
   focusIn: =>

+ 1 - 3
app/assets/javascripts/app/controllers/footer.js.coffee

@@ -1,6 +1,4 @@
 class App.Footer extends App.Controller
-  className: 'container'
-
   constructor: ->
     super
     @render()
@@ -12,4 +10,4 @@ class App.Footer extends App.Controller
   render: () ->
     @html App.view('footer')()
 
-App.Config.set( 'footer', App.Footer, 'Footers' )
+#App.Config.set( 'footer', App.Footer, 'Footers' )

+ 4 - 2
app/assets/javascripts/app/controllers/groups.js.coffee

@@ -24,6 +24,8 @@ class Index extends App.ControllerContent
       },
     )
 
-App.Config.set( 'groups', Index, 'Routes' )
+#App.Config.set( 'groups', Index, 'Routes' )
+#App.Config.set( 'Group', { prio: 1500, parent: '#admin', name: 'Groups', target: '#groups', role: ['Admin'] }, 'NavBar' )
+
+App.Config.set( 'Group', { prio: 1500, name: 'Groups', parent: '#manage', target: '#manage/groups', controller: Index, role: ['Admin'] }, 'NavBarLevel44' )
 
-App.Config.set( 'Group', { prio: 1500, parent: '#admin', name: 'Groups', target: '#groups', role: ['Admin'] }, 'NavBar' )

Some files were not shown because too many files changed in this diff