Revert to old container lookup behavior

This fixes a bug that affected only pro

app/helpers/pretty-date.js

@@ -2,5 +2,6 @@ import { timeAgoInWords, safe } from 'travis/utils/helpers';
 import Ember from "ember";
 
 export default Ember.Helper.helper(function(params) {
-  return safe(moment(params[0]).format('MMMM D, YYYY H:mm:ss') || '-');
+  let date = new Date(params[0]);
+  return safe(moment(date).format('MMMM D, YYYY H:mm:ss') || '-');
 });

app/styles/app/modules/sync-button.sass

@@ -16,8 +16,9 @@
       background-color: $oxide-blue
   .sync-last
     position: absolute
-    left: -15em
+    right: 9em
     top: 0
+    width: 170%
     z-index: -1
     transition: transform 150ms ease, opacity 250ms ease
     transform: translateX(80%)

app/styles/app/pages/getting-started.sass

@@ -3,18 +3,17 @@
   max-width: 900px
   margin: auto
   h1
-    color: #808080
+    color: $cement-grey
     font-size: 36px
     margin-bottom: 1em
     font-weight: 300
     line-height: 1.1
   h2
-    color: #35a764
+    color: $turf-green
     font-size: 22px
     margin-bottom: 1em
     font-weight: 300
   p, li
-    color: #666
     font-size: $font-size-m
     line-height: 25px
 
@@ -76,10 +75,3 @@
   strong
     text-transform: uppercase
     font-style: normal
-
-.note--info
-  background-color: #e7eeee
-  color: #3e8987
-  code
-    color: #267c8d
-    background-color: white

app/styles/app/pages/landing.sass

@@ -11,14 +11,14 @@
     background-color: #ffffff
     background-image: inline-image('landing-page/signingithub.svg')
     background-size: 16px 16px
-    border: 2px solid #e4e7e7
-    color: #a0a8a8
+    border: 2px solid rgba($cement-grey, .4)
+    color: $cement-grey
   .button--signingin
-    border: 2px solid #3FA75F
+    border: 2px solid $turf-green
   .button--signin:hover
-    background-color: #73c78d
+    background-color: $turf-green
     background-image: inline-image('landing-page/signingithub-hover.svg')
-    border: 2px solid #73c78d
+    border: 2px solid $turf-green
     color: #fff
 
 .landing-centered-wrapper
@@ -37,7 +37,7 @@
     font-size: 5em
     line-height: 1em
     font-weight: 300
-    color: #8f9294
+    color: $cement-grey
     margin-bottom: 0
 
   .hero, .oss-testing, .customers, .recent-builds, .free-for-oss, .private-repos, .features-list, .build-flows, .user-testimonials
@@ -52,7 +52,7 @@
       font-size: 3.3em
       line-height: 1.15em
       font-weight: 300
-      color: #39a85b
+      color: $turf-green
 
     p
       line-height: 1.5em
@@ -129,7 +129,11 @@
 
     br.mobile-break
       display: none
-
+  .os-numbers
+    width: 80%
+    @media #{$medium-up}
+      width: 60%
+      
   .customers
     text-align: center
 

app/styles/app/vars.sass

@@ -43,11 +43,11 @@ $color-bg-log-fold-highlight: #777
 $ansi-black: #4E4E4E
 $ansi-black-bold: #7C7C7C
 $ansi-red: #FF6C60
-$ansi-red-bold: #FFB6B0
+$ansi-red-bold: #FF9B93
 $ansi-green: #00AA00
-$ansi-green-bold: #CEFFAB
+$ansi-green-bold: #B1FD79
 $ansi-yellow: #FFFFB6
-$ansi-yellow-bold: #FFFFCB
+$ansi-yellow-bold: #FFFF91
 $ansi-blue: #96CBFE
 $ansi-blue-bold: #B5DCFE
 $ansi-magenta: #FF73FD

app/templates/account.hbs

