From 486e02fd71e8d22a710fcaf0eca74767ff663fdd Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Thu, 16 Feb 2017 06:11:42 +0530
Subject: [PATCH] adding ui changes to the cloud related uis

---
 .../app/pages/cdmf.page.devices/devices.hbs   | 30 ++++++++++---------
 .../cdmf.page.group.analytics/analytics.hbs   |  2 +-
 .../pages/cdmf.page.group.create/create.hbs   | 17 ++++++++---
 .../pages/cdmf.page.group.create/create.js    |  1 +
 .../public/js/group-add.js                    |  2 +-
 .../app/pages/cdmf.page.groups/groups.hbs     |  2 +-
 .../app/pages/cdmf.page.policies/policies.hbs |  2 +-
 7 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
index 96275a8933..354c6f2bb7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
@@ -91,7 +91,8 @@
                 <div id="device_overview">
                     <div class="media-left col-lg-2">
                         <div class="icon">
-                            <img src="/devicemgt/public/cdmf.page.groups/images/group-icon.png" style="background-color: #11375b; height: 152px;">
+                            <img src="/devicemgt/public/cdmf.page.groups/images/group-icon.png"
+                                 style="background-color: #11375b; height: 152px;">
                         </div>
                     </div>
                     <div class="media-body asset-desc add-padding-left-5x">
@@ -214,11 +215,11 @@
                             </thead>
                             <tbody id="ast-container">
 
-                            <br class="c-both" />
+                            <br class="c-both"/>
                             </tbody>
                         </table>
                     </div>
-                    <br class="c-both" />
+                    <br class="c-both"/>
                     <div id="content-filter-types" style="display: none">
                         <div class="sort-title">Sort By</div>
                         <div class="sort-options">
@@ -236,13 +237,13 @@
                                 <i class="fw fw-devices fw-3x"></i>
                             </h3>
                             <h3 class="text-muted">
