From 7aa77b4f6f36f38b968485580b5f702f150299d0 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Tue, 5 Jan 2016 11:51:57 +0100 Subject: [PATCH 1/3] add link to docs on requests if branch is gh-pages --- app/components/requests-item.coffee | 49 ++++++++++++++++++++++ app/components/requests-item.js | 4 ++ app/styles/app/layouts/requests.sass | 4 +- app/styles/app/modules/tooltips.sass | 16 +++++++ app/templates/components/requests-item.hbs | 9 +++- 5 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 app/components/requests-item.coffee diff --git a/app/components/requests-item.coffee b/app/components/requests-item.coffee new file mode 100644 index 00000000..cfca2471 --- /dev/null +++ b/app/components/requests-item.coffee @@ -0,0 +1,49 @@ +`import Ember from 'ember'` +`import config from 'travis/config/environment'` + +RequestsItemComponent = Ember.Component.extend + classNames: ['request-item'] + classNameBindings: ['requestClass'] + tagName: 'li' + + requestClass: (-> + if @get('request.isAccepted') + 'accepted' + else + 'rejected' + ).property('content.isAccepted') + + type: (-> + if @get('request.isPullRequest') + 'pull_request' + else + 'push' + ).property('request.isPullRequest') + + status: (-> + if @get('request.isAccepted') + 'Accepted' + else + 'Rejected' + ).property('request.isAccepted') + + hasBranchName: (-> + @get('request.branchName') + ).property('request') + + message: (-> + message = @get('request.message') + + if message == 'github pages branch' + @set('isGHPages', true) + + if config.pro && message == "private repository" + '' + else if !message + 'Build created successfully ' + else + message + ).property('request.message') + + +`export default RequestsItemComponent` diff --git a/app/components/requests-item.js b/app/components/requests-item.js index ef7a61ca..7d348005 100644 --- a/app/components/requests-item.js +++ b/app/components/requests-item.js @@ -37,6 +37,10 @@ export default Ember.Component.extend({ message: function() { var message; message = this.get('request.message'); + + if (message === 'github pages branch') { + this.set('isGHPages', true); + } if (config.pro && message === "private repository") { return ''; } else if (!message) { diff --git a/app/styles/app/layouts/requests.sass b/app/styles/app/layouts/requests.sass index d93b85ec..278d846f 100644 --- a/app/styles/app/layouts/requests.sass +++ b/app/styles/app/layouts/requests.sass @@ -14,6 +14,7 @@ list-style: none .request-item + position: relative border: 1px solid $cream-dark margin-bottom: 5px font-size: 15px @@ -46,8 +47,6 @@ align-items: center padding: .3em 0 white-space: nowrap - .row-item - overflow: hidden .row-item:first-of-type flex: 0 0 3em @@ -64,4 +63,3 @@ flex: 0 0 8% .row-item:last-of-type flex: 0 0 20% - diff --git a/app/styles/app/modules/tooltips.sass b/app/styles/app/modules/tooltips.sass index 9fdb8ed1..5b949eda 100644 --- a/app/styles/app/modules/tooltips.sass +++ b/app/styles/app/modules/tooltips.sass @@ -107,3 +107,19 @@ right: 0 margin: auto + +.tooltip--requests + @extend %tooltip + position: absolute + right: 0 + bottom: 0 + .tooltip-trigger + margin: .2em .5em + .tooltip-bubble + top: -3.6em + right: 0 + width: 10em + height: 3em + white-space: normal + &:before + right: .8em diff --git a/app/templates/components/requests-item.hbs b/app/templates/components/requests-item.hbs index 8d0e4fe0..37b347b7 100644 --- a/app/templates/components/requests-item.hbs +++ b/app/templates/components/requests-item.hbs @@ -33,5 +33,12 @@
- {{message}} + {{message}}
+ +{{#if isGHPages}} + + + Read about branch whitelisting + +{{/if}} From dbd124852dd352b271d79999d2ad683e9a683214 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Tue, 5 Jan 2016 12:44:08 +0100 Subject: [PATCH 2/3] remove coffee file --- app/components/requests-item.coffee | 49 ----------------------------- 1 file changed, 49 deletions(-) delete mode 100644 app/components/requests-item.coffee diff --git a/app/components/requests-item.coffee b/app/components/requests-item.coffee deleted file mode 100644 index cfca2471..00000000 --- a/app/components/requests-item.coffee +++ /dev/null @@ -1,49 +0,0 @@ -`import Ember from 'ember'` -`import config from 'travis/config/environment'` - -RequestsItemComponent = Ember.Component.extend - classNames: ['request-item'] - classNameBindings: ['requestClass'] - tagName: 'li' - - requestClass: (-> - if @get('request.isAccepted') - 'accepted' - else - 'rejected' - ).property('content.isAccepted') - - type: (-> - if @get('request.isPullRequest') - 'pull_request' - else - 'push' - ).property('request.isPullRequest') - - status: (-> - if @get('request.isAccepted') - 'Accepted' - else - 'Rejected' - ).property('request.isAccepted') - - hasBranchName: (-> - @get('request.branchName') - ).property('request') - - message: (-> - message = @get('request.message') - - if message == 'github pages branch' - @set('isGHPages', true) - - if config.pro && message == "private repository" - '' - else if !message - 'Build created successfully ' - else - message - ).property('request.message') - - -`export default RequestsItemComponent` From 5bf4e4ffe4bde27131f428eee8d55a6201d7c2cc Mon Sep 17 00:00:00 2001 From: Lisa P Date: Tue, 5 Jan 2016 15:01:38 +0100 Subject: [PATCH 3/3] make isGHPages a proper property --- app/components/requests-item.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/components/requests-item.js b/app/components/requests-item.js index 7d348005..6cdd6dab 100644 --- a/app/components/requests-item.js +++ b/app/components/requests-item.js @@ -6,6 +6,15 @@ export default Ember.Component.extend({ classNameBindings: ['requestClass'], tagName: 'li', + isGHPages: function() { + var message = this.get('request.message'); + if (message === 'github pages branch') { + return true; + } else { + return false; + } + }.property('request.message'), + requestClass: function() { if (this.get('request.isAccepted')) { return 'accepted'; @@ -37,10 +46,6 @@ export default Ember.Component.extend({ message: function() { var message; message = this.get('request.message'); - - if (message === 'github pages branch') { - this.set('isGHPages', true); - } if (config.pro && message === "private repository") { return ''; } else if (!message) {