Switch vbox with details back to tabbox now that we have et2-tabbox_mobile

This commit is contained in:
nathan 2023-02-22 12:37:06 -07:00
parent 7c2266b27b
commit 34cc0ff5be
11 changed files with 191 additions and 206 deletions

View File

@ -394,36 +394,30 @@
<et2-url id="url" autocomplete="url" ></et2-url> <et2-url id="url" autocomplete="url" ></et2-url>
</row> </row>
<row> <row>
<et2-vbox span="all" width="100%"> <et2-tabbox id="tabs" span="all">
<et2-details id="general" summary="Organisation" title=""> <tabs>
<template id="addressbook.edit.general"/> <tab id="general" label="Organisation"/>
</et2-details> <tab id="home" label="Private" statustext="Home address, Birthday, ..."/>
<et2-details id="home" summary="Private" title="Home address, Birthday, ..."> <tab id="details" label="Details" statustext="Categories, Notes, ..."/>
<template id="addressbook.edit.home"/> <tab id="links" label="Links" statustext="Links"/>
</et2-details> <tab id="distribution_list" label="Distribution lists"
<et2-details id="details" summary="Details" title="Categories, Notes, ..."> statustext="Distribution lists, ..."/>
<template id="addressbook.edit.details"/> <tab id="custom" label="Extra" statustext="Custom fields"/>
</et2-details> <tab id="custom_private" label="Extra private" statustext="Private custom fields"/>
<et2-details id="links" summary="Links" title="Links"> <tab id="ownership" label="Ownership"/>
<template id="addressbook.edit.links"/> </tabs>
</et2-details> <tabpanels>
<et2-details id="distribution_list" summary="Distribution lists" title="Distribution lists, ..."> <template id="addressbook.edit.general"/>
<template id="addressbook.edit.distribution_list"/> <template id="addressbook.edit.home"/>
</et2-details> <template id="addressbook.edit.details"/>
<et2-details id="custom" summary="Extra" title="Custom fields"> <template id="addressbook.edit.links"/>
<template id="addressbook.edit.custom"/> <template id="addressbook.edit.distribution_list"/>
</et2-details> <template id="addressbook.edit.custom"/>
<et2-details id="custom_private" summary="Extra private" title="Private custom fields"> <template id="addressbook.edit.custom_private"/>
<template id="addressbook.edit.custom_private"/> <template id="addressbook.edit.ownership"/>
</et2-details> </tabpanels>
<et2-details id="ownership" summary="Ownership" title="Ownership"> </et2-tabbox>
<template id="addressbook.edit.ownership"/> </row>
</et2-details>
</et2-vbox>
</row>
<row>
</row>
</rows> </rows>
</grid> </grid>
</template> </template>

View File

