From b7bec07f66c3fc5d29eafddce5b7554d3272757c Mon Sep 17 00:00:00 2001 From: hubsif Date: Thu, 25 Mar 2021 20:35:39 +0100 Subject: [PATCH] Fix zero margin not applied in oh-grid-layout (#973) Make slider label help more descriptive Fix load issue in item-list-vlist Signed-off-by: Hubert Nusser --- bundles/org.openhab.ui/doc/components/oh-cell.md | 2 +- bundles/org.openhab.ui/doc/components/oh-colorpicker-cell.md | 2 +- bundles/org.openhab.ui/doc/components/oh-colorpicker-item.md | 2 +- bundles/org.openhab.ui/doc/components/oh-input-card.md | 2 +- bundles/org.openhab.ui/doc/components/oh-input-item.md | 4 ++-- bundles/org.openhab.ui/doc/components/oh-input.md | 2 +- bundles/org.openhab.ui/doc/components/oh-knob-cell.md | 2 +- bundles/org.openhab.ui/doc/components/oh-label-card.md | 2 +- bundles/org.openhab.ui/doc/components/oh-label-cell.md | 2 +- bundles/org.openhab.ui/doc/components/oh-label-item.md | 2 +- bundles/org.openhab.ui/doc/components/oh-list-item.md | 2 +- bundles/org.openhab.ui/doc/components/oh-plan-marker.md | 2 +- bundles/org.openhab.ui/doc/components/oh-player-item.md | 2 +- .../org.openhab.ui/doc/components/oh-rollershutter-cell.md | 2 +- .../org.openhab.ui/doc/components/oh-rollershutter-item.md | 2 +- bundles/org.openhab.ui/doc/components/oh-slider-card.md | 2 +- bundles/org.openhab.ui/doc/components/oh-slider-cell.md | 4 ++-- bundles/org.openhab.ui/doc/components/oh-slider-item.md | 4 ++-- bundles/org.openhab.ui/doc/components/oh-slider.md | 2 +- bundles/org.openhab.ui/doc/components/oh-stepper-item.md | 2 +- bundles/org.openhab.ui/doc/components/oh-toggle-card.md | 2 +- bundles/org.openhab.ui/doc/components/oh-toggle-item.md | 2 +- .../web/src/assets/definitions/widgets/system/slider.js | 2 +- .../web/src/components/widgets/layout/oh-grid-layout.vue | 2 +- .../web/src/pages/settings/items/items-list-vlist.vue | 2 +- 25 files changed, 28 insertions(+), 28 deletions(-) diff --git a/bundles/org.openhab.ui/doc/components/oh-cell.md b/bundles/org.openhab.ui/doc/components/oh-cell.md index 08c0c3282..9fe490c9c 100644 --- a/bundles/org.openhab.ui/doc/components/oh-cell.md +++ b/bundles/org.openhab.ui/doc/components/oh-cell.md @@ -51,7 +51,7 @@ A regular or expandable cell - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) diff --git a/bundles/org.openhab.ui/doc/components/oh-colorpicker-cell.md b/bundles/org.openhab.ui/doc/components/oh-colorpicker-cell.md index 14b989c78..137fd4dd5 100644 --- a/bundles/org.openhab.ui/doc/components/oh-colorpicker-cell.md +++ b/bundles/org.openhab.ui/doc/components/oh-colorpicker-cell.md @@ -51,7 +51,7 @@ A cell expanding to a color picker - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) diff --git a/bundles/org.openhab.ui/doc/components/oh-colorpicker-item.md b/bundles/org.openhab.ui/doc/components/oh-colorpicker-item.md index 0a5da87fd..bea393146 100644 --- a/bundles/org.openhab.ui/doc/components/oh-colorpicker-item.md +++ b/bundles/org.openhab.ui/doc/components/oh-colorpicker-item.md @@ -46,7 +46,7 @@ Display a color picker in a list - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) diff --git a/bundles/org.openhab.ui/doc/components/oh-input-card.md b/bundles/org.openhab.ui/doc/components/oh-input-card.md index aeb65445b..d358cfe01 100644 --- a/bundles/org.openhab.ui/doc/components/oh-input-card.md +++ b/bundles/org.openhab.ui/doc/components/oh-input-card.md @@ -72,7 +72,7 @@ Display an input in a card - Type of data that might be entered: see MDN docs + Type of data that might be entered (see MDN docs) diff --git a/bundles/org.openhab.ui/doc/components/oh-input-item.md b/bundles/org.openhab.ui/doc/components/oh-input-item.md index 0976c7e10..a1dd04be0 100644 --- a/bundles/org.openhab.ui/doc/components/oh-input-item.md +++ b/bundles/org.openhab.ui/doc/components/oh-input-item.md @@ -46,7 +46,7 @@ Display an input field in a list - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) @@ -77,7 +77,7 @@ Display an input field in a list - Type of data that might be entered: see MDN docs + Type of data that might be entered (see MDN docs) diff --git a/bundles/org.openhab.ui/doc/components/oh-input.md b/bundles/org.openhab.ui/doc/components/oh-input.md index f66c709c2..eaaad4a55 100644 --- a/bundles/org.openhab.ui/doc/components/oh-input.md +++ b/bundles/org.openhab.ui/doc/components/oh-input.md @@ -40,7 +40,7 @@ Displays an input field, used to set a variable - Type of data that might be entered: see MDN docs + Type of data that might be entered (see MDN docs) diff --git a/bundles/org.openhab.ui/doc/components/oh-knob-cell.md b/bundles/org.openhab.ui/doc/components/oh-knob-cell.md index 65036fb4e..423f3b8db 100644 --- a/bundles/org.openhab.ui/doc/components/oh-knob-cell.md +++ b/bundles/org.openhab.ui/doc/components/oh-knob-cell.md @@ -51,7 +51,7 @@ A cell expanding to a knob control - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) 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 be30ad4ff..2cce314c1 100644 --- a/bundles/org.openhab.ui/doc/components/oh-label-card.md +++ b/bundles/org.openhab.ui/doc/components/oh-label-card.md @@ -237,7 +237,7 @@ Display the state of an item in a card - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) 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 89e376bd1..c63bd81ad 100644 --- a/bundles/org.openhab.ui/doc/components/oh-label-cell.md +++ b/bundles/org.openhab.ui/doc/components/oh-label-cell.md @@ -51,7 +51,7 @@ A cell with a big label to show a short item state value - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) diff --git a/bundles/org.openhab.ui/doc/components/oh-label-item.md b/bundles/org.openhab.ui/doc/components/oh-label-item.md index 69280f4ba..33f143f67 100644 --- a/bundles/org.openhab.ui/doc/components/oh-label-item.md +++ b/bundles/org.openhab.ui/doc/components/oh-label-item.md @@ -57,7 +57,7 @@ Display the state of an item in a list - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) diff --git a/bundles/org.openhab.ui/doc/components/oh-list-item.md b/bundles/org.openhab.ui/doc/components/oh-list-item.md index df357bc47..a6cdf040c 100644 --- a/bundles/org.openhab.ui/doc/components/oh-list-item.md +++ b/bundles/org.openhab.ui/doc/components/oh-list-item.md @@ -46,7 +46,7 @@ A list item - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) diff --git a/bundles/org.openhab.ui/doc/components/oh-plan-marker.md b/bundles/org.openhab.ui/doc/components/oh-plan-marker.md index f28bbb109..9bde44ac9 100644 --- a/bundles/org.openhab.ui/doc/components/oh-plan-marker.md +++ b/bundles/org.openhab.ui/doc/components/oh-plan-marker.md @@ -51,7 +51,7 @@ A marker on a floor plan - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) diff --git a/bundles/org.openhab.ui/doc/components/oh-player-item.md b/bundles/org.openhab.ui/doc/components/oh-player-item.md index d1b3e3c68..015c7c629 100644 --- a/bundles/org.openhab.ui/doc/components/oh-player-item.md +++ b/bundles/org.openhab.ui/doc/components/oh-player-item.md @@ -46,7 +46,7 @@ Display player controls in a list - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) diff --git a/bundles/org.openhab.ui/doc/components/oh-rollershutter-cell.md b/bundles/org.openhab.ui/doc/components/oh-rollershutter-cell.md index 4a48acbed..e2ade4ad3 100644 --- a/bundles/org.openhab.ui/doc/components/oh-rollershutter-cell.md +++ b/bundles/org.openhab.ui/doc/components/oh-rollershutter-cell.md @@ -51,7 +51,7 @@ A cell expanding to rollershutter controls - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) diff --git a/bundles/org.openhab.ui/doc/components/oh-rollershutter-item.md b/bundles/org.openhab.ui/doc/components/oh-rollershutter-item.md index 937608b09..577d7e037 100644 --- a/bundles/org.openhab.ui/doc/components/oh-rollershutter-item.md +++ b/bundles/org.openhab.ui/doc/components/oh-rollershutter-item.md @@ -46,7 +46,7 @@ Display rollershutter controls in a list - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) diff --git a/bundles/org.openhab.ui/doc/components/oh-slider-card.md b/bundles/org.openhab.ui/doc/components/oh-slider-card.md index 865222c4e..201fa46b5 100644 --- a/bundles/org.openhab.ui/doc/components/oh-slider-card.md +++ b/bundles/org.openhab.ui/doc/components/oh-slider-card.md @@ -87,7 +87,7 @@ Display a slider in a card to control an item - Display a label above the slider knob + Display a label above the slider knob while sliding diff --git a/bundles/org.openhab.ui/doc/components/oh-slider-cell.md b/bundles/org.openhab.ui/doc/components/oh-slider-cell.md index e066d7f0a..d7a192c26 100644 --- a/bundles/org.openhab.ui/doc/components/oh-slider-cell.md +++ b/bundles/org.openhab.ui/doc/components/oh-slider-cell.md @@ -51,7 +51,7 @@ A cell expanding to a big vertical slider - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) @@ -97,7 +97,7 @@ A cell expanding to a big vertical slider - Display a label above the slider knob + Display a label above the slider knob while sliding diff --git a/bundles/org.openhab.ui/doc/components/oh-slider-item.md b/bundles/org.openhab.ui/doc/components/oh-slider-item.md index 84a21a77a..dcfeb272a 100644 --- a/bundles/org.openhab.ui/doc/components/oh-slider-item.md +++ b/bundles/org.openhab.ui/doc/components/oh-slider-item.md @@ -46,7 +46,7 @@ Display a slider control in a list - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) @@ -92,7 +92,7 @@ Display a slider control in a list - Display a label above the slider knob + Display a label above the slider knob while sliding diff --git a/bundles/org.openhab.ui/doc/components/oh-slider.md b/bundles/org.openhab.ui/doc/components/oh-slider.md index 1177d2410..c5cb77713 100644 --- a/bundles/org.openhab.ui/doc/components/oh-slider.md +++ b/bundles/org.openhab.ui/doc/components/oh-slider.md @@ -55,7 +55,7 @@ Slider control, allows to pick a number value on a scale - Display a label above the slider knob + Display a label above the slider knob while sliding diff --git a/bundles/org.openhab.ui/doc/components/oh-stepper-item.md b/bundles/org.openhab.ui/doc/components/oh-stepper-item.md index 94435f3ed..5bfe453b8 100644 --- a/bundles/org.openhab.ui/doc/components/oh-stepper-item.md +++ b/bundles/org.openhab.ui/doc/components/oh-stepper-item.md @@ -46,7 +46,7 @@ Display a stepper control in a list - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) diff --git a/bundles/org.openhab.ui/doc/components/oh-toggle-card.md b/bundles/org.openhab.ui/doc/components/oh-toggle-card.md index 1cb9a4aa1..f839509bc 100644 --- a/bundles/org.openhab.ui/doc/components/oh-toggle-card.md +++ b/bundles/org.openhab.ui/doc/components/oh-toggle-card.md @@ -18,7 +18,7 @@ prev: /docs/ui/components/ -Display a toggle switch in a card to send ON/OFF commands +Display a toggle swtich in a card to send ON/OFF commands ## Configuration diff --git a/bundles/org.openhab.ui/doc/components/oh-toggle-item.md b/bundles/org.openhab.ui/doc/components/oh-toggle-item.md index fa0391c09..6cb4ae995 100644 --- a/bundles/org.openhab.ui/doc/components/oh-toggle-item.md +++ b/bundles/org.openhab.ui/doc/components/oh-toggle-item.md @@ -46,7 +46,7 @@ Display a toggle switch in a list - Use oh:iconName (openHAB icon) or f7:iconName (Framework7 icon) + Use oh:iconName (openHAB icon), f7:iconName (Framework7 icon) or material:iconName (Material icon) diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/slider.js b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/slider.js index c697b60f6..08a6a32c8 100644 --- a/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/slider.js +++ b/bundles/org.openhab.ui/web/src/assets/definitions/widgets/system/slider.js @@ -6,7 +6,7 @@ export default () => [ pd('max', 'Max', 'Maximum value'), pd('step', 'Step', 'Minimum interval between values'), pd('vertical', 'Vertical', 'Display the slider vertically'), - pb('label', 'Display Label', 'Display a label above the slider knob'), + pb('label', 'Display Label', 'Display a label above the slider knob while sliding'), pb('scale', 'Display Scale', 'Display a scale on the slider'), pn('scaleSteps', 'Scale steps', 'Number of (major) scale markers'), pn('scaleSubSteps', 'Scale sub-steps', 'Number of scale minor markers between each major marker'), diff --git a/bundles/org.openhab.ui/web/src/components/widgets/layout/oh-grid-layout.vue b/bundles/org.openhab.ui/web/src/components/widgets/layout/oh-grid-layout.vue index f921a7e11..904415360 100644 --- a/bundles/org.openhab.ui/web/src/components/widgets/layout/oh-grid-layout.vue +++ b/bundles/org.openhab.ui/web/src/components/widgets/layout/oh-grid-layout.vue @@ -117,7 +117,7 @@ export default { }, created () { this.colNum = this.config.colNum || 16 - this.margin = this.config.margin || 10 + this.margin = this.config.margin >= 0 ? this.config.margin : 10 if (this.config.layoutType === 'fixed') { this.style.width = this.screenWidth = this.config.screenWidth || 1280 diff --git a/bundles/org.openhab.ui/web/src/pages/settings/items/items-list-vlist.vue b/bundles/org.openhab.ui/web/src/pages/settings/items/items-list-vlist.vue index 7050b3fd0..363605669 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/items/items-list-vlist.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/items/items-list-vlist.vue @@ -1,5 +1,5 @@