extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-07 05:50:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP address-selection for mail-compose some styling

Browse Source
This commit is contained in:
ralf 2025-01-28 17:01:06 +01:00
parent 0de371829c
commit 6e5ab467d9
3 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -252,10 +252,10 @@ class addressbook_ui extends addressbook_bo
'default_cols' => !isset($template) ? 'type,n_fileas_n_given_n_family_n_family_n_given_org_name_n_family_n_given_n_fileas,'.
'number,org_name,org_unit,'.
'business_adr_one_countrycode_adr_one_postalcode,tel_work_tel_cell_tel_home,url_email_email_home' :
'!photo,home_adr_two_countrycode_adr_two_postalcode',
'!photo,home_adr_two_countrycode',
/* old negative list
'default_cols' => '!cat_id,contact_created_contact_modified,distribution_list,contact_id,owner,room',*/
//'no_columnselection' => false, // I turns off the columnselection completly, turned on by default
'no_columnselection' => isset($template), // I turn off the columnselection completly, turned on by default
// I name of the preference (plus 'nextmatch-' prefix), default = template-name
'columnselection_pref' => isset($template) ? 'nextmatch-'.$template : null,
'filter2_onchange' => "return app.addressbook.filter2_onchange();",
@ -361,7 +361,7 @@ class addressbook_ui extends addressbook_bo
{
$content['nm']['actions'] = array_filter($content['nm']['actions'], static function($action)
{
return in_array($action, ['open', 'email', 'delete']);
return in_array($action, ['open', 'delete']);
}, ARRAY_FILTER_USE_KEY);
}

31
addressbook/templates/default/select.xet
View File

@ -4,12 +4,12 @@
<template id="addressbook.select.rows" template="" lang="" group="0" version="1.9.005">
<grid width="100%">
<columns>
<column width="20"/> <!-- type -->
<column width="40"/> <!-- type -->
<column width="30%" minWidth="150"/> <!-- file as -->
<column width="80"/> <!-- photo -->
<column width="180"/> <!-- business addr -->
<column width="180"/> <!-- home addr -->
<column width="200"/> <!-- url, email, email-home -->
<column width="200"/> <!-- business addr -->
<column width="200" disabled="true"/> <!-- home addr -->
<column width="250"/> <!-- url, email, email-home -->
</columns>
<rows>
<row class="th">
@ -20,9 +20,6 @@
<column/>
</columns>
<rows>
<row disabled="!@order=n_fileas">
<nextmatch-sortheader label="own sorting" id="n_fileas" span="all"/>
</row>
<row disabled="!@order=n_given">
<nextmatch-sortheader label="Firstname" id="n_given"/>
<nextmatch-sortheader label="Name" id="n_family"/>
@ -38,21 +35,16 @@
<nextmatch-sortheader label="Name" id="n_family"/>
<nextmatch-sortheader label="Firstname" id="n_given" class="leftPad5"/>
</row>
<row disabled="@order=n_fileas">
<nextmatch-sortheader label="own sorting" id="n_fileas" span="all"/>
</row>
</rows>
</grid>
<nextmatch-header label="Photo" id="photo"/>
<et2-vbox>
<nextmatch-header label="Business address" id="business"/>
<et2-nextmatch-header-custom id="adr_one_countrycode" class="countrySelect" widgetType="select-country" emptyLabel="Country"/>
<nextmatch-sortheader label="zip code" id="adr_one_postalcode"/>
</et2-vbox>
<et2-vbox>
<nextmatch-header label="Home address" id="home"/>
<et2-nextmatch-header-custom id="adr_two_countrycode" class="countrySelect" widgetType="select-country" emptyLabel="Country"/>
<nextmatch-sortheader label="zip code" id="adr_two_postalcode"/>
</et2-vbox>
<et2-vbox>
<nextmatch-header label="Business email" id="email"/>
@ -70,7 +62,7 @@
</et2-vbox>
<et2-lavatar src="$row_cont[photo]" contactId="$row_cont[id]" lname="$row_cont[n_family]" fname="$row_cont[n_given]"></et2-lavatar>
<et2-vbox>
<et2-hbox>
<et2-hbox style="position: relative; left: -10px">
<et2-description id="${row}[adr_one_postalcode]" noLang="1"></et2-description>
<et2-description value=" " id="${row}[adr_one_locality]" class="leftPad5" noLang="1"></et2-description>
<et2-description id="${row}[adr_one_region]" class="leftPad5" noLang="1"></et2-description>
@ -79,7 +71,7 @@
<et2-select-country id="${row}[adr_one_countrycode]" readonly="true"></et2-select-country>
</et2-vbox>
<et2-vbox>
<et2-hbox>
<et2-hbox style="position: relative; left: -10px">
<et2-description id="${row}[adr_two_postalcode]" noLang="1"></et2-description>
<et2-description value=" " id="${row}[adr_two_locality]" class="leftPad5" noLang="1"></et2-description>
<et2-description id="${row}[adr_two_region]" class="leftPad5" noLang="1"></et2-description>
@ -98,21 +90,22 @@
</template>
<template id="addressbook.select" template="" lang="" group="0" version="1.9.002">
<nextmatch id="nm" template="addressbook.select.rows" span="all"/>
<et2-hbox>
<et2-hbox class="footer">
<et2-select label="Add" id="what_to_use">
<option value="">Business or home email</option>
<option value="email">Business email</option>
<option value="email_home">Home email</option>
</et2-select>
<et2-button label="To" id="add_to_to" onclick="app.addressbook.addEmailToCompose"></et2-button>
<et2-button label="Cc" id="add_to_cc" onclick="app.addressbook.addEmailToCompose"></et2-button>
<et2-button label="Bcc" id="add_to_bcc" onclick="app.addressbook.addEmailToCompose"></et2-button>
<et2-button label="Close" onclick="alert('ToDo ;)'); return false;"></et2-button>
<et2-button label="To" id="add_to_to" onclick="app.addressbook.addEmailToCompose" image="forward-fill"></et2-button>
<et2-button label="Cc" id="add_to_cc" onclick="app.addressbook.addEmailToCompose" image="forward-fill"></et2-button>
<et2-button label="Bcc" id="add_to_bcc" onclick="app.addressbook.addEmailToCompose" image="forward-fill"></et2-button>
<et2-button label="Close" id="close" onclick="alert('ToDo ;)'); return false;"></et2-button>
</et2-hbox>
<styles>
div.dialog_content img.dialog_icon[src=""] { display: none; }
et2-dialog#dialog-addressbook-select et2-button { max-width: 125px !important; }
et2-dialog#dialog-addressbook-select::part(panel) { width: 90vh; height: 75vh; position: absolute; bottom: 1vh; }
et2-hbox.footer { border-top: 2px solid #696969; padding-top: 10px; }
</styles>
</template>
</overlay>

3
mail/templates/default/app.css
View File

@ -1106,9 +1106,6 @@ et2-searchbox#mail-index_nm_search {
width: 100%;
min-width: 5em;
}
.nextmatch_header_row>.filtersContainer>et2-select, .nextmatch_header_row>.filtersContainer>et2-select-cat {
width: 80px;
}
et2-split#mail-index_mailSplitter.limitted .header_count {
display: none;
}