@ -330,30 +330,29 @@
<et2-checkbox label="account editable by user" id="acc_user_editable"></et2-checkbox> <et2-checkbox label="account editable by user" id="acc_user_editable"></et2-checkbox>
</row> </row>
<row> <row>
<et2-vbox span="all" width="100%"> <et2-tabbox id="tabs" span="all">
<et2-details id="admin.mailaccount.identity" summary="Identity+Signature" title="Identity&amp;Signature"> <tabs>
<template id="admin.mailaccount.identity"/> <tab id="admin.mailaccount.identity" label="Identity+Signature"
</et2-details> statustext="Identity&amp;Signature"/>
<et2-details id="admin.mailaccount.imap" summary="IMAP" title="incoming mail"> <tab id="admin.mailaccount.imap" label="IMAP" statustext="incoming mail"/>
<template id="admin.mailaccount.imap"/> <tab id="admin.mailaccount.folder" label="Folder" statustext="Folder"/>
</et2-details> <tab id="admin.mailaccount.sieve" label="Sieve" statustext="serverside filtering"/>
<et2-details id="admin.mailaccount.folder" summary="Folder" title="Folder"> <tab id="admin.mailaccount.smtp" label="SMTP" statustext="outgoing mail"/>
<template id="admin.mailaccount.folder"/> <tab id="admin.mailaccount.aliases" label="Aliases+Forwards"
</et2-details> statustext="Aliases, Forwarding, Quota, ..."/>
<et2-details id="admin.mailaccount.sieve" summary="Sieve" title="serverside filtering"> <tab id="admin.mailaccount.encryption" label="Encryption" statustext="Encryption settings"/>
<template id="admin.mailaccount.sieve"/> </tabs>
</et2-details> <tabpanels>
<et2-details id="admin.mailaccount.smtp" summary="SMTP" title="outgoing mail"> <template id="admin.mailaccount.identity"/>
<template id="admin.mailaccount.smtp"/> <template id="admin.mailaccount.imap"/>
</et2-details> <template id="admin.mailaccount.folder"/>
<et2-details id="admin.mailaccount.aliases" summary="Aliases+Forwards" title="Aliases, Forwarding, Quota, ..."> <template id="admin.mailaccount.sieve"/>
<template id="admin.mailaccount.aliases"/> <template id="admin.mailaccount.smtp"/>
</et2-details> <template id="admin.mailaccount.aliases"/>
<et2-details id="admin.mailaccount.encryption" summary="Encryption" title="Encryption settings"> <template id="admin.mailaccount.encryption"/>
<template id="admin.mailaccount.encryption"/> </tabpanels>
</et2-details> </et2-tabbox>
</et2-vbox> </row>
</row>
</rows> </rows>
</grid> </grid>
</template> </template>

View File

@ -243,33 +243,27 @@
<et2-select-cat id="category" multiple="true"></et2-select-cat> <et2-select-cat id="category" multiple="true"></et2-select-cat>
</row> </row>
<row> <row>
<et2-vbox span="all" width="100%"> <et2-tabbox id="tabs" span="all">
<et2-details id="description" summary="Description" title=""> <tabs>
<template id="calendar.edit.description"/> <tab id="description" label="Description" statustext="Full description"/>
</et2-details> <tab id="participants" label="Participants" statustext="Participants, Resources, ..."/>
<et2-details id="participants" summary="Participants" title=""> <tab id="details" label="Details"/>
<template id="calendar.edit.participants"/> <tab id="recurrence" label="Recurrence" statustext="Repeating Event Information"/>
</et2-details> <tab id="custom" label="Custom" statustext="Custom fields"/>
<et2-details id="details" summary="Details" title=""> <tab id="links" label="Links" statustext="Links, Attachments"/>
<template id="calendar.edit.details"/> <tab id="ownership" label="Ownership"/>
</et2-details> </tabs>
<et2-details id="recurrence" summary="Recurrence" title=""> <tabpanels>
<template id="calendar.edit.recurrence"/> <template id="calendar.edit.description"/>
</et2-details> <template id="calendar.edit.participants"/>
<et2-details id="custom" summary="Custom" title=""> <template id="calendar.edit.details"/>
<template id="calendar.edit.custom"/> <template id="calendar.edit.recurrence"/>
</et2-details> <template id="calendar.edit.custom"/>
<et2-details id="links" summary="Links" title=""> <template id="calendar.edit.links"/>
<template id="calendar.edit.links"/> <template id="calendar.edit.ownership"/>
</et2-details> </tabpanels>
<et2-details id="ownership" summary="Ownership" title=""> </et2-tabbox>
<template id="calendar.edit.ownership"/> </row>
</et2-details>
</et2-vbox>
</row>
<row>
</row>
</rows> </rows>
</grid> </grid>
</template> </template>

View File

