From 9840310f02586c4869f0027c3f96048ea4dc5003 Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Thu, 15 Sep 2016 13:47:24 +0530 Subject: [PATCH 1/2] [EMM-1571] Add policies page wizard styling and layout defects --- .../templates/hidden-operations-android.hbs | 108 ++++----- .../templates/hidden-operations-ios.hbs | 221 +++++++++--------- .../templates/hidden-operations-windows.hbs | 50 ++-- .../public/less/theme-variables.less | 2 +- 4 files changed, 180 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/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs index bc5c26c46e..66ee188cf4 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs @@ -3,10 +3,8 @@ - - Passcode Policy - + Passcode Policy + @@ -24,11 +22,9 @@ Encryption Settings - + - + @@ -74,8 +70,7 @@ Applications Restrictions - + @@ -95,18 +90,17 @@ -
-
- This configuration can be used to set a passcode policy to an Android Device. - Once this configuration profile is installed on a device, corresponding users will not be - able - to modify these settings on their devices. -
+
+ This configuration can be used to set a passcode policy to an Android Device. + Once this configuration profile is installed on a device, corresponding users will not be + able + to modify these settings on their devices. +
- +
@@ -250,17 +244,17 @@ -
-
- This configurations can be used to restrict certain settings on an Android device. - Once this configuration profile is installed on a device, corresponding users will not be - able - to modify these settings on their devices. -
+
+ This configurations can be used to restrict certain settings on an Android device. + Once this configuration profile is installed on a device, corresponding users will not be + able + to modify these settings on their devices. +
+
@@ -689,18 +683,18 @@ -
-
- This configuration can be used to encrypt data on an Android device, when the device is - locked and - make it readable when the passcode is entered. Once this configuration profile is installed - on a device, - corresponding users will not be able to modify these settings on their devices. -
+
+ This configuration can be used to encrypt data on an Android device, when the device is + locked and + make it readable when the passcode is entered. Once this configuration profile is installed + on a device, + corresponding users will not be able to modify these settings on their devices. +
+
@@ -735,17 +729,17 @@ -
-
- This configurations can be used to configure Wi-Fi access on an Android device. - Once this configuration profile is installed on a device, corresponding users will not be - able - to modify these settings on their devices. -
+
+ This configurations can be used to configure Wi-Fi access on an Android device. + Once this configuration profile is installed on a device, corresponding users will not be + able + to modify these settings on their devices. +
+
Please note that * sign represents required fields of data.

@@ -899,14 +893,13 @@ -
-
- This configuration can be used to create a black list or white list of applications. -
+
+ This configuration can be used to create a black list or white list of applications. +
- +
@@ -1006,17 +999,17 @@ -
-
- This configurations can be used to configure VPN settings on an Android device. - Once this configuration profile is installed on a device, corresponding users will not be - able - to modify these settings on their devices. -
+
+ This configurations can be used to configure VPN settings on an Android device. + Once this configuration profile is installed on a device, corresponding users will not be + able + to modify these settings on their devices. +
+
Please note that * sign represents required fields of data.

@@ -1188,16 +1181,15 @@ -
-
- The configurations below can be applied to the devices where the agent is running in Android - Work-Profile. -
+
+ The configurations below can be applied to the devices where the agent is running in Android + Work-Profile. +
- +
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.policy.create/public/templates/hidden-operations-ios.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-ios.hbs index 0c021e2a58..c0fcd1c10b 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-ios.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-ios.hbs @@ -175,18 +175,17 @@ -
-
- This configuration can be used to set a passcode policy to an iOS Device. - Once this configuration profile is installed on a device, corresponding users - will not be able - to modify these settings on their devices. -
+
+ This configuration can be used to set a passcode policy to an iOS Device. + Once this configuration profile is installed on a device, corresponding users + will not be able + to modify these settings on their devices. +
- +
+
Please note that * sign represents required fields of data.

@@ -1200,18 +1199,18 @@ -
-
- This configuration can be used to configure add-on VPN software (per-app VPN), - and it works only on VPN services of - type 'VPN'. Once this configuration profile is installed on a device, - corresponding users will not be able - to modify these settings on their devices. -
+
+ This configuration can be used to configure add-on VPN software (per-app VPN), + and it works only on VPN services of + type 'VPN'. Once this configuration profile is installed on a device, + corresponding users will not be able + to modify these settings on their devices. +
+
Please note that * sign represents required fields of data.

