From 8bd20911fe8db6cfccdb5b2f09e2da3f57d3f304 Mon Sep 17 00:00:00 2001
From: dilanua <dilan.u.ariyaratne@gmail.com>
Date: Fri, 23 Sep 2016 12:28:15 +0530
Subject: [PATCH] Refactoring application list view for improper text placement
 issues

---
 .../public/templates/applications-list.hbs    | 30 ++++++++++---------
 .../app/units/mdm.unit.device.view/view.hbs   | 21 ++++++-------
 2 files changed, 27 insertions(+), 24 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.device.view/public/templates/applications-list.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/templates/applications-list.hbs
index 3b55136af..9831cff18 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/templates/applications-list.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/templates/applications-list.hbs
@@ -1,29 +1,31 @@
 <div class="wr-app-listing">
     <div class="wr-applist">
         {{#each applications}}
-            <a style="text-align: center; width: 110px; height: 140px;">
-                {{#equal platform "android"}}<i class="icon fw fw-android"></i>{{/equal}}
-                {{#equal platform "ios"}}<i class="icon fw fw-apple"></i>{{/equal}}
-                {{#equal platform "windows"}}<i class="icon fw fw-windows"></i>{{/equal}}
+            <a style="width: 130px; height: 180px;" class="text-center">
                 {{#equal isActive true}}
-                    <span style="word-wrap: break-word;">
-                            <i class="fw fw-ok icon-success" style="font-size: 14px;"></i>
-                            &nbsp;Active
-                        </span>
+                    {{#equal platform "android"}}<i class="icon fw fw-android"></i>{{/equal}}
+                    {{#equal platform "ios"}}<i class="icon fw fw-apple"></i>{{/equal}}
+                    {{#equal platform "windows"}}<i class="icon fw fw-windows"></i>{{/equal}}
                     <span style="word-wrap: break-word;"><b>{{name}}</b></span>
                     <span style="word-wrap: break-word;"><b>V:{{version}}</b></span>
+                    <span style="word-wrap: break-word;" class="text-center">
+                        <i class="fw fw-ok icon-success" style="font-size: 14px;"></i>Active
+                    </span>
                     {{#if memoryUsage}}
                         <span style="word-wrap: break-word;">
-                                Memory Usage
-                            </span>
+                            Memory Usage
+                        </span>
                         <span style="word-wrap: break-word;">
-                                ( {{memoryUsage}} Bytes )
-                            </span>
+                            ( {{memoryUsage}} Bytes )
+                        </span>
                     {{/if}}
                 {{/equal}}
                 {{#equal isActive false}}
-                    <span style="word-wrap: break-word;">{{name}}</span>
-                    <span style="word-wrap: break-word;"><b>V:{{version}}</b></span>
+                    {{#equal platform "android"}}<i class="icon fw fw-android text-muted"></i>{{/equal}}
+                    {{#equal platform "ios"}}<i class="icon fw fw-apple text-muted"></i>{{/equal}}
+                    {{#equal platform "windows"}}<i class="icon fw fw-windows text-muted"></i>{{/equal}}
+                    <span style="word-wrap: break-word;" class="text-muted">{{name}}</span>
+                    <span style="word-wrap: break-word;" class="text-muted"><b>V:{{version}}</b></span>
                 {{/equal}}
             </a>
         {{/each}}
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.device.view/view.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
index 6cd497fc8..51a52044f 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.hbs
@@ -328,19 +328,20 @@
                     </div>
                     <div class="panel-heading display-none-xs">
                         Installed Applications
-                                        <span>
-                                            <a href="javascript:void(0);" id="refresh-apps">
-                                                <i class="fw fw-refresh"></i>
-                                            </a>
-                                        </span>
+                        &nbsp;&nbsp;
+                        <span>
+                            <a href="javascript:void(0);" id="refresh-apps">
+                                <i class="fw fw-refresh"></i>
+                            </a>
+                        </span>
                     </div>
                     <div id="collapseFour" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="installed_applications">
                         <div class="panel-body ">
-                                            <span class="visible-xs add-padding-2x text-right">
-                                                <a href="javascript:void(0);" id="refresh-apps">
-                                                    <i class="fw fw-refresh"></i>
-                                                </a>
-                                            </span>
+                            <span class="visible-xs add-padding-2x text-right">
+                                <a href="javascript:void(0);" id="refresh-apps">
+                                    <i class="fw fw-refresh"></i>
+                                </a>
+                            </span>
                             <div id="apps-spinner" class="wr-advance-operations-init hidden">
                                 <i class="fw fw-settings fw-spin fw-2x"></i> Loading Applications List...
                             </div>