From ad5b871a306fd31a66ad1481f96df744753ab16f Mon Sep 17 00:00:00 2001
From: kamidu <sachithp@wso2.com>
Date: Fri, 12 Aug 2016 17:40:42 +0530
Subject: [PATCH] Fix the device view zone conflict

---
 .../app/units/mdm.unit.device.view/view.hbs   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 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/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 1eb7f0e3c..59c6de171 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
@@ -1,19 +1,20 @@
-{{#zone "content"}}
-    {{#defineZone "device-detail-top"}}
-        <div class="row wr-device-board">
-            <div class="col-lg-12 wr-secondary-bar">
-                <label class="device-id device-select" data-deviceid="{{device.deviceIdentifier}}"
-                       data-type="{{device.type}}">
-                    Device {{device.name}}
-                    {{#if device.viewModel.model}}
-                        <span class="lbl-device">
+{{#zone "contentTitle"}}
+    <div class="row wr-device-board">
+        <div class="col-lg-12 wr-secondary-bar">
+            <label class="device-id device-select" data-deviceid="{{device.deviceIdentifier}}"
+                   data-type="{{device.type}}">
+                Device {{device.name}}
+                {{#if device.viewModel.model}}
+                    <span class="lbl-device">
                         ( {{device.viewModel.vendor}} {{device.viewModel.model}} )
                     </span>
-                    {{/if}}
-                </label>
-            </div>
+                {{/if}}
+            </label>
         </div>
-    {{/defineZone}}
+    </div>
+{{/zone}}
+
+{{#zone "content"}}
     <div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;">
         <div class="media">
             <div class="media-left media-middle asset-image col-xs-2 col-sm-2 col-md-2 col-lg-2">