Merge pull request #391 from travis-ci/fixes-for-notactive

Fixes for notactive

app/controllers/builds.coffee

@@ -31,7 +31,17 @@ Controller = Ember.ArrayController.extend
       false
   ).property('tab', 'repo.builds', 'repo.pullRequests')
 
-  things: (->
+  displayBranches: (->
+    if @get('tab') == 'branches'
+      if Ember.isEmpty(@get('repo.branches.content.content'))
+        true
+      else
+        false
+    else
+      false
+  ).property('tab', 'repo.builds', 'repo.branches')
+
+  noticeData: (->
     return {
       repo: @get('repo'),
       auth: @auth.token()

app/styles/app/layouts/missing-notice.sass

@@ -1,9 +1,14 @@
 .missing-notice
   text-align: center
 
-  a
+  p a
+    color: $grey-dark
+    text-decoration: underline
+
+  a.button
     font-size: 14px
 
+
 .page-title
   color: #434343
   font-size: 36px

app/templates/builds.hbs

@@ -1,9 +1,8 @@
 {{#if content.isLoaded}}
-{{!-- <table id="builds" class="list"> --}}
   {{#each controller as |build|}}
     {{builds-item build=build}}
   {{else}}
-    {{no-builds repo=things isPR=displayPullRequests}}
+    {{no-builds repo=noticeData isPR=displayPullRequests isBranch=displayBranches}}
   {{/each}}
   {{#if displayShowMoreButton}}
     <p>

app/templates/components/no-builds.hbs

@@ -62,17 +62,20 @@
     </svg>
   </figure>
 
-  {{#unless isPR}}
+  {{#if isPR}}
-    <h2 class="page-title">No builds for this repository</h2>
+    <h2 class="page-title">No pull request builds for this repositiory</h2>
-    <p class="page-notice">Want to start testing this project on Travis CI?</p>
-    <a href="http://docs.travis-ci.com/user/getting-started/" class="button button--green">Read the Docs on Getting Started</a>
-    {{!-- {{#if isLoading}}
-      {{loading-indicator}}
-    {{else}}
-      <a href="#" class="button button--green" {{action "triggerBuild"}}>Trigger the first build</a>
-    {{/if}} --}}
   {{else}}
-    <h2 class="page-title">No Pull Request builds for this repositiory</h2>
+    {{#if isBranch}}
-  {{/unless}}
+      <h2 class="page-title">No other branches for this repositiory</h2>
-
+    {{else}}
+      <h2 class="page-title">No builds for this repository</h2>
+      <p class="page-notice">Want to start testing this project on Travis CI?</p>
+      <a href="http://docs.travis-ci.com/user/getting-started/" class="button button--green">Read the Docs on Getting Started</a>
+      {{!-- {{#if isLoading}}
+        {{loading-indicator}}
+      {{else}}
+        <a href="#" class="button button--green" {{action "triggerBuild"}}>Trigger the first build</a>
+      {{/if}} --}}
+    {{/if}}
+  {{/if}}
 </div>

app/templates/components/not-active.hbs

@@ -63,5 +63,7 @@
   <h2 class="page-title">This is not an active repository</h2>
   <p class="page-notice">Want to start testing this project on Travis CI?</p>
   <a href="http://docs.travis-ci.com/user/getting-started/" class="button button--green">Read the Docs on Getting Started</a>
-
+  {{#if user.pushPermissions.length}}
+    <p>If this repository is already in active use, <br> make sure it’s activated on {{#link-to "account" repo.owner}}your profile{{/link-to}}.</p>
+  {{/if}}
 </div>

app/templates/repo.hbs

@@ -26,7 +26,11 @@
             {{#if repo.active}}
               {{outlet}}
             {{else}}
-              {{not-active}}
+              {{#if repo.lastBuildId}}
+                {{outlet}}
+              {{else}}
+                {{not-active user=currentUser repo=repo}}
+              {{/if}}
             {{/if}}
           </div>
         </div>