Merge pull request #363 from travis-ci/note-legacy-infrastructure

[wip] display notice for legacy infrastructure

app/models/job.coffee

@@ -143,4 +143,9 @@ Job = Model.extend DurationCalculations,
     "#{@get('repo.slug')} ##{@get('number')}"
   ).property()
 
+  isLegacyInfrastructure: (->
+    if @get('queue') == 'builds.linux'
+      true
+  ).property('queue')
+
 `export default Job`

app/styles/app.scss

@@ -38,6 +38,7 @@
 @import "app/modules/media";
 @import "app/modules/switch";
 @import "app/modules/memberlist";
+@import "app/modules/notice";
 
 @import "app/layout";
 @import "app/layouts/dashboard";

app/styles/app/layouts/profile.sass

@@ -3,6 +3,13 @@
   font-weight: 400
 
 .profile-main
+  padding: 0 $column-gutter/2
+
+  @media #{$medium-up}
+    width: grid-calc(8, 12)
+    float: right
+    padding: 0 0 0 $column-gutter/2
+
   header
     h1
       margin: 0 1.7rem 0 0
@@ -55,7 +62,10 @@
   figcaption
     width: 90%
     margin: auto
-    padding: 0 0 0 2.8em
+    padding: 0 1em 0 2.8em
+    text-align: center
+    @media #{$medium-up}
+      text-align: left
   img
     display: block
     margin: 0 auto 1em
@@ -125,17 +135,18 @@ p.profile-user-last
 .profile-hooklist
   @include resetul
   font-size: $font-size-m
-  color: #7a7a7a
   li
     clear: both
     margin-bottom: .8em
-    overflow: auto
+    // overflow: auto
   .profile-hooks
     width: grid-calc(10, 24)
+    display: inline-block
+    vertical-align: middle
     @media #{$medium-up}
-      width: grid-calc(7, 24)
+      width: grid-calc(5, 24) - 1%
     @media #{$large-up}
-      width: grid-calc(5, 24)
+      width: grid-calc(5, 24) - 1%
   .switch
     display: inline-block
     vertical-align: middle
@@ -158,7 +169,8 @@ p.profile-user-last
 .profile-repo
   @extend %border-radius-4px
   position: relative
-  width: grid-calc(14, 24)
+  display: inline-block
+  width: grid-calc(13, 24)
   padding: .25em .5em .3em
   white-space: nowrap
   overflow: hidden
@@ -182,7 +194,7 @@ p.profile-user-last
       content: ""
       @include fadeOut(right, -90deg, #e2eee2)
   @media #{$medium-up}
-    width: grid-calc(17, 24)
+    width: grid-calc(18, 24)
     height: 30px
     &:hover
       span

app/styles/app/modules/icons.sass

@@ -192,3 +192,6 @@
   border-left  : 5px solid transparent
   border-right : 5px solid transparent
   border-top   : 5px solid $dashboard-text-color
+
+.icon-flag
+  background-image: inline-image('svg/notice-flag.svg')

app/styles/app/modules/notice.sass

@@ -0,0 +1,16 @@
+.notice
+  padding: 0.3em 0.5em 0.2em
+  margin-bottom: .5em
+  background-color: #F9F3D3
+  color: #AF9112
+  border-radius: 4px
+  a
+    color: #AF9112
+    text-decoration: underline
+
+  .icon-flag
+    @extend %icon
+    width: 1.3em
+    height: 1.5em
+    margin: 0 .6em 0 .2em
+    vertical-align: middle

app/templates/components/hooks-list-item.hbs

@@ -1,4 +1,4 @@
-<div class="profile-hooks profile-switch columns">
+<div class="profile-hooks profile-switch">
   {{hook-switch hook=hook onToggleError="handleToggleError" onToggle="resetErrors"}}
   {{#if hook.isSaving}}
     {{loading-indicator}}
@@ -6,7 +6,7 @@
     {{#link-to "settings" hook.ownerName hook.name class="profile-settings" title="Repository settings"}}<span class="icon icon--cog"></span>{{/link-to}}
   {{/if}}
 </div>
-<a {{bind-attr href="hook.urlGithub"}} rel="nofollow" class="profile-repo columns">
+<a {{bind-attr href="hook.urlGithub"}} rel="nofollow" class="profile-repo">
   {{hook.slug}}
   <span>{{hook.description}}</span></a>
 

app/templates/jobs/pre.hbs

@@ -4,6 +4,19 @@
   {{#if view.job.notStarted}}
     <div class="log-notice">Hang tight, the log cannot be shown until the build has started.</div>
   {{/if}}
+  
+
+  {{#if view.job.isLegacyInfrastructure}}
+    {{#if view.job.isFinished}}
+      <p class="notice"><span class="icon-flag"></span>
+      This job ran on our legacy infrastructure. Please read <a href="http://docs.travis-ci.com/user/migrating-from-legacy/" title="Migrating from legacy">our docs on how to upgrade</a></p>
+    {{else}}
+      <p class="notice"><span class="icon-flag"></span>
+      This job is running on our legacy infrastructure. Please read <a href="http://docs.travis-ci.com/user/migrating-from-legacy/" title="Migrating from legacy">our docs on how to upgrade</a></p>
+    {{/if}}
+  {{/if}}
+
+
   <div {{bind-attr class="view.job.notStarted:hidden"}}>
     <menu class="log-header">
       {{#if view.canRemoveLog}}

app/templates/profile/show.hbs

@@ -1,28 +1,3 @@
-<article class="columns medium-8 float-right profile-main">
-
-{{!--   {{#if config.billingEndpoint}}
-    <div class="row">
-      {{#if view.subscribed}}
-        <a class="btn btn-activated" {{bind-attr href="billingUrl"}}>
-          Subscription active!
-        </a>
-      {{else}}
-        {{#if view.education}}
-          <a class="btn btn-activated" {{bind-attr href="billingUrl"}}>
-            Educational account!
-          </a>
-        {{else}}
-          <a class="btn btn-activate" {{bind-attr href="billingUrl"}}>
-            Sign up this account!
-          </a>
-        {{/if}}
-      {{/if}}
-    </div>
-  {{/if}} --}}
-
-  {{!-- {{view 'profile-tabs'}} --}}
-
-  {{!-- <div class="tab"> --}}
-    {{outlet}}
-  {{!-- </div> --}}
+<article class="profile-main">
+  {{outlet}}
 </article>

app/templates/profile/tabs/user.hbs

@@ -1,4 +1,4 @@
-<img {{bind-attr src="view.gravatarUrl"}}>
+{{!-- <img {{bind-attr src="view.gravatarUrl"}}>
 
 <dl class="profile">
   <div>
@@ -26,3 +26,4 @@
     </dd>
   </div>
 </dl>
+ --}}

public/images/svg/notice-flag.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 18.7 18.7" enable-background="new 0 0 18.7 18.7" xml:space="preserve">
+<path fill="#C9A92D" d="M9.3,0C4.2,0,0,4.2,0,9.3s4.2,9.3,9.3,9.3s9.3-4.2,9.3-9.3S14.5,0,9.3,0z M14.3,8.4L6.9,9.1v5.7H5.6V4.7h0
+	V3.8l8.6,0.8l-2.5,1.8L14.3,8.4z"/>
+</svg>