Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fix language bug, styling update parameter dialog (#820)

DonWillemsc4e9248e2737
diff --git a/ui/app/manager/src/index.ts b/ui/app/manager/src/index.ts
index b395762e2..367135ef8 100644
--- a/ui/app/manager/src/index.ts
+++ b/ui/app/manager/src/index.ts
@@ -242,14 +242,17 @@ fetch(configURL).then(async (result) => {
});
}
- if (normalisedConfig.language) {
- manager.language = normalisedConfig.language;
- }
-
orAppConfig.realms[name] = { ...defaultRealm, header: headers, ...(realmConfig as RealmAppConfig) };
});
}
+ // Check local storage for set language, otherwise use language set in config
+ manager.console.retrieveData("LANGUAGE").then((value: string | undefined) => {
+ manager.language = (value ? value : orAppConfig.realms[manager.displayRealm].language);
+ }).catch(() => {
+ manager.language = orAppConfig.realms[manager.displayRealm].language;
+ })
+
// Add config prefix if defined (used in dev)
if (CONFIG_URL_PREFIX) {
Object.values(orAppConfig.realms).forEach((realmConfig) => {
diff --git a/ui/component/or-json-forms/src/layouts/layout-vertical-element.ts b/ui/component/or-json-forms/src/layouts/layout-vertical-element.ts
index 1ea487bc6..d07257b8f 100644
--- a/ui/component/or-json-forms/src/layouts/layout-vertical-element.ts
+++ b/ui/component/or-json-forms/src/layouts/layout-vertical-element.ts
@@ -321,12 +321,14 @@ export class LayoutVerticalElement extends LayoutBaseElement<VerticalLayout | Gr
</div>
`}
<div id="parameter-desc" class="col">
- ${!selectedParameter ? `` : html`<p>${selectedParameter.description}</p>`}
+ ${!selectedParameter ? `` : html`
+ <or-translate id="parameter-title" value="${selectedParameter.label}"></or-translate>
+ <p>${selectedParameter.description}</p>`}
${!dynamic ? !schemaPicker ? `` : html`
<style>
#schema-picker {
align-self: stretch;
- margin: auto 10px;
+ margin: 10px;
display: flex;
align-items: center;
}
diff --git a/ui/component/or-json-forms/src/styles.ts b/ui/component/or-json-forms/src/styles.ts
index fa2fc8441..0c6bf9974 100644
--- a/ui/component/or-json-forms/src/styles.ts
+++ b/ui/component/or-json-forms/src/styles.ts
@@ -1,4 +1,4 @@
-import {DefaultColor4, DefaultColor5 } from "@openremote/core";
+import {DefaultColor3, DefaultColor4, DefaultColor5 } from "@openremote/core";
import { css, html, unsafeCSS } from "lit";
// language=CSS
@@ -140,12 +140,18 @@ export const addItemOrParameterDialogStyle = html`
#parameter-list {
display: block;
}
+ #parameter-title {
+ text-transform: capitalize;
+ color: var(--or-app-color3, ${unsafeCSS(DefaultColor3)});
+ font-size: 18px;
+ font-weight: bold;
+ }
#parameter-desc {
- text-align: justify;
padding: 15px;
flex: 1;
display: flex;
flex-direction: column;
+ justify-content: flex-start;
}
</style>
`;