adding room-column and change to only 2 flex-columns

This commit is contained in:
Ralf Becker 2014-09-03 10:56:12 +00:00
parent 0af2cceaab
commit e6d85652d8
2 changed files with 9 additions and 6 deletions

View File

@ -224,7 +224,7 @@ class addressbook_ui extends addressbook_bo
'filter2_no_lang'=> True, // I set no_lang for filter2 (=dont translate the options) 'filter2_no_lang'=> True, // I set no_lang for filter2 (=dont translate the options)
'lettersearch' => true, 'lettersearch' => true,
'do_email' => $do_email ? 1 : 0, 'do_email' => $do_email ? 1 : 0,
'default_cols' => '!cat_id,contact_created_contact_modified,distribution_list,contact_id,owner,legacy_actions', 'default_cols' => '!cat_id,contact_created_contact_modified,distribution_list,contact_id,owner,room',
'filter2_onchange' => "app.addressbook.filter2_onchange();", 'filter2_onchange' => "app.addressbook.filter2_onchange();",
'manual' => $do_email ? ' ' : false, // space for the manual icon 'manual' => $do_email ? ' ' : false, // space for the manual icon
//'actions' => $this->get_actions(), // set on each request, as it depends on some filters //'actions' => $this->get_actions(), // set on each request, as it depends on some filters

View File

@ -41,12 +41,13 @@
<column width="100"/> <column width="100"/>
<column width="60"/> <column width="60"/>
<column width="80"/> <column width="80"/>
<column width="20%"/> <column width="180"/>
<column width="20%"/> <column width="180"/>
<column width="20%"/> <column width="180"/>
<column width="20%"/> <column width="180"/>
<column width="40"/>
<column width="80" disabled="@no_customfields"/> <column width="80" disabled="@no_customfields"/>
<column width="80"/> <column width="60%"/>
<column width="80" disabled="@no_distribution_list"/> <column width="80" disabled="@no_distribution_list"/>
<column width="80"/> <column width="80"/>
<column width="50"/> <column width="50"/>
@ -110,6 +111,7 @@
<nextmatch-header label="Business email" id="email"/> <nextmatch-header label="Business email" id="email"/>
<nextmatch-header label="Home email" id="email_home"/> <nextmatch-header label="Home email" id="email_home"/>
</vbox> </vbox>
<nextmatch-header label="Room" id="room"/>
<nextmatch-customfields id="customfields"/> <nextmatch-customfields id="customfields"/>
<nextmatch-header label="Note" id="note"/> <nextmatch-header label="Note" id="note"/>
<nextmatch-header label="Distribution lists" id="distribution_list"/> <nextmatch-header label="Distribution lists" id="distribution_list"/>
@ -175,6 +177,7 @@
<url-email id="${row}[email]" readonly="true" class="fixedHeight"/> <url-email id="${row}[email]" readonly="true" class="fixedHeight"/>
<url-email id="${row}[email_home]" readonly="true" class="fixedHeight"/> <url-email id="${row}[email_home]" readonly="true" class="fixedHeight"/>
</vbox> </vbox>
<description id="${row}[room]"/>
<customfields-list id="$row" class="customfields"/> <customfields-list id="$row" class="customfields"/>
<textbox multiline="true" id="${row}[note]" no_lang="1" readonly="true"/> <textbox multiline="true" id="${row}[note]" no_lang="1" readonly="true"/>
<description id="${row}[distrib_lists]"/> <description id="${row}[distrib_lists]"/>