suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'anchor-btn-to-log' into dashboard-list

Browse Source 
Conflicts:
	app/templates/top.hbs
This commit is contained in:
Josh Kalderimis 2015-02-25 09:08:52 +13:00
commit 0d0b484954
18 changed files with 253 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/build.coffee
View File

@ -89,8 +89,8 @@ Build = Model.extend DurationCalculations,
).property('rawConfigKeys.length')
canCancel: (->
!@get('isFinished') && @get('jobs').filter( (j) -> j.get('canCancel') ).get('length') > 0
).property('isFinished', 'jobs.@each.canCancel')
@get('jobs').filter( (j) -> j.get('canCancel') ).get('length') > 0
).property('jobs.@each.canCancel')
cancel: (->
Ajax.post "/builds/#{@get('id')}/cancel"

2
app/models/log.coffee
View File

@ -41,6 +41,8 @@ Log = Ember.Object.extend
isLoaded: false
length: 0
hasContent: Ember.computed.gt('parts.length', 0)
fetchMissingParts: (partNumbers, after) ->
return if @get('notStarted')

17
app/styles/app/_mixins/mixins.sass
View File

@ -24,4 +24,19 @@
@mixin border-bottom-radius($radius)
border-bottom-left-radius: $radius
border-bottom-right-radius: $radius
border-bottom-right-radius: $radius
@mixin border-top-radius($radius)
border-top-left-radius: $radius
border-top-right-radius: $radius
%border-radius-4px
border-radius: 4px
%border-top-4px
border-top-left-radius: 4px
border-top-right-radius: 4px
%border-bottom-4px
border-bottom-left-radius: 4px
border-bottom-right-radius: 4px

5
app/styles/app/_mixins/vars.sass
View File

@ -53,4 +53,7 @@ $error-sand: #dcc682
// tabs
$tab-nav-inactive-bg: #f8f8f8
$tab-nav-inactive-bg-hover: $white
$tab-active-bg: $blue-grey-light
$tab-active-bg: $blue-grey-light
// log
$log-header-bg: #444444

18
app/styles/app/components/buttons.sass
View File

@ -93,3 +93,21 @@ $button-border-color: #d4d4d4
.button--fixedwidth
width: 8em
// temp
#auth #navigation .button--signin
display: none
.button--grey
height: 22px
padding: 0 10px 0 10px
background-color: #696867
color: #f2f2f2
// line-height: 1.45
font-size: $font-size-small
border: none
@extend %border-radius-4px
&:hover,
&:active
background-color: lighten(#696867, 10)
&:focus
background-color: #696867

193
app/styles/app/main/log.sass
View File

@ -1,20 +1,110 @@
pre#log
.log
position: relative
clear: left
min-height: 12px
margin-top: 25px
margin-top: 1em
padding: 15px 0
color: $color-text-log
font-family: monospace
font-size: $font-size-log
line-height: $line-height-log
white-space: pre-wrap
word-wrap: break-word
background-color: #2a2a2a
border-radius: 4px
counter-reset: line-numbering
margin-top: 35px
.log-tail
z-index: 99
position: absolute
display: block
top: 0
right: 2px
margin: 13px 10px 0 0
padding: 0 2px 0 3px
color: #666
text-shadow: 0px 1px 0px #fff
font-family: "Source Sans Pro", Helvetica, sans-serif
font-size: $font-size-tiny
line-height: 14px
text-decoration: none
white-space: nowrap
border: 1px solid #bbb
border-top-color: #ddd
border-bottom-color: #bbb
border-radius: 8px
background: linear-gradient(#fff, #e0e0e0)
label
display: none
cursor: pointer
&:hover
padding: 1px 4px 1px 6px
label
display: inline
&.scrolling
position: fixed
right: 32px
&.bottom
bottom: 45px
top: inherit
.status
display: inline-block
margin-right: 1px
width: 8px
height: 8px
background-color: #aaa
border-radius: 4px
box-shadow: $white 1px 1px 2px
&.active .status
background-color: #6b0
.to-top
z-index: 99
position: absolute
display: block
bottom: 2px
right: 2px
margin-right: 2px
padding-right: 16px
text-align: right
color: #999
background: inline-image('ui/workers-close.svg') no-repeat right 6px
.log-header
height: 44px
margin: 0
padding: .9em .8em .6em
text-align: right
background-color: $log-header-bg
@extend %border-top-4px
.icon
display: inline-block
background:
size: 100%
repeat: no-repeat
width: 1.3em
height: 1.1em
margin-right: 6px
vertical-align: middle
.icon--downloadLog
background-image: inline-image('icons/download-log-icon.svg')
.icon--removeLog
background-image: inline-image('icons/remove-log-icon.svg')
a
margin-left: .4em
.log-body
position: relative
pre
clear: left
min-height: 42px
padding: 15px 0
color: $color-text-log
font-family: monospace
font-size: $font-size-log
line-height: $line-height-log
white-space: pre-wrap
word-wrap: break-word
background-color: #2a2a2a
counter-reset: line-numbering
margin-top: 0
@extend %border-bottom-4px
.cut
padding: 20px 15px 0 55px
@ -95,74 +185,5 @@ pre#log
border-radius: 6px
color: #bbb
#log.loading
padding: 25px 0 0 10px
#log-container
position: relative
margin-top: 35px
#log-container
#tail
z-index: 99
position: absolute
display: block
top: 0
right: 2px
margin: 13px 10px 0 0
padding: 0 2px 0 3px
color: #666
text-shadow: 0px 1px 0px #fff
font-family: "Source Sans Pro", Helvetica, sans-serif
font-size: $font-size-tiny
line-height: 14px
text-decoration: none
white-space: nowrap
border: 1px solid #bbb
border-top-color: #ddd
border-bottom-color: #bbb
border-radius: 8px
background: linear-gradient(#fff, #e0e0e0)
label
display: none
cursor: pointer
&:hover
padding: 1px 4px 1px 6px
label
display: inline
&.scrolling
position: fixed
right: 32px
&.bottom
bottom: 45px
top: inherit
.status
display: inline-block
margin-right: 1px
width: 8px
height: 8px
background-color: #aaa
border-radius: 4px
box-shadow: $white 1px 1px 2px
&.active .status
background-color: #6b0
.to-top
z-index: 99
position: absolute
display: block
bottom: 2px
right: 2px
margin-right: 2px
padding-right: 16px
text-align: right
color: #999
background: inline-image('ui/workers-close.svg') no-repeat right 6px
.loading
padding: 25px 0 0 10px

6
app/styles/app/main/tools.sass
View File

@ -88,12 +88,6 @@
li.cancel-build a, li.cancel-job a
background-image: inline-image('icons/off.svg')
li.download-log a
background-image: inline-image('icons/download-log.svg')
li.remove-log a
background-image: inline-image('icons/delete-log.svg')
li.code-climate a
background-image: inline-image('icons/code-climate-icon.svg')

4
app/styles/app/pro.sass
View File

@ -60,7 +60,7 @@
position: absolute
display: block
right: 0
margin: -45px 40px 0 0
margin: -54px 30px 0 0
padding-right: 25px
&:before
@ -73,6 +73,8 @@
.activate:before
background: inline-image('ui/activate.png') no-repeat 0 0
background-position: 0px 5px
height: 100%
.activate:hover:before,
.activate:focus:before,

2
app/styles/app/profile.sass
View File

@ -50,4 +50,4 @@
.sync_now
float: right
margin-top: -3px
margin-top: -6px

50
app/templates/jobs/pre.hbs
View File

@ -1,23 +1,33 @@
<div id="log-container">
<a href="#" id="tail" {{action "toggleTailing" target=view}}>
<span class="status"></span>
<section id="log-container" class="log">
<menu class="log-header">
{{#if view.canRemoveLog}}
<a href="#" class="button button--grey open-popup" {{action "removeLogPopup" target=view}}><span class="icon icon--removeLog"></span> Remove Log</a>
{{/if}}
<a class="button button--grey" {{bind-attr href="view.plainTextLogUrl"}}><span class="icon icon--downloadLog"></span> Download Log</a>
</menu>
<div class="log-body">
<a href="#" id="tail" class="log-tail" {{action "toggleTailing" target=view}}>
<span class="status"></span>
<label>
{{#if view.job.isFinished}}
Scroll to End of Log
{{else}}
Follow Log
{{/if}}
</label>
</a>
<pre id="log" class="ansi"></pre>
<label>
{{#if view.job.isFinished}}
Scroll to End of Log
{{else}}
Follow Log
{{/if}}
</label>
</a>
<pre id="log" class="ansi"></pre>
<a href='#' class="to-top" {{action "toTop" target=view}}>Top</a>
{{#if view.log.hasContent}}
<a href='#' class="to-top" {{action "toTop" target=view}}>Top</a>
{{/if}}
{{#if view.limited}}
<p class="warning">
This log is too long to be displayed. Please reduce the verbosity of your
build or download the <a {{bind-attr href="view.plainTextLogUrl"}}>raw log</a>.
</p>
{{/if}}
</div>
{{#if view.limited}}
<p class="warning">
This log is too long to be displayed. Please reduce the verbosity of your
build or download the <a {{bind-attr href="view.plainTextLogUrl"}}>raw log</a>.
</p>
{{/if}}
</div>
</section>

16
app/templates/repos/show/actions.hbs
View File

@ -32,22 +32,6 @@
{{/if}}
</li>
{{/if}}
{{#if view.jobIdForLog}}
{{#if view.showDownloadLog}}
<li class="icon download-log" title="Download Log">
<a class="download-log" {{bind-attr href="view.plainTextLogUrl"}}></a>
</li>
{{/if}}
{{/if}}
{{! the next if is a hack for refreshing displayRemoveLog when we change
views, it sometimes doesn't work properly }}
{{#if view.jobIdForLog}}
{{#if view.displayRemoveLog}}
<li class="icon remove-log" title="Remove Log">
<a href="#" name="remove-log-popup" class="open-popup" {{action "removeLogPopup" target=view}}></a>
</li>
{{/if}}
{{/if}}
{{#if view.displayCodeClimate}}
<li class="icon code-climate" title="Test Coverage with Code Climate">
<a href="#" name="code-climate"

34
app/views/pre.coffee
View File

@ -2,6 +2,7 @@
`import LogFolder from 'travis/utils/log-folder'`
`import config from 'travis/config/environment'`
`import { plainTextLog as plainTextLogUrl } from 'travis/utils/urls'`
`import BasicView from 'travis/views/basic'`
Log.DEBUG = false
Log.LIMIT = 10000
@ -22,8 +23,9 @@ Log.Scroll.prototype = $.extend new Log.Listener,
$('#main').scrollTop(0)
$('html, body').scrollTop(element.offset()?.top - (window.innerHeight / 3)) # weird, html works in chrome, body in firefox
View = Ember.View.extend
View = BasicView.extend
templateName: 'jobs/pre'
currentUserBinding: 'controller.currentUser'
logWillChange: (->
console.log 'log view: log will change' if Log.DEBUG
@ -99,6 +101,16 @@ View = Ember.View.extend
url
).property('job.log.id', 'job.log.token')
hasPermission: (->
if permissions = @get('currentUser.permissions')
permissions.contains parseInt(@get('job.repo.id'))
).property('currentUser.permissions.length', 'job.repo.id')
canRemoveLog: (->
if job = @get('job')
job.get('canRemoveLog') && @get('hasPermission')
).property('job.canRemoveLog', 'hasPermission')
actions:
toTop: () ->
$(window).scrollTop(0)
@ -108,6 +120,26 @@ View = Ember.View.extend
@engine.autoCloseFold = !Travis.tailing.isActive()
event.preventDefault()
removeLog: ->
@popupCloseAll()
if @get('canRemoveLog')
job = @get('_job') || @get('build.jobs.firstObject')
job.removeLog().then ->
Travis.flash(success: 'Log has been successfully removed.')
, (xhr) ->
if xhr.status == 409
Travis.flash(error: 'Log can\'t be removed')
else if xhr.status == 401
Travis.flash(error: 'You don\'t have sufficient access to remove the log')
else
Travis.flash(error: 'An error occured when removing the log')
removeLogPopup: ->
if @get('canRemoveLog')
@set('active', true)
@popup('remove-log-popup')
return false
noop: -> # TODO required?
`export default View`

6
app/views/repo-actions.coffee
View File

@ -68,12 +68,6 @@ View = BasicView.extend
@popup('code-climate')
return false
removeLogPopup: ->
if @get('canRemoveLog')
@set('active', true)
@popup('remove-log-popup')
return false
hasPermission: (->
if permissions = @get('currentUser.permissions')
permissions.contains parseInt(@get('repo.id'))

6
config/environment.js
View File

@ -49,6 +49,12 @@ module.exports = function(environment) {
caches: true
};
ENV.charmKey = 'gy5gx7dy6dh86hxzkz1wmtvupwvievu';
ENV.urls = {
legal: ENV.billingEndpoint + "/pages/legal",
imprint: ENV.billingEndpoint + "/pages/imprint",
security: ENV.billingEndpoint + "/pages/security",
terms: ENV.billingEndpoint + "/pages/terms"
}
}
}

14
public/images/icons/delete-log.svg
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<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"
width="154px" height="152px" viewBox="0 0 154 152" enable-background="new 0 0 154 152" xml:space="preserve">
<g>
<polygon fill="#FFFFFF" points="130.351,34.261 130.351,16.789 86.292,16.789 101.697,34.261 "/>
<polygon fill="#FFFFFF" points="154.008,67.817 154.008,50.348 98.743,50.348 83.337,67.817 "/>
<polygon fill="#FFFFFF" points="144.88,101.377 144.88,83.927 87.781,83.927 103.165,101.377 "/>
<polygon fill="#FFFFFF" points="109.396,134.958 109.396,117.485 97.266,117.485 81.873,134.958 "/>
</g>
<polygon fill="#FFFFFF" points="60.836,73.358 89.697,40.631 73.842,22.652 44.968,55.389 16.096,22.652 0.239,40.631
29.102,73.358 0.239,106.083 16.096,124.075 44.968,91.338 73.842,124.075 89.697,106.083 "/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

15
public/images/icons/download-log-icon.svg Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<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"
width="11.731px" height="9.999px" viewBox="0 0 11.731 9.999" enable-background="new 0 0 11.731 9.999" xml:space="preserve">
<g>
<g>
<rect x="5.763" y="0.068" fill="#F2F2F2" width="3.981" height="1.468"/>
<rect x="5.763" y="2.888" fill="#F2F2F2" width="5.969" height="1.469"/>
<polygon fill="#F2F2F2" points="10.965,7.175 10.965,5.71 8.565,5.71 7.352,7.175 "/>
<polygon fill="#F2F2F2" points="7.982,9.997 7.982,8.529 6.229,8.529 5.012,9.997 "/>
</g>
<polygon fill="#F2F2F2" points="4.361,5.749 4.361,0 2.421,0 2.421,5.849 0,5.841 3.341,9.999 6.847,5.77 "/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 960 B

14
public/images/icons/download-log.svg
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<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"
width="154px" height="152px" viewBox="0 0 154 152" enable-background="new 0 0 154 152" xml:space="preserve">
<g>
<rect x="75.688" y="12.894" fill="#FFFFFF" width="51.308" height="18.926"/>
<rect x="75.688" y="49.244" fill="#FFFFFF" width="76.933" height="18.926"/>
<polygon fill="#FFFFFF" points="142.733,104.521 142.733,85.62 111.813,85.62 96.149,104.521 "/>
<polygon fill="#FFFFFF" points="104.296,140.896 104.296,121.97 81.688,121.97 66,140.896 "/>
</g>
<polygon fill="#FFFFFF" points="57.609,86.132 57.609,12.021 32.608,12.021 32.608,87.408 1.408,87.307 44.471,140.921
89.659,86.396 "/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 967 B

16
public/images/icons/remove-log-icon.svg Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<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"
width="13.012px" height="10px" viewBox="0 0 13.012 10" enable-background="new 0 0 13.012 10" xml:space="preserve">
<g>
<g>
<polygon fill="#F2F2F2" points="11.01,1.479 11.01,0 7.281,0 8.586,1.479 "/>
<polygon fill="#F2F2F2" points="13.012,4.319 13.012,2.84 8.335,2.84 7.032,4.319 "/>
<polygon fill="#F2F2F2" points="12.239,7.158 12.239,5.681 7.407,5.681 8.709,7.158 "/>
<polygon fill="#F2F2F2" points="9.236,10 9.236,8.521 8.21,8.521 6.908,10 "/>
</g>
<polygon fill="#F2F2F2" points="5.128,4.788 7.569,2.018 6.228,0.496 3.784,3.267 1.342,0.496 0,2.018 2.441,4.788 0,7.556
1.342,9.08 3.784,6.308 6.228,9.08 7.569,7.556 "/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB