diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee index 94c979fc..16f5bc27 100644 --- a/assets/scripts/app/controllers.coffee +++ b/assets/scripts/app/controllers.coffee @@ -2,19 +2,7 @@ require 'helpers' require 'travis/ticker' Travis.reopen - Controller: Em.Controller.extend - connectOutlet: -> - view = @_super.apply(this, arguments) - - if view - _connectedOutletViews = Travis.app.get('_connectedOutletViews') - unless _connectedOutletViews - _connectedOutletViews = [] - - _connectedOutletViews.pushObject(view) - Travis.app.set('_connectedOutletViews', _connectedOutletViews) - - view + Controller: Em.Controller.extend() TopController: Em.Controller.extend userBinding: 'Travis.app.currentUser' diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index cbb078f3..e88a4e5c 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -78,10 +78,10 @@ Travis.Router = Ember.Router.extend auth: Ember.Route.extend route: '/auth' connectOutlets: (router) -> - router.get('applicationController').connectOutlet('authLayout') + router.get('applicationView').connectLayout 'simple' $('body').attr('id', 'auth') - router.get('authLayoutController').connectOutlet('top', 'top') - router.get('authLayoutController').connectOutlet('main', 'signin') + router.get('applicationController').connectOutlet('top', 'top') + router.get('applicationController').connectOutlet('main', 'signin') afterSignIn: (router, path) -> router.route(path || '/') @@ -89,26 +89,26 @@ Travis.Router = Ember.Router.extend stats: Ember.Route.extend route: '/stats' connectOutlets: (router) -> - router.get('applicationController').connectOutlet 'statsLayout' + router.get('applicationView').connectLayout 'simple' $('body').attr('id', 'stats') - router.get('statsLayoutController').connectOutlet 'top', 'top' - router.get('statsLayoutController').connectOutlet 'main', 'stats' + router.get('applicationController').connectOutlet 'top', 'top' + router.get('applicationController').connectOutlet 'main', 'stats' profile: Ember.Route.extend initialState: 'index' route: '/profile' connectOutlets: (router) -> - router.get('applicationController').connectOutlet 'profileLayout' + router.get('applicationView').connectLayout 'profile' $('body').attr('id', 'profile') router.get('accountsController').set('content', Travis.Account.find()) - router.get('profileLayoutController').connectOutlet 'top', 'top' - router.get('profileLayoutController').connectOutlet 'left', 'accounts' + router.get('applicationController').connectOutlet 'top', 'top' + router.get('applicationController').connectOutlet 'left', 'accounts' index: Ember.Route.extend route: '/' connectOutlets: (router) -> - router.get('profileLayoutController').connectOutlet 'main', 'profile' + router.get('applicationController').connectOutlet 'main', 'profile' router.get('profileController').activate 'hooks' account: Ember.Route.extend @@ -163,13 +163,13 @@ Travis.Router = Ember.Router.extend home: Ember.Route.extend route: '/' connectOutlets: (router) -> - router.get('applicationController').connectOutlet 'homeLayout' + router.get('applicationView').connectLayout 'home' $('body').attr('id', 'home') - router.get('homeLayoutController').connectOutlet 'left', 'repos' - router.get('homeLayoutController').connectOutlet 'right', 'sidebar' - router.get('homeLayoutController').connectOutlet 'top', 'top' - router.get('homeLayoutController').connectOutlet 'main', 'repo' - router.get('homeLayoutController').connectOutlet 'flash', 'flash' + router.get('applicationController').connectOutlet 'left', 'repos' + router.get('applicationController').connectOutlet 'right', 'sidebar' + router.get('applicationController').connectOutlet 'top', 'top' + router.get('applicationController').connectOutlet 'main', 'repo' + router.get('applicationController').connectOutlet 'flash', 'flash' router.get('repoController').set('repos', router.get('reposController')) show: Ember.Route.extend diff --git a/assets/scripts/app/tailing.coffee b/assets/scripts/app/tailing.coffee index 50555f41..9c195fd4 100644 --- a/assets/scripts/app/tailing.coffee +++ b/assets/scripts/app/tailing.coffee @@ -42,7 +42,7 @@ $.extend Travis.Tailing.prototype, positionButton: -> tail = $('#tail') return if tail.length is 0 - offset = $(window).scrollTop() - $('#log').offset().top + $('#top').height() + offset = $(window).scrollTop() - $('#log').offset().top max = $('#log').height() - $('#tail').height() + 5 offset = max if offset > max if offset > 0 diff --git a/assets/scripts/app/templates/application.hbs b/assets/scripts/app/templates/application.hbs deleted file mode 100644 index c24cd689..00000000 --- a/assets/scripts/app/templates/application.hbs +++ /dev/null @@ -1 +0,0 @@ -{{outlet}} diff --git a/assets/scripts/app/templates/layouts/home.hbs b/assets/scripts/app/templates/layouts/home.hbs index e6c26fdc..2346b7bf 100644 --- a/assets/scripts/app/templates/layouts/home.hbs +++ b/assets/scripts/app/templates/layouts/home.hbs @@ -2,17 +2,15 @@ {{outlet top}} -
-
- {{outlet left}} -
- -
- {{outlet flash}} - {{outlet main}} -
- - +
+ {{outlet left}} +
+ +
+ {{outlet flash}} + {{outlet main}} +
+ + diff --git a/assets/scripts/app/templates/layouts/profile.hbs b/assets/scripts/app/templates/layouts/profile.hbs index acfd0f94..dfd3d499 100644 --- a/assets/scripts/app/templates/layouts/profile.hbs +++ b/assets/scripts/app/templates/layouts/profile.hbs @@ -2,41 +2,39 @@ {{outlet top}}
-
-
- {{outlet left}} +
+ {{outlet left}} +
+ +
+ {{outlet flash}} + {{outlet main}} +
+ +