100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
UI update: No assets selected text and translation update
Don30fc4c332a68
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.jsonindex 851bd9fbd..76de7d297 100644--- a/deployment/manager/shared/locales/en/or.json+++ b/deployment/manager/shared/locales/en/or.json@@ -77,5 +77,7 @@"accessPublicRead": "Public read","type": "Type","path": "Path",- "showOnMap": "Show on map"+ "showOnMap": "Show on map",+ "noAssetSelected": "Please select an asset on the left",+ "loading": "Loading..."}\ No newline at end of filediff --git a/deployment/manager/shared/locales/nl/or.json b/deployment/manager/shared/locales/nl/or.jsonindex 5dc96fd46..61809d73a 100644--- a/deployment/manager/shared/locales/nl/or.json+++ b/deployment/manager/shared/locales/nl/or.json@@ -65,16 +65,18 @@"rulesEditorAddAction": "Actie","sortBy": "Sorteren op","assetType": "Asset type",- "creationDate": "Creation date",+ "creationDate": "Aangemaakt op","status": "Status","name": "Naam",- "deleteAssetsNoChildrenAllowed": "Only assets that have no descendants can be deleted, please remove descendents first.",+ "deleteAssetsNoChildrenAllowed": "Kan deze asset niet verwijderen. Verwijder de onderliggende assets eerst.","confirmDeleteAssets": "Asset verwijderen?","ok": "OK",- "cancel": "Cancel",- "createdOn": "Created on",- "accessPublicRead": "Public read",+ "cancel": "Annuleren",+ "createdOn": "Aangemaakt op",+ "accessPublicRead": "Publiek","type": "Type",- "path": "Path",- "showOnMap": "Show on map"+ "path": "Pad",+ "showOnMap": "Tonen op kaart",+ "noAssetSelected": "Kies aan de linkerkant een asset uit de lijst",+ "loading": "Aan het laden..."}\ No newline at end of filediff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex 68a7b558f..3ada708fd 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -105,12 +105,14 @@ export class OrAssetViewer extends subscribe(openremote)(translate(i18next)(LitEif (this._loading) {return html`- <div id="loading"><div>Loading</div></div>+ <div id="loading"><or-translate value="loading"></or-translate></div>`;}if (!this.asset && !this.assetId) {- return html``;+ return html`+ <div id="noneselected"><or-translate value="noAssetSelected"></or-translate></div>+ `;}if (!this.asset) {@@ -278,6 +280,7 @@ export class OrAssetViewer extends subscribe(openremote)(translate(i18next)(LitE}#location-map-container > or-map {flex: 1;+ border: #dbdbdb 1px solid;}#location-map-input {flex: 0 0 auto;diff --git a/ui/component/or-asset-viewer/src/style.ts b/ui/component/or-asset-viewer/src/style.tsindex f7f8ce751..727dc74a7 100644--- a/ui/component/or-asset-viewer/src/style.ts+++ b/ui/component/or-asset-viewer/src/style.ts@@ -12,7 +12,7 @@ export const style = css`--internal-or-asset-viewer-grid-template-rows: var(--or-asset-viewer-grid-template-rows, repeat(auto-fill, 1fr));--internal-or-asset-viewer-grid-template-auto-rows: var(--or-asset-viewer-grid-template-auto-rows, minmax(min-content, 1fr));--internal-or-asset-viewer-panel-margin: var(--or-asset-viewer-panel-margin, 15px);- --internal-or-asset-viewer-panel-padding: var(--or-asset-viewer-panel-padding, 20px);+ --internal-or-asset-viewer-panel-padding: var(--or-asset-viewer-panel-padding, 24px);--internal-or-asset-viewer-text-color: var(--or-asset-viewer-text-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));--internal-or-asset-viewer-title-text-color: var(--or-asset-viewer-title-text-color, var(--or-app-color3, ${unsafeCSS(DefaultColor3)}));--internal-or-asset-viewer-panel-color: var(--or-asset-viewer-panel-color, var(--or-app-color1, ${unsafeCSS(DefaultColor1)}));@@ -119,7 +119,7 @@ export const style = css`text-transform: uppercase;font-weight: bolder;color: var(--internal-or-asset-viewer-title-text-color);- margin-bottom: 15px;+ margin-bottom: 12px;flex: 0 0 auto;}@@ -411,7 +411,7 @@ export const style = css`margin-right: 10px;}- #loading {+ #loading, #noneselected {display: flex;justify-content: center;align-items: center;