@ -196,24 +196,23 @@
</et2-hbox> </et2-hbox>
</row> </row>
<row class="dialogTabs"> <row class="dialogTabs">
<et2-vbox span="all" width="100%"> <et2-tabbox id="tabs" span="all">
<et2-details id="filemanager.file.general" summary="General" title=""> <tabs>
<template id="filemanager.file.general"/> <tab id="filemanager.file.general" label="General"/>
</et2-details> <tab id="filemanager.file.perms" label="Permissions"/>
<et2-details id="filemanager.file.perms" summary="Permissions" title=""> <tab id="filemanager.file.eacl" label="Extended ACL"/>
<template id="filemanager.file.perms"/> <tab id="filemanager.file.preview" label="Preview"/>
</et2-details> <tab id="filemanager.file.custom" label="Custom fields"/>
<et2-details id="filemanager.file.eacl" summary="Extended ACL" title=""> </tabs>
<template id="filemanager.file.eacl"/> <tabpanels>
</et2-details> <template id="filemanager.file.general"/>
<et2-details id="filemanager.file.preview" summary="Preview" title=""> <template id="filemanager.file.perms"/>
<template id="filemanager.file.preview"/> <template id="filemanager.file.eacl"/>
</et2-details> <template id="filemanager.file.preview"/>
<et2-details id="filemanager.file.custom" summary="Custom fields" title=""> <template id="filemanager.file.custom"/>
<template id="filemanager.file.custom"/> </tabpanels>
</et2-details> </et2-tabbox>
</et2-vbox> </row>
</row>
</rows> </rows>
</grid> </grid>
<styles> <styles>

View File

@ -185,27 +185,25 @@
<et2-select-percent span="4" statustext="Percent completed" id="info_percent" onchange="app.infolog.statusChanged"></et2-select-percent> <et2-select-percent span="4" statustext="Percent completed" id="info_percent" onchange="app.infolog.statusChanged"></et2-select-percent>
</row> </row>
<row> <row>
<et2-vbox span="all" width="100%"> <et2-tabbox id="tabs" span="all">
<et2-details id="description" summary="Description" title="longer textual description"> <tabs>
<template id="infolog.edit.description"/> <tab id="description" label="Description" statustext="longer textual description"/>
</et2-details> <tab id="details" label="Details" statustext="Location, priority , ..."/>
<et2-details id="details" summary="Details" title="Location, priority , ..."> <tab id="links" label="Links" statustext="Links of this entry"/>
<template id="infolog.edit.details"/> <tab id="project" label="Projectmanager" statustext="Project settings: price, times"/>
</et2-details> <tab id="customfields" label="Customfields" statustext="Custom fields"/>
<et2-details id="links" summary="Links" title="Links of this entry"> <tab id="ownership" label="Ownership"/>
<template id="infolog.edit.links"/> </tabs>
</et2-details> <tabpanels>
<et2-details id="project" summary="Projectmanager" title="Project settings: price, times"> <template id="infolog.edit.description"/>
<template id="infolog.edit.project"/> <template id="infolog.edit.details"/>
</et2-details> <template id="infolog.edit.links"/>
<et2-details id="customfields" summary="Customfields" title="Custom fields"> <template id="infolog.edit.project"/>
<template id="infolog.edit.customfields"/> <template id="infolog.edit.customfields"/>
</et2-details> <template id="infolog.edit.ownership"/>
<et2-details id="ownership" summary="Ownership" title="Ownership"> </tabpanels>
<template id="infolog.edit.ownership"/> </et2-tabbox>
</et2-details> </row>
</et2-vbox>
</row>
</rows> </rows>
</grid> </grid>
</template> </template>

View File

