Updating branch from master

This commit is contained in:
Justine Arreche 2014-01-09 15:19:42 -05:00
commit 909da95d0f
27 changed files with 20496 additions and 3167 deletions

View File

@ -10,7 +10,7 @@
# Handlebars # Handlebars
* Can't {{bindAttr}} be just {{attr}}? Who cares it's "bound" in that context? * Can't {{bind-attr}} be just {{attr}}? Who cares it's "bound" in that context?
{{#each}} isn't {{#bindEach}} either. {{#each}} isn't {{#bindEach}} either.
* Why is {{#collection contentBinding="foo"}} not just {{#collection foo}}? * Why is {{#collection contentBinding="foo"}} not just {{#collection foo}}?

View File

@ -59,7 +59,6 @@ Ember.Route.reopen
if !@signedIn() && @get('needsAuth') if !@signedIn() && @get('needsAuth')
Travis.auth.set('afterSignInTransition', transition) Travis.auth.set('afterSignInTransition', transition)
transition.abort()
Ember.RSVP.reject("needs-auth") Ember.RSVP.reject("needs-auth")
else else
@_super.apply(this, arguments) @_super.apply(this, arguments)

View File

@ -26,16 +26,16 @@
<td class="number"> <td class="number">
<span class="status"></span> <span class="status"></span>
{{#if id}} {{#if id}}
{{#linkTo "build" repo this}} {{#link-to "build" repo this}}
{{number}} {{number}}
{{/linkTo}} {{/link-to}}
{{/if}} {{/if}}
</td> </td>
<td class="message"> <td class="message">
{{{formatMessage commit.message short="true" repoBinding=build.repo}}} {{{formatMessage commit.message short="true" repoBinding=build.repo}}}
</td> </td>
<td class="commit"> <td class="commit">
<a {{bindAttr href="view.urlGithubCommit"}}> <a {{bind-attr href="view.urlGithubCommit"}}>
{{formatCommit commit}} {{formatCommit commit}}
</a> </a>
</td> </td>
@ -44,15 +44,15 @@
</td> </td>
{{#if view.isPullRequestsList}} {{#if view.isPullRequestsList}}
<td> <td>
<a {{bindAttr href="view.urlGithubPullRequest"}}> <a {{bind-attr href="view.urlGithubPullRequest"}}>
#{{pullRequestNumber}} #{{pullRequestNumber}}
</a> </a>
</td> </td>
{{/if}} {{/if}}
<td class="duration" {{bindAttr title="duration"}}> <td class="duration" {{bind-attr title="duration"}}>
{{formatDuration duration}} {{formatDuration duration}}
</td> </td>
<td class="finished_at timeago" {{bindAttr title="formattedFinishedAt"}}> <td class="finished_at timeago" {{bind-attr title="formattedFinishedAt"}}>
{{formatTime finishedAt}} {{formatTime finishedAt}}
</td> </td>
{{/view}} {{/view}}

View File

@ -8,29 +8,29 @@
<span class="status"></span> <span class="status"></span>
{{#if build.id}} {{#if build.id}}
{{#if build.repo.slug}} {{#if build.repo.slug}}
{{#linkTo "build" repo build}}{{build.number}}{{/linkTo}} {{#link-to "build" repo build}}{{build.number}}{{/link-to}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</dd> </dd>
<dt>{{t builds.state}}</dt> <dt>{{t builds.state}}</dt>
<dd class="state">{{capitalize build.state}}</dd> <dd class="state">{{capitalize build.state}}</dd>
<dt class="finished_at_label">{{t builds.finished_at}}</dt> <dt class="finished_at_label">{{t builds.finished_at}}</dt>
<dd class="finished_at timeago" {{bindAttr title="build.formattedFinishedAt"}}>{{formatTime build.finishedAt}}</dd> <dd class="finished_at timeago" {{bind-attr title="build.formattedFinishedAt"}}>{{formatTime build.finishedAt}}</dd>
<dt>{{t builds.duration}}</dt> <dt>{{t builds.duration}}</dt>
<dd class="duration" {{bindAttr title="startedAt"}}>{{formatDuration build.duration}}</dd> <dd class="duration" {{bind-attr title="startedAt"}}>{{formatDuration build.duration}}</dd>
</div> </div>
{{#with build}} {{#with build}}
<div class="right"> <div class="right">
<dt>{{t builds.commit}}</dt> <dt>{{t builds.commit}}</dt>
<dd class="commit"><a {{bindAttr href="controller.urlGithubCommit"}}>{{formatCommit commit}}</a></dd> <dd class="commit"><a {{bind-attr href="controller.urlGithubCommit"}}>{{formatCommit commit}}</a></dd>
{{#if pullRequest}} {{#if pullRequest}}
<dt>{{t builds.pull_request}}</dt> <dt>{{t builds.pull_request}}</dt>
<dd class="pull_request"><a {{bindAttr href="commit.compareUrl"}}>#{{pullRequestNumber}} {{pullRequestTitle}}</a></dd> <dd class="pull_request"><a {{bind-attr href="commit.compareUrl"}}>#{{pullRequestNumber}} {{pullRequestTitle}}</a></dd>
{{else}} {{else}}
{{#if commit.compareUrl}} {{#if commit.compareUrl}}
<dt>{{t builds.compare}}</dt> <dt>{{t builds.compare}}</dt>
<dd class="compare"><a {{bindAttr href="commit.compareUrl"}}>{{pathFrom commit.compareUrl}}</a></dd> <dd class="compare"><a {{bind-attr href="commit.compareUrl"}}>{{pathFrom commit.compareUrl}}</a></dd>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if commit.authorName}} {{#if commit.authorName}}

View File

@ -25,14 +25,14 @@
<span class="status"></span> <span class="status"></span>
{{#if job.id}} {{#if job.id}}
{{#if job.repo.slug}} {{#if job.repo.slug}}
{{#linkTo "job" repo job}}{{number}}{{/linkTo}} {{#link-to "job" repo job}}{{number}}{{/link-to}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</td> </td>
<td class="duration" {{bindAttr title="startedAt"}}> <td class="duration" {{bind-attr title="startedAt"}}>
{{formatDuration duration}} {{formatDuration duration}}
</td> </td>
<td class="finished_at timeago" {{bindAttr title="formattedFinishedAt"}}> <td class="finished_at timeago" {{bind-attr title="formattedFinishedAt"}}>
{{formatTime finishedAt}} {{formatTime finishedAt}}
</td> </td>
{{#each value in configValues}} {{#each value in configValues}}

View File

@ -17,14 +17,14 @@
{{#if view.job.sponsor.name}} {{#if view.job.sponsor.name}}
<p class="sponsor"> <p class="sponsor">
{{t builds.messages.sponsored_by}} {{t builds.messages.sponsored_by}}
<a {{bindAttr href="sponsor.url"}}>{{sponsor.name}}</a> <a {{bind-attr href="sponsor.url"}}>{{sponsor.name}}</a>
</p> </p>
{{/if}} {{/if}}
{{#if view.limited}} {{#if view.limited}}
<p class="warning"> <p class="warning">
This log is too long to be displayed. Please reduce the verbosity of your This log is too long to be displayed. Please reduce the verbosity of your
build or download the the <a {{bindAttr href="view.plainTextLogUrl"}}>raw log</a>. build or download the the <a {{bind-attr href="view.plainTextLogUrl"}}>raw log</a>.
</p> </p>
{{/if}} {{/if}}
</div> </div>

View File

@ -1,5 +1,5 @@
{{#if job.isLoaded}} {{#if job.isLoaded}}
<div {{bindAttr class="view.color"}}> <div {{bind-attr class="view.color"}}>
<dl id="summary"> <dl id="summary">
<div class="left"> <div class="left">
<dt>Job</dt> <dt>Job</dt>
@ -7,29 +7,29 @@
<span class="status"></span> <span class="status"></span>
{{#if job.id}} {{#if job.id}}
{{#if job.repo.slug}} {{#if job.repo.slug}}
{{#linkTo "job" repo job}}{{job.number}}{{/linkTo}} {{#link-to "job" repo job}}{{job.number}}{{/link-to}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</dd> </dd>
<dt>{{t jobs.state}}</dt> <dt>{{t jobs.state}}</dt>
<dd class="state">{{capitalize job.state}}</dd> <dd class="state">{{capitalize job.state}}</dd>
<dt class="finished_at_label">{{t jobs.finished_at}}</dt> <dt class="finished_at_label">{{t jobs.finished_at}}</dt>
<dd class="finished_at timeago" {{bindAttr title="job.formattedFinishedAt"}}>{{formatTime job.finishedAt}}</dd> <dd class="finished_at timeago" {{bind-attr title="job.formattedFinishedAt"}}>{{formatTime job.finishedAt}}</dd>
<dt>{{t jobs.duration}}</dt> <dt>{{t jobs.duration}}</dt>
<dd class="duration" {{bindAttr title="startedAt"}}>{{formatDuration job.duration}}</dd> <dd class="duration" {{bind-attr title="startedAt"}}>{{formatDuration job.duration}}</dd>
</div> </div>
{{#with job}} {{#with job}}
<div class="right"> <div class="right">
<dt>{{t jobs.commit}}</dt> <dt>{{t jobs.commit}}</dt>
<dd class="commit"><a {{bindAttr href="controller.urlGithubCommit"}}>{{formatCommit commit}}</a></dd> <dd class="commit"><a {{bind-attr href="controller.urlGithubCommit"}}>{{formatCommit commit}}</a></dd>
{{#if build.pullRequest}} {{#if build.pullRequest}}
<dt>{{t builds.pull_request}}</dt> <dt>{{t builds.pull_request}}</dt>
<dd class="pull_request"><a {{bindAttr href="commit.compareUrl"}}>#{{build.pullRequestNumber}} {{build.pullRequestTitle}}</a></dd> <dd class="pull_request"><a {{bind-attr href="commit.compareUrl"}}>#{{build.pullRequestNumber}} {{build.pullRequestTitle}}</a></dd>
{{else}} {{else}}
{{#if commit.compareUrl}} {{#if commit.compareUrl}}
<dt>{{t jobs.compare}}</dt> <dt>{{t jobs.compare}}</dt>
<dd class="compare"><a {{bindAttr href="commit.compareUrl"}}>{{pathFrom commit.compareUrl}}</a></dd> <dd class="compare"><a {{bind-attr href="commit.compareUrl"}}>{{pathFrom commit.compareUrl}}</a></dd>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if commit.authorName}} {{#if commit.authorName}}

View File

@ -1,10 +1,10 @@
{{#linkTo "index.current"}} {{#link-to "index.current"}}
<h1>Travis</h1> <h1>Travis</h1>
{{/linkTo}} {{/link-to}}
<ul id="navigation"> <ul id="navigation">
<li class="home"> <li class="home">
{{#linkTo "index.current"}}{{t layouts.top.home}}{{/linkTo}} {{#link-to "index.current"}}{{t layouts.top.home}}{{/link-to}}
</li> </li>
<li> <li>
<a href="http://about.travis-ci.org/blog">{{t layouts.top.blog}}</a> <a href="http://about.travis-ci.org/blog">{{t layouts.top.blog}}</a>
@ -29,13 +29,13 @@
<li class="traviscicom"> <li class="traviscicom">
<a href="http://travis-ci.com">Travis CI for Private Repositories</a> <a href="http://travis-ci.com">Travis CI for Private Repositories</a>
</li> </li>
<li {{bindAttr class="view.classProfile"}}> <li {{bind-attr class="view.classProfile"}}>
<p class="handle"> <p class="handle">
{{#if signedOut}} {{#if signedOut}}
<a class="signed-out" href="#" {{action "signIn" target="Travis"}}>{{t layouts.top.github_login}}</a> <a class="signed-out" href="#" {{action "signIn" target="Travis"}}>{{t layouts.top.github_login}}</a>
{{/if}} {{/if}}
{{#if signedIn}} {{#if signedIn}}
{{#linkTo "profile" class="signed-in"}}<img {{bindAttr src="gravatarUrl"}}/>{{userName}}{{/linkTo}} {{#link-to "profile" class="signed-in"}}<img {{bind-attr src="gravatarUrl"}}/>{{userName}}{{/link-to}}
{{/if}} {{/if}}
{{#if signingIn}} {{#if signingIn}}
<span class="signing-in">{{t layouts.top.signing_in}}</span> <span class="signing-in">{{t layouts.top.signing_in}}</span>
@ -43,7 +43,7 @@
</p> </p>
<ul> <ul>
<li> <li>
{{#linkTo "profile.index" class="signed-in"}}{{t layouts.top.accounts}}{{/linkTo}} {{#link-to "profile.index" class="signed-in"}}{{t layouts.top.accounts}}{{/link-to}}
</li> </li>
<li> <li>
<a href="/" {{action "signOut" target="Travis"}}>{{t layouts.top.sign_out}}</a> <a href="/" {{action "signOut" target="Travis"}}>{{t layouts.top.sign_out}}</a>

View File

@ -11,7 +11,7 @@
<div class="column-right"> <div class="column-right">
<span class="steps">Step 1: &nbsp; Enabling your projects</span> <span class="steps">Step 1: &nbsp; Enabling your projects</span>
<p> <p>
Start by going to your {{#linkTo "profile.index"}}profile{{/linkTo}} and enable one of your projects. We've been Start by going to your {{#link-to "profile.index"}}profile{{/link-to}} and enable one of your projects. We've been
synchronizing all repositories you have administrative access to. Pick one and flip the switch next to it. synchronizing all repositories you have administrative access to. Pick one and flip the switch next to it.
</p> </p>
</div> </div>

View File

@ -2,14 +2,14 @@
</div> </div>
<ul class="tabs"> <ul class="tabs">
<li id="tab_accounts" {{bindAttr class="view.classAccounts"}}> <li id="tab_accounts" {{bind-attr class="view.classAccounts"}}>
<h5><a name="accounts" href="">Accounts</a></h5> <h5><a name="accounts" href="">Accounts</a></h5>
</li> </li>
</ul> </ul>
<div class="tab"> <div class="tab">
{{#collection Travis.AccountsListView contentBinding="controller"}} {{#collection Travis.AccountsListView contentBinding="controller"}}
{{#linkTo "account.index" view.account class="name"}}{{view.name}}{{/linkTo}} {{#link-to "account.index" view.account class="name"}}{{view.name}}{{/link-to}}
<p class="summary"> <p class="summary">
<span class="repos_label">Repositories:</span> <span class="repos_label">Repositories:</span>
<abbr class="repos">{{view.account.reposCount}}</abbr> <abbr class="repos">{{view.account.reposCount}}</abbr>

View File

@ -1,17 +1,17 @@
<ul class="tabs"> <ul class="tabs">
<li id="tab_hooks" {{bindAttr class="view.classHooks"}}> <li id="tab_hooks" {{bind-attr class="view.classHooks"}}>
<h5> <h5>
{{#with view.account}} {{#with view.account}}
{{#if login}} {{#if login}}
{{#linkTo "account.index" this}}Repositories{{/linkTo}} {{#link-to "account.index" this}}Repositories{{/link-to}}
{{/if}} {{/if}}
{{/with}} {{/with}}
</h5> </h5>
</li> </li>
{{#if view.displayUser}} {{#if view.displayUser}}
<li id="tab_user" {{bindAttr class="view.classUser"}}> <li id="tab_user" {{bind-attr class="view.classUser"}}>
<h5> <h5>
{{#linkTo "account.profile" view.account}}Profile{{/linkTo}} {{#link-to "account.profile" view.account}}Profile{{/link-to}}
</h5> </h5>
</li> </li>
{{/if}} {{/if}}

View File

@ -17,13 +17,13 @@
<ul id="hooks"> <ul id="hooks">
{{#each hook in hooks}} {{#each hook in hooks}}
<li {{bindAttr class="hook.active:active"}}> <li {{bind-attr class="hook.active:active"}}>
<a {{bindAttr href="hook.urlGithub"}} rel="nofollow">{{hook.slug}}</a> <a {{bind-attr href="hook.urlGithub"}} rel="nofollow">{{hook.slug}}</a>
{{#if hook.isSaving}}<span class="loading"></span>{{/if}} {{#if hook.isSaving}}<span class="loading"></span>{{/if}}
<p class="description">{{hook.description}}</p> <p class="description">{{hook.description}}</p>
<div class="controls"> <div class="controls">
<a {{bindAttr href="hook.urlGithubAdmin"}} class="github-admin tool-tip" title="Github service hooks admin page"></a> <a {{bind-attr href="hook.urlGithubAdmin"}} class="github-admin tool-tip" title="Github service hooks admin page"></a>
<a {{action "toggle" hook}} class="switch"> <a {{action "toggle" hook}} class="switch">
{{#if hook.active}} {{#if hook.active}}
ON ON
@ -54,8 +54,8 @@
<ul> <ul>
{{#each hook in unAdminisetableHooks}} {{#each hook in unAdminisetableHooks}}
<li {{bindAttr class="hook.active:active"}}> <li {{bind-attr class="hook.active:active"}}>
<a {{bindAttr href="hook.urlGithub"}} rel="nofollow">{{hook.slug}}</a> <a {{bind-attr href="hook.urlGithub"}} rel="nofollow">{{hook.slug}}</a>
<p class="description">{{hook.description}}</p> <p class="description">{{hook.description}}</p>
</li> </li>
{{/each}} {{/each}}

View File

@ -1,4 +1,4 @@
<img {{bindAttr src="view.gravatarUrl"}}> <img {{bind-attr src="view.gravatarUrl"}}>
<dl class="profile"> <dl class="profile">
<div> <div>
@ -6,7 +6,7 @@
{{t profiles.show.github}}: {{t profiles.show.github}}:
</dt> </dt>
<dd> <dd>
<a {{bindAttr href="urlGithub"}}>{{user.login}}</a> <a {{bind-attr href="urlGithub"}}>{{user.login}}</a>
</dd> </dd>
</div> </div>
<div> <div>

View File

@ -2,16 +2,16 @@
{{#each queue in controller}} {{#each queue in controller}}
<li class="queue"> <li class="queue">
<h4>{{t queue}}: {{queue.name}}</h4> <h4>{{t queue}}: {{queue.name}}</h4>
<ul {{bindAttr id="queue.id"}}> <ul {{bind-attr id="queue.id"}}>
{{#each job in queue}} {{#each job in queue}}
{{#view Travis.QueueItemView jobBinding="job"}} {{#view Travis.QueueItemView jobBinding="job"}}
{{#if job.repo.slug}} {{#if job.repo.slug}}
{{#linkTo "job" job.repo job}} {{#link-to "job" job.repo job}}
<span class="slug"> <span class="slug">
{{job.repo.slug}} {{job.repo.slug}}
</span> </span>
#{{job.number}} #{{job.number}}
{{/linkTo}} {{/link-to}}
{{/if}} {{/if}}
{{/view}} {{/view}}
{{else}} {{else}}

View File

@ -11,22 +11,22 @@
<div class="slug-and-status"> <div class="slug-and-status">
<span class="status"></span> <span class="status"></span>
{{#if slug}} {{#if slug}}
{{#linkTo "repo" this class="slug"}}{{slug}}{{/linkTo}} {{#link-to "repo" this class="slug"}}{{slug}}{{/link-to}}
{{/if}} {{/if}}
</div> </div>
{{#with lastBuildHash}} {{#with lastBuildHash}}
{{#if repo.slug}} {{#if repo.slug}}
{{#linkTo "build" repo id class="last_build"}}{{number}}{{/linkTo}} {{#link-to "build" repo id class="last_build"}}{{number}}{{/link-to}}
{{/if}} {{/if}}
{{/with}} {{/with}}
<p class="summary"> <p class="summary">
<span class="duration-icon"></span><span class="duration_label">{{t repositories.duration}}:</span> <span class="duration-icon"></span><span class="duration_label">{{t repositories.duration}}:</span>
<abbr class="duration" {{bindAttr title="lastBuildStartedAt"}}>{{formatDuration lastBuildDuration}}</abbr> <abbr class="duration" {{bind-attr title="lastBuildStartedAt"}}>{{formatDuration lastBuildDuration}}</abbr>
</p> </p>
<p class="summary"> <p class="summary">
<span class="finished-icon"></span><span class="finished_at_label">{{t repositories.finished_at}}:</span> <span class="finished-icon"></span><span class="finished_at_label">{{t repositories.finished_at}}:</span>
<abbr class="finished_at timeago" {{bindAttr title="lastBuildFinishedAt"}}>{{formatTime lastBuildFinishedAt}}</abbr> <abbr class="finished_at timeago" {{bind-attr title="lastBuildFinishedAt"}}>{{formatTime lastBuildFinishedAt}}</abbr>
</p> </p>
<div class="indicator"><span></span></div> <div class="indicator"><span></span></div>

View File

@ -1,13 +1,13 @@
<ul class="tabs"> <ul class="tabs">
<li id="tab_owned" {{bindAttr class="view.classOwned"}}> <li id="tab_owned" {{bind-attr class="view.classOwned"}}>
<h5><a {{action "activate" "owned" target="view"}}>{{t layouts.application.my_repositories}}</a></h5> <h5><a {{action "activate" "owned" target="view"}}>{{t layouts.application.my_repositories}}</a></h5>
</li> </li>
<li id="tab_recent" {{bindAttr class="view.classRecent"}}> <li id="tab_recent" {{bind-attr class="view.classRecent"}}>
<h5><a {{action "activate" "recent" target="view"}}>{{t layouts.application.recent}}</a></h5> <h5><a {{action "activate" "recent" target="view"}}>{{t layouts.application.recent}}</a></h5>
</li> </li>
<li id="tab_search" {{bindAttr class="view.classSearch"}}> <li id="tab_search" {{bind-attr class="view.classSearch"}}>
<h5><a {{action "activate" "search" target="view"}}>{{t layouts.application.search}}</a></h5> <h5><a {{action "activate" "search" target="view"}}>{{t layouts.application.search}}</a></h5>
</li> </li>
</ul> </ul>

View File

@ -1,12 +1,12 @@
<div id="repo" {{bindAttr class="view.className"}}> <div id="repo" {{bind-attr class="view.className"}}>
{{#if view.isEmpty}} {{#if view.isEmpty}}
{{view Travis.ReposEmptyView}} {{view Travis.ReposEmptyView}}
{{else}} {{else}}
{{#if repo.isLoaded}} {{#if repo.isLoaded}}
{{#with repo}} {{#with repo}}
<div id="repo-header"> <div id="repo-header">
<h3>{{#linkTo "repo" this}}{{slug}}{{/linkTo}}</h3> <h3>{{#link-to "repo" this}}{{slug}}{{/link-to}}</h3>
<div class="github-icon"><a {{bindAttr href="controller.urlGithub"}}><img src="/images/icons/github.png" width="21" height="21"/></a></div> <div class="github-icon"><a {{bind-attr href="controller.urlGithub"}}><img src="/images/icons/github.png" width="21" height="21"/></a></div>
{{view Travis.RepoShowToolsView}} {{view Travis.RepoShowToolsView}}
</div> </div>

View File

@ -3,39 +3,39 @@
{{#if view.displayCancelBuild}} {{#if view.displayCancelBuild}}
<li class="icon" title="Cancel Build"> <li class="icon" title="Cancel Build">
<a href="#" {{action "cancelBuild" target="view"}} <a href="#" {{action "cancelBuild" target="view"}}
{{bindAttr class="view.canCancelBuild::disabled"}}><img class="icon" src="/images/icons/off.png" width="20"></a> {{bind-attr class="view.canCancelBuild::disabled"}}><img class="icon" src="/images/icons/off.png" width="20"></a>
</li> </li>
{{/if}} {{/if}}
{{#if view.displayCancelJob}} {{#if view.displayCancelJob}}
<li class="icon" title="Cancel Job"> <li class="icon" title="Cancel Job">
<a href="#" {{action "cancelJob" target="view"}} <a href="#" {{action "cancelJob" target="view"}}
{{bindAttr class="view.canCancelJob::disabled"}}><img class="icon" width="20" src="/images/icons/off.png"/></a> {{bind-attr class="view.canCancelJob::disabled"}}><img class="icon" width="20" src="/images/icons/off.png"/></a>
</li> </li>
{{/if}} {{/if}}
{{#if view.displayRequeueBuild}} {{#if view.displayRequeueBuild}}
<li class="icon" title="Restart Build"> <li class="icon" title="Restart Build">
<a href="#" {{action "requeueBuild" target="view"}} <a href="#" {{action "requeueBuild" target="view"}}
{{bindAttr class="view.canRequeueBuild::disabled"}}><img class="icon" src="/images/icons/repeat.png" width="20"></a> {{bind-attr class="view.canRequeueBuild::disabled"}}><img class="icon" src="/images/icons/repeat.png" width="20"></a>
</li> </li>
{{/if}} {{/if}}
{{#if view.displayRequeueJob}} {{#if view.displayRequeueJob}}
<li class="icon" title="Restart Job"> <li class="icon" title="Restart Job">
<a href="#" {{action "requeueJob" target="view"}} <a href="#" {{action "requeueJob" target="view"}}
{{bindAttr class="view.canRequeueJob::disabled"}}><img src="/images/icons/repeat.png" width="20"></a> {{bind-attr class="view.canRequeueJob::disabled"}}><img src="/images/icons/repeat.png" width="20"></a>
</li> </li>
{{/if}} {{/if}}
{{!TODO: for some reason showDownloadLog, which just delegates to jobIdForLog {{!TODO: for some reason showDownloadLog, which just delegates to jobIdForLog
does not refresh 'if' properly, need further investigation}} does not refresh 'if' properly, need further investigation}}
{{#if view.jobIdForLog}} {{#if view.jobIdForLog}}
<li class="icon" title="Download Log"> <li class="icon" title="Download Log">
<a class="download-log" {{bindAttr href="view.plainTextLogUrl"}}><img class="icon" src="/images/icons/align-justify.png" width="20"/></a> <a class="download-log" {{bind-attr href="view.plainTextLogUrl"}}><img class="icon" src="/images/icons/align-justify.png" width="20"/></a>
</li> </li>
{{/if}} {{/if}}
{{#if view.displayCodeClimate}} {{#if view.displayCodeClimate}}
<li class="icon" title="Test Coverage with Code Climate"> <li class="icon" title="Test Coverage with Code Climate">
<a href="#" name="code-climate" <a href="#" name="code-climate"
{{action "codeClimatePopup" target="view"}} {{action "codeClimatePopup" target="view"}}
{{bindAttr class=":open-popup"}}> {{bind-attr class=":open-popup"}}>
<img src="/images/icons/code-climate-icon.png"/> <img src="/images/icons/code-climate-icon.png"/>
</a> </a>
</li> </li>

View File

@ -1,58 +1,58 @@
<ul class="tabs"> <ul class="tabs">
<li id="tab_current" {{bindAttr class="view.classCurrent"}}> <li id="tab_current" {{bind-attr class="view.classCurrent"}}>
<h5> <h5>
{{#if repo.slug}} {{#if repo.slug}}
{{#linkTo "repo" repo currentWhen="repo.index"}} {{#link-to "repo" repo currentWhen="repo.index"}}
{{t repositories.tabs.current}} {{t repositories.tabs.current}}
{{/linkTo}} {{/link-to}}
{{/if}} {{/if}}
</h5> </h5>
</li> </li>
<li id="tab_builds" {{bindAttr class="view.classBuilds"}}> <li id="tab_builds" {{bind-attr class="view.classBuilds"}}>
<h5> <h5>
{{#if repo.slug}} {{#if repo.slug}}
{{#linkTo "builds" repo}} {{#link-to "builds" repo}}
{{t repositories.tabs.build_history}} {{t repositories.tabs.build_history}}
{{/linkTo}} {{/link-to}}
{{/if}} {{/if}}
</h5> </h5>
</li> </li>
<li id="tab_pull_requests" {{bindAttr class="view.classPullRequests"}}> <li id="tab_pull_requests" {{bind-attr class="view.classPullRequests"}}>
<h5> <h5>
{{#if repo.slug}} {{#if repo.slug}}
{{#linkTo "pullRequests" repo}} {{#link-to "pullRequests" repo}}
{{t repositories.tabs.pull_requests}} {{t repositories.tabs.pull_requests}}
{{/linkTo}} {{/link-to}}
{{/if}} {{/if}}
</h5> </h5>
</li> </li>
<li id="tab_branches" {{bindAttr class="view.classBranches"}}> <li id="tab_branches" {{bind-attr class="view.classBranches"}}>
<h5> <h5>
{{#if repo.slug}} {{#if repo.slug}}
{{#linkTo "branches" repo}} {{#link-to "branches" repo}}
{{t repositories.tabs.branches}} {{t repositories.tabs.branches}}
{{/linkTo}} {{/link-to}}
{{/if}} {{/if}}
</h5> </h5>
</li> </li>
<li id="tab_build" {{bindAttr class="view.classBuild"}}> <li id="tab_build" {{bind-attr class="view.classBuild"}}>
<h5> <h5>
{{#if build.id}} {{#if build.id}}
{{#if repo.slug}} {{#if repo.slug}}
{{#linkTo "build" repo build}} {{#link-to "build" repo build}}
{{t repositories.tabs.build}} #{{build.number}} {{t repositories.tabs.build}} #{{build.number}}
{{/linkTo}} {{/link-to}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</h5> </h5>
</li> </li>
<li id="tab_job" {{bindAttr class="view.classJob"}}> <li id="tab_job" {{bind-attr class="view.classJob"}}>
<h5> <h5>
{{#if job.id}} {{#if job.id}}
{{#if repo.slug}} {{#if repo.slug}}
{{#linkTo "job" repo job}} {{#link-to "job" repo job}}
{{t repositories.tabs.job}} #{{job.number}} {{t repositories.tabs.job}} #{{job.number}}
{{/linkTo}} {{/link-to}}
{{/if}} {{/if}}
{{/if}} {{/if}}
</h5> </h5>

View File

@ -6,7 +6,7 @@
<li> <li>
<a href="#" name="regenerate-key" <a href="#" name="regenerate-key"
{{action "regenerateKeyPopup" target="view"}} {{action "regenerateKeyPopup" target="view"}}
{{bindAttr class=":open-popup view.canRegenerateKey::disabled"}}> {{bind-attr class=":open-popup view.canRegenerateKey::disabled"}}>
Regenerate Key Regenerate Key
</a> </a>
</li> </li>
@ -14,7 +14,7 @@
</ul> </ul>
{{#if view.displayStatusImages}} {{#if view.displayStatusImages}}
<a href="#" id="status-image-popup" name="status-images" class="open-popup" {{action "statusImages" target="view"}}> <a href="#" id="status-image-popup" name="status-images" class="open-popup" {{action "statusImages" target="view"}}>
<img {{bindAttr src="view.statusImageUrl"}} title="Build Status Images"/> <img {{bind-attr src="view.statusImageUrl"}} title="Build Status Images"/>
</a> </a>
{{/if}} {{/if}}
@ -58,7 +58,11 @@
<p> <p>
Integrating <a href="https://codeclimate.com">Code Climate's test coverage</a> reporting with your test Integrating <a href="https://codeclimate.com">Code Climate's test coverage</a> reporting with your test
suite on Travis CI allows to track changes in coverage over time. If you haven't tried it out already, <a suite on Travis CI allows to track changes in coverage over time. If you haven't tried it out already, <a
<<<<<<< HEAD
{{bindAttr href="Travis.config.code_climate_url"}}" target="_blank">sign {{bindAttr href="Travis.config.code_climate_url"}}" target="_blank">sign
=======
{{bind-attr href="Travis.config.code_climate_url"}}" target="_blank">sign
>>>>>>> 60d42738019a33cc73008e81dd0a80eaa6eac147
up today</a> to improve your code's quality. New customers get 20% off for the first three months! up today</a> to improve your code's quality. New customers get 20% off for the first three months!
</p> </p>

View File

@ -9,25 +9,25 @@
</p> </p>
<p> <p>
<label>{{t repositories.image_url}}:</label> <label>{{t repositories.image_url}}:</label>
<input type="text" class="url" {{bindAttr value="view.statusImageUrl"}}></input> <input type="text" class="url" {{bind-attr value="view.statusImageUrl"}}></input>
</p> </p>
<p> <p>
<label>{{t repositories.markdown}}:</label> <label>{{t repositories.markdown}}:</label>
<input type="text" class="markdown" {{bindAttr value="view.markdownStatusImage"}}></input> <input type="text" class="markdown" {{bind-attr value="view.markdownStatusImage"}}></input>
</p> </p>
<p> <p>
<label>{{t repositories.textile}}:</label> <label>{{t repositories.textile}}:</label>
<input type="text" class="textile" {{bindAttr value="view.textileStatusImage"}}></input> <input type="text" class="textile" {{bind-attr value="view.textileStatusImage"}}></input>
</p> </p>
<p> <p>
<label>{{t repositories.rdoc}}:</label> <label>{{t repositories.rdoc}}:</label>
<input type="text" class="rdoc" {{bindAttr value="view.rdocStatusImage"}}></input> <input type="text" class="rdoc" {{bind-attr value="view.rdocStatusImage"}}></input>
</p> </p>
<p> <p>
<label>{{t repositories.asciidoc}}:</label> <label>{{t repositories.asciidoc}}:</label>
<input type="text" class="asciidoc" {{bindAttr value="view.asciidocStatusImage"}}></input> <input type="text" class="asciidoc" {{bind-attr value="view.asciidocStatusImage"}}></input>
</p> </p>
<p> <p>
<label>{{t repositories.rst}}:</label> <label>{{t repositories.rst}}:</label>
<input type="text" class="rst" {{bindAttr value="view.rstStatusImage"}}></input> <input type="text" class="rst" {{bind-attr value="view.rstStatusImage"}}></input>
</p> </p>

View File

@ -14,9 +14,9 @@
<div class="status"></div> <div class="status"></div>
{{#if worker.isWorking}} {{#if worker.isWorking}}
{{#if worker.jobId}} {{#if worker.jobId}}
{{#linkTo "job" worker.repo worker.jobId}} {{#link-to "job" worker.repo worker.jobId}}
{{view.display}} {{view.display}}
{{/linkTo}} {{/link-to}}
{{/if}} {{/if}}
{{else}} {{else}}
{{view.display}} {{view.display}}

View File

@ -37,7 +37,7 @@ Travis.reopen
tabBinding: 'controller.tab' tabBinding: 'controller.tab'
contextBinding: 'controller' contextBinding: 'controller'
# hrm. how to parametrize bindAttr? # hrm. how to parametrize bind-attr?
classCurrent: (-> classCurrent: (->
'active' if @get('tab') == 'current' 'active' if @get('tab') == 'current'
).property('tab') ).property('tab')

View File

@ -4,7 +4,7 @@
tabBinding: 'controller.tab' tabBinding: 'controller.tab'
# hrm. how to parametrize bindAttr? # hrm. how to parametrize bind-attr?
classHome: (-> classHome: (->
'active' if @get('tab') == 'home' 'active' if @get('tab') == 'home'
).property('tab') ).property('tab')

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -27,7 +27,7 @@ html, body
top: -40px top: -40px
left: 0 left: 0
width: 100% width: 100%
min-width: 1211px min-width: 930px
height: 55px height: 55px
z-index: 1000 z-index: 1000