Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a global component developer-dock-icon #2369

Merged
merged 3 commits into from
Feb 18, 2024
Merged

Add a global component developer-dock-icon #2369

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad8eb57
Add a global component developer-dock-icon
jimtng Feb 17, 2024
0b649a6
Add developer dock icon to rule-edit and script-edit
jimtng Feb 17, 2024
c4bdce0
Minor enhancements
florian-h05 Feb 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions bundles/org.openhab.ui/web/src/components/developer/developer-dock-icon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<template>
<f7-link v-if="$store.state.developerDock && $f7.width >= 1280" icon-f7="question_circle_fill" @click="$f7.emit('toggleDeveloperDock')" />
<f7-link v-else-if="$f7.width >= 1280" icon-f7="question_circle" @click="$f7.emit('selectDeveloperDock',{'dock':'help','helpTab':'current'})" />
</template>

<script>
export default {
}
</script>
2 changes: 2 additions & 0 deletions bundles/org.openhab.ui/web/src/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import OHIconComponent from '../components/widgets/system/oh-icon.vue'
import ModelTreeviewItem from '../components/model/treeview-item.vue'
import SitemapTreeviewItem from '../components/pagedesigner/sitemap/treeview-item.vue'
import GenericWidgetComponent from '../components/widgets/generic-widget-component.vue'
import DeveloperDockIcon from '../components/developer/developer-dock-icon.vue'