@ -170,26 +170,24 @@
<et2-select-percent span="4" statustext="Percent completed" id="info_percent"></et2-select-percent> <et2-select-percent span="4" statustext="Percent completed" id="info_percent"></et2-select-percent>
</row> </row>
<row> <row>
<et2-vbox span="all" width="100%"> <et2-tabbox id="tabs" span="all">
<et2-details id="description" summary="Description" title="longer textual description"> <tabs>
<tab id="description" label="Description" statustext="longer textual description"/>
<tab id="details" label="Details" statustext="Location, priority , ..."/>
<tab id="links" label="Links" statustext="Links of this entry"/>
<tab id="project" label="Projectmanager" statustext="Project settings: price, times"/>
<tab id="customfields" label="Customfields" statustext="Custom fields"/>
<tab id="history" label="Ownership" statustext="Ownership"/>
</tabs>
<tabpanels>
<template id="infolog.view.description"/> <template id="infolog.view.description"/>
</et2-details>
<et2-details id="details" summary="Details" title="Location, priority , ...">
<template id="infolog.view.details"/> <template id="infolog.view.details"/>
</et2-details>
<et2-details id="links" summary="Links" title="Links of this entry">
<template id="infolog.view.links"/> <template id="infolog.view.links"/>
</et2-details>
<et2-details id="project" summary="Projectmanager" title="Project settings: price, times">
<template id="infolog.view.project"/> <template id="infolog.view.project"/>
</et2-details>
<et2-details id="customfields" summary="Customfields" title="Custom fields">
<template id="infolog.view.customfields"/> <template id="infolog.view.customfields"/>
</et2-details>
<et2-details id="ownership" summary="Ownership" title="Ownership">
<template id="infolog.view.ownership"/> <template id="infolog.view.ownership"/>
</et2-details> </tabpanels>
</et2-vbox> </et2-tabbox>
</row> </row>
</rows> </rows>
</grid> </grid>

View File

@ -72,15 +72,17 @@
<et2-description span="all" value="You need to enter your password to make any security changes!"></et2-description> <et2-description span="all" value="You need to enter your password to make any security changes!"></et2-description>
</row> </row>
<row> <row>
<et2-vbox id="tabs" width="100%" tabHeight="400"> <et2-tabbox id="tabs">
<et2-details id="change_password" summary="Change password" title=""> <tabs>
<template id="preferences.password.change"/> <tab id="change_password" label="Change password"/>
</et2-details> <tab id="two_factor_auth" label="Two factor auth"/>
<et2-details id="two_factor_auth" summary="Two factor auth" title=""> </tabs>
<template id="preferences.password.2fa"/> <tabpanels>
</et2-details> <template id="preferences.password.change"/>
</et2-vbox> <template id="preferences.password.2fa"/>
</row> </tabpanels>
</et2-tabbox>
</row>
</rows> </rows>
</grid> </grid>
</template> </template>

View File

@ -170,24 +170,24 @@
<et2-checkbox statustext="Is resource bookable?" id="bookable" span="3"></et2-checkbox> <et2-checkbox statustext="Is resource bookable?" id="bookable" span="3"></et2-checkbox>
</row> </row>
<row> <row>
<et2-vbox span="all" width="100%" tabHeight="250"> <et2-tabbox id="tabs" span="all">
<et2-details id="page" summary="Description" title="Informations about the location of resource"> <tabs>
<template id="resources.edit_tabs.page"/> <tab id="page" label="Description"
</et2-details> statustext="Informations about the location of resource"/>
<et2-details id="general" summary="Details" title="General informations about resource"> <tab id="general" label="Details" statustext="General informations about resource"/>
<template id="resources.edit_tabs.general"/> <tab id="links" label="Links" statustext="Web-Page of resource"/>
</et2-details> <tab id="custom" label="Custom" statustext="Pictures or resource"/>
<et2-details id="links" summary="Links" title="Web-Page of resource"> <tab id="ownership" label="Ownership"/>
<template id="resources.edit_tabs.links"/> </tabs>
</et2-details> <tabpanels>
<et2-details id="custom" summary="Custom" title="Pictures or resource"> <template id="resources.edit_tabs.page"/>
<template id="resources.edit_tabs.custom"/> <template id="resources.edit_tabs.general"/>
</et2-details> <template id="resources.edit_tabs.links"/>
<et2-details id="ownership" summary="Ownership" title=""> <template id="resources.edit_tabs.custom"/>
<template id="resources.edit_tabs.ownership"/> <template id="resources.edit_tabs.ownership"/>
</et2-details> </tabpanels>
</et2-vbox> </et2-tabbox>
</row> </row>
</rows> </rows>

View File