-                                You don't have any device
+                                You don't have any
                                 {{#if group}}
-                                    assigned to this group
+                                    devices assigned to this group. Let's add a device!
                                 {{else}}
-                                    enrolled
+                                    enrolled devices. Let's enroll a device!
                                 {{/if}}
-                                at the moment.
+
                             </h3>
                             <h3>
                                 {{#if group}}
@@ -256,7 +257,7 @@
                                     </a>
                                 {{else}}
                                     {{#if permissions.enroll}}
-                                    <!--suppress HtmlUnknownTarget -->
+                                        <!--suppress HtmlUnknownTarget -->
                                         <a href="{{@app.context}}/device/enroll" class="btn-operations btn-default">
                                             <span class="fw-stack">
                                                 <i class="fw fw-circle-outline fw-stack-2x"></i>
@@ -427,7 +428,7 @@
                                     <div class="row">
                                         <div class="col-lg-5 col-md-6 col-centered">
                                             <h3>Exception at backend. Try Later.</h3>
-                                            <br />
+                                            <br/>
                                             <div class="buttons">
                                                 <a href="#" id="device-400-link" class="btn-operations">
                                                     Ok
@@ -443,7 +444,7 @@
                                     <div class="row">
                                         <div class="col-lg-5 col-md-6 col-centered">
                                             <h3>Operation not permitted.</h3>
-                                            <br />
+                                            <br/>
                                             <div class="buttons">
                                                 <a href="#" id="device-403-link" class="btn-operations">
                                                     Ok
@@ -458,9 +459,10 @@
                                 <div class="modal-content">
                                     <div class="row">
                                         <div class="col-lg-5 col-md-6 col-centered">
-                                            <h3>You don't have any groups to add this device. Please add group
-                                                first.</h3>
-                                            <br />
+                                            <h3>
+                                                You don't have any device group to add this device. Let's add a new
+                                                device group!</h3>
+                                            <br/>
                                             <div class="buttons">
                                                 <a href="{{@app.context}}/group/add" class="btn-operations">
                                                     Add New Group
@@ -480,7 +482,7 @@
                                     <div class="row">
                                         <div class="col-lg-5 col-md-6 col-centered">
                                             <h3>Device does not exist.</h3>
-                                            <br />
+                                            <br/>
                                             <div class="buttons">
                                                 <a href="#" id="remove-device-409-link" class="btn-operations">
                                                     Ok
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.hbs
index a54926eb39..8b81fdd212 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.analytics/analytics.hbs
@@ -65,7 +65,7 @@
             {{else}}
                 <div id="ast-container" class="ast-container list-view">
                     <div class="ctrl-info-panel col-centered text-center wr-login">
-                        <h2>You don't have any device assigned to this group to view analytics.</h2>
+                        <h2>You don't have any device assigned to this group to view analytics. Let's add a new device group!</h2>
                         <br/>
                         <p class="text-center">
                             <a href="{{@app.context}}/devices" class="wr-btn">
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
index 9d9edd0c53..85cc52f6b6 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.hbs
@@ -25,10 +25,17 @@
 
             <p class="page-sub-title">Add New Group</p>
 
-            <p>Create new device group on IoT Server</p>
+            <p>Create new device group on
+                {{#if isCloud}}
+                    Device Cloud
+                {{else}}
+                    IoT Server
+                {{/if}}
+                .
+            </p>
 
             <!-- validation -->
-        <span class="wr-validation-summary hidden center-block col-centered">
+            <span class="wr-validation-summary hidden center-block col-centered">
 		    <strong class="label label-danger col-centered"></strong>
 		</span>
 
@@ -51,9 +58,11 @@
 
                 <div class="wr-input-control">
                     <button class="wr-btn" id="add-group-btn">
-                        Add</button>
+                        Add
+                    </button>
                     <button class="wr-btn" onclick="window.location = '{{@app.context}}/groups';return false;">
-                        Cancel</button>
+                        Cancel
+                    </button>
                 </div>
             </div>
         </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.js
index 350d245d1f..b268e560fd 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/create.js
@@ -25,6 +25,7 @@
 function onRequest(context) {
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
     var page = {};
+    page["isCloud"] = devicemgtProps.isCloud;
     page["groupNameJSRegEx"] = devicemgtProps.groupValidationConfig.groupNameJSRegEx;
     page["groupNameRegExViolationErrorMsg"] = devicemgtProps.groupValidationConfig.groupNameRegExViolationErrorMsg;
     page["groupNameHelpMsg"] = devicemgtProps.groupValidationConfig.groupNameHelpMsg;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
index a4fcc5ab25..1ba4c545dc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
@@ -45,7 +45,7 @@ $(function () {
 
             var successCallback = function (jqXHR, status, resp) {
                 if (resp.status == 201) {
-                    $('.wr-validation-summary strong').text("Group created. You will be redirected to groups");
+                    $('.wr-validation-summary strong').text("Successfully created the group! You will be redirected to the group management page.");
                     $('.wr-validation-summary').removeClass("hidden");
                     $('.wr-validation-summary strong').removeClass("label-danger");
                     $('.wr-validation-summary strong').addClass("label-success");
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
index 282e6024fa..71aa91766a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
@@ -82,7 +82,7 @@
                             <h3 class="text-muted">
                                 <i class="fw fw-group fw-3x"></i>
                             </h3>
-                            <h3 class="text-muted">You don't have any group registered at the moment</h3>
+                            <h3 class="text-muted">You don't have any device group. Let's add a new device group!</h3>
                             {{#if permissions.ADD_GROUP}}
                                 <h3>
                                     <!--suppress HtmlUnknownTarget -->
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs
index ad28493c61..1819831912 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs
@@ -91,7 +91,7 @@
                 <h3 class="text-muted">
                     <i class="fw fw-policy fw-3x"></i>
                 </h3>
-                <h3 class="text-muted">You do not have any device policy at the moment</h3>
+                <h3 class="text-muted">You don't have any device policies. Let's add a new policy!</h3>
                 {{#if permissions.ADD_ADMIN_POLICY}}
                     <h3>
                         <!--suppress HtmlUnknownTarget -->