Merge branch 'develop' into feat461-agent-support

portainer · Mar 27, 2018 · d4a80cb · d4a80cb
2 parents 04cad9d + b2b685b
commit d4a80cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/app/docker/views/services/edit/serviceController.js b/app/docker/views/services/edit/serviceController.js
@@ -402,6 +402,7 @@ function ($q, $scope, $transition$, $state, $location, $timeout, $anchorScroll,
     service.RestartDelay = ServiceHelper.translateNanosToHumanDuration(service.RestartDelay) || '5s';
     service.RestartWindow = ServiceHelper.translateNanosToHumanDuration(service.RestartWindow) || '0s';
     service.UpdateDelay = ServiceHelper.translateNanosToHumanDuration(service.UpdateDelay) || '0s';
+    service.StopGracePeriod = service.StopGracePeriod ? ServiceHelper.translateNanosToHumanDuration(service.StopGracePeriod) : '';
   }
 
   function initView() {

diff --git a/assets/css/app.css b/assets/css/app.css
@@ -132,6 +132,10 @@ a[ng-click]{
   font-weight: normal;
 }
 
+.widget .widget-body table tbody td {
+  white-space: nowrap; 
+}
+
 .template-widget {
   height: 100%;
 }