Merge branch 'master' of github.com:travis-ci/travis-web

app/router.coffee

@@ -39,6 +39,7 @@ Router.map ->
     @route 'repositories', path: '/'
 
   @resource 'main', path: '/', ->
+    @resource 'owner', path: '/:owner'
     @resource 'getting_started'
     @route 'recent'
     @route 'repositories'
@@ -71,8 +72,6 @@ Router.map ->
       @resource 'account', path: '/:login'
       @route 'info', path: '/info'
 
-  @resource 'owner', path: '/:owner'
-
   @route 'error404', path: '/*path'
 
 `export default Router`

app/routes/owner.coffee

@@ -7,6 +7,15 @@ Route = TravisRoute.extend
   needsAuth: false
   # controllerName: 'owner'
 
+  renderTemplate: ->
+    @render 'owner', into: 'main'
+
+  activate: ->
+    @controllerFor('home').set('ownersPage', true)
+
+  deactivate: ->
+    @controllerFor('home').set('ownersPage', false)
+
   model: (params) ->
     owner = {}
 

app/templates/layouts/home.hbs

@@ -1,4 +1,4 @@
-<div {{bind-attr class=":wrapper auth.signedIn:non-centered:centered"}}>
+<div {{bind-attr class=":wrapper view.sidebarVisible:non-centered:centered"}}>
 
   <header id="top" class="top">
     {{render "top"}}
@@ -12,7 +12,7 @@
     </div>
   </div>
 
-  <aside id="left" {{bind-attr class="auth.signedIn::hidden"}}>
+  <aside id="left" {{bind-attr class="view.sidebarVisible:visible:hidden"}}>
     {{outlet "left"}}
   </aside>
 </div>

app/views/home.coffee

@@ -3,4 +3,8 @@
 View = BasicView.extend
   layoutName: 'layouts/landing-page'
 
+  sidebarVisible: (->
+    @get('auth.signedIn') && !@get('controller.ownersPage')
+  ).property('auth.signedIn', 'controller.ownersPage')
+
 `export default View`

app/views/owner.coffee

@@ -1,7 +1,6 @@
 `import Ember from 'ember'`
 
 View = Ember.View.extend
-  layoutName: 'layouts/profile'
   classNames: ['owner']
 
 `export default View`