@ -82,18 +82,20 @@
<et2-checkbox statustext="Is resource bookable?" id="bookable" span="3"></et2-checkbox> <et2-checkbox statustext="Is resource bookable?" id="bookable" span="3"></et2-checkbox>
</row> </row>
<row> <row>
<et2-vbox span="all" width="100%" tabHeight="250"> <et2-tabbox id="tabs" span="all">
<et2-details id="page" summary="Description (short)" title="Informations about the location of resource"> <tabs>
<template id="resources.view.page"/> <tab id="page" label="Description"
</et2-details> statustext="Informations about the location of resource"/>
<et2-details id="custom" summary="Custom" title="Pictures or resource"> <tab id="custom" label="Custom" statustext="Pictures or resource"/>
<template id="resources.view.custom"/> <tab id="ownership" label="Ownership"/>
</et2-details> </tabs>
<et2-details id="ownership" summary="Ownership" title=""> <tabpanels>
<template id="resources.view.ownership"/> <template id="resources.view.page"/>
</et2-details> <template id="resources.view.custom"/>
</et2-vbox> <template id="resources.view.ownership"/>
</row> </tabpanels>
</et2-tabbox>
</row>
</rows> </rows>
</grid> </grid>
</template> </template>

View File

@ -136,24 +136,23 @@
<et2-select statustext="select a status of the timesheet" id="ts_status" emptyLabel="please select"></et2-select> <et2-select statustext="select a status of the timesheet" id="ts_status" emptyLabel="please select"></et2-select>
</row> </row>
<row> <row>
<et2-vbox span="all" width="100%"> <et2-tabbox id="tabs" class="et2_nowrap" span="all">
<et2-details id="notes" summary="Description"> <tabs>
<template id="timesheet.edit.notes"/> <tab id="notes" label="Description"/>
</et2-details> <tab id="general" label="Details"/>
<et2-details id="general" summary="Details"> <tab id="links" label="Links"/>
<template id="timesheet.edit.general"/> <tab id="customfields" label="Custom Fields"/>
</et2-details> <tab id="ownership" label="Ownership"/>
<et2-details id="links" summary="Links"> </tabs>
<template id="timesheet.edit.links"/> <tabpanels class="dialog-main-timeframe">
</et2-details> <template id="timesheet.edit.notes"/>
<et2-details id="customfields" summary="Custom Fields"> <template id="timesheet.edit.general"/>
<template id="timesheet.edit.customfields"/> <template id="timesheet.edit.links"/>
</et2-details> <template id="timesheet.edit.customfields"/>
<et2-details id="ownership" summary="Ownership"> <template id="timesheet.edit.ownership"/>
<template id="timesheet.edit.ownership"/> </tabpanels>
</et2-details> </et2-tabbox>
</et2-vbox> </row>
</row>
</rows> </rows>
</grid> </grid>
</template> </template>

View File

@ -118,21 +118,21 @@
<et2-select statustext="select a status of the timesheet" id="ts_status" emptyLabel="please select"></et2-select> <et2-select statustext="select a status of the timesheet" id="ts_status" emptyLabel="please select"></et2-select>
</row> </row>
<row> <row>
<et2-vbox span="all" width="100%"> <et2-tabbox id="tabs" class="et2_nowrap" span="all">
<et2-details id="notes" summary="Description"> <tabs>
<template id="timesheet.view.notes"/> <tab id="notes" label="Description"/>
</et2-details> <tab id="general" label="Details"/>
<et2-details id="general" summary="Details"> <tab id="customfields" label="Custom Fields"/>
<template id="timesheet.view.general"/> <tab id="ownership" label="Ownership"/>
</et2-details> </tabs>
<et2-details id="customfields" summary="Custom Fields"> <tabpanels class="dialog-main-timeframe">
<template id="timesheet.view.customfields"/> <template id="timesheet.view.notes"/>
</et2-details> <template id="timesheet.view.general"/>
<et2-details id="ownership" summary="Ownership"> <template id="timesheet.view.customfields"/>
<template id="timesheet.view.ownership"/> <template id="timesheet.view.ownership"/>
</et2-details> </tabpanels>
</et2-vbox> </et2-tabbox>
</row> </row>
</rows> </rows>
</grid> </grid>
</template> </template>