@@ -1,6 +1,7 @@
 {{#if allHooks.isLoaded}}
 
-  <header>
+<header>
+  {{#unless config.enterprise}}
     {{#if config.billingEndpoint}}
       <div class="cta-btn">
         {{#if subscribeButtonInfo.subscribed}}
@@ -14,6 +15,7 @@
         {{/if}}
       </div>
     {{/if}}
+  {{/unless}}
 
     <div class="profile-header">
       <h1>{{accountName}}</h1>

app/templates/components/team-member.hbs

@@ -1,6 +1,6 @@
 <figure class="team-image">
-  <img class="front" src="../images/team/team-{{member.image}}.png" alt="">
-  <img class="back" src="../images/team/{{member.image}}-animated.gif" alt="">
+  <img class="front" src="../images/team/team-{{member.image}}.png" alt="{{member.name}}">
+  <img class="back" src="../images/team/{{member.image}}-animated.gif" alt="{{member.name}} gif">
 </figure>
 <h3 class="team-name">{{member.name}}</h3>
 <p class="team-title">{{member.title}}</p>
@@ -8,7 +8,7 @@
   <p class="team-handle"><a href="https://twitter.com/{{member.handle}}" title="{{member.name}} on Twitter">@{{member.handle}}</a></p>
 {{/if}}
 <div class="team-flags">
-  <img src="../images/pro-landing/flag-{{member.nationality}}.svg" alt="flag {{member.nationality}}">
+  <img src="../images/pro-landing/flag-{{member.nationality}}.svg" alt="flag {{member.nationality}}" title="is from {{member.nationality}}">
   <span class="flag-divider">/</span>
-  <img src="../images/pro-landing/flag-{{member.country}}.svg" alt="flag {{member.country}}">
+  <img src="../images/pro-landing/flag-{{member.country}}.svg" alt="flag {{member.country}}" title="lives in {{member.country}}">
 </div>

app/templates/getting-started.hbs

@@ -22,9 +22,6 @@
         <h2>Add .travis.yml file to your repository</h2>
         <p>In order for Travis CI to build your project, you need to tell the systems a little bit about it. You'll need to add a file named .travis.yml to the root of your repository.</p>
         <p>If .travis.yml is not in the repository, is misspelled or is not valid YAML, Travis CI will ignore it.</p>
-        <p class="note note--info">
-          <strong>Note:</strong> The <code>language</code> value is case-sensitive. If you set <code>language: C</code>, for example, your project will be considered a Ruby project.
-        </p>
         <p>Here you can find some of our basic <a href="http://docs.travis-ci.com/user/language-specific/" title="">language examples</a>.</p>
       </div>
     </li>

app/templates/home.hbs

@@ -1,7 +1,7 @@
 {{#travis-layout layoutName="layouts/landing-page"}}
 <div id="landing" class="landing">
   <div class="row hero z-1">
-    <div class="landing-centered-wrapper">
+    <section class="landing-centered-wrapper">
       <div class="large-12 columns" id="hero-copy">
 	<h1>Test and Deploy with Confidence</h1>
 	<p>Easily sync your GitHub projects with Travis CI<br class="mobile-break"> and you’ll be testing your code in minutes!</p>
@@ -16,25 +16,26 @@
       </div>
       <div class="large-12 columns laptop-wrapper">
 	<div id="laptop">
-	  <img src="../images/landing-page/laptop.png">
+	  <img src="../images/landing-page/laptop.png" alt="Travis CI screenshot">
 	</div>
       </div>
-    </div>
+    </section>
   </div>
 
   <div class="row oss-testing">
-    <div class="landing-centered-wrapper">
+    <section class="landing-centered-wrapper">
       <div class="large-12 columns">
-	      <h2>The home of<br class="mobile-break"> open source testing</h2>
-        	<p>Over 320k open source projects<br class="mobile-break"> and 235k users are testing on Travis CI.</p>
-        	<img src="../images/landing-page/customer-numbers.svg">
-        </div>
+	<h2>The home of<br class="mobile-break"> open source testing</h2>
+        <p>Over 300k open source projects<br class="mobile-break"> and 235k users are testing on Travis CI.</p>
+        <img src="../images/landing-page/customer-numbers.svg" alt="Open source project numbers" class="os-numbers">
       </div>
+    </section>
+  </div>
 
   <div class="row customers">
     <div class="landing-centered-wrapper">
       <div class="medium-6 columns">
-	<img src="../images/landing-page/customers-temp-together.svg">
+	<img src="../images/landing-page/customers-temp-together.svg" alt="customer logos">
       </div>
       <div class="medium-6 columns">
 	<p class="left">Some pretty awesome companies<br> and projects are using us.</p>
@@ -43,16 +44,16 @@
   </div>
 
   <div class="row free-for-oss">
-    <div class="landing-centered-wrapper">
+    <section class="landing-centered-wrapper">
       <div class="large-12 columns">
 	<h1>Testing your open source<br class="mobile-no-break"> project is 10000% free</h1>
 	<p><span class="bold-italic">Seriously. Always.</span> We like to think of it as our way of giving<br>back to a community that gives us so much as well.</p>
       </div>
-    </div>
+    </section>
   </div>
 
   <div class="row private-repos">
-    <div class="landing-centered-wrapper">
+    <section class="landing-centered-wrapper">
       <div class="medium-6 columns mobile-envelope">
 	<img src="../images/landing-page/envelope.svg">
       </div>
@@ -64,13 +65,13 @@
 	</div>
       </div>
       <div class="medium-6 columns desktop-envelope">
-	<img src="../images/landing-page/envelope.svg">
+	<img src="../images/landing-page/envelope.svg" alt="envelope">
       </div>
-    </div>
+    </section>
   </div>
 
   <div class="row features-list">
-    <div class="landing-centered-wrapper">
+    <section class="landing-centered-wrapper">
       <div class="large-6 columns features-callouts">
 	<div class="landing-vert-center-s">
 	  <div class="medium-6 columns">
@@ -104,16 +105,16 @@
 	  <li>Did we say free for Open Source already?</li>
 	</ul>
       </div>
-    </div>
+    </section>
   </div>
 
   <div class="row build-flows">
-    <div class="landing-centered-wrapper">
+    <section class="landing-centered-wrapper">
       <div class="large-12 columns">
 	<h2>Branch build flow</h2>
 	<div class="branch-bf">
 	  <div class="bf">
-	    <img src="../images/landing-page/push-icon-1.svg">
+	    <img src="../images/landing-page/push-icon-1.svg" alt="GitHub logo">
 	    <p>You push your<br>code to GitHub</p>
 	  </div>
 	  <div class="divider-line-horizontal">
@@ -121,7 +122,7 @@
 	  <div class="divider-line-vertical">
 	  </div>
 	  <div class="bf">
-	    <img src="../images/landing-page/push-icon-2.svg">
+	    <img src="../images/landing-page/push-icon-2.svg" alt="Trigger build">
 	    <p>GitHub triggers<br>Travis CI to build</p>
 	  </div>
 	  <div class="divider-line-horizontal">
@@ -129,7 +130,7 @@
 	  <div class="divider-line-vertical">
 	  </div>
 	  <div class="bf">
-	    <img src="../images/landing-page/push-icon-3.svg">
+	    <img src="../images/landing-page/push-icon-3.svg" alt="Travis logo">
 	    <p>Hooray!<br>Your build passes!</p>
 	  </div>
 	  <div class="divider-line-horizontal">
@@ -137,7 +138,7 @@
 	  <div class="divider-line-vertical">
 	  </div>
 	  <div class="bf">
-	    <img src="../images/landing-page/push-icon-4.svg">
+	    <img src="../images/landing-page/push-icon-4.svg" alt="Heroku logo">
 	    <p>Travis CI deploys<br>to Heroku</p>
 	  </div>
 	  <div class="divider-line-horizontal">
@@ -145,14 +146,14 @@
 	  <div class="divider-line-vertical">
 	  </div>
 	  <div class="bf">
-	    <img src="../images/landing-page/push-icon-5.svg">
+	    <img src="../images/landing-page/push-icon-5.svg" alt="Slack logo">
 	    <p>Travis CI tells the<br>team all is well</p>
 	  </div>
 	</div>
 	<h2 id="pr-bf-margin">Pull request build flow</h2>
 	<div class="branch-bf">
 	  <div class="bf">
-	    <img src="../images/landing-page/pull-icon-1.svg">
+	    <img src="../images/landing-page/pull-icon-1.svg" alt="PR icon">
 	    <p>A pull request<br>is created</p>
 	  </div>
 	  <div class="divider-line-horizontal">
@@ -160,7 +161,7 @@
 	  <div class="divider-line-vertical">
 	  </div>
 	  <div class="bf">
-	    <img src="../images/landing-page/pull-icon-2.svg">
+	    <img src="../images/landing-page/pull-icon-2.svg" alt="Check test">
 	    <p>GitHub tells Travis CI the build is mergeable</p>
 	  </div>
 	  <div class="divider-line-horizontal">
@@ -168,7 +169,7 @@
 	  <div class="divider-line-vertical">
 	  </div>
 	  <div class="bf">
-	    <img src="../images/landing-page/push-icon-3.svg">
+	    <img src="../images/landing-page/push-icon-3.svg" alt="Tavis logo">
 	    <p>Hooray!<br>Your build passes!</p>
 	  </div>
 	  <div class="divider-line-horizontal">
@@ -176,7 +177,7 @@
 	  <div class="divider-line-vertical">
 	  </div>
 	  <div class="bf">
-	    <img src="../images/landing-page/pull-icon-4.svg">
+	    <img src="../images/landing-page/pull-icon-4.svg" alt="Build status">
 	    <p>Travis CI updates the PR that it passed</p>
 	  </div>
 	  <div class="divider-line-horizontal">
@@ -184,22 +185,22 @@
 	  <div class="divider-line-vertical">
 	  </div>
 	  <div class="bf">
-	    <img src="../images/landing-page/pull-icon-5.svg">
+	    <img src="../images/landing-page/pull-icon-5.svg" alt="Merge icon">
 	    <p>You merge in<br>the PR goodness</p>
 	  </div>
 	</div>
       </div>
-    </div>
+    </section>
   </div>
 
   <div class="row user-testimonials">
-    <div class="landing-centered-wrapper">
+    <section class="landing-centered-wrapper">
       <div class="medium-6 columns">
 	<h2>Some people have said some pretty nice things about us</h2>
       </div>
       <div class="medium-6 columns">
 	<div class="small-3 columns">
-	  <img src="../images/landing-page/dhh.png" class="home-avatar">
+	  <img src="../images/landing-page/dhh.png" class="home-avatar" alt="image DHH">
 	</div>
 	<div class="small-9 columns">
 	  <p>Travis CI makes it so much easier for us to coordinate the thousands of commits and contributors that flow through the Rails code base. The test suite for such a large project is vast, and we wouldn’t be catching issues as quickly or smoothly without the help of Travis.</p>
@@ -208,7 +209,7 @@
 	</div>
 
 	<div class="small-3 columns">
-	  <img src="../images/landing-page/chris.png" class="home-avatar">
+	  <img src="../images/landing-page/chris.png" class="home-avatar" alt="image Chris Aniszczyk">
 	</div>
 	<div class="small-9 columns">
 	  <p>We love Travis CI at @TwitterOSS and use it for the majority of our open source projects on GitHub. Travis CI is simple to use, we love their API to build  tooling and adore the new container infrastructure for speedier builds.</p>
@@ -217,7 +218,7 @@
 	</div>
 
 	<div class="small-3 columns">
-	  <img src="../images/landing-page/alex.png" class="home-avatar">
+	  <img src="../images/landing-page/alex.png" class="home-avatar" alt="Alex Gaynor">
 	</div>
 	<div class="small-9 columns">
 	  <p>Not only is Travis CI the best way to test your software, it is the right way. rm -rf jenkins &amp;&amp; touch .travis.yml</p>
@@ -225,8 +226,7 @@
 	  <p class="title">PyPy and Python Core Team Member</p>
 	</div>
       </div>
-    </div>
+    </section>
   </div>
 </div>
-</div>
 {{/travis-layout}}

app/templates/top.hbs

@@ -14,7 +14,7 @@
     {{#each broadcasts.content as |broadcast|}}
       <li><p><span class="broadcast-status {{broadcast.category}}" title="Transmitted on {{broadcast.updated_at}}"></span> {{{broadcast.message}}} <a {{action 'markBroadcastAsSeen' broadcast}} class="icon-close"></a></p></li>
     {{else}}
-      <li><p>There are no broadcasts transmitted</p></li>
+      <li><p>There are no broadcasts</p></li>
     {{/each}}
     </ul>
   {{/if}}

app/utils/urls.js

@@ -35,7 +35,7 @@ githubAdmin = function(slug) {
 statusImage = function(slug, branch) {
   var token;
   if (config.pro) {
-    token = Ember.getOwner(Travis).lookup('controller:currentUser').get('model.token');
+    token = Travis.__container__.lookup('controller:currentUser').get('model.token');
     return (location.protocol + "//" + location.host + "/" + slug + ".svg?token=" + token) + (branch ? "&branch=" + branch : '');
   } else {
     return (location.protocol + "//" + location.host + "/" + slug + ".svg") + (branch ? "?branch=" + (encodeURIComponent(branch)) : '');
@@ -50,7 +50,7 @@ ccXml = function(slug, branch) {
   }
   if (config.pro) {
     delimiter = url.indexOf('?') === -1 ? '?' : '&';
-    token = Ember.getOwner(Travis).lookup('controller:currentUser').get('model.token');
+    token = Travis.__container__.lookup('controller:currentUser').get('model.token');
     url = "" + url + delimiter + "token=" + token;
   }
   return url;