Merge branch 'master' of github.com:thingsboard/thingsboard into new-nodes

@@ -55,6 +55,8 @@ spec:
         env:
         env:
         - name: POSTGRES_DB
         - name: POSTGRES_DB
           value: "thingsboard"
           value: "thingsboard"
+        - name: PGDATA
+          value: /var/lib/postgresql/data/pgdata
         volumeMounts:
         volumeMounts:
           - mountPath: /var/lib/postgresql/data
           - mountPath: /var/lib/postgresql/data
             name: postgres-data
             name: postgres-data

@@ -13,6 +13,9 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
+
+import './settings-card.scss';
+
 /*@ngInject*/
 /*@ngInject*/
 export default function AdminController(adminService, toast, $scope, $rootScope, $state, $translate) {
 export default function AdminController(adminService, toast, $scope, $rootScope, $state, $translate) {
 
 

@@ -15,8 +15,8 @@
     limitations under the License.
     limitations under the License.
 
 
 -->
 -->
-<div layout="row" width="100%" layout-wrap> 
-	<md-card flex-gt-sm="60" flex="100" style="height: 100%;">
+<div>
+	<md-card class="settings-card">
        <md-card-title>
        <md-card-title>
           <md-card-title-text>
           <md-card-title-text>
            		<span translate class="md-headline">admin.general-settings</span>
            		<span translate class="md-headline">admin.general-settings</span>

@@ -15,8 +15,8 @@
     limitations under the License.
     limitations under the License.
 
 
 -->
 -->
-<div layout="row" width="100%" layout-wrap tb-help="'outgoingMailSettings'" help-container-id="help-container">
-	<md-card flex-gt-sm="60" flex="100" style="height: 100%;">
+<div tb-help="'outgoingMailSettings'" help-container-id="help-container">
+	<md-card class="settings-card">
        <md-card-title>
        <md-card-title>
           <md-card-title-text layout="row">
           <md-card-title-text layout="row">
            	  <span translate class="md-headline">admin.outgoing-mail-settings</span>
            	  <span translate class="md-headline">admin.outgoing-mail-settings</span>

+/**
+ * Copyright © 2016-2019 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@import "../../scss/constants";
+
+md-card.settings-card {
+  @media (min-width: $layout-breakpoint-sm) {
+    width: 60%;
+  }
+}

@@ -499,6 +499,8 @@ function Utils($mdColorPalette, $rootScope, $window, $translate, $q, $timeout, t
                 label = label.split(variable).join(datasource.entityName);
                 label = label.split(variable).join(datasource.entityName);
             } else if (variableName === 'aliasName') {
             } else if (variableName === 'aliasName') {
                 label = label.split(variable).join(datasource.aliasName);
                 label = label.split(variable).join(datasource.aliasName);
+            } else if (variableName === 'entityDescription') {
+                label = label.split(variable).join(datasource.entityDescription);
             }
             }
             match = varsRegex.exec(pattern);
             match = varsRegex.exec(pattern);
         }
         }