Merge pull request #421 from travis-ci/lp-remove-deprecations

Remove deprecations

app/components/org-item.coffee

@@ -0,0 +1,28 @@
+`import Ember from 'ember'`
+
+OrgItemComponent = Ember.Component.extend
+
+  classNames: ['media', 'account']
+  tagName: 'li'
+  classNameBindings: ['type', 'selected']
+  typeBinding: 'account.type'
+  selectedBinding: 'account.selected'
+  tokenIsVisible: false
+
+  name: (->
+    @get('account.name') || @get('account.login')
+  ).property('account')
+
+  avatarUrl: (->
+    @get('account.avatarUrl') || false
+  ).property('account')
+
+  isUser: (->
+    @get('account.type') == 'user'
+  ).property('account')
+
+  actions:
+    tokenVisibility: () ->
+      @toggleProperty('tokenIsVisible')
+
+`export default OrgItemComponent`

app/components/repo-show-tabs.coffee

@@ -23,10 +23,6 @@ RepoShowTabsComponent = Ember.Component.extend
     'active' if @get('tab') == 'branches'
   ).property('tab')
 
-  classEvents: (->
-    'active' if @get('tab') == 'events'
-  ).property('tab')
-
   classBuild: (->
     tab = @get('tab')
     classes = []

app/components/subscribe-button.coffee

@@ -0,0 +1,8 @@
+`import Ember from 'ember'`
+`import config from 'travis/config/environment'`
+
+SubscribeButtonComponent = Ember.Component.extend
+
+  classNames: ['cta-btn']
+
+`export default SubscribeButtonComponent`

app/controllers/account.coffee

@@ -50,9 +50,17 @@ Controller = Ember.Controller.extend
     @config.show_repos_hint == 'public'
   ).property()
 
