From 0165242b5f2f81dcb68034a78fcacd148cd24b42 Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Wed, 4 Dec 2019 22:31:58 +0000 Subject: [PATCH] revert doc changes (mostly) --- dist/dashboard.appcache | 2 +- nodes/locales/en-US/ui_link.json | 2 +- nodes/locales/en-US/ui_tab.json | 2 +- nodes/locales/ja/ui_link.json | 3 ++- nodes/locales/ja/ui_tab.json | 2 +- nodes/locales/ja/ui_template.html | 4 ++-- nodes/ui_button.html | 3 ++- nodes/ui_link.html | 7 ++++--- nodes/ui_switch.html | 7 ++++--- nodes/ui_tab.html | 8 ++++---- nodes/ui_template.html | 7 ++++--- nodes/ui_text.html | 7 ++++--- 12 files changed, 30 insertions(+), 24 deletions(-) diff --git a/dist/dashboard.appcache b/dist/dashboard.appcache index b9ce706d..ca7fc6c8 100644 --- a/dist/dashboard.appcache +++ b/dist/dashboard.appcache @@ -1,5 +1,5 @@ CACHE MANIFEST -# Time: Wed Dec 04 2019 20:47:56 GMT+0000 (Greenwich Mean Time) +# Time: Wed Dec 04 2019 22:23:59 GMT+0000 (Greenwich Mean Time) CACHE: i18n.js diff --git a/nodes/locales/en-US/ui_link.json b/nodes/locales/en-US/ui_link.json index 6546a981..ce9ebdcf 100644 --- a/nodes/locales/en-US/ui_link.json +++ b/nodes/locales/en-US/ui_link.json @@ -9,6 +9,6 @@ "this-tab" : "This Tab", "iframe" : "iframe" }, - "tip" : "The Icon field can be either a Material Design icon (e.g. 'check', 'close') or a Font Awesome icon (e.g. 'fa-fire'), or a Weather icon (e.g. 'wi-wu-sunny').

" + "tip" : "The Icon field can be either a Material Design icon (e.g. 'check', 'close') or a Font Awesome icon (e.g. 'fa-fire'), or a Weather icon (e.g. 'wi-wu-sunny').

You can use the full set of google material icons if you add 'mi-' to the icon name. e.g. 'mi-videogame_asset'.

" } } diff --git a/nodes/locales/en-US/ui_tab.json b/nodes/locales/en-US/ui_tab.json index 5bfd93e5..b64cac12 100644 --- a/nodes/locales/en-US/ui_tab.json +++ b/nodes/locales/en-US/ui_tab.json @@ -16,6 +16,6 @@ "disabled": " Tab is inactive in Dashboard.", "hidden": " Tab is not shown in Navigation Menu." }, - "tip" : "The Icon field can be either a Material Design icon (e.g. 'check', 'close') or a Font Awesome icon (e.g. 'fa-fire'), or a Weather icon (e.g. 'wi-wu-sunny').

" + "tip" : "The Icon field can be either a Material Design icon (e.g. 'check', 'close') or a Font Awesome icon (e.g. 'fa-fire'), or a Weather icon (e.g. 'wi-wu-sunny').

You can use the full set of google material icons if you add 'mi-' to the icon name. e.g. 'mi-videogame_asset'.

" } } diff --git a/nodes/locales/ja/ui_link.json b/nodes/locales/ja/ui_link.json index 4bfafe4c..12658123 100644 --- a/nodes/locales/ja/ui_link.json +++ b/nodes/locales/ja/ui_link.json @@ -8,6 +8,7 @@ "new-tab" : "新規タブ", "this-tab" : "このタブ", "iframe" : "iframe" - } + }, + "tip" : "アイコンフィールドには Material Design icon (例: 'check', 'close')、Font Awesome icon (例: 'fa-fire')、もしくは Weather icon (例: 'wi-wu-sunny')を指定できます。

" } } diff --git a/nodes/locales/ja/ui_tab.json b/nodes/locales/ja/ui_tab.json index 01006071..aac24c8c 100644 --- a/nodes/locales/ja/ui_tab.json +++ b/nodes/locales/ja/ui_tab.json @@ -16,6 +16,6 @@ "disabled": " タブを無効化します", "hidden": " タブを移動メニューに表示しません" }, - "tip" : "アイコンフィールドには Material Design icon (例: 'check', 'close')、Font Awesome icon (例: 'fa-fire')、もしくは Weather icon (例: 'wi-wu-sunny')を指定できます。

" + "tip" : "アイコンフィールドには Material Design icon (例: 'check', 'close')、Font Awesome icon (例: 'fa-fire')、もしくは Weather icon (例: 'wi-wu-sunny')を指定できます。

