Revert "Move owner's page under main route"

This reverts commit ee4eb418ef.
This commit is contained in:
Piotr Sarnacki 2015-05-05 15:42:59 +02:00
parent 5229dc9fef
commit 95c91786ac
5 changed files with 5 additions and 16 deletions

View File

@ -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`

View File

@ -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 = {}

View File

@ -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>

View File

@ -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`

View File

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