prathabanKavin
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #329 from DimalChandrasiri/master

Browse Source 
Modal Changes
revert-dabc3590
Rasika Perera 8 years ago committed by GitHub
parent 751deed3e2 33b4f90e00
commit 252f2a06b6
4 changed files with 291 additions and 276 deletions
Show Stats Download Patch File Download Diff File

352
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs
Unescape View File

@ -261,97 +261,102 @@
</div> </div>
<div id="remove-policy-modal-content" class="hide"> <div id="remove-policy-modal-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> Do you really want to remove the selected policy(s)?
<h3>Do you really want to remove the selected policy(s)?</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
<div class="buttons">
<a href="#" id="remove-policy-yes-link" class="btn-operations">
Remove
</a>
<a href="#" id="remove-policy-cancel-link" class="btn-operations">
Cancel
</a>
</div> </div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div> </div>
<div class="modal-footer">
<div class="buttons">
<a href="#" id="remove-policy-yes-link" class="btn-operations">Remove</a>
<a href="#" id="remove-policy-cancel-link" class="btn-operations">Cancel</a>
</div> </div>
</div> </div>
</div> </div>
<div id="remove-policy-success-content" class="hide"> <div id="remove-policy-success-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> Done. Selected policy was successfully removed.
<h3>Done. Selected policy was successfully removed.</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
<div class="buttons">
<a href="#" id="remove-policy-success-link" class="btn-operations">
Ok
</a>
</div> </div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div> </div>
<div class="modal-footer">
<div class="buttons">
<a href="#" id="remove-policy-success-link" class="btn-operations">Ok</a>
</div> </div>
</div> </div>
</div> </div>
<div id="remove-policy-error-content" class="hide"> <div id="remove-policy-error-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> An unexpected error occurred. Please try again later
<h3>An unexpected error occurred. Please try again later.</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
<div class="buttons">
<a href="#" id="remove-policy-error-link" class="btn-operations">
Ok
</a>
</div> </div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div> </div>
<div class="modal-footer">
<div class="buttons">
<a href="#" id="remove-policy-error-link" class="btn-operations">Ok</a>
</div> </div>
</div> </div>
</div> </div>
<div id="remove-active-policy-error-content" class="hide"> <div id="remove-active-policy-error-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> Please Try again.
<h3>
You cannot remove policies that have been already applied to devices.
Please deselect active policies from your selection and try again.
</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
<div class="buttons">
<a href="#" id="remove-active-policy-error-link" class="btn-operations">
Ok
</a>
</div> </div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
<h4>You cannot remove policies that have been already applied to devices.
Please deselect active policies from your selection and try again.</h4>
</div> </div>
<div class="modal-footer">
<div class="buttons">
<a href="#" id="remove-active-policy-error-link" class="btn-operations">Ok</a>
</div> </div>
</div> </div>
</div> </div>
<div id="publish-policy-modal-content" class="hide"> <div id="publish-policy-modal-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> Do you really want to publish the selected policy(s)?
<h3>Do you really want to publish the selected policy(s)?</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
</div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="publish-policy-yes-link" class="btn-operations">Yes</a> <a href="#" id="publish-policy-yes-link" class="btn-operations">Yes</a>
<a href="#" id="publish-policy-cancel-link" class="btn-operations">No</a> <a href="#" id="publish-policy-cancel-link" class="btn-operations">No</a>
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="publish-policy-success-content" class="hide"> <div id="publish-policy-success-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> Done. Selected policy was successfully published.
<h3>Done. Selected policy was successfully published.</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
</div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="publish-policy-success-link" class="btn-operations"> <a href="#" id="publish-policy-success-link" class="btn-operations">
Ok Ok
@ -359,15 +364,17 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="publish-policy-error-content" class="hide"> <div id="publish-policy-error-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> An unexpected error occurred. Please try again later.
<h3>An unexpected error occurred. Please try again later.</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
</div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="publish-policy-error-link" class="btn-operations"> <a href="#" id="publish-policy-error-link" class="btn-operations">
Ok Ok
@ -375,15 +382,17 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="unpublish-policy-modal-content" class="hide"> <div id="unpublish-policy-modal-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> Do you really want to unpublish the selected policy(s)?
<h3>Do you really want to unpublish the selected policy(s)?</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
</div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="unpublish-policy-yes-link" class="btn-operations"> <a href="#" id="unpublish-policy-yes-link" class="btn-operations">
Yes Yes
@ -395,15 +404,17 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="unpublish-policy-success-content" class="hide"> <div id="unpublish-policy-success-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> Done. Selected policy was successfully unpublished.
<h3>Done. Selected policy was successfully unpublished.</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
</div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="unpublish-policy-success-link" class="btn-operations"> <a href="#" id="unpublish-policy-success-link" class="btn-operations">
Ok Ok
@ -411,15 +422,17 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="unpublish-policy-error-content" class="hide"> <div id="unpublish-policy-error-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> An unexpected error occurred. Please try again later.
<h3>An unexpected error occurred. Please try again later.</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
</div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="unpublish-policy-error-link" class="btn-operations"> <a href="#" id="unpublish-policy-error-link" class="btn-operations">
Ok Ok
@ -427,15 +440,17 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="save-policy-priorities-success-content" class="hide"> <div id="save-policy-priorities-success-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> Done. New Policy priorities were successfully updated.
<h3>Done. New Policy priorities were successfully updated.</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
</div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="save-policy-priorities-success-link" class="btn-operations"> <a href="#" id="save-policy-priorities-success-link" class="btn-operations">
Ok Ok
@ -443,16 +458,17 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="save-policy-priorities-error-content" class="hide"> <div id="save-policy-priorities-error-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> An unexpected error occurred. Please try again later.
<h3>An unexpected error occurred. Please try again later.</h3> </h3>
<h4 class="message-from-server"></h4> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
</div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="save-policy-priorities-error-link" class="btn-operations"> <a href="#" id="save-policy-priorities-error-link" class="btn-operations">
Ok Ok
@ -460,15 +476,17 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="change-policy-modal-content" class="hide"> <div id="change-policy-modal-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> Do you really want to apply changes to all policies?
<h3>Do you really want to apply changes to all policies?</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
</div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="change-policy-yes-link" class="btn-operations"> <a href="#" id="change-policy-yes-link" class="btn-operations">
Yes Yes
@ -480,15 +498,17 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="change-policy-success-content" class="hide"> <div id="change-policy-success-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> Done. Changes applied successfully.
<h3>Done. Changes applied successfully.</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
</div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="change-policy-success-link" class="btn-operations"> <a href="#" id="change-policy-success-link" class="btn-operations">
Ok Ok
@ -496,15 +516,17 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="change-policy-error-content" class="hide"> <div id="change-policy-error-content" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> An unexpected error occurred. Please try again later.
<h3>An unexpected error occurred. Please try again later.</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
</div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="#" id="change-policy-error-link" class="btn-operations"> <a href="#" id="change-policy-error-link" class="btn-operations">
Ok Ok
@ -512,24 +534,22 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="errorPolicyUnPublish" class="hide"> <div id="errorPolicyUnPublish" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered">
<h3>
<span class="fw-stack"> <span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-error fw-stack-1x"></i> <i class="fw fw-error fw-stack-1x"></i>
</span> </span>
Action cannot be performed ! Action cannot be performed !
</h3> </h3>
<h4> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
Please select a policy or a list of policies to un-publish. </div>
</h4> <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
<h4>Please select a policy or a list of policies to un-publish.</h4>
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="javascript:hidePopup()" class="btn-operations"> <a href="javascript:hidePopup()" class="btn-operations">
Ok Ok
@ -537,24 +557,22 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="errorPolicyUnPublishSelection" class="hide"> <div id="errorPolicyUnPublishSelection" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered">
<h3>
<span class="fw-stack"> <span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-error fw-stack-1x"></i> <i class="fw fw-error fw-stack-1x"></i>
</span> </span>
Action cannot be performed ! Action cannot be performed !
</h3> </h3>
<h4> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
You cannot select already inactive policies to be unpublished. </div>
Please deselect inactive policies and try again. <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
</h4> <h4>You cannot select already inactive policies to be unpublished.
Please deselect inactive policies and try again.</h4>
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="javascript:hidePopup()" class="btn-operations"> <a href="javascript:hidePopup()" class="btn-operations">
Ok Ok
@ -562,23 +580,21 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="active-policy-selection-error" class="hide"> <div id="active-policy-selection-error" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered">
<h3>
<span class="fw-stack"> <span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-error fw-stack-1x"></i> <i class="fw fw-error fw-stack-1x"></i>
</span> </span>
Action cannot be performed ! Action cannot be performed !
</h3> </h3>
<h4> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
You cannot select already active policies. Please deselect active policies and try again. </div>
</h4> <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
<h4>You cannot select already active policies. Please deselect active policies and try again.</h4>
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="javascript:hidePopup()" class="btn-operations"> <a href="javascript:hidePopup()" class="btn-operations">
Ok Ok
@ -586,23 +602,21 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="policy-publish-error" class="hide"> <div id="policy-publish-error" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered">
<h3>
<span class="fw-stack"> <span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-error fw-stack-1x"></i> <i class="fw fw-error fw-stack-1x"></i>
</span> </span>
Action cannot be performed ! Action cannot be performed !
</h3> </h3>
<h4> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
Please select a policy or a list of policies to publish. </div>
</h4> <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
<h4>Please select a policy or a list of policies to publish.</h4>
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="javascript:hidePopup()" class="btn-operations"> <a href="javascript:hidePopup()" class="btn-operations">
Ok Ok
@ -610,23 +624,21 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div id="policy-remove-error" class="hide"> <div id="policy-remove-error" class="hide">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered">
<h3>
<span class="fw-stack"> <span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-error fw-stack-1x"></i> <i class="fw fw-error fw-stack-1x"></i>
</span> </span>
Action cannot be performed ! Action cannot be performed !
</h3> </h3>
<h4> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
Please select a policy or a list of policies to remove. </div>
</h4> <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
<h4>Please select a policy or a list of policies to remove.</h4>
</div>
<div class="modal-footer">
<div class="buttons"> <div class="buttons">
<a href="javascript:hidePopup()" class="btn-operations"> <a href="javascript:hidePopup()" class="btn-operations">
Ok Ok
@ -634,8 +646,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
{{/zone}} {{/zone}}
{{#zone "bottomJs"}} {{#zone "bottomJs"}}

1
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
Unescape View File

@ -82,7 +82,6 @@ function setPopupMaxHeight() {
*/ */
function showPopup() { function showPopup() {
$(modalPopup).modal('show'); $(modalPopup).modal('show');
//setPopupMaxHeight();
} }
/* /*

15
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.qr-modal/qr-modal.hbs
Unescape View File

@ -17,10 +17,14 @@
}} }}
{{#zone "content"}} {{#zone "content"}}
<div id="qr-code-modal" data-enrollment-url="{{enrollmentURL}}" class="hidden"> <div id="qr-code-modal" data-enrollment-url="{{enrollmentURL}}" class="hidden">
<div class="content"> <div class="modal-header">
<div class="row"> <h3 class="pull-left modal-title">
<div class="col-lg-5 col-md-6 col-centered"> Scan QR code to start enrollment
<h3>Scan QR code to start enrollment</h3> </h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
</div>
<div class="modal-body add-margin-top-2x add-margin-bottom-2x">
<div>
<h4> <h4>
Please scan the QR code using your mobile device to retrieve enrollment URL. Please scan the QR code using your mobile device to retrieve enrollment URL.
</h4> </h4>
@ -31,6 +35,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer">
<div class="buttons">
</div>
</div> </div>
</div> </div>
{{/zone}} {{/zone}}

5
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
Unescape View File

@ -47,7 +47,6 @@ function setPopupMaxHeight() {
*/ */
function showPopup() { function showPopup() {
$(modalPopup).modal('show'); $(modalPopup).modal('show');
//setPopupMaxHeight();
} }
/* /*
@ -74,8 +73,8 @@ function generateQRCode(qrCodeClass) {
} }
function toggleEnrollment() { function toggleEnrollment() {
$(".modal-body").html($("#qr-code-modal").html()); $(".modal-content").html($("#qr-code-modal").html());
generateQRCode(".modal-body .qr-code"); generateQRCode(".modal-content .qr-code");
showPopup(); showPopup();
} }

Write Preview
Loading…
Cancel
Save