thingsboard-aplcache

UI: IE11 layout fixes.

12/8/2017 7:44:19 AM

Igor Kulikov

Commit: 25bdf8a

Tree: 24d39cb

Parents: b951314

Changes

ui/src/app/asset/asset-card.tpl.html 2(+1 -1)

ui/src/app/asset/assign-to-customer.controller.js 4(+2 -2)

ui/src/app/device/assign-to-customer.controller.js 4(+2 -2)

ui/src/app/device/device-card.tpl.html 2(+1 -1)

ui/src/index.html 2(+1 -1)

Details

ui/src/app/asset/asset-card.tpl.html 2(+1 -1)

diff --git a/ui/src/app/asset/asset-card.tpl.html b/ui/src/app/asset/asset-card.tpl.html
index 30d0483..b02b2e2 100644
--- a/ui/src/app/asset/asset-card.tpl.html
+++ b/ui/src/app/asset/asset-card.tpl.html
@@ -16,7 +16,7 @@
 
 -->
 <div flex layout="column" style="margin-top: -10px;">
-    <div flex style="text-transform: uppercase; padding-bottom: 10px;">{{vm.item.type}}</div>
+    <div style="text-transform: uppercase; padding-bottom: 10px;">{{vm.item.type}}</div>
     <div class="tb-small" ng-show="vm.isAssignedToCustomer()">{{'asset.assignedToCustomer' | translate}} '{{vm.item.assignedCustomer.title}}'</div>
     <div class="tb-small" ng-show="vm.isPublic()">{{'asset.public' | translate}}</div>
 </div>

ui/src/app/asset/assign-to-customer.controller.js 4(+2 -2)

diff --git a/ui/src/app/asset/assign-to-customer.controller.js b/ui/src/app/asset/assign-to-customer.controller.js
index 602e599..3df90ef 100644
--- a/ui/src/app/asset/assign-to-customer.controller.js
+++ b/ui/src/app/asset/assign-to-customer.controller.js
@@ -77,8 +77,8 @@ export default function AssignAssetToCustomerController(customerService, assetSe
 
     function assign() {
         var tasks = [];
-        for (var assetId in assetIds) {
-            tasks.push(assetService.assignAssetToCustomer(vm.customers.selection.id.id, assetIds[assetId]));
+        for (var i=0;i<assetIds.length;i++) {
+            tasks.push(assetService.assignAssetToCustomer(vm.customers.selection.id.id, assetIds[i]));
         }
         $q.all(tasks).then(function () {
             $mdDialog.hide();

ui/src/app/device/assign-to-customer.controller.js 4(+2 -2)

diff --git a/ui/src/app/device/assign-to-customer.controller.js b/ui/src/app/device/assign-to-customer.controller.js
index c04a200..b58435d 100644
--- a/ui/src/app/device/assign-to-customer.controller.js
+++ b/ui/src/app/device/assign-to-customer.controller.js
@@ -77,8 +77,8 @@ export default function AssignDeviceToCustomerController(customerService, device
 
     function assign() {
         var tasks = [];
-        for (var deviceId in deviceIds) {
-            tasks.push(deviceService.assignDeviceToCustomer(vm.customers.selection.id.id, deviceIds[deviceId]));
+        for (var i=0;i<deviceIds.length;i++) {
+            tasks.push(deviceService.assignDeviceToCustomer(vm.customers.selection.id.id, deviceIds[i]));
         }
         $q.all(tasks).then(function () {
             $mdDialog.hide();

ui/src/app/device/device-card.tpl.html 2(+1 -1)

diff --git a/ui/src/app/device/device-card.tpl.html b/ui/src/app/device/device-card.tpl.html
index 58f4c85..d7cd588 100644
--- a/ui/src/app/device/device-card.tpl.html
+++ b/ui/src/app/device/device-card.tpl.html
@@ -16,7 +16,7 @@
 
 -->
 <div flex layout="column" style="margin-top: -10px;">
-    <div flex style="text-transform: uppercase; padding-bottom: 10px;">{{vm.item.type}}</div>
+    <div style="text-transform: uppercase; padding-bottom: 10px;">{{vm.item.type}}</div>
     <div class="tb-small" ng-show="vm.isAssignedToCustomer()">{{'device.assignedToCustomer' | translate}} '{{vm.item.assignedCustomer.title}}'</div>
     <div class="tb-small" ng-show="vm.isPublic()">{{'device.public' | translate}}</div>
 </div>

ui/src/index.html 2(+1 -1)

diff --git a/ui/src/index.html b/ui/src/index.html
index 2f4045a..33702cc 100644
--- a/ui/src/index.html
+++ b/ui/src/index.html
@@ -16,7 +16,7 @@
 
 -->
 <!DOCTYPE html>
-<html ng-app="thingsboard" ng-strict-di>
+<html ng-app="thingsboard" ng-strict-di style="width: 100%;">
   <head>
     <title ng-bind="pageTitle"></title>
     <base href="/" />