@@ -1319,16 +1318,16 @@ -
-
- This configuration can be used to configure app-to-per-app VPN mappings. - Once this configuration profile is installed on a device, corresponding users will not be able - to modify these settings on their devices. -
+
+ This configuration can be used to configure app-to-per-app VPN mappings. + Once this configuration profile is installed on a device, corresponding users will not be able + to modify these settings on their devices. +
+
Please note that * sign represents required fields of data.

@@ -1418,18 +1417,18 @@ -
-
- These configurations can be used to set how devices connect to your wireless network(s), - including the necessary authentication - information. Once this configuration profile is installed on an iOS device, - corresponding users will not be able - to modify these settings on their devices. -
+
+ These configurations can be used to set how devices connect to your wireless network(s), + including the necessary authentication + information. Once this configuration profile is installed on an iOS device, + corresponding users will not be able + to modify these settings on their devices. +
+
@@ -2281,18 +2280,17 @@ -
-
- These configurations can be used to define settings for connecting - to your POP or IMAP email accounts. - Once this configuration profile is installed on an iOS device, - corresponding users will not be able to modify these settings on their devices. -
+
+ These configurations can be used to define settings for connecting + to your POP or IMAP email accounts. + Once this configuration profile is installed on an iOS device, + corresponding users will not be able to modify these settings on their devices. +
- +
@@ -2648,19 +2646,18 @@ -
-
- This configuration can be used to define settings for connecting to AirPlay - destinations. - Once this configuration profile is installed on an iOS device, - corresponding users will not be able to modify these settings on their devices. -

(This feature is supported only on iOS 7.0 and later.) -
+
+ This configuration can be used to define settings for connecting to AirPlay + destinations. + Once this configuration profile is installed on an iOS device, + corresponding users will not be able to modify these settings on their devices. +

(This feature is supported only on iOS 7.0 and later.) +
- +
@@ -2828,15 +2825,14 @@ -
-
- This payload defines web domains that are under an enterprise’s management. -
+
+ This payload defines web domains that are under an enterprise’s management. +
- +
@@ -2990,18 +2986,17 @@ -
-
- This configuration can be used to define settings for connecting to LDAP - servers. - Once this configuration profile is installed on an iOS device, - corresponding users will not be able to modify these settings on their devices. -
+
+ This configuration can be used to define settings for connecting to LDAP + servers. + Once this configuration profile is installed on an iOS device, + corresponding users will not be able to modify these settings on their devices. +
- +
@@ -3176,18 +3171,17 @@ -
-
- This configuration can be used to define settings for connecting to CalDAV - servers. - Once this configuration profile is installed on an iOS device, - corresponding users will not be able to modify these settings on their devices. -
+
+ This configuration can be used to define settings for connecting to CalDAV + servers. + Once this configuration profile is installed on an iOS device, + corresponding users will not be able to modify these settings on their devices. +
- +
@@ -3301,17 +3295,16 @@ -
-
- This configuration can be used to define settings for calendar subscriptions. - Once this configuration profile is installed on an iOS device, - corresponding users will not be able to modify these settings on their devices. -
+
+ This configuration can be used to define settings for calendar subscriptions. + Once this configuration profile is installed on an iOS device, + corresponding users will not be able to modify these settings on their devices. +
- +
- +
@@ -3527,21 +3519,20 @@ -
-
- These configurations can be used to specify Cellular Network Settings on an iOS - device. - Cellular settings cannot be installed if an APN setting is already installed and - upon successful installation, corresponding users will not be able to modify - these - settings on their devices. -

(This feature is supported only on iOS 7.0 and later.) -
+
+ These configurations can be used to specify Cellular Network Settings on an iOS + device. + Cellular settings cannot be installed if an APN setting is already installed and + upon successful installation, corresponding users will not be able to modify + these + settings on their devices. +

