You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mx...@apache.org on 2015/11/05 18:30:18 UTC
[4/4] flink git commit: [FLINK-2957][web-dashboard] Improve the
appearance of cancel button
[FLINK-2957][web-dashboard] Improve the appearance of cancel button
This closes #1319.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/54b1d2cc
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/54b1d2cc
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/54b1d2cc
Branch: refs/heads/master
Commit: 54b1d2cc426c155f82aaf96da3cbd740e99ef7d8
Parents: 9f30108
Author: Sachin Goel <sa...@gmail.com>
Authored: Tue Nov 3 16:17:14 2015 +0530
Committer: Maximilian Michels <mx...@apache.org>
Committed: Thu Nov 5 18:26:16 2015 +0100
----------------------------------------------------------------------
flink-runtime-web/web-dashboard/app/partials/jobs/job.jade | 2 +-
.../web-dashboard/app/scripts/modules/jobs/jobs.ctrl.coffee | 2 +-
flink-runtime-web/web-dashboard/app/styles/index.styl | 1 +
flink-runtime-web/web-dashboard/app/styles/job.styl | 7 +++++++
flink-runtime-web/web-dashboard/web/css/index.css | 6 ++++++
flink-runtime-web/web-dashboard/web/js/index.js | 4 ++--
flink-runtime-web/web-dashboard/web/partials/jobs/job.html | 2 +-
7 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/54b1d2cc/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
index bdfd7ea..61d1b17 100644
--- a/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
@@ -40,7 +40,7 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main(ng-if="job")
| {{job.duration}} ms
.navbar-info.last.first(ng-if="job.state=='RUNNING' || job.state=='CREATED'")
- span.show-pointer.label.label-danger(ng-click="cancelJob($event)")
+ span.navbar-info-button.btn.btn-default(ng-click="cancelJob($event)")
| Cancel
nav.navbar.navbar-default.navbar-fixed-top.navbar-main-additional(ng-if="job")
http://git-wip-us.apache.org/repos/asf/flink/blob/54b1d2cc/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.ctrl.coffee
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.ctrl.coffee b/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.ctrl.coffee
index e18a5fc..647cd1e 100644
--- a/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.ctrl.coffee
+++ b/flink-runtime-web/web-dashboard/app/scripts/modules/jobs/jobs.ctrl.coffee
@@ -71,7 +71,7 @@ angular.module('flinkApp')
$interval.cancel(refresher)
$scope.cancelJob = (cancelEvent) ->
- angular.element(cancelEvent.currentTarget).removeClass('label-danger').addClass('label-info').html('Cancelling...')
+ angular.element(cancelEvent.currentTarget).removeClass("btn").removeClass("btn-default").html('Cancelling...')
JobsService.cancelJob($stateParams.jobid).then (data) ->
{}
http://git-wip-us.apache.org/repos/asf/flink/blob/54b1d2cc/flink-runtime-web/web-dashboard/app/styles/index.styl
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/styles/index.styl b/flink-runtime-web/web-dashboard/app/styles/index.styl
index b800165..36d2beb 100644
--- a/flink-runtime-web/web-dashboard/app/styles/index.styl
+++ b/flink-runtime-web/web-dashboard/app/styles/index.styl
@@ -426,3 +426,4 @@ livechart
.show-pointer
cursor: pointer
+
http://git-wip-us.apache.org/repos/asf/flink/blob/54b1d2cc/flink-runtime-web/web-dashboard/app/styles/job.styl
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/styles/job.styl b/flink-runtime-web/web-dashboard/app/styles/job.styl
index e2cbede..1051712 100644
--- a/flink-runtime-web/web-dashboard/app/styles/job.styl
+++ b/flink-runtime-web/web-dashboard/app/styles/job.styl
@@ -43,3 +43,10 @@
&.label-black
background-color: #000000
+
+.navbar-info-button
+ padding: 3px 4px
+ font-size: 12px
+ font-family: inherit
+ margin-top: -2px
+
http://git-wip-us.apache.org/repos/asf/flink/blob/54b1d2cc/flink-runtime-web/web-dashboard/web/css/index.css
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/css/index.css b/flink-runtime-web/web-dashboard/web/css/index.css
index 5bf0a6e..45599ca 100644
--- a/flink-runtime-web/web-dashboard/web/css/index.css
+++ b/flink-runtime-web/web-dashboard/web/css/index.css
@@ -456,6 +456,12 @@ livechart {
.label-group .label.label-black {
background-color: #000;
}
+.navbar-info-button {
+ padding: 3px 4px;
+ font-size: 12px;
+ font-family: inherit;
+ margin-top: -2px;
+}
svg.graph {
overflow: hidden;
}