From 95c91786ac95991acc4cd7883dc8005c1c4af631 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 5 May 2015 15:42:59 +0200
Subject: [PATCH] Revert "Move owner's page under main route"

This reverts commit ee4eb418ef066261171ac8c7e873113c56e8bf53.
---
 app/router.coffee              | 3 ++-
 app/routes/owner.coffee        | 9 ---------
 app/templates/layouts/home.hbs | 4 ++--
 app/views/home.coffee          | 4 ----
 app/views/owner.coffee         | 1 +
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/app/router.coffee b/app/router.coffee
index e96554aa..138d9af4 100644
--- a/app/router.coffee
+++ b/app/router.coffee
@@ -39,7 +39,6 @@ Router.map ->
     @route 'repositories', path: '/'
 
   @resource 'main', path: '/', ->
-    @resource 'owner', path: '/:owner'
     @resource 'getting_started'
     @route 'recent'
     @route 'repositories'
@@ -72,6 +71,8 @@ Router.map ->
       @resource 'account', path: '/:login'
       @route 'info', path: '/info'
 
+  @resource 'owner', path: '/:owner'
+
   @route 'error404', path: '/*path'
 
 `export default Router`
diff --git a/app/routes/owner.coffee b/app/routes/owner.coffee
index f6cc3bf8..bdcda3d7 100644
--- a/app/routes/owner.coffee
+++ b/app/routes/owner.coffee
@@ -9,15 +9,6 @@ Route = TravisRoute.extend
   titleToken: (model) ->
     "#{model.name}"
 
-  renderTemplate: ->
-    @render 'owner', into: 'main'
-
-  activate: ->
-    @controllerFor('home').set('ownersPage', true)
-
-  deactivate: ->
-    @controllerFor('home').set('ownersPage', false)
-
   model: (params) ->
     owner = {}
 
diff --git a/app/templates/layouts/home.hbs b/app/templates/layouts/home.hbs
index 4ae6bd0d..cb1e693f 100644
--- a/app/templates/layouts/home.hbs
+++ b/app/templates/layouts/home.hbs
@@ -1,4 +1,4 @@
-<div {{bind-attr class=":wrapper view.sidebarVisible:non-centered:centered"}}>
+<div {{bind-attr class=":wrapper auth.signedIn:non-centered:centered"}}>
 
   <header id="top" class="top">
     {{render "top"}}
@@ -12,7 +12,7 @@
     </div>
   </div>
 
-  <aside id="left" {{bind-attr class="view.sidebarVisible:visible:hidden"}}>
+  <aside id="left" {{bind-attr class="auth.signedIn::hidden"}}>
     {{outlet "left"}}
   </aside>
 </div>
diff --git a/app/views/home.coffee b/app/views/home.coffee
index ac572457..06446f76 100644
--- a/app/views/home.coffee
+++ b/app/views/home.coffee
@@ -3,8 +3,4 @@
 View = BasicView.extend
   layoutName: 'layouts/landing-page'
 
-  sidebarVisible: (->
-    @get('auth.signedIn') && !@get('controller.ownersPage')
-  ).property('auth.signedIn', 'controller.ownersPage')
-
 `export default View`
diff --git a/app/views/owner.coffee b/app/views/owner.coffee
index 8d65d1f6..49b5bf65 100644
--- a/app/views/owner.coffee
+++ b/app/views/owner.coffee
@@ -1,6 +1,7 @@
 `import Ember from 'ember'`
 
 View = Ember.View.extend
+  layoutName: 'layouts/profile'
   classNames: ['owner']
 
 `export default View`