From bbe9dfecd209c0783d2493d8c68b4c7279cf6337 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Fri, 9 Sep 2016 10:44:04 +0530 Subject: [PATCH] adding modal changes --- .../public/js/policy-list.js | 14 +- .../public/js/operation-bar.js | 4 +- .../public/templates/operations.hbs | 293 +++++++----------- .../public/js/nav-menu.js | 18 +- 4 files changed, 128 insertions(+), 201 deletions(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js index 978d6f0bd..d6b17bb26 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/public/js/policy-list.js @@ -61,9 +61,9 @@ function InitiateViewOption() { * Modal related stuff are as follows. */ -var modalPopup = ".wr-modalpopup"; -var modalPopupContainer = modalPopup + " .modalpopup-container"; -var modalPopupContent = modalPopup + " .modalpopup-content"; +var modalPopup = ".modal"; +var modalPopupContainer = modalPopup + " .modal-content"; +var modalPopupContent = modalPopup + " .modal-content"; var body = "body"; /* @@ -81,8 +81,8 @@ function setPopupMaxHeight() { * show popup function. */ function showPopup() { - $(modalPopup).show(); - setPopupMaxHeight(); + $(modalPopup).modal('show'); + //setPopupMaxHeight(); } /* @@ -90,7 +90,9 @@ function showPopup() { */ function hidePopup() { $(modalPopupContent).html(''); - $(modalPopup).hide(); + $(modalPopup).modal('hide'); + $('body').removeClass('modal-open').css('padding-right','0px'); + $('.modal-backdrop').remove(); } /* diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js index 0485b20e0..6d9ef5567 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/js/operation-bar.js @@ -21,8 +21,8 @@ */ var operations = '.wr-operations', - modalPopup = '.wr-modalpopup', - modalPopupContent = modalPopup + ' .modalpopup-content', + modalPopup = '.modal', + modalPopupContent = modalPopup + ' .modal-content', navHeight = $('#nav').height(), headerHeight = $('header').height(), offset = (headerHeight + navHeight), diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs index 27d0d4062..54257292a 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs @@ -1,63 +1,66 @@
-
-
-
-

- - - - - Operation cannot be performed ! -

-

- Please select a device or a list of devices to perform an operation. -

-
- Ok -
-
+
+

+ + + + + Operation cannot be performed ! +

+ +
+
+

+ Please select a device or a list of devices to perform an operation. +

+
+
+
+ Ok
-
-
-
-

- - - - - Operation cannot be performed ! -

-

- Unexpected error occurred. Please Try again later. -

-
- Ok -
-
+
+

+ + + + + Operation cannot be performed ! +

+ +
+
+

+ Unexpected error occurred. Please Try again later. +

+
+
+
+ Ok
-
-
-
-

- - - - - Operation queued successfully ! -

-

- Operation has been queued successfully to be sent to the device. -

-
- Ok -
-
+
+

+ + + + + Operation queued successfully ! +

+ +
+
+

+ Operation has been queued successfully to be sent to the device. +

+
+
+
+ Ok
@@ -76,6 +79,7 @@

Message has been queued to be sent to the device.

+
Ok
@@ -89,150 +93,69 @@ {{name}}
-
-
-
-

- - - - - {{name}} -
-

-

- {{#equal code "WIPE_DATA"}} - {{#equal type "android"}} - Enter PIN code (Optional - This is required only if the device type is BYOD). -

-
- -
-
- {{/equal}} - {{/equal}} - {{#equal code "NOTIFICATION"}} - Type your message below. + +
+
+

+ + + + + {{name}} +
+

+ +
+
+

+ {{#equal code "WIPE_DATA"}} + {{#equal type "android"}} + Enter PIN code (Optional - This is required only if the device type + is BYOD).

- -
- -
-
- + +
+

{{/equal}} - {{#equal code "CHANGE_LOCK_CODE"}} - Type new lock-code below. -

- -
- {{/equal}} - {{#equal code "DEVICE_LOCK"}} - {{#equal type "android"}} - Type your message to be shown in the lock screen (Optional). -

-
- -
-
- - {{/equal}} - {{/equal}} - {{#equal code "UPGRADE_FIRMWARE"}} - {{#equal type "android"}} - Enter firmware upgrade scheduling information. -

- -

-
- Enter the date and time to schedule firmware upgrade. -

- - -
-

-
- Enter firmware upgrade server URL (ie. http://abc.com or http://abc.com/ota) - (Optional). -

- -
- -
- {{/equal}} - {{/equal}} + +
+ +
+
+ {{/equal}} + {{#equal code "CHANGE_LOCK_CODE"}} + Type new lock-code below.

- Do you want to perform this operation on selected device(s) ? +
-

-
- Yes - No -
+ {{/equal}} + Do you want to perform this operation on selected device(s) ? +
+

+
+
+
+ Yes + No
+
{{/each}}
\ No newline at end of file diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js index 5015563a9..270f471b9 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.ui.navbar.nav-menu/public/js/nav-menu.js @@ -16,9 +16,9 @@ * under the License. */ -var modalPopup = ".wr-modalpopup", - modalPopupContainer = modalPopup + " .modalpopup-container", - modalPopupContent = modalPopup + " .modalpopup-content"; +var modalPopup = ".modal", + modalPopupContainer = modalPopup + " .modal-content", + modalPopupContent = modalPopup + " .modal-content"; var emmAdminBasePath = "/api/device-mgt/v1.0"; @@ -46,8 +46,8 @@ function setPopupMaxHeight() { * show popup function. */ function showPopup() { - $(modalPopup).show(); - setPopupMaxHeight(); + $(modalPopup).modal('show'); + //setPopupMaxHeight(); } /* @@ -56,7 +56,9 @@ function showPopup() { function hidePopup() { $(modalPopupContent).html(""); $(modalPopupContent).removeClass("operation-data"); - $(modalPopup).hide(); + $(modalPopup).modal('hide'); + $('body').removeClass('modal-open').css('padding-right','0px'); + $('.modal-backdrop').remove(); } /* @@ -72,8 +74,8 @@ function generateQRCode(qrCodeClass) { } function toggleEnrollment() { - $(".modalpopup-content").html($("#qr-code-modal").html()); - generateQRCode(".modalpopup-content .qr-code"); + $(".modal-body").html($("#qr-code-modal").html()); + generateQRCode(".modal-body .qr-code"); showPopup(); }