From 99f537f2af25e2810ff39077d3d49fadff6272ff Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 1 Apr 2019 13:17:42 +0300
Subject: Display Manual Task description in actions popup

Change-Id: I3aa990785b340cdff647154016ae6078aabc3ee7
Issue-ID: VID-403
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../alert-change-management.html                     | 20 ++++++++++----------
 .../change-management-manual-tasks.html              |  7 ++++++-
 .../failed-change-management.html                    | 20 ++++++++++----------
 .../in-progress-change-management.html               | 20 ++++++++++----------
 4 files changed, 36 insertions(+), 31 deletions(-)

(limited to 'vid-app-common')

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/alert-change-management/alert-change-management.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/alert-change-management/alert-change-management.html
index 9acc2c2e1..4cfc5be7f 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/alert-change-management/alert-change-management.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/alert-change-management/alert-change-management.html
@@ -21,13 +21,13 @@
 <link rel="stylesheet" type="text/css" href="app/vid/styles/modal-create-new.css" />
 <link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/alert-change-management/alert-change-management.css" />
 <link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/css/manual-task-popup.css" />
-<div class="modal-header">
-    <h3 class="modal-title" id="alert-modal-header">On Hold</h3>
-    <span id="cancel" ng-click="vm.close()" class="pull-right modal-close" aria-hidden="true">&times;</span>
-</div>
-<div class="modal-body">
-    <span id="alert-modal-content">{{vm.content}}</span>
-</div>
-<div class="modal-footer">
-    <div ng-include="'app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html'"></div>
-</div>
+<div>
+    <div class="modal-header">
+        <h3 class="modal-title" id="alert-modal-header">On Hold</h3>
+        <span id="cancel" ng-click="vm.close()" class="pull-right modal-close" aria-hidden="true">&times;</span>
+    </div>
+    <div class="modal-body">
+        <span id="alert-modal-content">{{vm.content}}</span>
+    </div>
+    <div ng-include="'app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html'" />
+</div>
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html
index 40fefab98..099a6ad7b 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html
@@ -18,7 +18,12 @@
   ============LICENSE_END=========================================================
   -->
 
-<div class="pull-right">
+<div class="modal-body">
+    <span id="in-progress-modal-description" ng-if="vm.description">{{vm.description}}</span>
+    <span id="in-progress-modal-timeout" ng-if="vm.timeout">({{vm.timeout}})</span>
+</div>
+
+<div class="modal-footer">
     <button ng-repeat="task in vm.manualTasks"
             type="button" id="{{task}}-button" name="{{task}}" class="btn btn-primary"
             ng-show="vm.isTaskAvailable(vm.MANUAL_TASKS[task])"
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/failed-change-management/failed-change-management.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/failed-change-management/failed-change-management.html
index 11d73e26e..4a4a3cfec 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/failed-change-management/failed-change-management.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/failed-change-management/failed-change-management.html
@@ -21,13 +21,13 @@
 <link rel="stylesheet" type="text/css" href="app/vid/styles/modal-create-new.css" />
 <link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/failed-change-management/failed-change-management.css" />
 <link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/css/manual-task-popup.css" />
-<div class="modal-header">
-    <h3 class="modal-title" id="failed-modal-header">{{vm.requestState || 'Failed' }}</h3>
-    <span id="cancel" ng-click="vm.close()" class="pull-right modal-close" aria-hidden="true">&times;</span>
-</div>
-<div class="modal-body">
-    <span id="failed-modal-content">{{vm.content}}</span>
-</div>
-<div class="modal-footer">
-    <div ng-include="'app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html'"></div>
-</div>
+<div>
+    <div class="modal-header">
+        <h3 class="modal-title" id="failed-modal-header">{{vm.requestState || 'Failed' }}</h3>
+        <span id="cancel" ng-click="vm.close()" class="pull-right modal-close" aria-hidden="true">&times;</span>
+    </div>
+    <div class="modal-body">
+        <span id="failed-modal-content">{{vm.content}}</span>
+    </div>
+    <div ng-include="'app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html'" />
+</div>
\ No newline at end of file
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/in-progress-modal-management/in-progress-change-management.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/in-progress-modal-management/in-progress-change-management.html
index e0c88660b..d133d4960 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/in-progress-modal-management/in-progress-change-management.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/in-progress-modal-management/in-progress-change-management.html
@@ -21,13 +21,13 @@
 <link rel="stylesheet" type="text/css" href="app/vid/styles/modal-create-new.css" />
 <link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/in-progress-modal-management/in-progress-change-management.css" />
 <link rel="stylesheet" type="text/css" href="app/vid/scripts/modals/css/manual-task-popup.css" />
-<div class="modal-header">
-    <h3 class="modal-title" id="in-progress-modal-header">In Progress</h3>
-    <span id="cancel" ng-click="vm.close()" class="pull-right modal-close" aria-hidden="true">&times;</span>
-</div>
-<div class="modal-body">
-    <span id="in-progress-modal-content">{{vm.content}}</span>
-</div>
-<div class="modal-footer">
-    <div ng-include="'app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html'"></div>
-</div>
+<div>
+    <div class="modal-header">
+        <h3 class="modal-title" id="in-progress-modal-header">In Progress</h3>
+        <span id="cancel" ng-click="vm.close()" class="pull-right modal-close" aria-hidden="true">&times;</span>
+    </div>
+    <div class="modal-body">
+        <span id="in-progress-modal-content">{{vm.content}}</span>
+    </div>
+    <div ng-include="'app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.html'" />
+</div>
\ No newline at end of file
-- 
cgit 1.2.3-korg