From 0eaa2af8fd61d68cb1962f358a373f6341361b3c Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 30 Jan 2015 09:13:00 +0100 Subject: [PATCH 1/4] Show docs also on pro --- assets/scripts/app/templates/layouts/top.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/app/templates/layouts/top.hbs b/assets/scripts/app/templates/layouts/top.hbs index 6cba6261..dcd7eebd 100644 --- a/assets/scripts/app/templates/layouts/top.hbs +++ b/assets/scripts/app/templates/layouts/top.hbs @@ -8,7 +8,7 @@
  • {{#link-to "main"}}Home{{/link-to}}
  • - {{#if config.enterprise}} + {{#if config.pro}}
  • Docs
  • {{else}}
  • From fefd18593e461a9effaed51d29b76363e0ee38b1 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 30 Jan 2015 09:23:42 +0100 Subject: [PATCH 2/4] We should show also blog and legal on pro --- assets/scripts/app/templates/layouts/top.hbs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/scripts/app/templates/layouts/top.hbs b/assets/scripts/app/templates/layouts/top.hbs index dcd7eebd..5ef9acd0 100644 --- a/assets/scripts/app/templates/layouts/top.hbs +++ b/assets/scripts/app/templates/layouts/top.hbs @@ -10,6 +10,9 @@
  • {{#if config.pro}}
  • Docs
  • + {{/if}} + {{#if config.enterprise}} +
  • Docs
  • {{else}}
  • Blog From ca659944cd9cefa36fd798cc5e89462ab90fc0a6 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 30 Jan 2015 11:29:43 +0100 Subject: [PATCH 3/4] Add humanize-state helper We don't want to display 'received' state as it's not meaningful for the users. We're displaying 'booting' instead. --- assets/scripts/app/helpers/handlebars.coffee | 5 +++++ assets/scripts/app/templates/builds/show.hbs | 2 +- assets/scripts/app/templates/jobs/show.hbs | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/assets/scripts/app/helpers/handlebars.coffee b/assets/scripts/app/helpers/handlebars.coffee index 5d120f99..0dd474d4 100644 --- a/assets/scripts/app/helpers/handlebars.coffee +++ b/assets/scripts/app/helpers/handlebars.coffee @@ -176,3 +176,8 @@ Ember.Handlebars.registerBoundHelper 'formatLog', (log, options) -> item = parentView.get(options.item) Travis.Helpers.formatLog(log, repo, item) || '' +Ember.Handlebars.registerBoundHelper 'humanize-state', (state) -> + if state == 'received' + 'booting' + else + state diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index 88907014..615deabe 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -6,7 +6,7 @@
    - {{#link-to "build" repo build}}#{{build.number}} {{build.state}}{{/link-to}} + {{#link-to "build" repo build}}#{{build.number}} {{humanize-state build.state}}{{/link-to}}
    diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs index a0139070..9dfdfd01 100644 --- a/assets/scripts/app/templates/jobs/show.hbs +++ b/assets/scripts/app/templates/jobs/show.hbs @@ -7,7 +7,7 @@
    - {{#link-to "job" repo job}}#{{job.number}} {{job.state}}{{/link-to}} + {{#link-to "job" repo job}}#{{job.number}} {{humanize-state job.state}}{{/link-to}}
    From ab7a818f4db3ef96226d12d29d27f706512d7f5c Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Mon, 2 Feb 2015 18:42:59 +0100 Subject: [PATCH 4/4] Remove link to hiring page --- assets/scripts/app/templates/layouts/top.hbs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/assets/scripts/app/templates/layouts/top.hbs b/assets/scripts/app/templates/layouts/top.hbs index 5ef9acd0..eb7462d8 100644 --- a/assets/scripts/app/templates/layouts/top.hbs +++ b/assets/scripts/app/templates/layouts/top.hbs @@ -56,10 +56,6 @@ {{/if}} {{#unless config.pro}} -
  • - We're Hiring! -
  • -
  • Travis CI for Private Repositories