From 613e1dac802202cc5f856451325e46905e429832 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Tue, 24 Nov 2015 12:55:02 +0100 Subject: [PATCH] make component for build header --- app/components/build-header.coffee | 19 +++++++ app/controllers/build.coffee | 8 --- app/templates/build.hbs | 65 +---------------------- app/templates/components/build-header.hbs | 62 +++++++++++++++++++++ 4 files changed, 82 insertions(+), 72 deletions(-) create mode 100644 app/components/build-header.coffee create mode 100644 app/templates/components/build-header.hbs diff --git a/app/components/build-header.coffee b/app/components/build-header.coffee new file mode 100644 index 00000000..8f85adb8 --- /dev/null +++ b/app/components/build-header.coffee @@ -0,0 +1,19 @@ +`import Ember from 'ember'` +`import { gravatarImage } from 'travis/utils/urls'` +`import GithubUrlPropertievs from 'travis/mixins/github-url-properties'` + +BuildHeaderComponent = Ember.Component.extend + + tagName: 'section' + classNames: ['build-header'] + classNameBindings: ['item.state'] + + urlCommitterGravatarImage: (-> + gravatarImage(@get('commit.committerEmail'), 40) + ).property('commit.committerEmail') + + urlAuthorGravatarImage: (-> + gravatarImage(@get('commit.authorEmail'), 40) + ).property('commit.authorEmail') + +`export default BuildHeaderComponent` diff --git a/app/controllers/build.coffee b/app/controllers/build.coffee index b25d61b1..6470f9a0 100644 --- a/app/controllers/build.coffee +++ b/app/controllers/build.coffee @@ -21,14 +21,6 @@ Controller = Ember.Controller.extend GithubUrlPropertievs, @get('build.isLoading') ).property('build.isLoading') - urlCommitterGravatarImage: (-> - gravatarImage(@get('commit.committerEmail'), 40) - ).property('commit.committerEmail') - - urlAuthorGravatarImage: (-> - gravatarImage(@get('commit.authorEmail'), 40) - ).property('commit.authorEmail') - buildStateDidChange: (-> if @get('sendFaviconStateChanges') @send('faviconStateDidChange', @get('build.state')) diff --git a/app/templates/build.hbs b/app/templates/build.hbs index 1210c06c..41e53594 100644 --- a/app/templates/build.hbs +++ b/app/templates/build.hbs @@ -2,70 +2,7 @@ {{loading-indicator}} {{else}} -
-
-

- {{status-icon status=build.state}} - {{#if build.pullRequest}} - Pull Request #{{build.pullRequestNumber}} - {{build.pullRequestTitle}} - {{else}} - {{build.commit.branch}} - {{format-message build.commit.subject repo=build.repo}} - {{/if}} -

-
-

- {{#if build.pullRequest}} - {{format-message build.commit.subject repo=build.repo}}
- {{/if}} - {{format-message build.commit.body repo=build.repo pre=true}} -

- -

- {{#if commit.authorName}} - {{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}} - {{/if}} - {{#unless commit.authorIsCommitter}} - {{#if commit.committerName}} - {{commit.committerName}} committed - {{/if}} - {{/unless}} -

-
-
- -
-

- {{#link-to "build" repo build}} - {{status-icon status=build.state}} #{{build.number}} {{humanize-state build.state}}{{/link-to}} -

-
    -
  • {{#if build.isFinished}}ran{{else}}running{{/if}} for {{format-duration build.duration}}
  • - {{!--
  • Elapsed time
  • --}} -
  • {{format-time build.finishedAt}}
  • -
-
- -
- {{repo-actions build=build repo=build.repo user=auth.currentUser}} -
-
+ {{build-header item=build user=auth.currentUser commit=commit}} {{#unless build.isMatrix}} {{view 'annotations' annotations=build.jobs.firstObject.annotations}} diff --git a/app/templates/components/build-header.hbs b/app/templates/components/build-header.hbs new file mode 100644 index 00000000..05133880 --- /dev/null +++ b/app/templates/components/build-header.hbs @@ -0,0 +1,62 @@ +
+

+ {{status-icon status=item.state}} + {{#if item.pullRequest}} + Pull Request #{{item.pullRequestNumber}} + {{item.pullRequestTitle}} + {{else}} + {{item.commit.branch}} + {{format-message item.commit.subject repo=item.repo}} + {{/if}} +

+
+

+ {{#if item.pullRequest}} + {{format-message item.commit.subject repo=item.repo}}
+ {{/if}} + {{format-message item.commit.body repo=item.repo pre=true}} +

+ +

+ {{#if commit.authorName}} + {{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}} + {{/if}} + {{#unless commit.authorIsCommitter}} + {{#if commit.committerName}} + {{commit.committerName}} committed + {{/if}} + {{/unless}} +

+
+
+ +
+

+ {{#link-to "build" repo item}} + {{status-icon status=item.state}} #{{item.number}} {{humanize-state item.state}}{{/link-to}} +

+ +
+ +
+ {{repo-actions build=item repo=item.repo user=user}} +