From c2b579ef2ab1c10e5e24936a8c226190c909e517 Mon Sep 17 00:00:00 2001 From: jgeorgi Date: Mon, 11 Sep 2023 20:00:54 -0700 Subject: [PATCH 01/19] Resize col test Signed-off-by: jgeorgi --- .../org.openhab.ui/web/src/components/app.vue | 2 +- .../components/developer/developer-dock.vue | 12 ++ .../developer/developer-sidebar.vue | 2 +- .../src/components/developer/help-sidebar.vue | 177 ++++++++++++++++++ 4 files changed, 191 insertions(+), 2 deletions(-) create mode 100644 bundles/org.openhab.ui/web/src/components/developer/developer-dock.vue create mode 100644 bundles/org.openhab.ui/web/src/components/developer/help-sidebar.vue diff --git a/bundles/org.openhab.ui/web/src/components/app.vue b/bundles/org.openhab.ui/web/src/components/app.vue index 4a5eaab83f..e22e60bd38 100644 --- a/bundles/org.openhab.ui/web/src/components/app.vue +++ b/bundles/org.openhab.ui/web/src/components/app.vue @@ -141,7 +141,7 @@ - + diff --git a/bundles/org.openhab.ui/web/src/components/developer/developer-dock.vue b/bundles/org.openhab.ui/web/src/components/developer/developer-dock.vue new file mode 100644 index 0000000000..fc2c5aae6e --- /dev/null +++ b/bundles/org.openhab.ui/web/src/components/developer/developer-dock.vue @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/bundles/org.openhab.ui/web/src/components/developer/developer-sidebar.vue b/bundles/org.openhab.ui/web/src/components/developer/developer-sidebar.vue index dce6a849b4..82d2e9fb39 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/developer-sidebar.vue +++ b/bundles/org.openhab.ui/web/src/components/developer/developer-sidebar.vue @@ -1,6 +1,6 @@ + + + + \ No newline at end of file diff --git a/bundles/org.openhab.ui/web/src/components/developer/developer-sidebar.vue b/bundles/org.openhab.ui/web/src/components/developer/developer-sidebar.vue index 82d2e9fb39..376dc23248 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/developer-sidebar.vue +++ b/bundles/org.openhab.ui/web/src/components/developer/developer-sidebar.vue @@ -1,11 +1,11 @@ diff --git a/bundles/org.openhab.ui/web/src/components/developer/help/default-context.vue b/bundles/org.openhab.ui/web/src/components/developer/help/default-context.vue new file mode 100644 index 0000000000..464c2854d6 --- /dev/null +++ b/bundles/org.openhab.ui/web/src/components/developer/help/default-context.vue @@ -0,0 +1,47 @@ + + + diff --git a/bundles/org.openhab.ui/web/src/components/developer/help/help-faq-defs.json b/bundles/org.openhab.ui/web/src/components/developer/help/help-faq-defs.json new file mode 100644 index 0000000000..048c240d55 --- /dev/null +++ b/bundles/org.openhab.ui/web/src/components/developer/help/help-faq-defs.json @@ -0,0 +1,50 @@ +[ + { + "title" : "Create an Item", + "goto" : { + "target" : "settings/items/", + "text" : "Settings > Items" + }, + "text" : "Click on the blue + in the lower right corner and select Add item.", + "doclink" : "https://www.openhab.org/docs/configuration/items.html" + }, + { + "title" : "Create a Page", + "goto" : { + "target" : "settings/pages/", + "text" : "Settings > Pages" + }, + "text" : "Click on the blue + in the lower right corner and select the type of page you want to create.", + "doclink" : "https://www.openhab.org/docs/tutorial/rules_introduction.html" + }, + { + "title" : "Create a Rule", + "goto" : { + "target" : "settings/rules/", + "text" : "Settings > Rules" + }, + "text" : "Click on the blue + in the lower right corner.", + "doclink" : "https://www.openhab.org/docs/tutorial/rules_introduction.html" + }, + { + "title" : "Delete an Item", + "goto" : { + "target" : "settings/items/", + "text" : "Settings > Items" + }, + "text" : "Select the item from the list to go to the details page. Click on the Remove Item button at the bottom of the page." + }, + { + "title" : "Delete multiple Items", + "goto" : { + "target" : "settings/items/", + "text" : "Settings > Items" + }, + "text" : "Click on Select in the upper-right corner (or ctrl + click on an Item). Select all Items to be deleted using the checkboxes and then click on the Remove button at the bottom of the screen." + }, + { + "title" : "Find available icons", + "text" : "OpenHAB specific icons can be found at the docs page linked below. F7 icons are listed in the F7 docs.", + "doclink" : "https://www.openhab.org/docs/configuration/iconsets/classic/" + } +] diff --git a/bundles/org.openhab.ui/web/src/components/developer/help/help-qstart-defs.json b/bundles/org.openhab.ui/web/src/components/developer/help/help-qstart-defs.json new file mode 100644 index 0000000000..4eb538293f --- /dev/null +++ b/bundles/org.openhab.ui/web/src/components/developer/help/help-qstart-defs.json @@ -0,0 +1,146 @@ +[ + { + "opened": true, + "title": "1. Install a Binding (Add-on)", + "steps": [ + { + "link": "/settings/addons", + "title": "Addon-Store", + "text": "Left panel > Settings > Add-on Store or click here" + }, + { + "title": "Install", + "text": "Scroll to the Binding you need and click the install button" + } + ], + "button": { + "title": "More help on Bindings", + "link": "https://www.openhab.org/docs/configuration/addons.html" + } + }, + { + "title": "2. Add a Thing", + "steps": [ + { + "link": "/settings/things/inbox", + "title": "Thing Inbox", + "text": "Left panel > Settings > Things > Inbox or click here" + }, + { + "title": "New Thing", + "text": "Click the blue + button in the lower-right corner" + }, + { + "title": "Choose Binding", + "text": "Click on the listing of the Binding for the Thing you want to add to openHAB" + }, + { + "title": "Scan", + "text": "Click the blue Scan button to automatically search for related devices" + }, + { + "title": "Add Thing", + "text": "Select the device from the list of Discovered Things and Click OK to add the Thing" + } + ], + "button": { + "title": "More help on Things", + "link": "https://www.openhab.org/docs/tutorial/things_intermediate.html" + } + }, + { + "title": "3. Configure the Thing", + "steps": [ + { + "link": "/settings/things/", + "title": "Thing List", + "text": "Left panel > Settings > Things or click here" + }, + { + "title": "Select Thing", + "text": "Click on the listing for the Thing you want to configure" + }, + { + "title": "Configuration", + "text": "Follow the documentation for the Thing's Binding to add configuration then click Save in upper right-hand corner" + } + ], + "button": { + "title": "Binding Documentation", + "link": "https://www.openhab.org/addons/" + } + }, + { + "title": "4. Create an Item", + "steps": [ + { + "link": "/settings/things/", + "title": "Thing List", + "text": "Left panel > Settings > Things or click here" + }, + { + "title": "Select Thing", + "text": "Click on the listing for the Thing you want to interface with" + }, + { + "title": "Channels", + "text": "Click on the Channels tab in the center at the top of the Thing Page" + }, + { + "title": "Select Channel", + "text": "Click to expand the Channel you will control and then click Add Link to Item" + }, + { + "title": "New Item", + "text": "Select the Create a new Item option" + }, + { + "title": "Add Item", + "text": "Click the blue Link button at the bottom of the page" + } + ], + "button": { + "title": "More help on Items", + "link": "https://www.openhab.org/docs/configuration/items.html" + } + }, + { + "title": "5. Display Item in UI", + "steps": [ + { + "link": "/settings/pages/layout/overview", + "title": "Select Page from Page List", + "text": "Left panel > Settings > Pages > Overview or click here" + }, + { + "title": "Add Block, Row, and Column", + "text": "Click on the Add Block, Add Row, and Add Column buttons in the editor" + }, + { + "title": "Add Widget", + "text": "Click the gray rectangle and select a card appropriate for the intended item (for example, a toggle card for a switch item)" + }, + { + "title": "Configure Widget", + "text": "Click the black menu button above the right corner of the widget and select Configure Widget" + }, + { + "title": "Select Item", + "text": "Click on the Item field and select an appropriate item from the list then click Done" + }, + { + "title": "Save Page", + "text": "Click Save in the upper right corner of the editor" + }, + { + "link": "/", + "title": "View Home Page", + "text": "Click here to return to the Home Overview Page" + } + ], + "button": { + "title": "More help on UI pages", + "link": "https://www.openhab.org/docs/tutorial/pages_intro.html" + } + } +] \ No newline at end of file diff --git a/bundles/org.openhab.ui/web/src/components/developer/help/thing-context.vue b/bundles/org.openhab.ui/web/src/components/developer/help/thing-context.vue new file mode 100644 index 0000000000..84459ec70f --- /dev/null +++ b/bundles/org.openhab.ui/web/src/components/developer/help/thing-context.vue @@ -0,0 +1,29 @@ + + + diff --git a/bundles/org.openhab.ui/web/src/js/store/index.js b/bundles/org.openhab.ui/web/src/js/store/index.js index 91bc8c85ae..a7c5da56e1 100644 --- a/bundles/org.openhab.ui/web/src/js/store/index.js +++ b/bundles/org.openhab.ui/web/src/js/store/index.js @@ -23,7 +23,8 @@ const store = new Vuex.Store({ apiEndpoints: null, locale: null, runtimeInfo: null, - developerSidebar: false + developerDock: false, + pagePath: null }, getters: { apiEndpoint: (state) => (type) => (!state.apiEndpoints) ? null : state.apiEndpoints.find((e) => e.type === type), @@ -38,9 +39,12 @@ const store = new Vuex.Store({ setLocale (state, locale) { state.locale = locale }, - setDeveloperSidebar (state, value) { - state.developerSidebar = value + setDeveloperDock (state, value) { + state.developerDock = value state.states.keepConnectionOpen = value + }, + setPagePath (state, value) { + state.pagePath = value } }, actions: { From abd429b472d9babd0e2116d336b1387abf1d4a97 Mon Sep 17 00:00:00 2001 From: jgeorgi Date: Sun, 17 Sep 2023 21:01:44 -0700 Subject: [PATCH 04/19] Add context dependent pages Signed-off-by: jgeorgi --- .../components/developer/developer-dock.vue | 20 +++++++++-- .../developer/developer-sidebar.vue | 8 +---- .../src/components/developer/help-sidebar.vue | 29 +++++++++++---- .../developer/help/addon-context.vue | 29 +++++++++++++++ .../developer/help/help-faq-defs.json | 8 ++--- .../developer/help/item-context.vue | 26 ++++++++++++++ .../developer/help/model-context.vue | 32 +++++++++++++++++ .../developer/help/page-context.vue | 29 +++++++++++++++ .../developer/help/rule-context.vue | 35 +++++++++++++++++++ .../developer/help/widget-context.vue | 29 +++++++++++++++ 10 files changed, 224 insertions(+), 21 deletions(-) create mode 100644 bundles/org.openhab.ui/web/src/components/developer/help/addon-context.vue create mode 100644 bundles/org.openhab.ui/web/src/components/developer/help/item-context.vue create mode 100644 bundles/org.openhab.ui/web/src/components/developer/help/model-context.vue create mode 100644 bundles/org.openhab.ui/web/src/components/developer/help/page-context.vue create mode 100644 bundles/org.openhab.ui/web/src/components/developer/help/rule-context.vue create mode 100644 bundles/org.openhab.ui/web/src/components/developer/help/widget-context.vue diff --git a/bundles/org.openhab.ui/web/src/components/developer/developer-dock.vue b/bundles/org.openhab.ui/web/src/components/developer/developer-dock.vue index b1653e944a..6d3b9b0d5c 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/developer-dock.vue +++ b/bundles/org.openhab.ui/web/src/components/developer/developer-dock.vue @@ -5,8 +5,20 @@ Tools Help - - + + + + + + + + + + + + + + @@ -37,7 +49,9 @@ export default { }, data () { return { - dockView: 'tools' + dockView: 'tools', + activeHelpTab: 'current', + activeTab: 'pin' } } } diff --git a/bundles/org.openhab.ui/web/src/components/developer/developer-sidebar.vue b/bundles/org.openhab.ui/web/src/components/developer/developer-sidebar.vue index 800edda3eb..2008b903d7 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/developer-sidebar.vue +++ b/bundles/org.openhab.ui/web/src/components/developer/developer-sidebar.vue @@ -1,11 +1,5 @@ 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 34ecbf4a11..301923aa04 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 @@ -2,6 +2,7 @@ + @@ -54,8 +55,7 @@ - {{ items.length }} Items - - + {{ items.length }} Items = 1280 ? 'Search (for advanced search, use the developer sidebar (Shift+Alt+D))' : 'Search' } From 43fce84c1bab1a69111f152cfd7f811494838fbe Mon Sep 17 00:00:00 2001 From: jgeorgi Date: Fri, 22 Sep 2023 07:31:56 -0700 Subject: [PATCH 06/19] Add help button to navbars Signed-off-by: jgeorgi --- .../src/components/developer/help-sidebar.vue | 13 ++++-- .../developer/help/help-faq-defs.json | 18 ++++---- .../developer/help/model-context.vue | 8 +++- .../developer/help/page-context.vue | 6 +++ .../developer/help/rule-context.vue | 43 +++++++++++++------ .../developer/help/thing-context.vue | 6 +++ .../src/pages/developer/developer-tools.vue | 4 +- bundles/org.openhab.ui/web/src/pages/home.vue | 2 + .../pages/settings/items/items-list-vlist.vue | 3 +- .../web/src/pages/settings/model/model.vue | 4 ++ .../src/pages/settings/pages/pages-list.vue | 8 ++-- .../src/pages/settings/rules/rules-list.vue | 8 ++-- .../src/pages/settings/schedule/schedule.vue | 2 + .../src/pages/settings/things/things-list.vue | 8 ++-- 14 files changed, 90 insertions(+), 43 deletions(-) diff --git a/bundles/org.openhab.ui/web/src/components/developer/help-sidebar.vue b/bundles/org.openhab.ui/web/src/components/developer/help-sidebar.vue index abbb410372..4466608a3b 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/help-sidebar.vue +++ b/bundles/org.openhab.ui/web/src/components/developer/help-sidebar.vue @@ -38,7 +38,7 @@ In the left panel go to {{ faq.goto.text }}

-

Full Help Docs

+

Full Help Docs

 @@ -70,7 +70,9 @@ - + + + @@ -81,7 +83,7 @@

You can find many more details and help at these resources

-

+

@@ -146,6 +148,11 @@ export default { addons: [] } }, + computed: { + documentationLinkPrefix () { + return `https://${this.$store.state.runtimeInfo.buildString === 'Release Build' ? 'www' : 'next'}.openhab.org/` + } + }, created () { this.faqs = require('./help/help-faq-defs.json') this.qstart = require('./help/help-qstart-defs.json') diff --git a/bundles/org.openhab.ui/web/src/components/developer/help/help-faq-defs.json b/bundles/org.openhab.ui/web/src/components/developer/help/help-faq-defs.json index c126422382..8d94deea1a 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/help/help-faq-defs.json +++ b/bundles/org.openhab.ui/web/src/components/developer/help/help-faq-defs.json @@ -2,34 +2,34 @@ { "title" : "Create an Item", "goto" : { - "target" : "settings/items/", + "target" : "/settings/items/", "text" : "Settings > Items" }, "text" : "Click on the plus_circle_fill in the lower right corner and select Add item.", - "doclink" : "https://www.openhab.org/docs/configuration/items.html" + "doclink" : "docs/configuration/items.html" }, { "title" : "Create a Page", "goto" : { - "target" : "settings/pages/", + "target" : "/settings/pages/", "text" : "Settings > Pages" }, "text" : "Click on the plus_circle_fill in the lower right corner and select the type of page you want to create.", - "doclink" : "https://www.openhab.org/docs/tutorial/rules_introduction.html" + "doclink" : "docs/tutorial/pages_intro.html" }, { "title" : "Create a Rule", "goto" : { - "target" : "settings/rules/", + "target" : "/settings/rules/", "text" : "Settings > Rules" }, "text" : "Click on the plus_circle_fill in the lower right corner.", - "doclink" : "https://www.openhab.org/docs/tutorial/rules_introduction.html" + "doclink" : "docs/tutorial/rules_introduction.html" }, { "title" : "Delete an Item", "goto" : { - "target" : "settings/items/", + "target" : "/settings/items/", "text" : "Settings > Items" }, "text" : "Select the item from the list to go to the details page. Click on the Remove Item button at the bottom of the page." @@ -37,7 +37,7 @@ { "title" : "Delete multiple Items", "goto" : { - "target" : "settings/items/", + "target" : "/settings/items/", "text" : "Settings > Items" }, "text" : "Click on Select in the upper-right corner (or Ctrl + Click on an Item). Select all Items to be deleted using the checkboxes and then click on the Remove button at the bottom of the screen." @@ -45,6 +45,6 @@ { "title" : "Find available icons", "text" : "OpenHAB specific icons can be found at the docs page linked below. F7 icons are listed in the F7 docs. Material icons can be found here. The entire Iconify library is also available for use.", - "doclink" : "https://www.openhab.org/docs/configuration/iconsets/classic/" + "doclink" : "docs/configuration/iconsets/classic/" } ] diff --git a/bundles/org.openhab.ui/web/src/components/developer/help/model-context.vue b/bundles/org.openhab.ui/web/src/components/developer/help/model-context.vue index 7640294a21..193fab44a2 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/help/model-context.vue +++ b/bundles/org.openhab.ui/web/src/components/developer/help/model-context.vue @@ -16,17 +16,23 @@ Add group items with semantic equipment tags to represent devices of interest to users in specific locations - Add items with seemantic class and property tags to represent the actual information and interactions that users will need + Add items with semantic class and property tags to represent the actual information and interactions that users will need Create equipement directly from your Things with the desired items for rapid building of a semantic model

+ diff --git a/bundles/org.openhab.ui/web/src/components/developer/help/page-context.vue b/bundles/org.openhab.ui/web/src/components/developer/help/page-context.vue index 80674be75d..6c37226501 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/help/page-context.vue +++ b/bundles/org.openhab.ui/web/src/components/developer/help/page-context.vue @@ -20,10 +20,16 @@

+ diff --git a/bundles/org.openhab.ui/web/src/components/developer/help/rule-context.vue b/bundles/org.openhab.ui/web/src/components/developer/help/rule-context.vue index 3dc4100aa5..5a873ba9f3 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/help/rule-context.vue +++ b/bundles/org.openhab.ui/web/src/components/developer/help/rule-context.vue @@ -1,35 +1,54 @@ diff --git a/bundles/org.openhab.ui/web/src/components/developer/help/thing-context.vue b/bundles/org.openhab.ui/web/src/components/developer/help/thing-context.vue index 84459ec70f..39055a2920 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/help/thing-context.vue +++ b/bundles/org.openhab.ui/web/src/components/developer/help/thing-context.vue @@ -20,10 +20,16 @@

+ diff --git a/bundles/org.openhab.ui/web/src/pages/developer/developer-tools.vue b/bundles/org.openhab.ui/web/src/pages/developer/developer-tools.vue index ffa3ecbb5e..daa542a9e5 100644 --- a/bundles/org.openhab.ui/web/src/pages/developer/developer-tools.vue +++ b/bundles/org.openhab.ui/web/src/pages/developer/developer-tools.vue @@ -32,10 +32,10 @@ Maintenance Tools - +
- +
diff --git a/bundles/org.openhab.ui/web/src/pages/home.vue b/bundles/org.openhab.ui/web/src/pages/home.vue index 2cbf318c00..f441c68fdc 100644 --- a/bundles/org.openhab.ui/web/src/pages/home.vue +++ b/bundles/org.openhab.ui/web/src/pages/home.vue @@ -12,6 +12,8 @@ {{ title }} + + 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 301923aa04..e75d87f618 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 @@ -2,7 +2,8 @@ - + + diff --git a/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue b/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue index 6e894baf19..46daacb27b 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue @@ -1,6 +1,10 @@ diff --git a/bundles/org.openhab.ui/web/src/components/developer/help/rule-context.vue b/bundles/org.openhab.ui/web/src/components/developer/help/rule-context.vue index 5a873ba9f3..fee0b71b24 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/help/rule-context.vue +++ b/bundles/org.openhab.ui/web/src/components/developer/help/rule-context.vue @@ -7,7 +7,11 @@ Community made Rule Templates can also be added to your system from the Automation tab of the Add-on Store.

- The shedule page shows you a calendar layout of all Rules that have the tag and trigger at one or more defined times. + The shedule page shows you a calendar layout of all Rules that have the + + + + tag and trigger at one or more defined times.

On these pages you can manage all the basic {{ type }} you have added to your system. @@ -25,7 +29,7 @@ Click on any Scene in the main list to edit scene's item commands - Select multiple {{ type }} using the top Select button and use the Remove button at the bottom or use the Remove {{ type }} button on the individual {{ type.slice(0,-1).toLowerCase() }} pages + Select multiple {{ type }} using the top Select button and use the Remove button at the bottom or use the Remove {{ type }} button on the individual {{ type.slice(0,-1).toLowerCase() }} pages Select multiple {{ type }} using the top Select button and use the Enable or Disable buttons at the bottom or use the play_circle and pause_circle buttons on the individual {{ type.slice(0,-1).toLowerCase() }} pages diff --git a/bundles/org.openhab.ui/web/src/components/developer/help/transform-context.vue b/bundles/org.openhab.ui/web/src/components/developer/help/transform-context.vue index d816c5f81a..bda399978b 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/help/transform-context.vue +++ b/bundles/org.openhab.ui/web/src/components/developer/help/transform-context.vue @@ -4,7 +4,11 @@ Transformations are openHAB objects that convert a value or item state into different value or state. Transformations can be used in many different instances including Links betweens Channels and Items, Rule scripts, and some Thing configurations.

- The different available Transformation methods must be individually installed via the Other tab of the Add-on Store. + The different available Transformation methods must be individually installed via the Other tab of the + + Add-on Store + + .

On these pages you can manage all the Transformations you have added to your system. diff --git a/bundles/org.openhab.ui/web/src/js/store/index.js b/bundles/org.openhab.ui/web/src/js/store/index.js index 09ba724181..a7c5da56e1 100644 --- a/bundles/org.openhab.ui/web/src/js/store/index.js +++ b/bundles/org.openhab.ui/web/src/js/store/index.js @@ -24,7 +24,7 @@ const store = new Vuex.Store({ locale: null, runtimeInfo: null, developerDock: false, - pagePath: null, + pagePath: null }, getters: { apiEndpoint: (state) => (type) => (!state.apiEndpoints) ? null : state.apiEndpoints.find((e) => e.type === type), From 33f4ded9e27a6e2ff6b3c4ab112457ae1f3fa5b5 Mon Sep 17 00:00:00 2001 From: jgeorgi Date: Sat, 23 Sep 2023 21:02:20 -0700 Subject: [PATCH 11/19] Fix build errors Signed-off-by: jgeorgi --- .../web/src/components/developer/help-sidebar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.ui/web/src/components/developer/help-sidebar.vue b/bundles/org.openhab.ui/web/src/components/developer/help-sidebar.vue index 49abaf82fe..3443a4e110 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/help-sidebar.vue +++ b/bundles/org.openhab.ui/web/src/components/developer/help-sidebar.vue @@ -82,7 +82,7 @@ - + From 74a0e5d8dbd32a0472bb210cb329c3615ba4fe60 Mon Sep 17 00:00:00 2001 From: Justin Georgi Date: Sat, 30 Sep 2023 16:40:25 -0700 Subject: [PATCH 12/19] Fix help link on narrow screens Signed-off-by: Justin Georgi --- bundles/org.openhab.ui/web/src/pages/home.vue | 7 ++++--- .../web/src/pages/settings/items/items-list-vlist.vue | 7 ++++--- .../org.openhab.ui/web/src/pages/settings/model/model.vue | 7 ++++--- .../web/src/pages/settings/pages/pages-list.vue | 7 ++++--- .../web/src/pages/settings/rules/rules-list.vue | 7 ++++--- .../web/src/pages/settings/schedule/schedule.vue | 7 ++++--- .../web/src/pages/settings/things/things-list.vue | 7 ++++--- .../settings/transformations/transformations-list.vue | 7 ++++--- 8 files changed, 32 insertions(+), 24 deletions(-) diff --git a/bundles/org.openhab.ui/web/src/pages/home.vue b/bundles/org.openhab.ui/web/src/pages/home.vue index f441c68fdc..55cb8bdb20 100644 --- a/bundles/org.openhab.ui/web/src/pages/home.vue +++ b/bundles/org.openhab.ui/web/src/pages/home.vue @@ -12,8 +12,8 @@ {{ title }} - - + + @@ -103,7 +103,8 @@ export default { showExitToApp: false, currentTab: this.initialTab || 'overview', overviewPageKey: this.$utils.id(), - items: [] + items: [], + windowWidth: window.innerWidth } }, computed: { 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 e75d87f618..4554625575 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 @@ -2,8 +2,8 @@ - - + + @@ -150,7 +150,8 @@ export default { }, selectedItems: [], showCheckboxes: false, - eventSource: null + eventSource: null, + windowWidth: window.innerWidth } }, methods: { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue b/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue index 46daacb27b..461a38507d 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue @@ -2,8 +2,8 @@ - - + + - - + + @@ -167,7 +167,8 @@ export default { { type: 'map', label: 'Map', componentType: 'oh-map-page', icon: 'map' }, { type: 'plan', label: 'Floor plan', componentType: 'oh-plan-page', icon: 'square_stack_3d_up' }, { type: 'chart', label: 'Chart', componentType: 'oh-chart-page', icon: 'graph_square' } - ] + ], + windowWidth: window.innerWidth } }, computed: { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue index 8ad0a096c4..1af79a56d6 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue @@ -2,8 +2,8 @@ - - + + @@ -149,7 +149,8 @@ export default { initSearchbar: false, selectedItems: [], showCheckboxes: false, - eventSource: null + eventSource: null, + windowWidth: window.innerWidth } }, computed: { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue b/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue index f769e86254..18994f5fbf 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue @@ -2,8 +2,8 @@ - - + + @@ -96,7 +96,8 @@ export default { initSearchbar: false, selectedItems: [], showCheckboxes: false, - eventSource: null + eventSource: null, + windowWidth: window.innerWidth } }, created () { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue index 40ad4ca941..02ad28944d 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue @@ -2,8 +2,8 @@ - - + + @@ -165,7 +165,8 @@ export default { selectedItems: [], showCheckboxes: false, groupBy: 'alphabetical', - eventSource: null + eventSource: null, + windowWidth: window.innerWidth } }, created () { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformations-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformations-list.vue index 02a9dbeae5..ee901935cc 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformations-list.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformations-list.vue @@ -2,8 +2,8 @@ - - + + @@ -131,7 +131,8 @@ export default { initSearchbar: false, selectedTransformations: [], groupBy: 'alphabetical', - showCheckboxes: false + showCheckboxes: false, + windowWidth: window.innerWidth } }, computed: { From aec2fe12f09a5876e6c9d8cdf93a19c001081b83 Mon Sep 17 00:00:00 2001 From: Justin Georgi Date: Sat, 14 Oct 2023 08:15:29 -0700 Subject: [PATCH 13/19] Fix conflict error Signed-off-by: Justin Georgi --- bundles/org.openhab.ui/web/src/components/app.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.openhab.ui/web/src/components/app.vue b/bundles/org.openhab.ui/web/src/components/app.vue index eb6c2135a7..2fd9198565 100644 --- a/bundles/org.openhab.ui/web/src/components/app.vue +++ b/bundles/org.openhab.ui/web/src/components/app.vue @@ -248,7 +248,7 @@ import Framework7 from 'framework7/framework7-lite.esm.bundle.js' import cordovaApp from '../js/cordova-app.js' import routes from '../js/routes.js' import PanelRight from '../pages/panel-right.vue' -import DeveloperSidebar from './developer/developer-sidebar.vue' +import DeveloperDock from './developer/developer-dock.vue' import EmptyStatePlaceholder from '@/components/empty-state-placeholder.vue' import { loadLocaleMessages } from '@/js/i18n' From 8e8bab49a734a437afecaf72a937238b04cc55a3 Mon Sep 17 00:00:00 2001 From: Justin Georgi Date: Sat, 14 Oct 2023 08:54:50 -0700 Subject: [PATCH 14/19] Link and button updates Signed-off-by: Justin Georgi --- .../src/components/developer/help-sidebar.vue | 7 +++++-- .../developer/help/help-qstart-defs.json | 16 ++++++++-------- .../web/src/pages/home/overview-tab.vue | 2 +- .../pages/settings/items/items-list-vlist.vue | 2 +- .../web/src/pages/settings/rules/rules-list.vue | 2 +- .../src/pages/settings/things/things-list.vue | 2 +- .../transformations/transformations-list.vue | 2 +- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/bundles/org.openhab.ui/web/src/components/developer/help-sidebar.vue b/bundles/org.openhab.ui/web/src/components/developer/help-sidebar.vue index 3443a4e110..d6eb184c6b 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/help-sidebar.vue +++ b/bundles/org.openhab.ui/web/src/components/developer/help-sidebar.vue @@ -123,10 +123,13 @@ background #232323 !important .add-button-icon - color: blue + color: #2196f3 + +.link-item-icon + color: #4cd964 .chevron-icon - color: blue + color: #2196f3 .faq-title .item-title white-space: normal !important diff --git a/bundles/org.openhab.ui/web/src/components/developer/help/help-qstart-defs.json b/bundles/org.openhab.ui/web/src/components/developer/help/help-qstart-defs.json index de760a592f..434dccc89a 100644 --- a/bundles/org.openhab.ui/web/src/components/developer/help/help-qstart-defs.json +++ b/bundles/org.openhab.ui/web/src/components/developer/help/help-qstart-defs.json @@ -6,7 +6,7 @@ { "link": "/settings/addons", "title": "Addon-Store", - "text": "Left panel > Settings > Add-on Store or click here" + "text": "Left panel > Settings > Add-on Store or click here arrow_right" }, { "title": "Install", @@ -24,7 +24,7 @@ { "link": "/settings/things/inbox", "title": "Thing Inbox", - "text": "Left panel > Settings > Things > Inbox or click here" + "text": "Left panel > Settings > Things > Inbox or click here arrow_right" }, { "title": "New Thing", @@ -36,7 +36,7 @@ }, { "title": "Scan", - "text": "Click the Scan button to automatically search for related devices" + "text": "Click the Scan button to automatically search for related devices" }, { "title": "Add Thing", @@ -54,7 +54,7 @@ { "link": "/settings/things/", "title": "Thing List", - "text": "Left panel > Settings > Things or click here" + "text": "Left panel > Settings > Things or click here arrow_right" }, { "title": "Select Thing", @@ -76,7 +76,7 @@ { "link": "/settings/things/", "title": "Thing List", - "text": "Left panel > Settings > Things or click here" + "text": "Left panel > Settings > Things or click here arrow_right" }, { "title": "Select Thing", @@ -88,7 +88,7 @@ }, { "title": "Select Channel", - "text": "Click to expand the Channel you will control and then click Add Link to Item" + "text": "Click to expand the Channel you will control and then click plus_circle_fill Add Link to Item" }, { "title": "New Item", @@ -110,7 +110,7 @@ { "link": "/settings/pages/layout/overview", "title": "Select Page from Page List", - "text": "Left panel > Settings > Pages > Overview or click here" + "text": "Left panel > Settings > Pages > Overview or click here arrow_right" }, { "title": "Add Block, Row, and Column", @@ -135,7 +135,7 @@ { "link": "/", "title": "View Home Page", - "text": "Click here to return to the Home Overview Page" + "text": "Click here to return to the Home Overview Page arrow_right" } ], "button": { diff --git a/bundles/org.openhab.ui/web/src/pages/home/overview-tab.vue b/bundles/org.openhab.ui/web/src/pages/home/overview-tab.vue index c6109709b0..c3cd8448d0 100644 --- a/bundles/org.openhab.ui/web/src/pages/home/overview-tab.vue +++ b/bundles/org.openhab.ui/web/src/pages/home/overview-tab.vue @@ -15,7 +15,7 @@

- + 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 4554625575..f8dc8b46c9 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 @@ -100,7 +100,7 @@ - + diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue index 1af79a56d6..e68410b1b4 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue @@ -119,7 +119,7 @@ - + diff --git a/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue index 02ad28944d..dcd5e774e2 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue @@ -122,7 +122,7 @@ - + diff --git a/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformations-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformations-list.vue index ee901935cc..b798735ffd 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformations-list.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformations-list.vue @@ -106,7 +106,7 @@ - + From 132e668bfb0d414ea07dc3a076b6e99e89092aec Mon Sep 17 00:00:00 2001 From: Florian Hotze Date: Fri, 17 Nov 2023 21:43:22 +0100 Subject: [PATCH 15/19] Review changes to /settings/ pages Signed-off-by: Florian Hotze --- .../src/pages/settings/items/items-list-vlist.vue | 12 +++++++----- .../web/src/pages/settings/model/model.vue | 7 +++---- .../web/src/pages/settings/pages/pages-list.vue | 7 +++---- .../web/src/pages/settings/rules/rules-list.vue | 12 +++++++----- .../web/src/pages/settings/things/things-list.vue | 12 +++++++----- .../transformations/transformations-list.vue | 12 +++++++----- 6 files changed, 34 insertions(+), 28 deletions(-) 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 f8dc8b46c9..e58f98459f 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 @@ -2,8 +2,8 @@ - - + + @@ -100,7 +100,7 @@ - + @@ -150,8 +150,7 @@ export default { }, selectedItems: [], showCheckboxes: false, - eventSource: null, - windowWidth: window.innerWidth + eventSource: null } }, methods: { @@ -299,6 +298,9 @@ export default { } }, computed: { + documentationLink () { + return `https://${this.$store.state.runtimeInfo.buildString === 'Release Build' ? 'www' : 'next'}.openhab.org/link/items` + }, searchPlaceholder () { return window.innerWidth >= 1280 ? 'Search (for advanced search, use the developer sidebar (Shift+Alt+D))' : 'Search' } diff --git a/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue b/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue index 461a38507d..83dce94cf6 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue @@ -2,8 +2,8 @@ - - + + - - + + @@ -167,8 +167,7 @@ export default { { type: 'map', label: 'Map', componentType: 'oh-map-page', icon: 'map' }, { type: 'plan', label: 'Floor plan', componentType: 'oh-plan-page', icon: 'square_stack_3d_up' }, { type: 'chart', label: 'Chart', componentType: 'oh-chart-page', icon: 'graph_square' } - ], - windowWidth: window.innerWidth + ] } }, computed: { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue index e68410b1b4..8485bcb48f 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue @@ -2,8 +2,8 @@ - - + + @@ -119,7 +119,7 @@ - + @@ -149,11 +149,13 @@ export default { initSearchbar: false, selectedItems: [], showCheckboxes: false, - eventSource: null, - windowWidth: window.innerWidth + eventSource: null } }, computed: { + documentationLink () { + return `https://${this.$store.state.runtimeInfo.buildString === 'Release Build' ? 'www' : 'next'}.openhab.org/link/${this.type.toLowerCase()}` + }, type () { return this.showScripts ? 'Scripts' : (this.showScenes ? 'Scenes' : 'Rules') }, diff --git a/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue index dcd5e774e2..9215b87ded 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue @@ -2,8 +2,8 @@ - - + + @@ -122,7 +122,7 @@ - + @@ -165,14 +165,16 @@ export default { selectedItems: [], showCheckboxes: false, groupBy: 'alphabetical', - eventSource: null, - windowWidth: window.innerWidth + eventSource: null } }, created () { }, computed: { + documentationLink () { + return `https://${this.$store.state.runtimeInfo.buildString === 'Release Build' ? 'www' : 'next'}.openhab.org/link/thing` + }, indexedThings () { if (this.groupBy === 'alphabetical') { return this.things.reduce((prev, thing, i, things) => { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformations-list.vue b/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformations-list.vue index b798735ffd..8fa13fa1c4 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformations-list.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/transformations/transformations-list.vue @@ -2,8 +2,8 @@ - - + + @@ -106,7 +106,7 @@ - + @@ -131,11 +131,13 @@ export default { initSearchbar: false, selectedTransformations: [], groupBy: 'alphabetical', - showCheckboxes: false, - windowWidth: window.innerWidth + showCheckboxes: false } }, computed: { + documentationLink () { + return `https://${this.$store.state.runtimeInfo.buildString === 'Release Build' ? 'www' : 'next'}.openhab.org/link/transformations` + }, indexedTransformations () { if (this.groupBy === 'alphabetical') { return this.transformations.reduce((prev, transformation, i, transformations) => { From fbf6eb99e8a579bf2249416d95659c7ac9f2191b Mon Sep 17 00:00:00 2001 From: Florian Hotze Date: Fri, 17 Nov 2023 21:50:55 +0100 Subject: [PATCH 16/19] Review changes to remaining existing pages Signed-off-by: Florian Hotze --- bundles/org.openhab.ui/web/src/pages/home.vue | 7 +++---- .../org.openhab.ui/web/src/pages/settings/model/model.vue | 6 +++--- .../web/src/pages/settings/rules/rules-list.vue | 6 +++--- .../web/src/pages/settings/schedule/schedule.vue | 7 +++---- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/bundles/org.openhab.ui/web/src/pages/home.vue b/bundles/org.openhab.ui/web/src/pages/home.vue index 55cb8bdb20..c2f77fa77b 100644 --- a/bundles/org.openhab.ui/web/src/pages/home.vue +++ b/bundles/org.openhab.ui/web/src/pages/home.vue @@ -12,8 +12,8 @@ {{ title }} - - + + @@ -103,8 +103,7 @@ export default { showExitToApp: false, currentTab: this.initialTab || 'overview', overviewPageKey: this.$utils.id(), - items: [], - windowWidth: window.innerWidth + items: [] } }, computed: { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue b/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue index 83dce94cf6..47fdfd2be5 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/model/model.vue @@ -1,9 +1,9 @@