// Import Framework7
import Framework7 from 'framework7/framework7-lite.esm.bundle.js'
Expand Down Expand Up @@ -80,3 +81,4 @@ Vue.component('oh-icon', OHIconComponent)
Vue.component('model-treeview-item', ModelTreeviewItem)
Vue.component('sitemap-treeview-item', SitemapTreeviewItem)
Vue.component('generic-widget-component', GenericWidgetComponent)
Vue.component('developer-dock-icon', DeveloperDockIcon)
3 changes: 1 addition & 2 deletions bundles/org.openhab.ui/web/src/pages/about.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<f7-page name="about" class="page-about" @page:beforein="beforePageIn">
<f7-navbar large :title-large="$t('about.title')" :title="$t('about.title')" :back-link="$t('dialogs.back')">
<f7-nav-right>
<f7-link v-if="$store.state.developerDock && $f7.width >= 1280" icon-f7="question_circle_fill" @click="$f7.emit('toggleDeveloperDock')" />
<f7-link v-else-if="$f7.width >= 1280" icon-f7="question_circle" @click="$f7.emit('selectDeveloperDock',{'dock':'help','helpTab':'current'})" />
<developer-dock-icon />
</f7-nav-right>
</f7-navbar>
<f7-block class="block-narrow after-big-title">
Expand Down
3 changes: 1 addition & 2 deletions bundles/org.openhab.ui/web/src/pages/addons/addons-store.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
<span v-if="currentTab === 'search'">Search</span>
</f7-nav-title>
<f7-nav-right>
<f7-link v-if="$store.state.developerDock && $f7.width >= 1280" icon-f7="question_circle_fill" @click="$f7.emit('toggleDeveloperDock')" />
<f7-link v-else-if="$f7.width >= 1280" icon-f7="question_circle" @click="$f7.emit('selectDeveloperDock',{'dock':'help','helpTab':'current'})" />
<developer-dock-icon />
<f7-link
v-show="currentTab === 'search'"
class="searchbar-enable"
Expand Down
3 changes: 1 addition & 2 deletions bundles/org.openhab.ui/web/src/pages/developer/developer-tools.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<f7-page name="devtools" @page:beforeremove="onPageBeforeRemove">
<f7-navbar title="Developer Tools" back-link="Back" back-link-url="/" back-link-force no-hairline>
<f7-nav-right>
<f7-link v-if="$store.state.developerDock && $f7.width >= 1280" icon-f7="question_circle_fill" @click="$f7.emit('toggleDeveloperDock')" />
<f7-link v-else-if="$f7.width >= 1280" icon-f7="question_circle" @click="$f7.emit('selectDeveloperDock',{'dock':'help','helpTab':'current'})" />
<developer-dock-icon />
</f7-nav-right>
</f7-navbar>
<f7-toolbar tabbar position="top">
Expand Down
3 changes: 1 addition & 2 deletions bundles/org.openhab.ui/web/src/pages/settings/items/items-list-vlist.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<f7-page @page:afterin="onPageAfterIn" @page:beforeout="onPageBeforeOut">
<f7-navbar title="Items" back-link="Settings" back-link-url="/settings/" back-link-force>
<f7-nav-right>
<f7-link v-if="$store.state.developerDock && $f7.width >= 1280" icon-f7="question_circle_fill" @click="$f7.emit('toggleDeveloperDock')" />
<f7-link v-else-if="$f7.width >= 1280" icon-f7="question_circle" @click="$f7.emit('selectDeveloperDock',{'dock':'help','helpTab':'current'})" />
<developer-dock-icon />
<f7-link icon-md="material:done_all" @click="toggleCheck()"
:text="(!$theme.md) ? ((showCheckboxes) ? 'Done' : 'Select') : ''" />
</f7-nav-right>
Expand Down
3 changes: 1 addition & 2 deletions bundles/org.openhab.ui/web/src/pages/settings/menu/settings-menu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<f7-page @page:init="onPageInit" @page:afterin="onPageAfterIn" class="page-settings">
<f7-navbar large :large-transparent="false" title-large="Settings" title="Settings" back-link="Back" back-link-url="/home/" back-link-force>
<f7-nav-right>
<f7-link v-if="$store.state.developerDock && $f7.width >= 1280" icon-f7="question_circle_fill" @click="$f7.emit('toggleDeveloperDock')" />
<f7-link v-else-if="$f7.width >= 1280" icon-f7="question_circle" @click="$f7.emit('selectDeveloperDock',{'dock':'help','helpTab':'current'})" />
<developer-dock-icon />
<f7-link
class="searchbar-enable"
data-searchbar=".searchbar-demo"
Expand Down
5 changes: 2 additions & 3 deletions bundles/org.openhab.ui/web/src/pages/settings/model/model.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<template>
<f7-page name="Model" :stacked="true" @page:afterin="onPageAfterIn" @page:beforeout="onPageBeforeOut" @click="selectItem(null)">
<f7-navbar title="Semantic Model" back-link="Settings" back-link-url="/settings/" back-link-force>
<f7-nav-right v-if="$f7.width >= 1280">
<f7-link v-if="$store.state.developerDock" icon-f7="question_circle_fill" @click="$f7.emit('toggleDeveloperDock')" />
<f7-link v-else icon-f7="question_circle" @click="$f7.emit('selectDeveloperDock',{'dock':'help','helpTab':'current'})" />
<f7-nav-right>
<developer-dock-icon />
</f7-nav-right>
<f7-subnavbar :inner="false" v-show="initSearchbar">
<f7-searchbar
Expand Down
3 changes: 1 addition & 2 deletions bundles/org.openhab.ui/web/src/pages/settings/pages/pages-list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<f7-page @page:afterin="onPageAfterIn" @page:afterout="onPageAfterOut">
<f7-navbar title="Pages" back-link="Settings" back-link-url="/settings/" back-link-force>
<f7-nav-right>
<f7-link v-if="$store.state.developerDock && $f7.width >= 1280" icon-f7="question_circle_fill" @click="$f7.emit('toggleDeveloperDock')" />
<f7-link v-else-if="$f7.width >= 1280" icon-f7="question_circle" @click="$f7.emit('selectDeveloperDock',{'dock':'help','helpTab':'current'})" />
<developer-dock-icon />
<f7-link icon-md="material:done_all" @click="toggleCheck()"
:text="(!$theme.md) ? ((showCheckboxes) ? 'Done' : 'Select') : ''" />
</f7-nav-right>
Expand Down
3 changes: 1 addition & 2 deletions bundles/org.openhab.ui/web/src/pages/settings/persistence/persistence-settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<f7-page @page:afterin="onPageAfterIn" @page:beforeout="onPageBeforeOut">
<f7-navbar title="Persistence Settings" back-link="Settings" back-link-url="/settings/" back-link-force>
<f7-nav-right v-if="persistenceList.length > 0">
<f7-link v-if="$store.state.developerDock && $f7.width >= 1280" icon-f7="question_circle_fill" @click="$f7.emit('toggleDeveloperDock')" />
<f7-link v-else-if="$f7.width >= 1280" icon-f7="question_circle" @click="$f7.emit('selectDeveloperDock',{'dock':'help','helpTab':'current'})" />
<developer-dock-icon />
<f7-link @click="save()" v-if="$theme.md" icon-md="material:save" icon-only />
<f7-link @click="save()" v-if="!$theme.md">
Save<span v-if="$device.desktop">&nbsp;(Ctrl-S)</span>
Expand Down
13 changes: 8 additions & 5 deletions bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
<template>
<f7-page @page:afterin="onPageAfterIn" @page:afterout="onPageAfterOut">
<f7-navbar :title="isNewRule ? 'Create rule' : rule.name" back-link="Back" no-hairline>
<f7-nav-right v-if="isEditable">
<f7-link @click="save()" v-if="$theme.md" icon-md="material:save" icon-only />
<f7-link @click="save()" v-if="!$theme.md">
Save<span v-if="$device.desktop">&nbsp;(Ctrl-S)</span>
</f7-link>
<f7-nav-right>
<developer-dock-icon />
florian-h05 marked this conversation as resolved.
Show resolved Hide resolved
<template v-if="isEditable">
<f7-link @click="save()" v-if="$theme.md" icon-md="material:save" icon-only />
<f7-link @click="save()" v-if="!$theme.md">
Save<span v-if="$device.desktop">&nbsp;(Ctrl-S)</span>
</f7-link>
</template>
</f7-nav-right>
</f7-navbar>
<f7-toolbar tabbar position="top">
Expand Down
3 changes: 1 addition & 2 deletions bundles/org.openhab.ui/web/src/pages/settings/rules/rules-list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<f7-page @page:afterin="onPageAfterIn" @page:afterout="stopEventSource">
<f7-navbar :title="type" back-link="Settings" back-link-url="/settings/" back-link-force>
<f7-nav-right>
<f7-link v-if="$store.state.developerDock && $f7.width >= 1280" icon-f7="question_circle_fill" @click="$f7.emit('toggleDeveloperDock')" />
<f7-link v-else-if="$f7.width >= 1280" icon-f7="question_circle" @click="$f7.emit('selectDeveloperDock',{'dock':'help','helpTab':'current'})" />
<developer-dock-icon />
<f7-link icon-md="material:done_all" @click="toggleCheck()"
:text="(!$theme.md) ? ((showCheckboxes) ? 'Done' : 'Select') : ''" />
</f7-nav-right>
Expand Down
25 changes: 14 additions & 11 deletions bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
<template>
<f7-page @page:afterin="onPageAfterIn" @page:beforeout="onPageBeforeOut">
<f7-navbar :title="pageTitle" :subtitle="(!newScript) ? mode : undefined" back-link="Back">
<f7-nav-right v-if="isEditable && !newScript">
<f7-link @click="onSave()" v-if="$theme.md" icon-md="material:save" icon-only />
<f7-link @click="onSave()" v-if="!$theme.md">
Save<span v-if="$device.desktop">&nbsp;(Ctrl-S)</span>
</f7-link>
</f7-nav-right>
<f7-nav-right v-else-if="isEditable && newScript">
<f7-link @click="createScript" v-if="$theme.md && newScript" icon-md="material:save" icon-only />
<f7-link @click="createScript" v-if="$theme.ios && newScript">
Create
</f7-link>
<f7-nav-right>
<developer-dock-icon />
<template v-if="isEditable && !newScript">
<f7-link @click="onSave()" v-if="$theme.md" icon-md="material:save" icon-only />
<f7-link @click="onSave()" v-if="!$theme.md">
Save<span v-if="$device.desktop">&nbsp;(Ctrl-S)</span>
</f7-link>
</template>
<template v-else-if="isEditable && newScript">
<f7-link @click="createScript" v-if="$theme.md && newScript" icon-md="material:save" icon-only />
<f7-link @click="createScript" v-if="$theme.ios && newScript">
Create
</f7-link>
</template>
</f7-nav-right>
</f7-navbar>
<f7-toolbar v-if="!newScript && ready" position="bottom">
Expand Down
3 changes: 1 addition & 2 deletions bundles/org.openhab.ui/web/src/pages/settings/schedule/schedule.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<f7-page @page:afterin="onPageAfterIn" @page:afterout="stopEventSource">
<f7-navbar title="Schedule" back-link="Settings" back-link-url="/settings/" back-link-force>
<f7-nav-right>
<f7-link v-if="$store.state.developerDock && $f7.width >= 1280" icon-f7="question_circle_fill" @click="$f7.emit('toggleDeveloperDock')" />
<f7-link v-else-if="$f7.width >= 1280" icon-f7="question_circle" @click="$f7.emit('selectDeveloperDock',{'dock':'help','helpTab':'current'})" />
<developer-dock-icon />
<f7-link icon-md="material:done_all" @click="toggleCheck()"
:text="(!$theme.md) ? ((showCheckboxes) ? 'Done' : 'Select') : ''" />
</f7-nav-right>
Expand Down
3 changes: 1 addition & 2 deletions bundles/org.openhab.ui/web/src/pages/settings/things/things-list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<f7-page @page:afterin="onPageAfterIn" @page:afterout="stopEventSource">
<f7-navbar title="Things" back-link="Settings" back-link-url="/settings/" back-link-force>
<f7-nav-right>
<f7-link v-if="$store.state.developerDock && $f7.width >= 1280" icon-f7="question_circle_fill" @click="$f7.emit('toggleDeveloperDock')" />
<f7-link v-else-if="$f7.width >= 1280" icon-f7="question_circle" @click="$f7.emit('selectDeveloperDock',{'dock':'help','helpTab':'current'})" />
<developer-dock-icon />
<f7-link icon-md="material:done_all" @click="toggleCheck()"
:text="(!$theme.md) ? ((showCheckboxes) ? 'Done' : 'Select') : ''" />
</f7-nav-right>
Expand Down
3 changes: 1 addition & 2 deletions bundles/org.openhab.ui/web/src/pages/settings/transformations/transformations-list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<f7-page @page:afterin="onPageAfterIn" @page:afterout="onPageAfterOut">
<f7-navbar title="Transformations" back-link="Settings" back-link-url="/settings/" back-link-force>
<f7-nav-right>
<f7-link v-if="$store.state.developerDock && $f7.width >= 1280" icon-f7="question_circle_fill" @click="$f7.emit('toggleDeveloperDock')" />
<f7-link v-else-if="$f7.width >= 1280" icon-f7="question_circle" @click="$f7.emit('selectDeveloperDock',{'dock':'help','helpTab':'current'})" />
<developer-dock-icon />
<f7-link icon-md="material:done_all" @click="toggleCheck()"
:text="(!$theme.md) ? ((showCheckboxes) ? 'Done' : 'Select') : ''" />
</f7-nav-right>
Expand Down