From 69eca5927260e3e4a83879546005aecbb87a3a75 Mon Sep 17 00:00:00 2001
From: oleg <oleg@thingsboard.io>
Date: Fri, 9 Mar 2018 17:17:12 +0200
Subject: [PATCH 1/2] UI:Fix. "GUI fields don't match server-side fields"

---
 .../extensions-forms/extension-form-opc.directive.js   |  8 ++++----
 .../extensions-forms/extension-form-opc.tpl.html       | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ui/src/app/extension/extensions-forms/extension-form-opc.directive.js b/ui/src/app/extension/extensions-forms/extension-form-opc.directive.js
index fc69b68f9b..914c1ba3fa 100644
--- a/ui/src/app/extension/extensions-forms/extension-form-opc.directive.js
+++ b/ui/src/app/extension/extensions-forms/extension-form-opc.directive.js
@@ -129,8 +129,8 @@ export default function ExtensionFormOpcDirective($compile, $templateCache, $tra
                         let addedFile = event.target.result;
 
                         if (addedFile && addedFile.length > 0) {
-                            model[options.fileName] = $file.name;
-                            model[options.file] = addedFile.replace(/^data.*base64,/, "");
+                            model[options.location] = $file.name;
+                            model[options.fileContent] = addedFile.replace(/^data.*base64,/, "");
 
                         }
                     }
@@ -143,8 +143,8 @@ export default function ExtensionFormOpcDirective($compile, $templateCache, $tra
         scope.clearFile = function(model, options) {
             scope.theForm.$setDirty();
 
-            model[options.fileName] = null;
-            model[options.file] = null;
+            model[options.location] = null;
+            model[options.fileContent] = null;
 
         };
 
diff --git a/ui/src/app/extension/extensions-forms/extension-form-opc.tpl.html b/ui/src/app/extension/extensions-forms/extension-form-opc.tpl.html
index 6d74cc560c..b602180783 100644
--- a/ui/src/app/extension/extensions-forms/extension-form-opc.tpl.html
+++ b/ui/src/app/extension/extensions-forms/extension-form-opc.tpl.html
@@ -215,8 +215,8 @@
                                                     </md-input-container>
 
                                                     <section class="dropdown-section">
-                                                        <div class="tb-container" ng-class="{'ng-invalid':!server.keystore.file}">
-                                                            <span ng-init='fieldsToFill = {"fileName":"fileName", "file":"file"}'></span>
+                                                        <div class="tb-container" ng-class="{'ng-invalid':!server.keystore.fileContent}">
+                                                            <span ng-init='fieldsToFill = {"location":"location", "fileContent":"fileContent"}'></span>
                                                             <label class="tb-label" translate>extension.opc-keystore-location</label>
                                                             <div flow-init="{singleFile:true}" flow-file-added='fileAdded($file, server.keystore, fieldsToFill)' class="tb-file-select-container">
                                                                 <div class="tb-file-clear-container">
@@ -234,14 +234,14 @@
                                                                            class="file-input"
                                                                            flow-btn id="dropFileKeystore_{{serverIndex}}"
                                                                            name="keystoreFile"
-                                                                           ng-model="server.keystore.file"
+                                                                           ng-model="server.keystore.fileContent"
                                                                     >
                                                                 </div>
                                                             </div>
                                                         </div>
                                                         <div class="dropdown-messages">
-                                                            <div ng-if="!server.keystore[fieldsToFill.fileName]" class="tb-error-message" translate>extension.no-file</div>
-                                                            <div ng-if="server.keystore[fieldsToFill.fileName]">{{server.keystore[fieldsToFill.fileName]}}</div>
+                                                            <div ng-if="!server.keystore[fieldsToFill.location]" class="tb-error-message" translate>extension.no-file</div>
+                                                            <div ng-if="server.keystore[fieldsToFill.location]">{{server.keystore[fieldsToFill.location]}}</div>
                                                         </div>
                                                     </section>
 

From 8df34fbee2777b877a4efe1ba4aacba6d1f808b8 Mon Sep 17 00:00:00 2001
From: oleg <oleg@thingsboard.io>
Date: Thu, 22 Mar 2018 11:34:03 +0200
Subject: [PATCH 2/2] UI:Fix. "Widget action buttons overlays with data loading
 indicator"

---
 ui/src/app/components/dashboard.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/src/app/components/dashboard.scss b/ui/src/app/components/dashboard.scss
index cf56c15c00..466a59e4a3 100644
--- a/ui/src/app/components/dashboard.scss
+++ b/ui/src/app/components/dashboard.scss
@@ -40,12 +40,12 @@ div.tb-widget {
     position: absolute;
     top: 8px;
     right: 8px;
-    z-index: 1;
-    margin: 0px;
+    z-index: 19;
+    margin: 0;
 
     .md-button.md-icon-button {
-      margin: 0px !important;
-      padding: 0px !important;
+      margin: 0 !important;
+      padding: 0 !important;
       line-height: 20px;
       width: 32px;
       height: 32px;