Commit 6ce3a7577f1e5e161286e9c3c4c9e66b03cf323d
1 parent
314f5a7c
Edge license key tooltip. Code icon changed to settings_ethernet
Showing
7 changed files
with
24 additions
and
14 deletions
... | ... | @@ -100,15 +100,24 @@ |
100 | 100 | tb-required="true" |
101 | 101 | the-form="theForm" |
102 | 102 | ng-model="edge.type" |
103 | - entity-type="types.entityType.edge"> | |
103 | + entity-type="types.entityType.edge" | |
104 | + ng-value="defaultType"> | |
104 | 105 | </tb-entity-subtype-autocomplete> |
105 | - <md-input-container class="md-block"> | |
106 | + <div layout="row"> | |
107 | + <md-input-container class="md-block" flex> | |
106 | 108 | <label translate>edge.edge-license-key</label> |
107 | 109 | <input required name="edgeLicenseKey" ng-model="edge.edgeLicenseKey"> |
108 | 110 | <div ng-messages="theForm.edgeLicenseKey.$error"> |
109 | 111 | <div translate ng-message="required">edge.edge-license-key-required</div> |
110 | 112 | </div> |
111 | 113 | </md-input-container> |
114 | + <md-button class="md-icon-button" style="margin-top: 14px;"> | |
115 | + <md-tooltip md-direction="left"> | |
116 | + {{ 'edge.license-key-tooltip' | translate }} | |
117 | + </md-tooltip> | |
118 | + <md-icon md-svg-icon="mdi:help"></md-icon> | |
119 | + </md-button> | |
120 | + </div> | |
112 | 121 | <md-input-container class="md-block"> |
113 | 122 | <label translate>edge.cloud-endpoint</label> |
114 | 123 | <input required name="cloudEndpoint" ng-model="edge.cloudEndpoint"> |
... | ... | @@ -147,7 +156,7 @@ |
147 | 156 | </md-tooltip> |
148 | 157 | </md-button> |
149 | 158 | </div> |
150 | - <div layout="row"> | |
159 | + <fieldset ng-disabled="$root.loading || !isEdit"> | |
151 | 160 | <md-input-container class="md-block"> |
152 | 161 | <label translate>edge.label</label> |
153 | 162 | <input name="label" ng-model="edge.label"> |
... | ... | @@ -156,5 +165,5 @@ |
156 | 165 | <label translate>edge.description</label> |
157 | 166 | <textarea ng-model="edge.additionalInfo.description" rows="2"></textarea> |
158 | 167 | </md-input-container> |
159 | - </div> | |
168 | + </fieldset> | |
160 | 169 | </md-content> | ... | ... |
... | ... | @@ -283,7 +283,7 @@ export function EdgeController($rootScope, userService, edgeService, customerSer |
283 | 283 | details: function() { |
284 | 284 | return $translate.instant('edge.manage-edge-rulechains'); |
285 | 285 | }, |
286 | - icon: "code" | |
286 | + icon: "settings_ethernet" | |
287 | 287 | } |
288 | 288 | ); |
289 | 289 | ... | ... |
... | ... | @@ -29,6 +29,7 @@ export default function EdgeDirective($compile, $templateCache, $translate, $mdD |
29 | 29 | scope.isAssignedToCustomer = false; |
30 | 30 | scope.isPublic = false; |
31 | 31 | scope.assignedCustomer = null; |
32 | + scope.defaultType = 'default'; | |
32 | 33 | |
33 | 34 | scope.$watch('edge', function(newVal) { |
34 | 35 | if (newVal) { |
... | ... | @@ -36,7 +37,6 @@ export default function EdgeDirective($compile, $templateCache, $translate, $mdD |
36 | 37 | scope.edge.routingKey = utils.guid(''); |
37 | 38 | scope.edge.secret = generateSecret(20); |
38 | 39 | scope.edge.cloudEndpoint = utils.baseUrl(); |
39 | - scope.edge.type = 'default'; | |
40 | 40 | } |
41 | 41 | if (scope.edge.customerId && scope.edge.customerId.id !== types.id.nullUid) { |
42 | 42 | scope.isAssignedToCustomer = true; | ... | ... |
... | ... | @@ -198,7 +198,7 @@ export default function EdgeRoutes($stateProvider, types) { |
198 | 198 | ruleChainsType: 'edge' |
199 | 199 | }, |
200 | 200 | ncyBreadcrumb: { |
201 | - label: '{"icon": "code", "label": "edge.rulechain-templates"}' | |
201 | + label: '{"icon": "settings_ethernet", "label": "edge.rulechain-templates"}' | |
202 | 202 | } |
203 | 203 | }).state('home.edges.ruleChains.ruleChain', { |
204 | 204 | url: '/:ruleChainId', |
... | ... | @@ -235,7 +235,7 @@ export default function EdgeRoutes($stateProvider, types) { |
235 | 235 | pageTitle: 'edge.rulechain-templates' |
236 | 236 | }, |
237 | 237 | ncyBreadcrumb: { |
238 | - label: '{"icon": "code", "label": "{{ vm.ruleChain.name }}", "translate": "false"}' | |
238 | + label: '{"icon": "settings_ethernet", "label": "{{ vm.ruleChain.name }}", "translate": "false"}' | |
239 | 239 | } |
240 | 240 | }); |
241 | 241 | } | ... | ... |
... | ... | @@ -852,7 +852,8 @@ |
852 | 852 | "enter-edge-type": "Enter edge type", |
853 | 853 | "no-edge-types-matching": "No edge types matching '{{entitySubtype}}' were found.", |
854 | 854 | "edge-type-list-empty": "No edge types selected.", |
855 | - "edge-types": "Edge types" | |
855 | + "edge-types": "Edge types", | |
856 | + "license-key-tooltip": "To get license key please visit www.thingsboard.io/edge" | |
856 | 857 | }, |
857 | 858 | "error": { |
858 | 859 | "unable-to-connect": "Unable to connect to the server! Please check your internet connection.", | ... | ... |
... | ... | @@ -143,7 +143,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider |
143 | 143 | ruleChainsType: 'edges' |
144 | 144 | }, |
145 | 145 | ncyBreadcrumb: { |
146 | - label: '{"icon": "code", "label": "edge.rulechain-templates"}' | |
146 | + label: '{"icon": "settings_ethernet", "label": "edge.rulechain-templates"}' | |
147 | 147 | } |
148 | 148 | }).state('home.edges.edgeRuleChains.ruleChain', { |
149 | 149 | url: '/:ruleChainId', |
... | ... | @@ -180,7 +180,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider |
180 | 180 | pageTitle: 'edge.rulechain-template' |
181 | 181 | }, |
182 | 182 | ncyBreadcrumb: { |
183 | - label: '{"icon": "code", "label": "{{ vm.ruleChain.name }}", "translate": "false"}' | |
183 | + label: '{"icon": "settings_ethernet", "label": "{{ vm.ruleChain.name }}", "translate": "false"}' | |
184 | 184 | } |
185 | 185 | }).state('home.edges.edgeRuleChains.importRuleChain', { |
186 | 186 | url: '/edges/ruleChains/import', |
... | ... | @@ -221,7 +221,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider |
221 | 221 | pageTitle: 'edge.rulechain-template' |
222 | 222 | }, |
223 | 223 | ncyBreadcrumb: { |
224 | - label: '{"icon": "code", "label": "{{ (\'rulechain.import\' | translate) + \': \'+ vm.ruleChain.name }}", "translate": "false"}' | |
224 | + label: '{"icon": "settings_ethernet", "label": "{{ (\'rulechain.import\' | translate) + \': \'+ vm.ruleChain.name }}", "translate": "false"}' | |
225 | 225 | } |
226 | 226 | }); |
227 | 227 | } | ... | ... |
... | ... | @@ -203,7 +203,7 @@ function Menu(userService, $state, $rootScope) { |
203 | 203 | name: 'edge.rulechain-templates', |
204 | 204 | type: 'link', |
205 | 205 | state: 'home.edges.edgeRuleChains', |
206 | - icon: 'code' | |
206 | + icon: 'settings_ethernet' | |
207 | 207 | } |
208 | 208 | ] |
209 | 209 | } |
... | ... | @@ -292,7 +292,7 @@ function Menu(userService, $state, $rootScope) { |
292 | 292 | }, |
293 | 293 | { |
294 | 294 | name: 'edge.rulechain-templates', |
295 | - icon: 'code', | |
295 | + icon: 'settings_ethernet', | |
296 | 296 | state: 'home.edges.edgeRuleChains' |
297 | 297 | } |
298 | 298 | ] | ... | ... |