trying to add actions
This commit is contained in:
Lisa Passing
parent
101fbc3021
commit
e4a58787f4
|
|
@ -30,6 +30,9 @@
|
|||
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
|
||||
|
|
|
|||
|
|
@ -83,3 +83,14 @@ $button-border-color: #d4d4d4
|
|||
#auth #navigation .button--signin
|
||||
display: none
|
||||
|
||||
.button--grey
|
||||
height: 24px
|
||||
padding: 0 10px 0 10px
|
||||
background-color: #696867
|
||||
color: #f2f2f2
|
||||
font-size: $font-size-small
|
||||
border: none
|
||||
@extend %border-radius-4px
|
||||
&:hover,
|
||||
&:active
|
||||
background-color: lighten(#696867, 10)
|
||||
|
|
|
|||
|
|
@ -67,10 +67,28 @@
|
|||
background: inline-image('ui/workers-close.svg') no-repeat right 6px
|
||||
|
||||
.log-header
|
||||
height: 40px
|
||||
height: 44px
|
||||
margin: 0
|
||||
padding: .8em
|
||||
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.2em
|
||||
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')
|
||||
button
|
||||
margin-left: .4em
|
||||
|
||||
|
||||
.log-body
|
||||
position: relative
|
||||
|
|
|
|||
|
|
@ -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')
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
<section id="log-container" class="log">
|
||||
<menu class="log-header">
|
||||
<button class="button button--grey button--removeLog">Remove Log</button>
|
||||
<button class="button button--grey button--downloadLog">Download Log</button>
|
||||
{{#if view.canRemoveLog}}
|
||||
<button class="button button--grey" {{action "removeLogPopup" target=view}}><span class="icon icon--removeLog"></span> Remove Log</button>
|
||||
{{/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}}>
|
||||
|
|
|
|||
|
|
@ -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`
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
Before Width: | Height: | Size: 1.1 KiB |
15
public/images/icons/download-log-icon.svg
Normal file
15
public/images/icons/download-log-icon.svg
Normal 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>
|
||||
|
After Width: | Height: | Size: 960 B |
|
|
@ -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>
|
||||
|
Before Width: | Height: | Size: 967 B |
16
public/images/icons/remove-log-icon.svg
Normal file
16
public/images/icons/remove-log-icon.svg
Normal 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>
|
||||
|
After Width: | Height: | Size: 1.0 KiB |
Loading…
Reference in New Issue
Block a user