dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: IE11 layout fixes.

Browse Source
This commit is contained in:
Igor Kulikov 2017-12-08 11:44:19 +02:00
parent b951314b96
commit 25bdf8adde
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/app/asset/asset-card.tpl.html
View File

@ -16,7 +16,7 @@
--> -->
<div flex layout="column" style="margin-top: -10px;"> <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.isAssignedToCustomer()">{{'asset.assignedToCustomer' | translate}} '{{vm.item.assignedCustomer.title}}'</div>
<div class="tb-small" ng-show="vm.isPublic()">{{'asset.public' | translate}}</div> <div class="tb-small" ng-show="vm.isPublic()">{{'asset.public' | translate}}</div>
</div> </div>

4
ui/src/app/asset/assign-to-customer.controller.js
View File

@ -77,8 +77,8 @@ export default function AssignAssetToCustomerController(customerService, assetSe
function assign() { function assign() {
var tasks = []; var tasks = [];
for (var assetId in assetIds) { for (var i=0;i<assetIds.length;i++) {
tasks.push(assetService.assignAssetToCustomer(vm.customers.selection.id.id, assetIds[assetId])); tasks.push(assetService.assignAssetToCustomer(vm.customers.selection.id.id, assetIds[i]));
} }
$q.all(tasks).then(function () { $q.all(tasks).then(function () {
$mdDialog.hide(); $mdDialog.hide();

4
ui/src/app/device/assign-to-customer.controller.js
View File

@ -77,8 +77,8 @@ export default function AssignDeviceToCustomerController(customerService, device
function assign() { function assign() {
var tasks = []; var tasks = [];
for (var deviceId in deviceIds) { for (var i=0;i<deviceIds.length;i++) {
tasks.push(deviceService.assignDeviceToCustomer(vm.customers.selection.id.id, deviceIds[deviceId])); tasks.push(deviceService.assignDeviceToCustomer(vm.customers.selection.id.id, deviceIds[i]));
} }
$q.all(tasks).then(function () { $q.all(tasks).then(function () {
$mdDialog.hide(); $mdDialog.hide();

2
ui/src/app/device/device-card.tpl.html
View File

@ -16,7 +16,7 @@
--> -->
<div flex layout="column" style="margin-top: -10px;"> <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.isAssignedToCustomer()">{{'device.assignedToCustomer' | translate}} '{{vm.item.assignedCustomer.title}}'</div>
<div class="tb-small" ng-show="vm.isPublic()">{{'device.public' | translate}}</div> <div class="tb-small" ng-show="vm.isPublic()">{{'device.public' | translate}}</div>
</div> </div>

2
ui/src/index.html
View File

@ -16,7 +16,7 @@
--> -->
<!DOCTYPE html> <!DOCTYPE html>
<html ng-app="thingsboard" ng-strict-di> <html ng-app="thingsboard" ng-strict-di style="width: 100%;">
<head> <head>
<title ng-bind="pageTitle"></title> <title ng-bind="pageTitle"></title>
<base href="/" /> <base href="/" />