change pro navigation and landing page redirects

This commit is contained in:
Lisa P 2015-11-11 18:18:58 +01:00
parent 88fd47002f
commit 701acecc56
4 changed files with 19 additions and 17 deletions

View File

@ -0,0 +1,6 @@
`import TravisRoute from 'travis/routes/basic'`
Route = TravisRoute.extend
needsAuth: false
`export default Route`

View File

@ -251,7 +251,7 @@
.list--check,
.list--cross
@extend %list
padding: 0 0 0 1.4em
padding: 0 0 0 2em
li
&:before
content: ""

View File

@ -20,9 +20,9 @@
<nav id="navigation" class="navigation {{if is-open 'is-open'}}">
<ul>
<li><a href="http://blog.travis-ci.com" class="navigation-anchor">Blog</a></li>
<li><a href="http://www.traviscistatus.com/" class="navigation-anchor">Status</a></li>
{{#unless config.pro}}
<li><a href="http://blog.travis-ci.com" title="Travis CI Blog" class="navigation-anchor">Blog</a></li>
<li><a href="http://www.traviscistatus.com/" title="Travis CI Status" class="navigation-anchor">Status</a></li>
<li>
<span class="navigation-anchor">Help</span>
<ul class="navigation-nested">
@ -33,15 +33,9 @@
{{/unless}}
{{#if config.pro}}
<li><a href="http://docs.travis-ci.com">Docs</a></li>
<li>
<span class="navigation-anchor">Legal</span>
<ul class="navigation-nested">
<li><a href={{config.urls.imprint}}>Imprint</a></li>
<li><a href={{config.urls.security}}>Security</a></li>
<li><a href={{config.urls.terms}}>Terms</a></li>
</ul>
</li>
<li><a href="/team" title="Travis CI team" class="navigation-anchor">About Us</a></li>
<li><a href="/plans" title="" class="navigation-anchor">Plans & Pricing</a></li>
<li><a href="https://enterprise.travis-ci.com" title="">Enterprise</a></li>
{{/if}}
<li class="{{view.classProfile}}">

View File

@ -13,17 +13,19 @@ Location = Ember.HistoryLocation.extend
getURL: ->
url = this._super.apply(this, arguments)
unless config.pro
if location.pathname == '/'
if @get('auth.signedIn')
return '/repositories'
if location.pathname == '/'
if @get('auth.signedIn')
return '/repositories'
else
if config.pro
return '/home-pro'
else
return '/home'
url
formatURL: (logicalPath) ->
if logicalPath == '/repositories' || logicalPath == '/home'
if logicalPath == '/repositories' || logicalPath == '/home' || logicalPath == '/home-pro'
'/'
else
@_super.apply this, arguments