(This feature is supported only on iOS 7.0 and later.) +
- +
@@ -3713,18 +3704,17 @@ -
-
- These configurations can be used to restrict apps, device features and - media content available on an iOS device. Once this configuration profile is installed - on a device, corresponding users will not be able to modify these settings on their - devices. -
+
+ These configurations can be used to restrict apps, device features and + media content available on an iOS device. Once this configuration profile is installed + on a device, corresponding users will not be able to modify these settings on their + devices. +
- +
@@ -4768,16 +4758,15 @@ -
-
- This configuration can be used to create a black list or white list of - applications. -
+
+ This configuration can be used to create a black list or white list of + applications. +
- +
- +
@@ -221,15 +220,15 @@ -
-
- This configuration can be used to restrict the usage of camera on an Windows device together with all the applications using the camera. - Once this configuration profile is installed on a device, corresponding users will not be able - to modify these settings on their devices. -
+
+ This configuration can be used to restrict the usage of camera on an Windows device together with all the applications using the camera. + Once this configuration profile is installed on a device, corresponding users will not be able + to modify these settings on their devices. +
+
@@ -262,15 +261,15 @@ -
-
- This configuration can be used to encrypt data on an Windows device, when the device is locked and - make it readable when the passcode is entered. Once this configuration profile is installed on a device, - corresponding users will not be able to modify these settings on their devices. -
+
+ This configuration can be used to encrypt data on an Windows device, when the device is locked and + make it readable when the passcode is entered. Once this configuration profile is installed on a device, + corresponding users will not be able to modify these settings on their devices. +
+
@@ -302,14 +301,13 @@ -
-
- This configuration can be used to create a black list or white list of applications. -
+
+ This configuration can be used to create a black list or white list of applications. +
- +
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/units/mdm.unit.ui.theme/public/less/theme-variables.less b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/units/mdm.unit.ui.theme/public/less/theme-variables.less index 5dcd3c3ce4..8095451680 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/units/mdm.unit.ui.theme/public/less/theme-variables.less +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/units/mdm.unit.ui.theme/public/less/theme-variables.less @@ -6,7 +6,7 @@ @base-dark-color: #11375B; @base-light-color: #ffffff; @base-success-color: #5cb85c; -@base-info-color: #009DA7; +@base-info-color: #526A84; @base-warning-color: #f0ad4e; @base-danger-color: #d9534f; From d33fbc99b1550a0f25dc643b43c041d9cf6c2720 Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Thu, 15 Sep 2016 15:07:14 +0530 Subject: [PATCH 2/2] [EMM-1571] Add policies page wizard styling and layout defects - edit pages --- .../templates/hidden-operations-android.hbs | 1927 ++--- .../templates/hidden-operations-ios.hbs | 6590 ++++++++--------- .../templates/hidden-operations-windows.hbs | 46 +- 3 files changed, 4308 insertions(+), 4255 deletions(-) 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.policy.edit/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs index 4736d8ec3d..987a24deb2 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-android.hbs @@ -1,1225 +1,1290 @@
-
- +
+ - Passcode Policy - - - - - + Passcode Policy + + + + + - Restrictions - - - - - + Restrictions + + + + + - Encryption Settings - - - - - + Encryption Settings + + + + + - Wi-Fi Settings - - - - - + Wi-Fi Settings + + + + + - Virtual Private Network - - - - - + Virtual Private Network + + + + + - Work-Profile Configurations - - - - - - + Work-Profile Configurations + + + + + - Applications Restrictions - - - - - - - - - - - - - - - - - - - - - - -
+ Applications Restrictions + + + + + + + + + + + + + + + + + + + + + + +
-
- -
-
- -
+
+
+ - - -
- +
-
- +
-
- + +
-
- + +
-
- + +
-
- + +
-
-
-
-
- + - -
-
- -
- -
-
-
-
\ 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.policy.edit/public/templates/hidden-operations-ios.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-ios.hbs index 612b913d64..25bc972fa1 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-ios.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/templates/hidden-operations-ios.hbs @@ -1,504 +1,503 @@
-
- +
+ - Passcode Policy + Passcode Policy - - + + - Restrictions + Restrictions - - + + - Wi-Fi Settings + Wi-Fi Settings - + - - + + - Email Settings + Email Settings - + - - + + - AirPlay Settings + AirPlay Settings - + - - + + - Manage Domains + Manage Domains - + - - + + - LDAP Settings + LDAP Settings - + - - + + - Calendar + Calendar - - + + - Calendar Subscription + Calendar Subscription - - + + - Access Point Names - - - - - + Access Point Names + + + + + - Cellular Network Settings + Cellular Network Settings - - + + - Virtual Private Network - - - - - + Virtual Private Network + + + + + - Per Application VPN + Per Application VPN - - + + - Applications Restrictions + Applications Restrictions - -
- -
- -
-
- -
- - -
-