diff options
author | Ittay Stern <ittay.stern@att.com> | 2019-04-01 13:17:42 +0300 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2019-04-01 13:17:42 +0300 |
commit | 99f537f2af25e2810ff39077d3d49fadff6272ff (patch) | |
tree | cbdf4c0f6bbf482bcdd88f9f015e54cbdc677833 /vid-app-common | |
parent | 92c875958080d6e3039952b3ea3f8deab704ea51 (diff) |
Display Manual Task description in actions popup
Change-Id: I3aa990785b340cdff647154016ae6078aabc3ee7
Issue-ID: VID-403
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-app-common')
4 files changed, 36 insertions, 31 deletions
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">×</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">×</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">×</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">×</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">×</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">×</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 |