-  billingUrl: (->
+  billingUrl: ( ->
     id = if @get('model.type') == 'user' then 'user' else @get('model.login')
     "#{@config.billingEndpoint}/subscriptions/#{id}"
+  ).property('model.name', 'model.login')
+
+  subscribeButtonInfo: (->
+    {
+      billingUrl: @get('billingUrl')
+      subscribed: @get('model.subscribed')
+      education: @get('model.education')
+    }
   ).property('model.login', 'model.type')
 
 `export default Controller`

app/controllers/accounts.coffee

@@ -1,16 +1,5 @@
 `import Ember from 'ember'`
 
-Controller = Ember.ArrayController.extend
+Controller = Ember.ArrayController.extend()
-  tab: 'accounts'
-
-  userName: (->
-    @get('user.name') || @get('user.login')
-  ).property('user.login', 'user.name')
-
-
-  actions: 
-    tokenVisibility: () ->
-      @toggleProperty('isVisible')
-      return false
 
 `export default Controller`

app/controllers/build.coffee

@@ -14,7 +14,7 @@ Controller = Ember.Controller.extend GithubUrlPropertievs,
 
   jobsLoaded: (->
     if jobs = @get('build.jobs')
-      jobs.everyBy('config')
+      jobs.isEvery('config')
   ).property('build.jobs.@each.config')
 
   loading: (->

app/controllers/job.coffee

@@ -6,7 +6,6 @@ Controller = Ember.Controller.extend
 
   repoBinding: 'repoController.repo'
   commitBinding: 'job.commit'
-  annotationsBinding: 'job.annotations'
   currentUserBinding: 'auth.currentUser'
   tabBinding: 'repoController.tab'
 

app/controllers/profile.coffee

@@ -21,9 +21,4 @@ Controller = Ember.Controller.extend
   connectTab: (tab) ->
     @set('tab', tab)
 
-  billingUrl: (->
-    id = if @get('account.type') == 'user' then 'user' else @get('account.login')
-    "#{@get('config').billingEndpoint}/subscriptions/#{id}"
-  ).property('account.login', 'account.type')
-
 `export default Controller`

app/controllers/top.coffee

@@ -13,7 +13,8 @@ Controller = Ember.Controller.extend
   ).property('user.login', 'user.name')
 
   gravatarUrl: (->
-    "#{location.protocol}//www.gravatar.com/avatar/#{@get('user.gravatarId')}?s=48&d=mm"
+    if @get('user.gravatarId')
+      "#{location.protocol}//www.gravatar.com/avatar/#{@get('user.gravatarId')}?s=36&d=mm"
   ).property('user.gravatarId')
 
   defineTowerColor: (broadcastArray) ->

app/helpers/label.coffee

@@ -1,33 +0,0 @@
-`import Ember from 'ember'`
-
-LabelView = Ember.View.extend(
-  tagName: 'label'
-
-  attributeBindings: ['for', 'accesskey', 'form']
-  classNameBindings: ['class']
-)
-
-label = (params, hash, options, env) ->
-  view = LabelView
-
-  controller = env.data.view.get('controller')
-  name = hash.for
-  if name
-    labels = controller.get('_labels')
-    unless labels
-      labels = Ember.Object.create()
-      controller.set('_labels', labels)
-
-    # for now I support only label + input in their own context
-    id = labels.get(name)
-    unless id
-      id = "#{name}-#{Math.round(Math.random() * 1000000)}"
-      labels.set(name, id)
-
-    hash.for = id
-    if hash.content
-      view = view.extend(templateName: 'helpers/label')
-
-  env.helpers.view.helperFunction.call(this, [view], hash, options, env)
-
-`export default label`

app/routes/accounts.coffee

@@ -18,4 +18,11 @@ Route = TravisRoute.extend
     @render 'profile_accounts', outlet: 'left', into: 'profile'
 
 
+  organizations: ->
+    model.filterBy('type', 'organization')
+
+  user: ->
+    model.filterBy('type', 'user')[0]
+
+
 `export default Route`

app/routes/env-vars.coffee

@@ -1,10 +0,0 @@
-`import TravisRoute from 'travis/routes/basic'`
-
-Route = TravisRoute.extend
-  titleToken: 'Environment variables'
-
-  model: (params) ->
-    repo = @modelFor('repo')
-    repo.get('envVars.promise')
-
-`export default Route`

app/styles/app.scss

@@ -12,7 +12,6 @@
 @import "app/forms";
 @import "app/github";
 
-@import "app/main/annotations";
 @import "app/userlike";
 
 @import "app/main/log";
@@ -43,6 +42,7 @@
 @import "app/modules/forms";
 @import "app/modules/notice";
 @import "app/modules/build-header";
+@import "app/modules/avatar";
 
 @import "app/layout";
 @import "app/layouts/dashboard";

app/styles/app/layouts/profile.sass

@@ -25,7 +25,7 @@
         color: $grey-light
         text-decoration: underline
     @media #{$medium-up}
-      .profile-header, .sync-button, .ember-view
+      .profile-header, .sync-button
         display: inline-block
         vertical-align: middle
       .sync-button
@@ -128,9 +128,7 @@ p.profile-user-last
 
 .profile-orglist
   @media #{$large-up}
-    padding-right: 10em
+    padding: 0 3em 0 0
-    aside
-      padding: 0
 
 .profile-hooklist
   @include resetul
@@ -138,7 +136,6 @@ p.profile-user-last
   li
     clear: both
     margin-bottom: .8em
-    // overflow: auto
   .profile-hooks
     width: grid-calc(10, 24)
     display: inline-block

app/styles/app/main/annotations.sass

@@ -1,17 +0,0 @@
-
-#annotations
-  @include clearfix
-  margin: 8px 0 25px 12px
-  padding: 12px 0 0 0
-
-  a
-    text-decoration: underline
-
-    img
-      border: none
-
-  .annotation
-    float: left
-    min-height: 25px
-    margin: 0
-

app/styles/app/modules/avatar.sass

@@ -0,0 +1,43 @@
+%avatar
+  position: relative
+  background-color: #a0a0a0
+  border-radius: 50%
+  overflow: hidden
+  &:before
+    content: ""
+    display: block
+    width: 40%
+    height: 40%
+    border-radius: 50%
+    background: $cream-light
+    position: absolute
+    top: 20%
+    margin: auto
+    left: 0
+    right: 0
+
+  &:after
+    content: ""
+    display: block
+    width: 66%
+    height: 70%
+    border-radius: 50%
+    background: $cream-light
+    position: absolute
+    top: 55%
+    margin: auto
+    left: 0
+    right: 0
+
+.default-avatar--profile
+  @extend %avatar
+  width: 2.6rem
+  height: 2.6rem
+
+.default-avatar--topbar
+  @extend %avatar
+  width: 2.7rem
+  height: 2.7rem
+  display: inline-block
+  vertical-align: middle
+  margin-left: 0.3em

app/templates/account.hbs

@@ -126,5 +126,3 @@
 {{else}}
   {{loading-indicator}}
 {{/if}}
-
-

app/templates/accounts-list/empty.hbs

@@ -1 +0,0 @@
-{{loading-indicator}}

app/templates/annotations/list.hbs

@@ -1,12 +0,0 @@
-{{#if view.annotations}}
-<div id="annotations">
-  {{#each annotation in view.annotations}}
-    <div class="annotation">
-      <a href={{annotation.url}}>
-          {{annotation.status}} {{annotation.providerName}}
-      </a>:
-      {{annotation.description}}
-    </div>
-  {{/each}}
-</div>
-{{/if}}

app/templates/build.hbs

@@ -4,10 +4,6 @@
 
   {{build-header item=build user=auth.currentUser commit=commit repo=repo}}
 
-  {{#unless build.isMatrix}}
-    {{view 'annotations' annotations=build.jobs.firstObject.annotations}}
-  {{/unless}}
-
   {{#if build.isMatrix}}
     {{#if jobsLoaded}}
       {{jobs-list jobs=build.requiredJobs repo=repo required="true"}}

app/templates/components/add-env-var.hbs

@@ -1,6 +1,6 @@
 <form {{action "save" on="submit"}}>
   <div class="form-elem">
-    {{input value=name class="env-name" on="key-up" action="nameChanged" placeholder="Name"}}
+    {{input value=name class="env-name" key-up="nameChanged" placeholder="Name"}}
     {{#if nameIsBlank }}
       <p class="form-error-message">Name cannot be blank</p>
     {{/if}}

app/templates/components/limit-concurrent-builds.hbs

@@ -6,7 +6,7 @@
   </a>
 </div>
 {{#if enabled}}
-  {{input pattern="/^[0-9]+$/" value=value on="key-up" action="limitChanged"}}
+  {{input pattern="/^[0-9]+$/" value=value key-up="limitChanged"}}
 {{/if}}
 {{#if isSaving}}
 {{loading-indicator inline=true}}

app/templates/components/org-item.hbs

@@ -0,0 +1,27 @@
+<div class="media-elem">
+  {{#if avatarUrl}}
+    <img src={{avatarUrl}} alt="{{name}} avatar">
+  {{else}}
+    <div class="default-avatar--profile"></div>
+  {{/if}}
+</div>
+<div class="media-body">
+  {{#link-to "account" account.login}}
+    <h2>{{name}}</h2>
+    {{#if account.reposCount}}<p>Repositories <strong>{{account.reposCount}}</strong></p>{{else}}No repositories{{/if}}
+  {{/link-to}}
+
+  {{#if isUser}}
+    <p class="profile-user-last">Token: 
+    {{#if tokenIsVisible}}
+      <strong>{{auth.currentUser.token}}</strong>
+    {{/if}}
+    <a {{action 'tokenVisibility' prevenDefault=true}} class="profile-token-toggle tooltip--profile {{if tokenIsVisible 'is-visible'}} dropdown">
+      <span class="tooltip-bubble">
+        {{#if tokenIsVisible}}hide token{{else}}show token{{/if}}
+      </span>
+      {{eye-icon}}
+      </a>
+    </p>
+  {{/if}}
+</div>

app/templates/components/subscribe-button.hbs

@@ -0,0 +1,15 @@
+{{#if account.subscribed}}
+  <a class="btn btn-activated" href={{account.billingUrl}}>
+    Subscription active!
+  </a>
+{{else}}
+  {{#if account.education}}
+    <a class="btn btn-activated" href={{account.billingUrl}}>
+      Educational account!
+    </a>
+  {{else}}
+    <a class="btn btn-activate" href={{account.billingUrl}}>
+      Sign up this account!
+    </a>
+  {{/if}}
+{{/if}}

app/templates/dashboard/repositories.hbs

@@ -17,7 +17,7 @@
   </section> --}}
 
   <ul class="dashboard-active">
-    {{#each repo in filteredRepositories}}
+    {{#each filteredRepositories as |repo|}}
       {{dashboard-row repo=repo}}
     {{else}}
       {{no-repos}}

app/templates/events/list.hbs

@@ -1,34 +0,0 @@
-{{#if view.events.isLoaded}}
-  <table id="events" class="list">
-    <thead>
-      <tr>
-        <th>Time</th>
-        <th>Event</th>
-        <th>Result</th>
-        <th>Message</th>
-      </tr>
-    </thead>
-
-    <tbody>
-      {{#each event in view.events}}
-        {{#view "events-item" contextBinding="event"}}
-          <td class="created_at">
-            {{format-time createdAt}}
-          </td>
-          <td class="event">
-            {{event.event_}}
-          </td>
-          <td class="state">
-            {{event.state}}
-          </td>
-          <td class="message">
-            {{event.message}}
-          </td>
-        {{/view}}
-      {{/each}}
-    </tbody>
-  </table>
-{{else}}
-  {{loading-indicator}}
-{{/if}}
-

app/templates/helpers/label.hbs

@@ -1 +0,0 @@
-{{view.content}}

app/templates/helpers/travis-errors.hbs

@@ -1 +1 @@
-{{#each error in view.errors}}{{error.message}}{{/each}}
+{{#each view.errors as |error|}}{{error.message}}{{/each}}

app/templates/job.hbs

@@ -2,8 +2,6 @@
 
   {{build-header item=job user=auth.currentUser commit=job.commit repo=repo}}
 
-  {{view 'annotations' annotations=view.annotations}}
-
   {{job-log job=job}}
 
 {{else}}

app/templates/jobs.hbs

@@ -1,85 +0,0 @@
-{{#if view.jobs.length}}
-  <section id={{view.jobTableId}}>
-
-  {{#if view.required}}
-    <h2 class="build-title">Build Jobs</h2>
-  {{else}}
-    <h2 class="build-title">Allowed Failures
-      <div class="tooltip--jobs">
-        <span class="icon icon--question"></span>
-        <p class="tooltip-bubble">These are jobs are allowed to fail, without failing your entire build.</p>
-      </div>
-    </h2>
-  {{/if}}
-
-    {{#each view.jobs as |job|}}
-      {{#view 'jobs-item' context=job}}
-        <div class="tile tile--jobs row {{job.state}}">
-          {{#if job.config}}
-            {{#link-to "job" job.repo job}}
-
-              <div class="tile-status tile-status--job">
-                <span class="icon icon--job {{job.state}}"></span>
-              </div>
-
-              <p class="job-id jobs-item build-status">
-                <span class="icon icon--hash-dark"></span>
-                {{#if job.id}}
-                  {{#if job.repo.slug}}
-                    {{number}}
-                  {{/if}}
-                {{/if}}
-              </p>
-
-            <p class="job-os jobs-item build-os {{config.os}}">
-              <span class="icon {{config.os}}"></span>
-              {{!-- {{config.os}} --}}
-            </p>
-
-            {{#if view.languages}}
-              <p class="job-lang jobs-item build-lang">
-                <span class="icon icon--lang"></span>
-                {{view.languages}}
-              </p>
-            {{else}}
-              <p class="job-lang jobs-item build-lang is-empty">
-                <span class="icon icon--lang"></span>
-                no language set
-              </p>
-            {{/if}}
-
-            <div class="job-anchor jobs-item">
-              {{#if config.env}}
-                <p class="job-env jobs-item build-env">
-                  <span class="icon icon--env"></span>
-                  {{config.env}}
-                </p>
-              {{else}}
-                <p class="job-env jobs-item build-env is-empty">
-                  <span class="icon icon--env"></span>
-                  no environment variables set
-                </p>
-              {{/if}}
-
-              <p class="job-duration jobs-item" title={{startedAt}}>
-                <span class="icon icon--clock-dark"></span>
-                {{format-duration duration}}
-              </p>
-
-            </div>
-
-              {{!-- <p class="" title={{formattedFinishedAt}}>
-                <span class="icon icon--cal"></span>
-                {{format-time finishedAt}}
-              </p> --}}
-
-            {{/link-to}}
-          {{else}}
-            {{loading-indicator}}
-          {{/if}}
-        </div>
-      {{/view}}
-      {{!-- {{job.configKeys}} --}}
-    {{/each}}
-  </section>
-{{/if}}

app/templates/owner/repositories.hbs

@@ -1,5 +1,5 @@
 <ul class="owner-tiles">
-  {{#each repo in repos}}
+  {{#each repos as |repo|}}
     {{owner-repo-tile repo=repo}}
   {{else}}
     {{no-repos}}

app/templates/owner/running.hbs

@@ -1,5 +1,5 @@
 <ul class="owner-tiles">
-  {{#each repo in running}}
+  {{#each running as |repo|}}
     {{owner-repo-tile repo=repo}}
   {{else}}
     <li>No running builds</li>

app/templates/profile/accounts.hbs

@@ -1,51 +1,20 @@
-<aside class="columns medium-4">
+<section class="profile-orgs">
-  <section class="profile-user">
+  <ul>
-    <div class="media">
+    {{org-item account=user}}
-      <div class="media-elem">
+  </ul>
-        <img src={{auth.gravatarUrl}} alt="">
+  <h1>Organizations</h1>
-      </div>
+  <ul>
-      <div class="media-body">
+  {{#each organizations as |org|}}
-        {{#link-to 'profile'}}
+    {{org-item account=org}}
-          <h1>{{userName}}</h1>
+  {{else}}
-          <p>Repositories <strong>{{user.reposCount}}</strong></p>
+    <li class="profile-text">You are not currently a member of <br> any organization.</li>
-        {{/link-to}}
+  {{/each}}
-        <p class="profile-user-last">Token: 
+  </ul>
+</section>
 
-        {{#if isVisible}}
-          <strong>{{auth.currentUser.token}}</strong>
-        {{/if}}
-        <a {{action 'tokenVisibility'}} class="profile-token-toggle tooltip--profile {{if isVisible 'is-visible'}} dropdown">
-          <span class="tooltip-bubble">
-            {{#if isVisible}}hide token{{else}}show token{{/if}}
-          </span>
-          {{eye-icon}}
-          </a>
-        </p>
-      </div>
-    </div>
-  </section>
-  <section class="profile-orgs">
-    <h1>Organizations</h1>
-    {{#collection "accounts-list" contentBinding="organizations"}}
-      {{#link-to "account" view.account class="name"}}
-        <div class="media">
-          <div class="media-elem">
-            <img src={{view.avatarUrl}} alt="">
-          </div>
-          <div class="media-body">
-            <h2>{{view.name}}</h2>
-            <p>Repositories <strong>{{view.account.reposCount}}</strong></p>
-          </div>
-        </div>
-      {{/link-to}}
-    {{else}}
-      <p class="profile-text">You are not currently a member of <br> any organization.</p>
-    {{/collection}}
-  </section>
 {{#if config.githubOrgsOauthAccessSettingsUrl}}
   <section class="profile-additional">
     <p>Is an organization missing?<br>
-      <a href={{config.githubOrgsOauthAccessSettingsUrl}} title="Orgs Oauth Access Settings on GitHub">Review and add</a> your authorized organizations.</p>
+      <a href={{config.githubOrgsOauthAccessSettingsUrl}} title="Organizations Oauth Access Settings on GitHub">Review and add</a> your authorized organizations.</p>
   </section>
 {{/if}}
-</aside>

app/templates/repo.hbs

@@ -1,4 +1,3 @@
-
 {{#if view.isEmpty}}
   {{repos-empty}}
 {{else}}
@@ -39,4 +38,4 @@
   {{else}}
     {{loading-indicator}}
   {{/if}}
-{{/if}}
+{{/if}}

app/templates/repos/show/tabs.hbs

@@ -1 +0,0 @@
-

app/templates/repos/show/tools.hbs

@@ -1 +0,0 @@
-

app/templates/status-images.hbs

@@ -2,13 +2,13 @@
 <p>
   <label>Branch:</label>
   {{#if view.branches.isLoaded}}
-    {{view Ember.Select contentBinding="view.branches" selectionBinding="view.statusImageBranch" optionLabelPath="content.commit.branch" optionValuePath="content.commit.branch"}}
+    {{view Ember.Select content="view.branches" selection="view.statusImageBranch" optionLabelPath="content.commit.branch" optionValuePath="content.commit.branch"}}
   {{else}}
     {{loading-indicator}}
   {{/if}}
 </p>
 
 <p>
-  <label>{{view Ember.Select contentBinding="view.formats" selectionBinding="view.statusImageFormat"}}</label>
+  <label>{{view Ember.Select content="view.formats" selection="view.statusImageFormat"}}</label>
-  {{view 'status-image-input' valueBinding="view.statusString" class="url" rows=3}}
+  {{view 'status-image-input' value="view.statusString" class="url" rows=3}}
 </p>

app/templates/top.hbs

@@ -56,7 +56,8 @@
           <button class="signed-out button--signin" {{action "signIn" target="auth"}}>Sign in with GitHub</button>
         {{/if}}
         {{#if auth.signedIn}}
-          {{#link-to "profile" class="navigation-anchor signed-in"}}{{userName}}<img src={{gravatarUrl}} />
+          {{#link-to "profile" class="navigation-anchor signed-in"}}{{userName}}
+          {{#if gravatarUrl }}<img src={{gravatarUrl}} />{{else}}<div class="default-avatar--topbar"></div>{{/if}}
           {{/link-to}}
         {{/if}}
         {{#if auth.signingIn}}

app/views/accounts-list.coffee

@@ -1,35 +0,0 @@
-`import Ember from 'ember'`
-`import { account as accountUrl } from 'travis/utils/urls'`
-
-View = Ember.CollectionView.extend
-  elementId: 'accounts'
-  accountBinding: 'content'
-  tagName: 'ul'
-
-  emptyView: Ember.View.extend
-    templateName: 'accounts-list/empty'
-
-  itemViewClass: Ember.View.extend
-    accountBinding: 'content'
-    typeBinding: 'content.type'
-    selectedBinding: 'account.selected'
-
-    classNames: ['account']
-    classNameBindings: ['type', 'selected']
-
-    name: (->
-      @get('content.name') || @get('content.login')
-    ).property('content.login', 'content.name')
-
-    urlAccount: (->
-      accountUrl(@get('account.login'))
-    ).property('account.login')
-
-    avatarUrl: (->
-      @get('account.avatarUrl') || "//placehold.it/50x50"
-    ).property('account.avatarUrl')
-
-    click: ->
-      @get('controller').transitionToRoute("account", @get('account.login'))
-
-`export default View`

app/views/annotation.coffee

@@ -1,6 +0,0 @@
-`import BasicView from 'travis/views/basic'`
-
-View = BasicView.extend
-  templateName: 'annotations/list'
-
-`export default View`

app/views/annotations.coffee

@@ -1,5 +0,0 @@
-`import Ember from 'ember'`
-
-View = Ember.View.extend()
-
-`export default View`

app/views/job.coffee

@@ -9,7 +9,6 @@ View = Ember.View.extend Polling,
   repoBinding: 'controller.repo'
   jobBinding: 'controller.job'
   commitBinding: 'job.commit'
-  annotationsBinding: 'job.annotations'
 
   currentItemBinding: 'job'
 

app/views/profile-accounts.coffee

@@ -2,11 +2,8 @@
 
 View = BasicView.extend
   tabBinding: 'controller.tab'
-  classNames: ['profile-orglist']
+  classNames: ['profile-orglist', 'columns', 'medium-4']
+  tagName: 'aside'
   templateName: 'profile/accounts'
-  classAccounts: (->
-    'active' if @get('tab') == 'accounts'
-  ).property('tab')
-
 
 `export default View`

app/views/profile.coffee

@@ -5,8 +5,9 @@ View = BasicView.extend
   layoutName: 'layouts/profile'
   classNames: ['profile-view']
   accountBinding: 'controller.account'
-  subscribedBinding: 'account.subscribed'
+  # Can we remove these?
-  educationBinding: 'account.education'
+  # subscribedBinding: 'account.subscribed'
+  # educationBinding: 'account.education'
 
   name: (->
     @get('account.name') || @get('account.login')

app/views/repo-show-tabs.coffee

@@ -23,10 +23,6 @@ View = Ember.View.extend
     'active' if @get('tab') == 'branches'
   ).property('tab')
 
-  classEvents: (->
-    'active' if @get('tab') == 'events'
-  ).property('tab')
-
   classBuild: (->
     tab = @get('tab')
     classes = []