diff --git a/assets/javascripts/app/helpers/urls.coffee b/assets/javascripts/app/helpers/urls.coffee index 89adcb4e..34d20299 100644 --- a/assets/javascripts/app/helpers/urls.coffee +++ b/assets/javascripts/app/helpers/urls.coffee @@ -23,5 +23,8 @@ githubNetwork: (slug) -> "http://github.com/#{slug}/network" + githubAdmin: (slug) -> + "http://github.com/#{slug}/admin/hooks#travis_minibucket" + email: (email) -> "mailto:#{email}" diff --git a/assets/javascripts/app/templates/builds/list.hbs b/assets/javascripts/app/templates/builds/list.hbs index a84e2103..f5bb24bb 100644 --- a/assets/javascripts/app/templates/builds/list.hbs +++ b/assets/javascripts/app/templates/builds/list.hbs @@ -1,4 +1,4 @@ -{{#with view.builds}} +{{#with view}} @@ -11,7 +11,7 @@ - {{#each build in content}} + {{#each build in builds}} {{#view Travis.Views.BuildsItemView contextBinding="build"}} diff --git a/assets/javascripts/app/templates/jobs/list.hbs b/assets/javascripts/app/templates/jobs/list.hbs index 9e52a312..41d42fd3 100644 --- a/assets/javascripts/app/templates/jobs/list.hbs +++ b/assets/javascripts/app/templates/jobs/list.hbs @@ -1,6 +1,6 @@ -{{#with view.jobs}} - {{#if length}} - {{#if view.required}} +{{#with view}} + {{#if jobs.length}} + {{#if required}}
{{number}}
- {{#each configKeys}} + {{#each build.configKeys}} {{/each}} - {{#each job in view.jobs}} + {{#each job in jobs}} {{#view Travis.Views.JobsItemView contextBinding="job"}} @@ -35,7 +35,7 @@
{{t jobs.build_matrix}} @@ -14,13 +14,13 @@ {{/if}}
{{this}}
{{number}}
- {{#unless view.required}} + {{#unless required}}
{{t "jobs.allowed_failures"}}
diff --git a/assets/javascripts/app/templates/jobs/log.hbs b/assets/javascripts/app/templates/jobs/log.hbs index 7fb70934..1f9279e7 100644 --- a/assets/javascripts/app/templates/jobs/log.hbs +++ b/assets/javascripts/app/templates/jobs/log.hbs @@ -1,10 +1,8 @@ -{{#with job}} - 
{{{formatLog log.body}}}
+
{{{formatLog log.body}}}
- {{#if sponsor.name}} - - {{/if}} -{{/with}} +{{#if sponsor.name}} + +{{/if}} diff --git a/assets/javascripts/app/templates/jobs/show.hbs b/assets/javascripts/app/templates/jobs/show.hbs index da26dfb4..c3bf2d6a 100644 --- a/assets/javascripts/app/templates/jobs/show.hbs +++ b/assets/javascripts/app/templates/jobs/show.hbs @@ -34,7 +34,7 @@
{{formatConfig job.config}}
- {{view Travis.Views.LogView}} + {{view Travis.Views.LogView contextBinding="job"}}}
{{/if}} {{/with}} diff --git a/assets/javascripts/app/views/job.coffee b/assets/javascripts/app/views/job.coffee index 5ff19584..20b195a8 100644 --- a/assets/javascripts/app/views/job.coffee +++ b/assets/javascripts/app/views/job.coffee @@ -1,6 +1,7 @@ @Travis.Views.reopen JobsView: Em.View.extend templateName: 'jobs/list' + buildBinding: 'controller.build' toggleHelp: -> $.facebox(div: '#allow_failure_help') diff --git a/assets/javascripts/app/views/profile.coffee b/assets/javascripts/app/views/profile.coffee index 2d639aec..cebd18ab 100644 --- a/assets/javascripts/app/views/profile.coffee +++ b/assets/javascripts/app/views/profile.coffee @@ -2,12 +2,16 @@ UserView: Em.View.extend templateName: 'profile/show' - # userBinding: 'controller.user' + userBinding: 'controller.user' - # gravatarUrl: (-> - # "http://www.gravatar.com/avatar/#{@getPath('user.gravatar')}?s=48&d=mm" - # ).property('user.gravatar') + gravatarUrl: (-> + "http://www.gravatar.com/avatar/#{@getPath('user.gravatar')}?s=48&d=mm" + ).property('user.gravatar') HooksView: Em.View.extend templateName: 'profile/hooks' + urlGithubAdmin: (-> + Travis.Urls.githubAdmin(@getPath('hook.slug')) + ).property('hook.slug') + diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 51a20e95..5a390351 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1 +1 @@ -minispade.register('templates', "(function() {Ember.TEMPLATES['builds/list']=Ember.Handlebars.compile(\"{{#with view.builds}}\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\\n \\n {{#each build in content}}\\n {{#view Travis.Views.BuildsItemView contextBinding=\\\"build\\\"}}\\n \\n \\n \\n \\n \\n \\n \\n {{/view}}\\n {{/each}}\\n \\n
{{t builds.name}}{{t builds.commit}}{{t builds.message}}{{t builds.duration}}{{t builds.finished_at}}
{{number}}{{formatCommit commit}}{{{formatMessage commit.message short=\\\"true\\\"}}}{{formatDuration duration}}{{formatTime finished_at}}
\\n\\n

\\n \\n

\\n{{/with}}\\n\");Ember.TEMPLATES['builds/show']=Ember.Handlebars.compile(\"{{#with view}}\\n {{#unless build.isLoaded}}\\n Loading ...\\n {{else}}\\n
\\n
\\n
\\n
{{t builds.name}}
\\n
{{build.number}}
\\n
{{t builds.finished_at}}
\\n
{{formatTime build.finished_at}}
\\n
{{t builds.duration}}
\\n
{{formatDuration build.duration}}
\\n
\\n\\n
\\n
{{t builds.commit}}
\\n
{{formatCommit build.commit}}
\\n {{#if commit.compareUrl}}\\n
{{t builds.compare}}
\\n
{{pathFrom build.commit.compareUrl}}
\\n {{/if}}\\n {{#if commit.authorName}}\\n
{{t builds.author}}
\\n
{{build.commit.authorName}}
\\n {{/if}}\\n {{#if commit.committerName}}\\n
{{t builds.committer}}
\\n
{{build.commit.committerName}}
\\n {{/if}}\\n
\\n\\n
{{t builds.message}}
\\n
{{{formatMessage build.commit.message}}}
\\n\\n {{#unless isMatrix}}\\n
{{t builds.config}}
\\n
{{formatConfig build.config}}
\\n {{/unless}}\\n
\\n\\n {{#if build.isMatrix}}\\n {{view Travis.Views.JobsView jobsBinding=\\\"requiredJobs\\\" required=\\\"true\\\"}}\\n {{view Travis.Views.JobsView jobsBinding=\\\"allowedFailureJobs\\\"}}\\n {{else}}\\n {{view Travis.Views.LogView contextBinding=\\\"build.jobs.firstObject\\\"}}\\n {{/if}}\\n
\\n {{/unless}}\\n{{/with}}\\n\");Ember.TEMPLATES['jobs/list']=Ember.Handlebars.compile(\"{{#with view.jobs}}\\n {{#if length}}\\n {{#if view.required}}\\n \\n \\n {{else}}\\n
\\n {{t jobs.build_matrix}}\\n
\\n \\n {{/if}}\\n \\n \\n {{#each configKeys}}\\n \\n {{/each}}\\n \\n \\n \\n {{#each job in view.jobs}}\\n {{#view Travis.Views.JobsItemView contextBinding=\\\"job\\\"}}\\n \\n \\n \\n \\n {{#each configValues}}\\n \\n {{/each}}\\n \\n {{/view}}\\n {{/each}}\\n \\n
\\n {{t jobs.allowed_failures}}\\n \\n
{{this}}
{{number}}{{formatDuration duration}}{{formatTime finished_at}}{{this}}
\\n\\n {{#unless view.required}}\\n
\\n
{{t \\\"jobs.allowed_failures\\\"}}
\\n
\\n

\\n Allowed Failures are items in your build matrix that are allowed to\\n fail without causing the entire build to be shown as failed. This lets you add\\n in experimental and preparatory builds to test against versions or\\n configurations that you are not ready to officially support.\\n

\\n

\\n You can define allowed failures in the build matrix as follows:\\n

\\n 
 matrix:\\n    allow_failures:\\n      - rvm: ruby-head
\\n
\\n
\\n {{/unless}}\\n {{/if}}\\n{{/with}}\\n\");Ember.TEMPLATES['jobs/log']=Ember.Handlebars.compile(\"{{#with job}}\\n 
{{{formatLog log.body}}}
\\n\\n {{#if sponsor.name}}\\n

\\n {{t builds.messages.sponsored_by}}\\n {{sponsor.name}}\\n

\\n {{/if}}\\n{{/with}}\\n\");Ember.TEMPLATES['jobs/show']=Ember.Handlebars.compile(\"{{#with view}}\\n {{#if job.isLoaded}}\\n
\\n
\\n
\\n
Job
\\n
{{job.number}}
\\n
{{t jobs.finished_at}}
\\n
{{formatTime job.finished_at}}
\\n
{{t jobs.duration}}
\\n
{{formatDuration job.duration}}
\\n
\\n\\n
\\n
{{t jobs.commit}}
\\n
{{formatCommit commit}}
\\n {{#if commit.compareUrl}}\\n
{{t jobs.compare}}
\\n
{{pathFrom commit.compareUrl}}
\\n {{/if}}\\n {{#if commit.authorName}}\\n
{{t jobs.author}}
\\n
{{commit.authorName}}
\\n {{/if}}\\n {{#if commit.committerName}}\\n
{{t jobs.committer}}
\\n
{{commit.committerName}}
\\n {{/if}}\\n
\\n\\n
{{t jobs.message}}
\\n
{{formatMessage commit.message}}
\\n
{{t jobs.config}}
\\n
{{formatConfig job.config}}
\\n
\\n\\n {{view Travis.Views.LogView}}\\n
\\n {{/if}}\\n{{/with}}\\n\");Ember.TEMPLATES['layouts/home']=Ember.Handlebars.compile(\"
\\n {{outlet top}}\\n
\\n\\n
\\n
\\n \\n
\\n\\n \\n\\n
\\n {{outlet left}}\\n
\\n
\\n\\n
\\n {{outlet main}}\\n\\n {{outlet tabs}}\\n\\n
\\n {{outlet tab}}\\n
\\n\\n
\\n {{outlet right}}\\n
\\n
\\n\\n\");Ember.TEMPLATES['layouts/sidebar']=Ember.Handlebars.compile(\"\\n {{t layouts.application.fork_me}}\\n\\n\\n
\\n
 \\n
\\n\\n{{view templateName=\\\"sponsors/decks\\\"}}\\n{{view templateName=\\\"workers/list\\\" id=\\\"workers\\\"}}\\n{{view templateName=\\\"queues/list\\\" id=\\\"queues\\\"}}\\n{{view templateName=\\\"sponsors/links\\\"}}\\n\\n
\\n

{{t layouts.about.alpha}}

\\n

{{{t layouts.about.messages.alpha}}}

\\n
\\n\\n
\\n

{{t layouts.about.join}}

\\n \\n
\\n\");Ember.TEMPLATES['layouts/simple']=Ember.Handlebars.compile(\"
\\n {{outlet top}}\\n
\\n\\n
\\n {{outlet main}}\\n
\\n\\n\");Ember.TEMPLATES['layouts/top']=Ember.Handlebars.compile(\"\\n

Travis

\\n\\n\\n\\n\");Ember.TEMPLATES['profile/hooks']=Ember.Handlebars.compile(\"{{#if content.length}}\\n \\n{{else}}\\n

Please wait while we sync with GitHub

\\n{{/if}}\\n\\n\");Ember.TEMPLATES['profile/show']=Ember.Handlebars.compile(\"

{{name}}

\\n\\n\\n
\\n
\\n {{t profiles.show.github}}:\\n
\\n
\\n {{login}}\\n
\\n
\\n {{t profiles.show.email}}:\\n
\\n
\\n {{email}}\\n
\\n
\\n {{t profiles.show.token}}:\\n
\\n
\\n {{token}}\\n
\\n
\\n\\n

\\n {{{t profiles.show.messages.notice}}}\\n

\\n\\n

{{t profiles.show.your_locale}}

\\n
\\n \\n \\n
\\n\\n

{{t profiles.show.your_repos}}

\\n

\\n {{{t profiles.show.message.your_repos}}}\\n \\n {{{t profiles.show.message.config}}}\\n \\n

\\n\\n{{outlet hooks}}\\n\");Ember.TEMPLATES['queues/list']=Ember.Handlebars.compile(\"{{#each queue in queues}}\\n

{{t queue}}: {{queue.name}}

\\n \\n{{/each}}\\n\");Ember.TEMPLATES['repositories/list']=Ember.Handlebars.compile(\"