From 37cb6364c54dec0106d015474ed2eef6ab2eeb27 Mon Sep 17 00:00:00 2001
From: Eiko Wagenknecht <eiko.wagenknecht@web.de>
Date: Sun, 9 May 2021 10:14:43 +0200
Subject: [PATCH] Fix height description in grid layout properties (#1023)

Fix missing doc from #993

Signed-off-by: Eiko Wagenknecht <eiko.wagenknecht@web.de>
---
 bundles/org.openhab.ui/doc/components/oh-cell.md             | 5 +++++
 bundles/org.openhab.ui/doc/components/oh-grid-layout.md      | 2 +-
 bundles/org.openhab.ui/doc/components/oh-label-card.md       | 5 +++++
 bundles/org.openhab.ui/doc/components/oh-label-cell.md       | 5 +++++
 .../web/src/assets/definitions/widgets/layout/index.js       | 2 +-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/bundles/org.openhab.ui/doc/components/oh-cell.md b/bundles/org.openhab.ui/doc/components/oh-cell.md
index 9fe490c9c4..031ff421f5 100644
--- a/bundles/org.openhab.ui/doc/components/oh-cell.md
+++ b/bundles/org.openhab.ui/doc/components/oh-cell.md
@@ -240,6 +240,11 @@ A regular or expandable cell
     Colors of the trend line (see <a target="_blank" class="external text-color-blue" href="https://github.com/QingWei-Li/vue-trend#props">vue-trend</a>)
   </PropDescription>
 </PropBlock>
+<PropBlock type="TEXT" name="trendSampling" label="Trend Line Sampling">
+  <PropDescription>
+    Amount of minutes between each point of the trendline (default: 60). Affected by persistence strategies different from "every minute"
+  </PropDescription>
+</PropBlock>
 </PropGroup>
 </div>
 
diff --git a/bundles/org.openhab.ui/doc/components/oh-grid-layout.md b/bundles/org.openhab.ui/doc/components/oh-grid-layout.md
index 0e0f08052d..58892f3378 100644
--- a/bundles/org.openhab.ui/doc/components/oh-grid-layout.md
+++ b/bundles/org.openhab.ui/doc/components/oh-grid-layout.md
@@ -56,7 +56,7 @@ Arranges widgets on a grid of squares with user-defined sizes
 </PropBlock>
 <PropBlock type="INTEGER" name="screenHeight" label="Screen Height">
   <PropDescription>
-    Screen width in pixels (default 720)
+    Screen height in pixels (default 720)
   </PropDescription>
 </PropBlock>
 <PropBlock type="BOOLEAN" name="scale" label="Scaling">
diff --git a/bundles/org.openhab.ui/doc/components/oh-label-card.md b/bundles/org.openhab.ui/doc/components/oh-label-card.md
index 2cce314c1c..a867303991 100644
--- a/bundles/org.openhab.ui/doc/components/oh-label-card.md
+++ b/bundles/org.openhab.ui/doc/components/oh-label-card.md
@@ -287,6 +287,11 @@ Display the state of an item in a card
     Colors of the trend line (see <a target="_blank" class="external text-color-blue" href="https://github.com/QingWei-Li/vue-trend#props">vue-trend</a>)
   </PropDescription>
 </PropBlock>
+<PropBlock type="TEXT" name="trendSampling" label="Trend Line Sampling">
+  <PropDescription>
+    Amount of minutes between each point of the trendline (default: 60). Affected by persistence strategies different from "every minute"
+  </PropDescription>
+</PropBlock>
 </PropGroup>
 </div>
 
diff --git a/bundles/org.openhab.ui/doc/components/oh-label-cell.md b/bundles/org.openhab.ui/doc/components/oh-label-cell.md
index c63bd81ad2..b865c1a4bc 100644
--- a/bundles/org.openhab.ui/doc/components/oh-label-cell.md
+++ b/bundles/org.openhab.ui/doc/components/oh-label-cell.md
@@ -256,6 +256,11 @@ A cell with a big label to show a short item state value
     Colors of the trend line (see <a target="_blank" class="external text-color-blue" href="https://github.com/QingWei-Li/vue-trend#props">vue-trend</a>)
   </PropDescription>
 </PropBlock>
+<PropBlock type="TEXT" name="trendSampling" label="Trend Line Sampling">
+  <PropDescription>
+    Amount of minutes between each point of the trendline (default: 60). Affected by persistence strategies different from "every minute"
+  </PropDescription>
+</PropBlock>
 </PropGroup>
 </div>
 
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/layout/index.js b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/layout/index.js
index 3183b3a699..992c16d3d0 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/layout/index.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/layout/index.js
@@ -54,7 +54,7 @@ export function OhGridLayoutDefinition () {
     .paramGroup(pg('screenSettings', 'Screen Settings'), [
       pn('screenWidth', 'Screen Width', 'Screen width in pixels (default 1280)')
         .v((value, configuration, configDescription, parameters) => { return configuration.layoutType === 'fixed' }),
-      pn('screenHeight', 'Screen Height', 'Screen width in pixels (default 720)')
+      pn('screenHeight', 'Screen Height', 'Screen height in pixels (default 720)')
         .v((value, configuration, configDescription, parameters) => { return configuration.layoutType === 'fixed' }),
       pb('scale', 'Scaling', 'Scale content to other screen widths (can lead to unexpected styling issues) (default false)')
         .v((value, configuration, configDescription, parameters) => { return configuration.layoutType === 'fixed' })