diff --git a/app/components/masthead/masthead.html b/app/components/masthead/masthead.html index 0e358e7cb..e17808c11 100644 --- a/app/components/masthead/masthead.html +++ b/app/components/masthead/masthead.html @@ -7,8 +7,8 @@
  • Containers
  • Containers Network
  • Images
  • -
  • Networks
  • -
  • Volumes
  • +
  • Networks
  • +
  • Volumes
  • Info
  • diff --git a/app/components/masthead/mastheadController.js b/app/components/masthead/mastheadController.js index 713ff8bf3..579ef6e5a 100644 --- a/app/components/masthead/mastheadController.js +++ b/app/components/masthead/mastheadController.js @@ -11,5 +11,5 @@ angular.module('masthead', []) $scope.refresh = function() { location.reload(); - } + }; }]); diff --git a/app/components/stats/stats.html b/app/components/stats/stats.html index 71f3a2fa0..fa47be6a0 100644 --- a/app/components/stats/stats.html +++ b/app/components/stats/stats.html @@ -44,7 +44,7 @@ -

    Network

    +

    Network {{ networkName}}

    diff --git a/app/components/stats/statsController.js b/app/components/stats/statsController.js index 40d0b4159..38fb08de6 100644 --- a/app/components/stats/statsController.js +++ b/app/components/stats/statsController.js @@ -138,6 +138,12 @@ angular.module('stats', []) var lastRxBytes = 0, lastTxBytes = 0; function updateNetworkChart(data) { + // 1.9+ contains an object of networks, for now we'll just show stats for the first network + // TODO: Show graphs for all networks + if (data.networks) { + $scope.networkName = Object.keys(data.networks)[0]; + data.network = data.networks[$scope.networkName]; + } var rxBytes = 0, txBytes = 0; if (lastRxBytes !== 0 || lastTxBytes !== 0) { // These will be zero on first call, ignore to prevent large graph spike