Merge branch 'master' of https://github.com/travis-ci/travis-web

assets/scripts/app/models/job.coffee

@@ -52,13 +52,11 @@ require 'travis/model'
       @get('log').clear()
 
   sponsor: (->
-    worker = @get('log.workerName')
+    {
-    if worker && worker.length
+      name: "Blue Box"
-      Travis.WORKERS[worker] || {
+      url: "http://bluebox.net"
-        name: "Travis Pro"
-        url: "http://travis-ci.com"
     }
-  ).property('log.workerName')
+  ).property()
 
   configValues: (->
     config = @get('config')

assets/scripts/app/templates/layouts/profile.hbs

@@ -12,12 +12,6 @@
 </div>
 
 <div id="right">
-  <div id="github-wrapper">
-    <a id="github" href="https://github.com/travis-ci" title="Fork me on GitHub">
-      {{t layouts.application.fork_me}}
-    </a>
-  </div>
-
   <div id="slider" {{action toggle target="Travis.slider"}}>
     <div class='icon'></div>&nbsp;
   </div>

assets/scripts/app/templates/layouts/sidebar.hbs

@@ -1,9 +1,3 @@
-<div id="github-wrapper">
-  <a id="github" href="https://github.com/travis-ci" title="Fork me on GitHub">
-    {{t layouts.application.fork_me}}
-  </a>
-</div>
-
 <div id="slider" {{action toggle target="Travis.slider"}}>
   <div class='icon'></div>&nbsp;
 </div>
@@ -15,7 +9,7 @@
 <div id="about" class="box">
   <h4>{{t layouts.about.join}}</h4>
   <ul>
-    <li>{{t layouts.about.repository}}: <a href="http://github.com/travis-ci">Github</a></li>
+    <li>{{t layouts.about.repository}}: <a href="http://github.com/travis-ci">GitHub</a></li>
     <li>{{t layouts.about.twitter}}: <a href="http://twitter.com/travisci">@travisci</a></li>
     <li>{{t layouts.about.mailing_list}}: <a href="http://groups.google.com/group/travis-ci">travis-ci</a></li>
     <li><a href="irc://irc.freenode.net#travis">irc.freenode.net#travis</a></li>

assets/scripts/app/templates/repos/show.hbs

@@ -7,9 +7,10 @@
     {{else}}
       {{#if repo.isLoaded}}
         {{#with repo}}
-          <h3>
+          <div id="repo-header">
-            <a {{bindAttr href="controller.urlGithub"}}>{{slug}}</a>
+            <h3>{{#linkTo "repo" this}}{{slug}}{{/linkTo}}</h3>
-          </h3>
+            <div class="github-icon"><a {{bindAttr href="controller.urlGithub"}}><img src="/images/icons/github.png" width="21" height="21"/></a></div>
+          </div>
 
           <p class="description">{{description}}</p>
 

assets/scripts/data/sponsors.coffee

@@ -46,41 +46,3 @@
   { id: '43', type: 'silver', link: "<a href=\"http://busyconf.com\">BusyConf</a><span>: Conferences and Events Made Easy</span>"}
 ]
 
-@Travis.WORKERS = {
-  "jvm-otp1.worker.travis-ci.org":
-    name: "Travis Pro"
-    url: "http://travis-ci.com"
-  "jvm-otp2.worker.travis-ci.org":
-    name: "Transloadit"
-    url: "http://transloadit.com"
-  "ppp1.worker.travis-ci.org":
-    name: "Travis Pro"
-    url: "http://beta.travis-ci.com"
-  "ppp2.worker.travis-ci.org":
-    name: "EnterpriseRails"
-    url: "http://www.enterprise-rails.com"
-  "ppp3.worker.travis-ci.org":
-    name: "Alchemy CMS"
-    url: "http://alchemy-cms.com/"
-  "rails1.worker.travis-ci.org":
-    name: "EnterpriseRails"
-    url: "http://www.enterprise-rails.com"
-  "ruby1.worker.travis-ci.org":
-    name: "Engine Yard"
-    url: "http://www.engineyard.com"
-  "ruby2.worker.travis-ci.org":
-    name: "EnterpriseRails"
-    url: "http://www.enterprise-rails.com"
-  "ruby3.worker.travis-ci.org":
-    name: "Railslove"
-    url: "http://railslove.de"
-  "ruby4.worker.travis-ci.org":
-    name: "Engine Yard"
-    url: "http://www.engineyard.com"
-  "spree.worker.travis-ci.org":
-    name: "Spree"
-    url: "http://spreecommerce.com"
-  "staging.worker.travis-ci.org":
-    name: "EnterpriseRails"
-    url: "http://www.enterprise-rails.com"
-}

assets/scripts/spec/build_spec.coffee

@@ -14,7 +14,7 @@ describe 'on the "build" state', ->
     ]
 
     displaysRepository
-      href: 'http://github.com/travis-ci/travis-core'
+      href: '/travis-ci/travis-core'
 
     displaysSummary
       type: 'build'

assets/scripts/spec/builds_spec.coffee

@@ -11,7 +11,7 @@ describe 'on the "builds" state', ->
     ]
 
     displaysRepository
-      href: 'http://github.com/travis-ci/travis-core'
+      href: '/travis-ci/travis-core'
 
     displaysTabs
       current: { href: '/travis-ci/travis-core' }

assets/scripts/spec/current_spec.coffee

@@ -11,7 +11,7 @@ describe 'on the "current" state', ->
     ]
 
     displaysRepository
-      href: 'http://github.com/travis-ci/travis-core'
+      href: '/travis-ci/travis-core'
 
     displaysSummary
       type: 'build'

assets/scripts/spec/index_spec.coffee

@@ -11,7 +11,7 @@ describe 'on the "index" state', ->
     ]
 
     displaysRepository
-      href: 'http://github.com/travis-ci/travis-core'
+      href: '/travis-ci/travis-core'
 
     displaysSummary
       type: 'build'

assets/scripts/spec/job_spec.coffee

@@ -21,7 +21,7 @@ describe 'on the "job" state', ->
     waits 100
     runs ->
       displaysRepository
-        href: 'http://github.com/travis-ci/travis-core'
+        href: '/travis-ci/travis-core'
 
       displaysSummary
         id: 1

assets/scripts/spec/my_repos_spec.coffee

@@ -13,7 +13,7 @@ describe 'my repos tab', ->
       ]
 
       displaysRepository
-        href: 'http://github.com/travis-ci/travis-core'
+        href: '/travis-ci/travis-core'
 
       displaysSummary
         type: 'build'

assets/scripts/spec/support/expectations.coffee

@@ -1,5 +1,6 @@
 @displaysRepository = (repo) ->
   expect($('#repo h3 a').attr('href')).toEqual (repo.href)
+  expect($('#repo .github-icon a').attr('href')).toEqual ("http://github.com#{repo.href}")
 
 @displaysTabs = (tabs) ->
   for name, tab of tabs

assets/styles/main/repository.sass

@@ -6,6 +6,19 @@
   overflow-x: hidden
   padding-right: 10px
 
+  h3
+    display: inline-block
+    margin-right: 5px
+
+  .github-icon
+    width: 21px
+    height: 21px
+    display: inline-block
+
+  .github-icon
+    img
+      margin-top: 2px
+
   .not-found
     display: block
     padding: 10px 5px

assets/styles/maximize.sass

@@ -16,7 +16,4 @@
     @include border-bottom-left-radius(4px)
 
 #top .profile
-  margin-right: 140px
+  margin-right: 50px
-
-.maximized #top .profile
-  margin-right: 40px

locales/en.yml

@@ -68,7 +68,7 @@ en:
       repository: Repository
       twitter: Twitter
     application:
-      fork_me: Fork me on Github
+      fork_me: Fork me on GitHub
       my_repositories: My Repositories
       recent: Recent
       search: Search
@@ -91,7 +91,7 @@ en:
       admin: Admin
       blog: Blog
       docs: Docs
-      github_login: Sign in with Github
+      github_login: Sign in with GitHub
       home: Home
       profile: Profile
       sign_out: Sign Out
@@ -114,7 +114,7 @@ en:
   profiles:
     show:
       email: Email
-      github: Github
+      github: GitHub
       locale: locale
       message:
         config: how to configure custom build options