From d1acfe1503ff0ba0b1c755109331636200685a7c Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Mon, 5 Sep 2016 14:44:21 +0530 Subject: [PATCH] Modal Changes added --- .../public/js/certificate-listing.js | 6 +- .../cdmf.page.devices/public/js/listing.js | 6 +- .../cdmf.page.groups/public/js/listing.js | 8 +- .../public/js/policy-list.js | 6 +- .../app/pages/cdmf.page.users/users.hbs | 284 +++++++++--------- .../app/units/cdmf.unit.lib.qrcode/qrcode.hbs | 8 +- .../public/js/policy-priority.js | 8 +- .../public/js/bottomJs.js | 6 +- .../public/js/role-listing.js | 8 +- .../user-menu.hbs | 77 ++--- .../public/css/custom-desktop.css | 150 +-------- .../cdmf.unit.ui.theme/public/css/modal.css | 73 ----- 12 files changed, 223 insertions(+), 417 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/js/certificate-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/js/certificate-listing.js index 2004b7914a..a7241b9240 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/js/certificate-listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/public/js/certificate-listing.js @@ -14,7 +14,7 @@ $(function () { var modalPopup = ".modal"; var modalPopupContainer = modalPopup + " .modal-content"; -var modalPopupContent = modalPopup + " .modal-body"; +var modalPopupContent = modalPopup + " .modal-content"; var body = "body"; var isInit = true; @@ -35,7 +35,7 @@ function setPopupMaxHeight() { */ function showPopup() { $(modalPopup).modal('show'); - setPopupMaxHeight(); + //setPopupMaxHeight(); } /* @@ -44,6 +44,8 @@ function showPopup() { function hidePopup() { $(modalPopupContent).html(''); $(modalPopup).modal('hide'); + $('body').removeClass('modal-open').css('padding-right','0px'); + $('.modal-backdrop').remove(); } /** diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js index 6c1a5ccf46..ce8117634a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js @@ -440,7 +440,7 @@ $(document).ready(function () { var modalPopup = ".modal"; var modalPopupContainer = modalPopup + " .modal-content"; -var modalPopupContent = modalPopup + " .modal-body"; +var modalPopupContent = modalPopup + " .modal-content"; var body = "body"; /* @@ -456,7 +456,7 @@ function setPopupMaxHeight() { */ function showPopup() { $(modalPopup).modal('show'); - setPopupMaxHeight(); + //setPopupMaxHeight(); } /* @@ -465,6 +465,8 @@ function showPopup() { function hidePopup() { $(modalPopupContent).html(''); $(modalPopup).modal('hide'); + $('body').removeClass('modal-open').css('padding-right','0px'); + $('.modal-backdrop').remove(); } /** diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js index 6be6689ccf..ba07b661a9 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js @@ -253,7 +253,7 @@ $(document).ready(function () { var modalPopup = ".modal"; var modalPopupContainer = modalPopup + " .modal-content"; -var modalPopupContent = modalPopup + " .modal-body"; +var modalPopupContent = modalPopup + " .modal-content"; var body = "body"; /* @@ -268,8 +268,8 @@ function setPopupMaxHeight() { * show popup function. */ function showPopup() { - $(modalPopup).show(); - setPopupMaxHeight(); + $(modalPopup).modal('show'); + //setPopupMaxHeight(); } /* @@ -278,6 +278,8 @@ function showPopup() { function hidePopup() { $(modalPopupContent).html(''); $(modalPopup).modal('hide'); + $('body').removeClass('modal-open').css('padding-right','0px'); + $('.modal-backdrop').remove(); } /** diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js index a8fcf9d022..891a4ae12d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/public/js/policy-list.js @@ -63,7 +63,7 @@ var sortElements = function () { var modalPopup = ".modal"; var modalPopupContainer = modalPopup + " .modal-content"; -var modalPopupContent = modalPopup + " .modal-body"; +var modalPopupContent = modalPopup + " .modal-content"; var body = "body"; /* @@ -82,7 +82,7 @@ function setPopupMaxHeight() { */ function showPopup() { $(modalPopup).modal('show'); - setPopupMaxHeight(); + //setPopupMaxHeight(); } /* @@ -91,6 +91,8 @@ function showPopup() { function hidePopup() { $(modalPopupContent).html(''); $(modalPopup).modal('hide'); + $('body').removeClass('modal-open').css('padding-right','0px'); + $('.modal-backdrop').remove(); } /* diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs index ae90987ece..a854c840bd 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs @@ -164,23 +164,19 @@
-
-
-
-

- An invitation mail will be sent to the selected user(s) to initiate an enrolment process. - Do you wish to continue ? -

-
- - yes - - - - No - -
-
+
+ +
+
+

+ An invitation mail will be sent to the selected user(s) to initiate an enrolment process. + Do you wish to continue ? +

+
+
+
+ yes + No
@@ -201,165 +197,179 @@
-
-
-
-

An unexpected error occurred. Try again later.

-
- - Ok - -
-
+
+

+ + + + + Unexpected Error +

+ +
+
+

+ An unexpected error occurred. Try again later. +

+
+
+
+ Ok
-
-
-
-

Do you really want to remove this user ?

- -
- - Remove - - - Cancel - -
-
+
+

+ Remove User +

+ +
+
+

+ Do you really want to remove this user ? +

+
+
+
+ Remove + Cancel
-
-
-
-

Done. User was successfully removed.

-
- - Ok - -
-
+
+

+ User Removed. +

+ +
+
+

+ Done. User was successfully removed. +

+
+
+
+ Ok
-
-
-
-

An unexpected error occurred. Please try again later.

- -
- - Ok - -
-
+
+

+ + + + + Unexpected Error +

+ +
+
+

+ An unexpected error occurred. Please try again later. +

+
+
+
+ Ok
-
-
-
-

- +
+

+ - Operation cannot be performed ! -

-

- Please select a user or a list of users to send invitation emails. -

-
- - Ok - -
-
+ Operation cannot be performed ! +

+ +
+
+

+ Please select a user or a list of users to send invitation emails. +

+
+
+
+ Ok
-
-
-
-

- - - - - Unauthorized action! -

-
-
+
+

+ Unauthorized action! +

+
-
-
-
-

- - - - - Reset Password -
-

- -

- Enter new password -

-
- -
-
- Retype new password -

-
- -
-
-

-
- -     Save     - -    - -     Cancel     - -
+ +
+

+ + + + + Reset Password +

+ +
+
+ +

+ Enter new password +

+
+ +
+
+ Retype new password +

+
+
+
+

+
+
+
+ +     Save     + +    + +     Cancel     +
-
-
-
-

Password reset is successful.

-
- -     Ok     - -
-
+
+

+ Password reset is successful. +

+ +
+
+
+ +     Ok     +
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs index 7b52e8cbcc..501248ece8 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.lib.qrcode/qrcode.hbs @@ -20,7 +20,7 @@ diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/public/js/policy-priority.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/public/js/policy-priority.js index 80ebe1c21a..87c93b949c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/public/js/policy-priority.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/public/js/policy-priority.js @@ -32,7 +32,7 @@ if (saveNewPrioritiesButtonEnabled) { var modalPopup = ".modal"; var modalPopupContainer = modalPopup + " .modal-content"; -var modalPopupContent = modalPopup + " .modal-body"; +var modalPopupContent = modalPopup + " .modal-content"; var body = "body"; /* @@ -50,8 +50,8 @@ function setPopupMaxHeight() { * show popup function. */ function showPopup() { - $(modalPopup).show(); - setPopupMaxHeight(); + $(modalPopup).modal('show'); + //setPopupMaxHeight(); } /* @@ -60,6 +60,8 @@ function showPopup() { function hidePopup() { $(modalPopupContent).html(''); $(modalPopup).modal('hide'); + $('body').removeClass('modal-open').css('padding-right','0px'); + $('.modal-backdrop').remove(); } $(document).ready(function () { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/public/js/bottomJs.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/public/js/bottomJs.js index b32d734368..f208c67de2 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/public/js/bottomJs.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.edit.permission/public/js/bottomJs.js @@ -29,7 +29,7 @@ * @return {Null} */ var modalPopup = ".modal"; -var modalPopupContent = modalPopup + " .modal-body"; +var modalPopupContent = modalPopup + " .modal-content"; var apiBasePath = "/api/device-mgt/v1.0"; @@ -39,6 +39,8 @@ var apiBasePath = "/api/device-mgt/v1.0"; function hidePopup() { $(modalPopupContent).html(''); $(modalPopup).modal('hide'); + $('body').removeClass('modal-open').css('padding-right','0px'); + $('.modal-backdrop').remove(); } /* @@ -46,7 +48,7 @@ function hidePopup() { */ function showPopup() { $(modalPopup).modal('show'); - setPopupMaxHeight(); + //setPopupMaxHeight(); } $.fn.tree_view = function(){ var tree = $(this); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.listing/public/js/role-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.listing/public/js/role-listing.js index bfec8b339f..47a6dc90e0 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.listing/public/js/role-listing.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.role.listing/public/js/role-listing.js @@ -145,7 +145,7 @@ function loadRoles(searchQuery) { var modalPopup = ".modal"; var modalPopupContainer = modalPopup + " .modal-content"; -var modalPopupContent = modalPopup + " .modal-body"; +var modalPopupContent = modalPopup + " .modal-content"; var body = "body"; var isInit = true; @@ -162,8 +162,8 @@ function setPopupMaxHeight() { * show popup function. */ function showPopup() { - $(modalPopup).show(); - setPopupMaxHeight(); + $(modalPopup).modal('show'); + //setPopupMaxHeight(); } /* @@ -172,6 +172,8 @@ function showPopup() { function hidePopup() { $(modalPopupContent).html(''); $(modalPopup).modal('hide'); + $('body').removeClass('modal-open').css('padding-right','0px'); + $('.modal-backdrop').remove(); } /** diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs index 21b7c28f3e..c4fd938ae5 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs @@ -25,47 +25,48 @@
-
-
-
-

- - - - - Change Password -

-

- -

- Enter old password * -

-
- -
-
- Enter new password * -

-
- -
-
- Retype new password * -

-
- -
-
-

-
- Update - Cancel -
+
+

+ + + + + Change Password +

+ +
+
+ +

+ Enter old password * +

+
+ +
+
+ Enter new password * +

+
+
+
+ Retype new password * +

+
+ +
+
+

+
+
+
+ Update + Cancel
+
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css index 3ae90e467d..acdff12e39 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css @@ -2642,64 +2642,7 @@ ul.tiles .icon { /* ======================================================================== * modal popup styles * ======================================================================== */ -.modal-open { - padding: 0 !important; -} -.modal { - z-index: 100000001; - padding: 0 !important; -} - -.modal-backdrop { - z-index: 100000000; -} - -.modal-content { - background: #222; - color: #ffffff; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} - -.modal-header { - border-bottom: none; - padding: 15px 15px 0; -} - -.modal-header .close { - color: #ffffff; - text-shadow: none; - opacity: 0.8; -} - -.modal-body { - padding: 0 15px; -} - -.modal-dialog { - margin: 80px auto; -} - -.modal-footer { - border-top: none; -} - -@media only screen and (max-width: 768px) { - .modal { - padding: 0 15px !important; - } -} - -@media only screen and (min-width: 1280px) { - .modal-dialog { - width: 1000px; - } -} /* ======================================================================== * list group styles @@ -4018,72 +3961,6 @@ a.btn-operations { } /* modal pop-up styles */ -.wr-modalpopup { - display: none; -} - -.wr-modalpopup .modalpopup-container { - display: block; - min-height: 100px; - width: 100%; - position: fixed; - background: #11375B; - color: #fff; - z-index: 1000001; - align-content: center; - top: 50%; -} - -.modalpopup-content { - position: relative; - overflow-x: hidden; - overflow-y: auto; - padding: 50px 60px 60px 60px; -} - -.modalpopup-content h3 { - font-weight: 300; -} - -.modalpopup-content h3 .fw-stack { - margin-right: 15px; -} - -.wr-modalpopup .modalpopup-close-btn { - color: #fff; - z-index: 1000002; - cursor: pointer; - position: absolute; - top: 20px; - left: 20px; - padding: 5px 8px; - font-size: 18px; -} - -.wr-modalpopup .modalpopup-close-btn:hover { - -} - -.wr-modalpopup .modalpopup-content .buttons { - margin-top: 30px; -} - -.wr-modalpopup .modalpopup-content .buttons .btn-operations { - background: #fff; - color: #333; - text-transform: uppercase; - font-weight: 500; -} - -.wr-modalpopup .modalpopup-bg { - position: fixed; - z-index: 1000000; - width: 100%; - height: 100%; - background: #000000; - opacity: 0.9; - display: block; -} /* notification panel styles */ .wr-notification-bar, .wr-side-panel { @@ -6750,32 +6627,7 @@ ul.tiles .icon { /* ======================================================================== * modal popup styles * ======================================================================== */ -.modal-open { - padding: 0 !important; -} -.modal { - z-index: 100000001; - padding: 0 !important; -} -.modal-backdrop { - z-index: 0; -} -.modal-content { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.modal-dialog { - margin: 80px auto; -} -@media only screen and (max-width: 768px) { - .modal { - padding: 0 15px !important; - } -} + /* ======================================================================== * asset details styles diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/modal.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/modal.css index 320e313906..77a3bb1502 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/modal.css +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/modal.css @@ -17,77 +17,4 @@ */ /* modal pop-up styles */ -.wr-modalpopup { - display: none; -} -.wr-modalpopup .modalpopup-container { - display: block; - min-height: 100px; - width: 100%; - position: fixed; - background: #11375B; - color: #fff; - z-index: 1000001; - align-content: center; - top: 50%; - left: 0%; -} - -.modalpopup-content { - position: relative; - overflow-x: hidden; - overflow-y: auto; - padding: 50px; -} - -.center-container { - left: 25%; - right: 25%; -} - -.modal-content { - display: block; - /*padding: 2em 1.4em;*/ - min-height: 110px; - background: none; - border: none; - -webkit-box-shadow: none; - box-shadow: none; -} - -.modalpopup-content h3 { - font-weight: 300; - font-size: 15px; -} - -.modalpopup-content h3 .fw-stack { - margin-right: 15px; -} - -.wr-modalpopup .modalpopup-close-btn { - color: #fff; - z-index: 1000002; - cursor: pointer; - position: absolute; - top: 30px; - left: 40px; - padding: 5px 8px; - font-size: 18px; -} - -.wr-modalpopup .modalpopup-close-btn:hover { - -} - -.wr-modalpopup .modalpopup-bg { - position: fixed; - z-index: 1000000; - width: 100%; - height: 100%; - background: #000000; - opacity: 0.8; - display: block; - left: 0; - top: 0; -}