extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-23 14:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Admin: Different App configuration tab sizing, should take all vertical space now

Browse Source
This commit is contained in:
nathan 2024-08-14 12:59:34 -06:00
parent a126c2116d
commit bfa19597d1
3 changed files with 53 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
admin/templates/default/app.css
View File

@ -148,7 +148,7 @@ span#admin-mailaccount_acc_id {
/** /**
* new et2 site configuration * new et2 site configuration
*/ */
#admin-site-config > div > .subHeader { #admin-site-config > div > et2-vbox > .subHeader {
border-bottom: 3px solid #696969; border-bottom: 3px solid #696969;
padding-left: 3px; padding-left: 3px;
padding-bottom: 3px; padding-bottom: 3px;
@ -156,6 +156,19 @@ span#admin-mailaccount_acc_id {
margin-bottom: 5px; margin-bottom: 5px;
} }
#admin-site-config > div > et2-vbox {
height: 100%;
}
#admin-site-config .mainContent, #admin-site-config .mainContent et2-tabbox {
flex-grow: 1;
}
#admin-site-config .mainContent > div {
display: flex;
flex-direction: column;
}
#admin-index_ajax_target > form[id$="-config"] tr.th > td, #admin-index_ajax_target > form[id$="-config"] tr.th > td,
#admin-site-config .subHeader { #admin-site-config .subHeader {
font-weight: bold; font-weight: bold;

24
admin/templates/default/config.xet
View File

@ -53,14 +53,26 @@
<option value="disabled">{No}</option> <option value="disabled">{No}</option>
</et2-select> </et2-select>
</row> </row>
<!-- remove currently not supported/necessary development option debug_minify
<row> <row>
<et2-description value="Disable minifying of javascript and CSS files" label="%s:"></et2-description> <et2-description value="Group hierarchy" span="all" class="subHeader"></et2-description>
<et2-select id="newsettings[debug_minify]"> </row>
<row>
<et2-description value="Show groups in container based on" label="%s:"></et2-description>
<et2-select id="newsettings[group_container_attribute]">
<option value="">{No} - {Default}</option> <option value="">{No} - {Default}</option>
<option value="True">Yes</option> <option value="account_lid">{Group name}: /^([^ ]+) / --> $1</option>
<option value="account_dn">LDAP DN: /,CN=([^,]+),/ --> $1</option>
</et2-select> </et2-select>
</row --> </row>
<row>
<et2-description value="Regular expression to find part to use as container" label="%s:"></et2-description>
<et2-hbox>
<et2-textbox id="newsettings[group_container_regexp]" placeholder="/,CN=([^,]+),/"></et2-textbox>
<et2-description value="-->" style="position: relative; top: .5em"></et2-description>
<et2-textbox id="newsettings[group_container_replace]" placeholder="$1" width="100px"></et2-textbox>
</et2-hbox>
</row>
<row> <row>
<et2-description value="Encryption" span="all" class="subHeader"></et2-description> <et2-description value="Encryption" span="all" class="subHeader"></et2-description>
</row> </row>
@ -390,7 +402,7 @@
</grid> </grid>
</template> </template>
<template id="admin.config" template="" lang="" group="0" version="18.1"> <template id="admin.config" template="" lang="" group="0" version="18.1">
<et2-tabbox id="tabs" width="100%"> <et2-tabbox id="tabs">
<tabs> <tabs>
<tab id="general" label="General"/> <tab id="general" label="General"/>
<tab id="appearance" label="Appearance"/> <tab id="appearance" label="Appearance"/>

51
admin/templates/default/site-config.xet
View File

@ -2,35 +2,26 @@
<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd"> <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
<overlay> <overlay>
<template id="admin.site-config" template="" lang="" group="0" version="16.1"> <template id="admin.site-config" template="" lang="" group="0" version="16.1">
<grid width="100%"> <et2-vbox height="100%">
<columns> <et2-description value="Site configuration" class="subHeader"></et2-description>
<column/> <et2-box disabled="@need_tab" class="mainContent">
</columns> <template template="@template" width="99%"/>
<rows> </et2-box>
<row> <et2-box disabled="!@need_tab" class="mainContent">
<et2-description value="Site configuration" class="subHeader"></et2-description> <et2-tabbox id="tabs2">
</row> <tabs>
<row disabled="@need_tab"> <tab id="config" label="Configuration"/>
<template template="@template" width="99%"/> </tabs>
</row> <tabpanels>
<row disabled="!@need_tab"> <template template="@template" width="99%"/>
<et2-tabbox id="tabs2" width="100%"> </tabpanels>
<tabs> </et2-tabbox>
<tab id="config" label="Configuration"/> </et2-box>
</tabs> <et2-hbox class="dialogFooterToolbar">
<tabpanels> <et2-button id="save" label="Save"></et2-button>
<template template="@template" width="99%"/> <et2-button id="apply" label="Apply"></et2-button>
</tabpanels> <et2-button id="cancel" label="Cancel"></et2-button>
</et2-tabbox> </et2-hbox>
</row> </et2-vbox>
<row class="dialogFooterToolbar">
<et2-hbox>
<et2-button id="save" label="Save"></et2-button>
<et2-button id="apply" label="Apply"></et2-button>
<et2-button id="cancel" label="Cancel"></et2-button>
</et2-hbox>
</row>
</rows>
</grid>
</template> </template>
</overlay> </overlay>