" } } diff --git a/nodes/locales/ja/ui_template.html b/nodes/locales/ja/ui_template.html index 95f85258..be04f2ec 100644 --- a/nodes/locales/ja/ui_template.html +++ b/nodes/locales/ja/ui_template.html @@ -1,4 +1,4 @@ - diff --git a/nodes/ui_button.html b/nodes/ui_button.html index 7124873e..360975c8 100644 --- a/nodes/ui_button.html +++ b/nodes/ui_button.html @@ -108,9 +108,10 @@

Clicking the button generates a message with msg.payload set to the Payload field. If no payload is specified, the node id is used.

The Size defaults to 3 by 1.

-

The Icon can be defined, as either a Material Design icon +

The Icon can be defined, as either a Material Design icon (e.g. 'check', 'close') or a Font Awesome icon (e.g. 'fa-fire'), or a Weather icon. + You can use the full set of google material icons if you add 'mi-' to the icon name. e.g. 'mi-videogame_asset'.

The colours of the text and background may be set. They can also be set by a message property by setting the field to the name of the property, for example {{msg.background}}.

The label can also be set by a message property by setting diff --git a/nodes/ui_link.html b/nodes/ui_link.html index 8761f2ac..29d98c0d 100644 --- a/nodes/ui_link.html +++ b/nodes/ui_link.html @@ -60,8 +60,9 @@ diff --git a/nodes/ui_switch.html b/nodes/ui_switch.html index f1d47165..8869f42a 100644 --- a/nodes/ui_switch.html +++ b/nodes/ui_switch.html @@ -171,9 +171,10 @@ a msg.payload with the specified On and Off values.

The On/Off Color and On/Off Icon are optional fields. If they are all present, the default toggle switch will be replaced with the relevant icons and their respective colors.

-

The On/Off Icon field can be either Material Design icons - (e.g. 'check', 'close') or Font Awesome icons (e.g. 'fa-fire') - or weather icons. +

The On/Off Icon field can be either a Material Design icon + (e.g. 'check', 'close') or a Font Awesome icon + (e.g. 'fa-fire'), or a Weather icon. + You can use the full set of google material icons if you add 'mi-' to the icon name. e.g. 'mi-videogame_asset'.

In pass through mode the switch state can be updated by an incoming msg.payload with the specified values, that must also match the specified type (number, string, etc). When not in passthrough mode then the icon can either track the state of the output - or the input msg.payload, in order to provide a closed loop feedback.

diff --git a/nodes/ui_tab.html b/nodes/ui_tab.html index 235591b1..b5666c25 100644 --- a/nodes/ui_tab.html +++ b/nodes/ui_tab.html @@ -98,8 +98,8 @@

Hidden pages are not listed in the Left-hand Navigation Menu. However, they are still active in the Dashboard, and can be shown by using a `ui_control` msg.

-

The Icon field can be either - Material Design icons (e.g. 'check', 'close') - or Font Awesome icons (e.g. 'fa-fire'), - or Weather icons (e.g. 'wi-wu-sunny').

+

The Icon field can be either a Material Design icon + (e.g. 'check', 'close') or a Font Awesome icon + (e.g. 'fa-fire'), or a Weather icon. + You can use the full set of google material icons if you add 'mi-' to the icon name. e.g. 'mi-videogame_asset'.

diff --git a/nodes/ui_template.html b/nodes/ui_template.html index fe1bf0ff..0096134b 100644 --- a/nodes/ui_template.html +++ b/nodes/ui_template.html @@ -239,7 +239,8 @@ You can also define the template content via msg.template, so you can use external files for example.
Template will be reloaded on input if it has changed.
Code written in the Template field will be ignored when msg.template is present.

-

The following icon fonts are also available: Material Design icons, - Font Awesome icons, - Weather icons.

+

The following icon fonts are available: Material Design icon + (e.g. 'check', 'close') or a Font Awesome icon + (e.g. 'fa-fire'), or a Weather icon. + You can use the full set of google material icons if you add 'mi-' to the icon name. e.g. 'mi-videogame_asset'.

diff --git a/nodes/ui_text.html b/nodes/ui_text.html index 7d9b809e..5b4868f2 100644 --- a/nodes/ui_text.html +++ b/nodes/ui_text.html @@ -173,7 +173,8 @@

For example: {{value | uppercase}} ° will uppercase the payload text and add the degree symbol.

The label can also be set by a message property by setting the field to the name of the property, for example {{msg.topic}}.

-

The following icon fonts are also available: Material Design icons, - Font Awesome icons, - Weather icons.

+

The following icon fonts are also available: Material Design icon + (e.g. 'check', 'close') or a Font Awesome icon + (e.g. 'fa-fire'), or a Weather icon. + You can use the full set of google material icons if you add 'mi-' to the icon name. e.g. 'mi-videogame_asset'.