suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dashboard

Browse Source
This commit is contained in:
Piotr Sarnacki 2015-01-19 16:50:11 +01:00
commit 0a02c8a349
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/scripts/app/app.coffee
View File

@ -70,6 +70,9 @@ unless window.TravisApplication
type = Ember.get(Travis, 'mappings')[name] type = Ember.get(Travis, 'mappings')[name]
if name == 'job' && data.job?.commit
@loadOrMerge(Travis.Commit, data.job.commit)
if name == 'build' && data.build?.commit if name == 'build' && data.build?.commit
# TODO: commit should be a sideload record on build, not mixed with it # TODO: commit should be a sideload record on build, not mixed with it
build = data.build build = data.build

6
assets/scripts/app/templates/layouts/top.hbs
View File

@ -8,14 +8,16 @@
<li class="home"> <li class="home">
{{#link-to "main"}}Home{{/link-to}} {{#link-to "main"}}Home{{/link-to}}
</li> </li>
{{#unless config.enterprise}} {{#if config.enterprise}}
<li><a href="http://docs.travis-ci.com">Docs</a></li>
{{else}}
<li> <li>
<a href="http://blog.travis-ci.com">Blog</a> <a href="http://blog.travis-ci.com">Blog</a>
</li> </li>
<li> <li>
<a href="http://traviscistatus.com">Status</a> <a href="http://traviscistatus.com">Status</a>
</li> </li>
{{/unless}} {{/if}}
{{#unless config.pro}} {{#unless config.pro}}
<li class="menu community"> <li class="menu community">
<p class="handle"> <p class="handle">

2
assets/scripts/app/templates/sidebar.hbs
View File

@ -10,7 +10,7 @@
</div> </div>
{{/if}} {{/if}}
{{#if config.pages_endpoint}} {{#if config.sidebar_support_box}}
{{view templateName="layouts/support"}} {{view templateName="layouts/support"}}
{{/if}} {{/if}}

13
assets/scripts/travis.coffee
View File

@ -64,6 +64,12 @@ billing_endpoint = $('meta[rel="travis.billing_endpoint"]').attr('href')
customer_io_site_id = $('meta[name="travis.customer_io_site_id"]').attr('value') customer_io_site_id = $('meta[name="travis.customer_io_site_id"]').attr('value')
setupCustomerio(customer_io_site_id) if customer_io_site_id setupCustomerio(customer_io_site_id) if customer_io_site_id
enterprise = $('meta[name="travis.enterprise"]').attr('value') == 'true'
# for now I set pro to true also for enterprise, but it should be changed
# to allow more granular config later
pro = $('meta[name="travis.pro"]').attr('value') == 'true' || enterprise
$.extend Travis, $.extend Travis,
run: -> run: ->
Travis.advanceReadiness() # bc, remove once merged to master Travis.advanceReadiness() # bc, remove once merged to master
@ -82,10 +88,9 @@ $.extend Travis,
show_repos_hint: 'private' show_repos_hint: 'private'
avatar_default_url: 'https://travis-ci.org/images/ui/default-avatar.png' avatar_default_url: 'https://travis-ci.org/images/ui/default-avatar.png'
pusher_log_fallback: $('meta[name="travis.pusher_log_fallback"]').attr('value') == 'true' pusher_log_fallback: $('meta[name="travis.pusher_log_fallback"]').attr('value') == 'true'
# for now I set pro to true also for enterprise, but it should be changed pro: pro
# to allow more granular config later enterprise: enterprise
pro: $('meta[name="travis.pro"]').attr('value') == 'true' || $('meta[name="travis.enterprise"]').attr('value') == 'true' sidebar_support_box: pro && !enterprise
enterprise: $('meta[name="travis.enterprise"]').attr('value') == 'true'
pages_endpoint: pages_endpoint || billing_endpoint pages_endpoint: pages_endpoint || billing_endpoint
billing_endpoint: billing_endpoint billing_endpoint: billing_endpoint