Skip to content
This repository has been archived by the owner on May 24, 2018. It is now read-only.

Commit

Permalink
[CDSK-554] Add stop logic
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mowinski
Mowinski committed Apr 23, 2018
1 parent fb0228d commit 2b29677
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 18 deletions.
2 changes: 1 addition & 1 deletion master/buildbot/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1524141495
1524473663
7 changes: 5 additions & 2 deletions www/prod/css/default.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -957,10 +957,12 @@ ul.top-menu>li>a:hover{opacity:.5}
.link-button:hover{color:#999}
.link-1 a{text-decoration:underline;color:#333}
.link-1 a:hover{color:#999}
.blue-btn,.clear-btn,.grey-btn,a.grey-btn{background-image:-moz-linear-gradient(bottom,#5eaaad 10%,#438e89 100%);background-image:-webkit-linear-gradient(bottom,#5eaaad 10%,#438e89 100%);background-image:-o-linear-gradient(bottom,#5eaaad 10%,#438e89 100%);background-image:-ms-linear-gradient(bottom,#5eaaad 10%,#438e89 100%);background-image:linear-gradient(bottom,#5eaaad 10%,#438e89 100%);border:1px solid #417c7e;-webkit-border-radius:7px;-moz-border-radius:7px;-ms-border-radius:7px;-o-border-radius:7px;border-radius:7px;color:#eee;font-size:10px;font-weight:700;letter-spacing:.3px;padding:10px;text-transform:uppercase;display:inline-block}
.blue-btn:hover,.clear-btn:hover,.grey-btn:hover,a.grey-btn:hover{color:#A4A4A4}
.blue-btn,.clear-btn,.grey-btn,.red-btn,a.grey-btn{background-image:-moz-linear-gradient(bottom,#5eaaad 10%,#438e89 100%);background-image:-webkit-linear-gradient(bottom,#5eaaad 10%,#438e89 100%);background-image:-o-linear-gradient(bottom,#5eaaad 10%,#438e89 100%);background-image:-ms-linear-gradient(bottom,#5eaaad 10%,#438e89 100%);background-image:linear-gradient(bottom,#5eaaad 10%,#438e89 100%);border:1px solid #417c7e;-webkit-border-radius:7px;-moz-border-radius:7px;-ms-border-radius:7px;-o-border-radius:7px;border-radius:7px;color:#eee;font-size:10px;font-weight:700;letter-spacing:.3px;padding:10px;text-transform:uppercase;display:inline-block}
.blue-btn:hover,.clear-btn:hover,.grey-btn:hover,.red-btn:hover,a.grey-btn:hover{color:#A4A4A4}
.blue-btn{background-image:-moz-linear-gradient(bottom,#5eaaad 10%,#438e89 100%);background-image:-webkit-linear-gradient(bottom,#5eaaad 10%,#438e89 100%);background-image:-o-linear-gradient(bottom,#5eaaad 10%,#438e89 100%);background-image:-ms-linear-gradient(bottom,#5eaaad 10%,#438e89 100%);background-image:linear-gradient(bottom,#5eaaad 10%,#438e89 100%);border:1px solid #417c7e;border-bottom:1px solid #6D6D6D;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.45) inset,1px 1px 0 #fff;box-shadow:0 1px 0 rgba(255,255,255,.45) inset,1px 1px 0 #fff;-webkit-border-radius:6px;-moz-border-radius:6px;-ms-border-radius:6px;-o-border-radius:6px;border-radius:6px;color:#F7F7F7;display:inline-block;font-size:10px;font-weight:700;letter-spacing:.3px;padding:8px 10px;text-shadow:0 -1px 0 rgba(0,0,0,.44);text-transform:uppercase}
.blue-btn:hover{color:rgba(247,247,247,.72)}
.red-btn{background-image:-moz-linear-gradient(bottom,#d9534f 10%,#d9534f 100%);background-image:-webkit-linear-gradient(bottom,#d9534f 10%,#d9534f 100%);background-image:-o-linear-gradient(bottom,#d9534f 10%,#d9534f 100%);background-image:-ms-linear-gradient(bottom,#d9534f 10%,#d9534f 100%);background-image:linear-gradient(bottom,#d9534f 10%,#d9534f 100%);border:1px solid #d9534f;border-bottom:1px solid #d9534f;color:#444}
.red-btn:hover{color:#5eaaad}
.grey-btn{background-image:-moz-linear-gradient(bottom,#eee 10%,#999 100%);background-image:-webkit-linear-gradient(bottom,#eee 10%,#999 100%);background-image:-o-linear-gradient(bottom,#eee 10%,#999 100%);background-image:-ms-linear-gradient(bottom,#eee 10%,#999 100%);background-image:linear-gradient(bottom,#eee 10%,#999 100%);border:1px solid #eee;border-bottom:1px solid #999;color:#444}
.grey-btn:hover{color:#5eaaad}
.grey-btn.var-1{float:right;font-size:12px;margin-left:15px;margin-bottom:15px}
Expand All @@ -985,6 +987,7 @@ ul.top-menu>li>a:hover{opacity:.5}
.close-btn{position:absolute;right:10px;top:4px;cursor:pointer}
.close-btn:hover:after{color:#5eaaad}
.close-btn:after{color:#333;content:"✖";font-size:20px;text-shadow:1px 1px 1px #FFF}
.form-btn{min-width:60px}
.initjson{display:none}
.percent-outer{position:relative;height:17px;width:100%;overflow:hidden;background-color:#ADADAD;border-radius:4px;-webkit-box-shadow:1px 0 4px rgba(0,0,0,.6) inset;box-shadow:1px 0 4px rgba(0,0,0,.6) inset;margin-top:2px;margin-bottom:10px}
.percent-outer.build-detail-progress{width:40%;margin-top:10px}
Expand Down
18 changes: 9 additions & 9 deletions www/prod/script/main.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/prod/script/main.js.map
View file

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions www/sass/modules/page-elements/_buttons.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
a.grey-btn,
.grey-btn,
.clear-btn,
.red-btn,
.blue-btn {
@include bgimage(linear-gradient(bottom, lighten($brand-katana, 20%) 10%, lighten($brand-primary, 5%) 100%));
border: 1px solid lighten($brand-katana, 5%);
Expand Down Expand Up @@ -67,6 +68,16 @@ a.grey-btn,
}
}

.red-btn {
@include bgimage(linear-gradient(bottom, $brand-danger 10%, $brand-danger 100%));
border: 1px solid $brand-danger;
border-bottom:1px solid $brand-danger;
color: $text-color;
&:hover{
color: $link-hover-color;
}
}

.grey-btn{
@include bgimage(linear-gradient(bottom, $gray-lighter 10%, $gray-light 100%));
border: 1px solid $gray-lighter;
Expand Down Expand Up @@ -203,3 +214,7 @@ a.grey-btn,
font-size: 20px;
text-shadow: 1px 1px 1px #FFFFFF;
}

.form-btn {
min-width: 60px;
}
8 changes: 6 additions & 2 deletions www/script/project/rtBuildDetail.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,12 @@ define(function (require) {
onCreate: function($elem) {
$elem.on('click', '.close-button', $elem.hidePopup);
$elem.on('click', '.confirm-button', function() {
var url = $(this).data('url');
$elem.hidePopup();
$('.confirm-button, .close-button').hide();
$('#loading-modal').show();
$.post($(this).data('url'), {}, function() {
$elem.hidePopup();
location.reload();
});
});
}
});
Expand Down
8 changes: 5 additions & 3 deletions www/script/templates/stop_build.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
{{/if}}
</div>


<div class="confirmation-footer pull-right">
<button class="btn btn-md btn-danger confirm-button" data-url="{{url}}">Yes</button>
<button class="btn btn-md btn-info close-button">No</button>
<span class="spin-icon animate-spin" id="loading-modal" style="display: none;"></span>
<button class="btn btn-md red-btn confirm-button form-btn" data-url="{{url}}">Yes</button>
<button class="btn btn-md grey-btn close-button form-btn">No</button>
</div>
</div>
</div>

0 comments on commit 2b29677

Please sign in to comment.