-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1364 from FlowFuse/1106-have-dialog-group-types
Implementation of dialog groups for all the layout types
- Loading branch information
Showing
14 changed files
with
504 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,215 @@ | ||
| [ | ||
| { | ||
| "id": "0aa38a714b8a3d67", | ||
| "type": "ui-form", | ||
| "z": "9337c17e1a7f6875", | ||
| "name": "", | ||
| "group": "c7871ac53089d535", | ||
| "label": "New User", | ||
| "order": 1, | ||
| "width": 0, | ||
| "height": 0, | ||
| "options": [ | ||
| { | ||
| "label": "Name", | ||
| "key": "name", | ||
| "type": "text", | ||
| "required": true, | ||
| "rows": null | ||
| }, | ||
| { | ||
| "label": "Admin", | ||
| "key": "isAdmin", | ||
| "type": "switch", | ||
| "required": false, | ||
| "rows": null | ||
| } | ||
| ], | ||
| "formValue": { | ||
| "name": "", | ||
| "isAdmin": false | ||
| }, | ||
| "payload": "", | ||
| "submit": "Add", | ||
| "cancel": "clear", | ||
| "resetOnSubmit": true, | ||
| "topic": "topic", | ||
| "topicType": "msg", | ||
| "splitLayout": "", | ||
| "className": "", | ||
| "passthru": false, | ||
| "dropdownOptions": [], | ||
| "x": 220, | ||
| "y": 100, | ||
| "wires": [ | ||
| [ | ||
| "adbd76ecf97076a1" | ||
| ] | ||
| ] | ||
| }, | ||
| { | ||
| "id": "fa4925a5253341ce", | ||
| "type": "ui-control", | ||
| "z": "9337c17e1a7f6875", | ||
| "name": "", | ||
| "ui": "c2e1aa56f50f03bd", | ||
| "events": "all", | ||
| "x": 580, | ||
| "y": 100, | ||
| "wires": [ | ||
| [] | ||
| ] | ||
| }, | ||
| { | ||
| "id": "adbd76ecf97076a1", | ||
| "type": "change", | ||
| "z": "9337c17e1a7f6875", | ||
| "name": "Hide Dialog", | ||
| "rules": [ | ||
| { | ||
| "t": "set", | ||
| "p": "payload", | ||
| "pt": "msg", | ||
| "to": "{\"groups\":{\"hide\":[\"Active Development:Dialog Group\"]}}", | ||
| "tot": "json" | ||
| } | ||
| ], | ||
| "action": "", | ||
| "property": "", | ||
| "from": "", | ||
| "to": "", | ||
| "reg": false, | ||
| "x": 390, | ||
| "y": 100, | ||
| "wires": [ | ||
| [ | ||
| "fa4925a5253341ce", | ||
| "b9d77a856b1be020" | ||
| ] | ||
| ] | ||
| }, | ||
| { | ||
| "id": "294ac777d99f5789", | ||
| "type": "ui-button", | ||
| "z": "9337c17e1a7f6875", | ||
| "group": "497106faf38a5190", | ||
| "name": "", | ||
| "label": "Add User (Dialog)", | ||
| "order": 1, | ||
| "width": 0, | ||
| "height": 0, | ||
| "emulateClick": false, | ||
| "tooltip": "", | ||
| "color": "", | ||
| "bgcolor": "", | ||
| "className": "", | ||
| "icon": "", | ||
| "iconPosition": "left", | ||
| "payload": "{\"groups\":{\"show\":[\"Active Development:Dialog Group\"]}}", | ||
| "payloadType": "json", | ||
| "topic": "topic", | ||
| "topicType": "msg", | ||
| "buttonColor": "", | ||
| "textColor": "", | ||
| "iconColor": "", | ||
| "x": 370, | ||
| "y": 140, | ||
| "wires": [ | ||
| [ | ||
| "fa4925a5253341ce", | ||
| "b9d77a856b1be020" | ||
| ] | ||
| ] | ||
| }, | ||
| { | ||
| "id": "b9d77a856b1be020", | ||
| "type": "debug", | ||
| "z": "9337c17e1a7f6875", | ||
| "name": "debug 2572", | ||
| "active": true, | ||
| "tosidebar": true, | ||
| "console": false, | ||
| "tostatus": false, | ||
| "complete": "false", | ||
| "statusVal": "", | ||
| "statusType": "auto", | ||
| "x": 590, | ||
| "y": 140, | ||
| "wires": [] | ||
| }, | ||
| { | ||
| "id": "c7871ac53089d535", | ||
| "type": "ui-group", | ||
| "name": "Dialog Group", | ||
| "page": "22b5519aa675ad88", | ||
| "width": "6", | ||
| "height": "1", | ||
| "order": 1, | ||
| "showTitle": true, | ||
| "className": "", | ||
| "visible": "true", | ||
| "disabled": "false", | ||
| "groupType": "dialog" | ||
| }, | ||
| { | ||
| "id": "c2e1aa56f50f03bd", | ||
| "type": "ui-base", | ||
| "name": "Dashboard", | ||
| "path": "/dashboard", | ||
| "includeClientData": true, | ||
| "acceptsClientConfig": [ | ||
| "ui-control", | ||
| "ui-notification" | ||
| ], | ||
| "showPathInSidebar": false, | ||
| "showPageTitle": false, | ||
| "navigationStyle": "icon", | ||
| "titleBarStyle": "default" | ||
| }, | ||
| { | ||
| "id": "497106faf38a5190", | ||
| "type": "ui-group", | ||
| "name": "Button Groups", | ||
| "page": "22b5519aa675ad88", | ||
| "width": "6", | ||
| "height": "1", | ||
| "order": 10, | ||
| "showTitle": true, | ||
| "className": "", | ||
| "visible": "true", | ||
| "disabled": "false" | ||
| }, | ||
| { | ||
| "id": "22b5519aa675ad88", | ||
| "type": "ui-page", | ||
| "name": "Active Development", | ||
| "ui": "c2e1aa56f50f03bd", | ||
| "path": "/active-development", | ||
| "icon": "forum", | ||
| "layout": "grid", | ||
| "theme": "129e99574def90a3", | ||
| "order": 1, | ||
| "className": "", | ||
| "visible": "true", | ||
| "disabled": "false" | ||
| }, | ||
| { | ||
| "id": "129e99574def90a3", | ||
| "type": "ui-theme", | ||
| "name": "Custom Theme", | ||
| "colors": { | ||
| "surface": "#000000", | ||
| "primary": "#ff4000", | ||
| "bgPage": "#f0f0f0", | ||
| "groupBg": "#ffffff", | ||
| "groupOutline": "#d9d9d9" | ||
| }, | ||
| "sizes": { | ||
| "pagePadding": "24px", | ||
| "groupGap": "12px", | ||
| "groupBorderRadius": "9px", | ||
| "widgetGap": "6px", | ||
| "density": "default" | ||
| } | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,49 @@ | ||
| <script type="text/html" data-help-name="ui-group"> | ||
| <p>Group</p> | ||
| <p> | ||
| A container for multiple UI Widgets. Groups can be used to organize and manage the layout of UI Widgets. | ||
| </p> | ||
| <p>A container for multiple UI Widgets. Groups can be used to organize and manage the layout of UI Widgets.</p> | ||
| <h3>Properties</h3> | ||
| <dl class="message-properties"> | ||
| <dt> | ||
| Page | ||
| <span class="property-type">option</span> | ||
| </dt> | ||
| <dd> | ||
| Specifies the page within the Node-RED Dashboard 2.0 where the group will be displayed. You can select or change the page using this option. | ||
| </dd> | ||
| <dt> | ||
| Type | ||
| <span class="property-type">option</span> | ||
| </dt> | ||
| <dd> | ||
| Controls whether the group appears as a default, inline, group or is rendered as a modal/dialog. IN the latter case, you can use a <code>ui-control</code> to open/close the dialog. | ||
| </dd> | ||
| <dt> | ||
| Size | ||
| <span class="property-type">input</span> | ||
| </dt> | ||
| <dd> | ||
| Defines the width and height of the group in grid units. You can adjust these values to control the space allocated to the group on the dashboard. | ||
| </dd> | ||
| <dt> | ||
| Class | ||
| <span class="property-type">input</span> | ||
| </dt> | ||
| <dd> | ||
| Allows the assignment of custom CSS class names for advanced styling of the group and its contents. | ||
| </dd> | ||
| <dt> | ||
| Visibility | ||
| <span class="property-type">option</span> | ||
| </dt> | ||
| <dd> | ||
| Visibility controls whether the group is displayed (Visible/Hidden). | ||
| </dd> | ||
| <dt> | ||
| Interactivity | ||
| <span class="property-type">option</span> | ||
| </dt> | ||
| <dd> | ||
| Iteractivity defines whether user interaction is allowed.(Active/Disabled). | ||
| </dd> | ||
| </dl> | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.