You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gearpump.apache.org by ap...@apache.org on 2016/04/11 20:26:47 UTC
[45/50] incubator-gearpump git commit: fix #1989: add confirmation
dialog for kill app and restart app
fix #1989: add confirmation dialog for kill app and restart app
Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/fc918491
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/fc918491
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/fc918491
Branch: refs/heads/master
Commit: fc918491d1fc90e3d6b21198ec26e6c9ed3ce72c
Parents: 3f3d911
Author: Qian Xu <qi...@intel.com>
Authored: Fri Mar 4 14:21:49 2016 +0800
Committer: Qian Xu <qi...@intel.com>
Committed: Fri Mar 4 15:17:39 2016 +0800
----------------------------------------------------------------------
project/Build.scala | 4 ++--
services/dashboard/dashboard.js | 8 ++++++++
services/dashboard/index.html | 6 +++---
services/dashboard/styles/dashboard.css | 5 +++++
services/dashboard/views/apps/apps.html | 13 ++++++++-----
services/dashboard/views/apps/apps.js | 12 ++++++++----
6 files changed, 34 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/fc918491/project/Build.scala
----------------------------------------------------------------------
diff --git a/project/Build.scala b/project/Build.scala
index 3f91f1e..3723020 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -279,7 +279,7 @@ object Build extends sbt.Build {
"com.lihaoyi" %% "upickle" % upickleVersion,
"com.softwaremill" %% "akka-http-session" % "0.1.4",
"org.webjars" % "angularjs" % "1.4.9",
- "org.webjars.npm" % "angular-touch" % "1.5.0-rc.2", // angular 1.5 breaks ui-select, but we need ng-touch 1.5
+ "org.webjars.npm" % "angular-touch" % "1.5.0", // angular 1.5 breaks ui-select, but we need ng-touch 1.5
"org.webjars" % "angular-ui-router" % "0.2.15",
"org.webjars" % "bootstrap" % "3.3.6",
"org.webjars" % "d3js" % "3.5.6",
@@ -298,7 +298,7 @@ object Build extends sbt.Build {
"org.webjars.bower" % "vis" % "4.7.0",
"org.webjars.bower" % "clipboard.js" % "0.1.1",
"org.webjars.npm" % "dashing-deps" % "0.1.2",
- "org.webjars.npm" % "dashing" % "0.4.5"
+ "org.webjars.npm" % "dashing" % "0.4.6"
).map(_.exclude("org.scalamacros", "quasiquotes_2.10")).map(_.exclude("org.scalamacros", "quasiquotes_2.10.3")))
lazy val serviceJSSettings = Seq(
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/fc918491/services/dashboard/dashboard.js
----------------------------------------------------------------------
diff --git a/services/dashboard/dashboard.js b/services/dashboard/dashboard.js
index a9b8fc7..90f3609 100644
--- a/services/dashboard/dashboard.js
+++ b/services/dashboard/dashboard.js
@@ -61,6 +61,14 @@
});
}])
+ // configure dashing
+ .config(['dashing.i18n', function(i18n) {
+ 'use strict';
+
+ i18n.confirmationYesButtonText = 'OK';
+ i18n.confirmationNoButtonText = 'Cancel';
+ }])
+
// disable logging for production
.config(['$compileProvider', function($compileProvider) {
'use strict';
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/fc918491/services/dashboard/index.html
----------------------------------------------------------------------
diff --git a/services/dashboard/index.html b/services/dashboard/index.html
index a3bbaa9..3ba09e3 100644
--- a/services/dashboard/index.html
+++ b/services/dashboard/index.html
@@ -17,7 +17,7 @@
<link rel="stylesheet" href="webjars/ui-select/0.14.2/dist/select.min.css"/>
<link rel="stylesheet" href="webjars/angular-loading-bar/0.8.0/build/loading-bar.min.css"/>
<link rel="stylesheet" href="webjars/vis/4.7.0/dist/vis.min.css"/>
- <link rel="stylesheet" href="webjars/dashing/0.4.5/dist/dashing.min.css"/>
+ <link rel="stylesheet" href="webjars/dashing/0.4.6/dist/dashing.min.css"/>
<!-- Site styles -->
<link rel="stylesheet" href="webjars/dashing-deps/0.1.2/roboto/roboto.min.css"/>
@@ -46,7 +46,7 @@
<script src="webjars/bootstrap/3.3.6/js/bootstrap.min.js"></script>
<script src="webjars/angularjs/1.4.9/angular.min.js"></script>
<script src="webjars/angularjs/1.4.9/angular-cookies.min.js"></script>
-<script src="webjars/angular-touch/1.5.0-rc.2/angular-touch.min.js"></script>
+<script src="webjars/angular-touch/1.5.0/angular-touch.min.js"></script>
<script src="webjars/angularjs/1.4.9/angular-animate.min.js"></script>
<script src="webjars/angularjs/1.4.9/angular-sanitize.min.js"></script>
<script src="webjars/angular-loading-bar/0.8.0/build/loading-bar.min.js"></script>
@@ -62,7 +62,7 @@
<script src="webjars/ng-file-upload/5.0.9/ng-file-upload-all.min.js"></script>
<script src="webjars/clipboard.js/0.1.1/clipboard.js"></script>
<script src="webjars/dashing-deps/0.1.2/echarts/2.2.7-compact/echarts-all.min.js"></script>
-<script src="webjars/dashing/0.4.5/dist/dashing.min.js"></script>
+<script src="webjars/dashing/0.4.6/dist/dashing.min.js"></script>
<!-- Application -->
<script src="dashboard.js"></script>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/fc918491/services/dashboard/styles/dashboard.css
----------------------------------------------------------------------
diff --git a/services/dashboard/styles/dashboard.css b/services/dashboard/styles/dashboard.css
index 8c17282..8062959 100644
--- a/services/dashboard/styles/dashboard.css
+++ b/services/dashboard/styles/dashboard.css
@@ -120,6 +120,11 @@ h4, table > caption {
color: #fff !important;
}
+/* Add extra margin to heading text */
+.btn-group-after-heading {
+ margin-left: 16px;
+}
+
/* Small badge for version label */
.navbar-brand > span {
font-size: .6em;
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/fc918491/services/dashboard/views/apps/apps.html
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/apps.html b/services/dashboard/views/apps/apps.html
index 30e455b..c4999a3 100644
--- a/services/dashboard/views/apps/apps.html
+++ b/services/dashboard/views/apps/apps.html
@@ -4,10 +4,11 @@
<div class="col-md-6 col-sm-6">
<span class="table-caption-ext pull-left">Applications</span>
<!-- dropdown button -->
- <div class="btn-group">
- <span class="btn btn-xs btn-primary dropdown-toggle pull-left" data-toggle="dropdown"
- style="margin-left: 6px; color: white"
- bs-dropdown="composeMenuOptions" html="true">Create
+ <div class="btn-group btn-group-after-heading">
+ <span class="btn btn-xs btn-default dropdown-toggle pull-left" data-toggle="dropdown"
+ bs-dropdown="composeMenuOptions" html="true">
+ <span class="fa fa-plus"></span>
+ Add
<span class="caret"></span>
</span>
</div>
@@ -16,7 +17,9 @@
<!--FILTER-->
</div>
<div class="col-md-3 hidden-sm hidden-xs">
- <searchbox ng-model="search" placeholder="Search Anything"></searchbox>
+ <searchbox
+ ng-show="appsTable.rows && appsTable.rows.length > 0"
+ ng-model="search" placeholder="Search Applications"></searchbox>
</div>
</div>
<!-- end of control toolbar -->
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/fc918491/services/dashboard/views/apps/apps.js
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/apps.js b/services/dashboard/views/apps/apps.js
index 669d018..6707e36 100644
--- a/services/dashboard/views/apps/apps.js
+++ b/services/dashboard/views/apps/apps.js
@@ -22,8 +22,8 @@ angular.module('dashboard')
});
}])
- .controller('AppsCtrl', ['$scope', '$modal', '$state', '$sortableTableBuilder', 'apps0',
- function($scope, $modal, $state, $stb, apps0) {
+ .controller('AppsCtrl', ['$scope', '$modal', '$state', '$sortableTableBuilder', '$dialogs', 'apps0',
+ function($scope, $modal, $state, $stb, $dialogs, apps0) {
'use strict';
var submitWindow = $modal({
@@ -91,13 +91,17 @@ angular.module('dashboard')
kill: {
text: 'Kill', class: 'btn-xs', disabled: !app.isRunning,
click: function() {
- app.terminate();
+ $dialogs.confirm('Are you sure to kill this application?', function() {
+ app.terminate();
+ });
}
},
restart: {
text: 'Restart', class: 'btn-xs', disabled: !app.isRunning,
click: function() {
- app.restart();
+ $dialogs.confirm('Are you sure to restart this application?', function() {
+ app.restart();
+ });
}
}
};