Merge remote-tracking branch 'upstream/master'

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/edit.hbs

@@ -264,13 +264,13 @@
 {{/zone}}
 {{#zone "bottomJs"}}
     <!--suppress HtmlUnknownTarget -->
-    <script id="hidden-operations-ios" src="{{@unit.publicUri}}/templates/hidden-operations-ios.hbs"
+    <script id="hidden-operations-ios" src="{{@unit.publicUri}}/templates/hidden-operations-ios-edit.hbs"
             type="text/x-handlebars-template"></script>
     <!--suppress HtmlUnknownTarget -->
-    <script id="hidden-operations-android" src="{{@unit.publicUri}}/templates/hidden-operations-android.hbs"
+    <script id="hidden-operations-android" src="{{@unit.publicUri}}/templates/hidden-operations-android-edit.hbs"
             type="text/x-handlebars-template"></script>
     <!--suppress HtmlUnknownTarget -->
-    <script id="hidden-operations-windows" src="{{@unit.publicUri}}/templates/hidden-operations-windows.hbs"
+    <script id="hidden-operations-windows" src="{{@unit.publicUri}}/templates/hidden-operations-windows-edit.hbs"
             type="text/x-handlebars-template"></script>
     {{js "js/edit.js"}}
 {{/zone}}

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/js/edit.js

@@ -2559,6 +2559,22 @@ $(document).ready(function () {
         }
     });
 
+
+    $(advanceOperations).on('hidden.bs.collapse', function () {
+        if($(this).find('input').prop('checked')){
+            $(this).find('input').prop('checked',false);
+        }
+    });
+
+
+    $(advanceOperations).on('shown.bs.collapse', function () {
+        if($(this).find('input').prop('checked') == false){
+            $(this).find('input').prop('checked',true);
+        }
+    });
+
+
+
     // adding support for cloning multiple profiles per feature with cloneable class definitions
     $(advanceOperations).on("click", ".multi-view.add.enabled", function () {
         // get a copy of .cloneable and create new .cloned div element

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/view.hbs

@@ -75,13 +75,13 @@
 {{/zone}}
 {{#zone "bottomJs"}}
     <!--suppress HtmlUnknownTarget -->
-    <script id="hidden-operations-ios" src="{{@unit.publicUri}}/templates/hidden-operations-ios.hbs"
+    <script id="hidden-operations-ios" src="{{@unit.publicUri}}/templates/hidden-operations-ios-view.hbs"
             type="text/x-handlebars-template"></script>
     <!--suppress HtmlUnknownTarget -->
-    <script id="hidden-operations-android" src="{{@unit.publicUri}}/templates/hidden-operations-android.hbs"
+    <script id="hidden-operations-android" src="{{@unit.publicUri}}/templates/hidden-operations-android-view.hbs"
             type="text/x-handlebars-template"></script>
     <!--suppress HtmlUnknownTarget -->
-    <script id="hidden-operations-windows" src="{{@unit.publicUri}}/templates/hidden-operations-windows.hbs"
+    <script id="hidden-operations-windows" src="{{@unit.publicUri}}/templates/hidden-operations-windows-view.hbs"
             type="text/x-handlebars-template"></script>
     {{js "js/view.js"}}
 {{/zone}}

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs

@@ -52,4 +52,15 @@ under the License. --}}
             </div>
         </div>
     </div>
+    <div class="row">
+        <div class="col-md-4 wr-text">
+            <div class="wr-buttons text-center">
+                <br class="c-both" />
+                <br/>
+                For evaluation purposes, you can skip the installer and proceed with enrollment.
+                <br/><br/>
+                <a href="#" class="btn btn-secondary">Skip Agent Installer</a>
+            </div>
+        </div>
+    </div>
 {{/zone}}