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:24 UTC
[22/50] incubator-gearpump git commit: fix #1906: some visual
glichtes found in mobile view
fix #1906: some visual glichtes found in mobile view
Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/25f82edc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/25f82edc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/25f82edc
Branch: refs/heads/master
Commit: 25f82edc345b2234069915467cedb0fa17b06d36
Parents: 34c62fc
Author: Qian Xu <qi...@intel.com>
Authored: Fri Feb 5 12:58:37 2016 +0800
Committer: Qian Xu <qi...@intel.com>
Committed: Fri Feb 5 12:58:37 2016 +0800
----------------------------------------------------------------------
project/Build.scala | 7 ++++---
services/dashboard/index.html | 18 +++++++++---------
.../dashboard/views/apps/streamingapp/executor.js | 2 +-
.../views/apps/streamingapp/metric_selector.js | 2 +-
services/dashboard/views/cluster/master/master.js | 2 +-
.../views/cluster/workers/worker/worker.js | 2 +-
.../views/cluster/workers/workers_listview.js | 4 +---
7 files changed, 18 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/25f82edc/project/Build.scala
----------------------------------------------------------------------
diff --git a/project/Build.scala b/project/Build.scala
index 19dde53..830e7c2 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -278,7 +278,8 @@ object Build extends sbt.Build {
"org.scalatest" %% "scalatest" % scalaTestVersion % "test",
"com.lihaoyi" %% "upickle" % upickleVersion,
"com.softwaremill" %% "akka-http-session" % "0.1.4",
- "org.webjars" % "angularjs" % "1.4.8",
+ "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" % "angular-ui-router" % "0.2.15",
"org.webjars" % "bootstrap" % "3.3.6",
"org.webjars" % "d3js" % "3.5.6",
@@ -292,12 +293,12 @@ object Build extends sbt.Build {
"org.webjars.bower" % "angular-motion" % "0.4.3",
"org.webjars.bower" % "bootstrap-additions" % "0.3.1",
"org.webjars.bower" % "angular-strap" % "2.3.5",
- "org.webjars.bower" % "angular-ui-select" % "0.13.2",
+ "org.webjars.npm" % "ui-select" % "0.14.2",
"org.webjars.bower" % "ng-file-upload" % "5.0.9",
"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.4"
+ "org.webjars.npm" % "dashing" % "0.4.5"
).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/25f82edc/services/dashboard/index.html
----------------------------------------------------------------------
diff --git a/services/dashboard/index.html b/services/dashboard/index.html
index 96b5742..47007cc 100644
--- a/services/dashboard/index.html
+++ b/services/dashboard/index.html
@@ -14,10 +14,10 @@
<!-- angular-strap requires the following 2 stylesheets -->
<link rel="stylesheet" href="webjars/bootstrap-additions/0.3.1/dist/bootstrap-additions.min.css"/>
<link rel="stylesheet" href="webjars/angular-motion/0.4.3/dist/angular-motion.min.css"/>
- <link rel="stylesheet" href="webjars/angular-ui-select/0.13.2/dist/select.min.css"/>
+ <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.4/dist/dashing.min.css"/>
+ <link rel="stylesheet" href="webjars/dashing/0.4.5/dist/dashing.min.css"/>
<!-- Site styles -->
<link rel="stylesheet" href="webjars/dashing-deps/0.1.2/roboto/roboto.min.css"/>
@@ -44,16 +44,16 @@
<!-- Static Resources -->
<script src="webjars/jquery/2.2.0/jquery.min.js"></script>
<script src="webjars/bootstrap/3.3.6/js/bootstrap.min.js"></script>
-<script src="webjars/angularjs/1.4.8/angular.min.js"></script>
-<script src="webjars/angularjs/1.4.8/angular-cookies.min.js"></script>
-<script src="webjars/angularjs/1.4.8/angular-touch.min.js"></script>
-<script src="webjars/angularjs/1.4.8/angular-animate.min.js"></script>
-<script src="webjars/angularjs/1.4.8/angular-sanitize.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/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>
<script src="webjars/angular-ui-router/0.2.15/angular-ui-router.min.js"></script>
<script src="webjars/angular-strap/2.3.5/dist/angular-strap.min.js"></script>
<script src="webjars/angular-strap/2.3.5/dist/angular-strap.tpl.min.js"></script>
-<script src="webjars/angular-ui-select/0.13.2/dist/select.min.js"></script>
+<script src="webjars/ui-select/0.14.2/dist/select.min.js"></script>
<script src="webjars/angular-smart-table/2.1.6/dist/smart-table.min.js"></script>
<script src="webjars/d3js/3.5.6/d3.min.js"></script>
<script src="webjars/momentjs/2.10.6/min/moment.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.4/dist/dashing.min.js"></script>
+<script src="webjars/dashing/0.4.5/dist/dashing.min.js"></script>
<!-- Application -->
<script src="dashboard.js"></script>
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/25f82edc/services/dashboard/views/apps/streamingapp/executor.js
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/executor.js b/services/dashboard/views/apps/streamingapp/executor.js
index 60df92f..31cbd5f 100644
--- a/services/dashboard/views/apps/streamingapp/executor.js
+++ b/services/dashboard/views/apps/streamingapp/executor.js
@@ -30,7 +30,7 @@ angular.module('dashboard')
$scope.executorName = executor0.id === -1 ?
'AppMaster' : ('Executor ' + executor0.id);
$scope.overviewTable = [
- $ptb.text('JVM Info').help('Format: PID@hostname').done(),
+ $ptb.text('JVM Info').done(),
$ptb.text('Actor Path').done(),
$ptb.link('Worker').done(),
$ptb.number('Task Count').done(),
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/25f82edc/services/dashboard/views/apps/streamingapp/metric_selector.js
----------------------------------------------------------------------
diff --git a/services/dashboard/views/apps/streamingapp/metric_selector.js b/services/dashboard/views/apps/streamingapp/metric_selector.js
index f2025ef..88fc507 100644
--- a/services/dashboard/views/apps/streamingapp/metric_selector.js
+++ b/services/dashboard/views/apps/streamingapp/metric_selector.js
@@ -14,7 +14,7 @@ angular.module('dashboard')
scope: {
metricName: '=',
metricType: '=',
- metricDescription: '='
+ metricDescription: '=?'
},
link: function(scope) {
'use strict';
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/25f82edc/services/dashboard/views/cluster/master/master.js
----------------------------------------------------------------------
diff --git a/services/dashboard/views/cluster/master/master.js b/services/dashboard/views/cluster/master/master.js
index 31cba33..44a38f7 100644
--- a/services/dashboard/views/cluster/master/master.js
+++ b/services/dashboard/views/cluster/master/master.js
@@ -28,7 +28,7 @@ angular.module('dashboard')
$scope.whatIsMaster = i18n.terminology.master;
$scope.masterInfoTable = [
- $ptb.text('JVM Info').help('Format: PID@hostname').done(),
+ $ptb.text('JVM Info').done(),
$ptb.text('Leader').done(),
$ptb.text('Master Members').done(),
$ptb.tag('Status').done(),
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/25f82edc/services/dashboard/views/cluster/workers/worker/worker.js
----------------------------------------------------------------------
diff --git a/services/dashboard/views/cluster/workers/worker/worker.js b/services/dashboard/views/cluster/workers/worker/worker.js
index 599f1d6..ad92a74 100644
--- a/services/dashboard/views/cluster/workers/worker/worker.js
+++ b/services/dashboard/views/cluster/workers/worker/worker.js
@@ -36,7 +36,7 @@ angular.module('dashboard')
$scope.whatIsWorker = i18n.terminology.worker;
$scope.overviewTable = [
- $ptb.text('JVM Info').help('Format: PID@hostname').done(),
+ $ptb.text('JVM Info').done(),
$ptb.text('Actor Path').done(),
$ptb.number('Slots Capacity').done(),
$ptb.button('Quick Links').values([
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/25f82edc/services/dashboard/views/cluster/workers/workers_listview.js
----------------------------------------------------------------------
diff --git a/services/dashboard/views/cluster/workers/workers_listview.js b/services/dashboard/views/cluster/workers/workers_listview.js
index 9c27327..3cdf14e 100644
--- a/services/dashboard/views/cluster/workers/workers_listview.js
+++ b/services/dashboard/views/cluster/workers/workers_listview.js
@@ -33,9 +33,7 @@ angular.module('dashboard')
$stb.indicator().key('state').canSort('state.condition+"_"+aliveFor').styleClass('td-no-padding').done(),
$stb.link('ID').key('id').canSort().sortDefaultDescent().styleClass('col-md-1').done(),
$stb.text('Address').key('akkaAddr').canSort().styleClass('col-md-1').done(),
- $stb.text('JVM Info').key('jvm')
- .help('Format: PID@hostname')
- .styleClass('col-md-2 hidden-xs').done(),
+ $stb.text('JVM Info').key('jvm').styleClass('col-md-2 hidden-xs').done(),
// group 2/3 (5-col)
$stb.number('Executors').key('executors').canSort().styleClass('col-md-1 hidden-xs').done(),
$stb.progressbar('Slots Usage').key('slots').sortBy('slots.usage').styleClass('col-md-1').done(),