fix search in addressbook allways searches for "pressed", caused by now validated advanced search button having same id as search field, renamed it to "advanced-search"

This commit is contained in:
Ralf Becker 2016-03-22 11:16:11 +00:00
parent 53a726dd6f
commit d969525522

View File

@ -118,9 +118,7 @@
<description id="${row}[adr_one_region]" no_lang="1" class="leftPad5"/> <description id="${row}[adr_one_region]" no_lang="1" class="leftPad5"/>
</hbox> </hbox>
<description id="${row}[adr_one_countryname]" no_lang="1"/> <description id="${row}[adr_one_countryname]" no_lang="1"/>
<menulist> <select-country id="${row}[adr_one_countrycode]" readonly="true"/>
<menupopup type="select-country" id="${row}[adr_one_countrycode]" readonly="true"/>
</menulist>
</vbox> </vbox>
<vbox> <vbox>
<description id="${row}[adr_two_street]" no_lang="1"/> <description id="${row}[adr_two_street]" no_lang="1"/>
@ -151,9 +149,7 @@
<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]"/>
<menulist> <select id="${row}[owner]" readonly="true"/>
<menupopup id="${row}[owner]" readonly="true"/>
</menulist>
<description id="${row}[id]" class="contactid"/> <description id="${row}[id]" class="contactid"/>
<vbox> <vbox>
<link id="${row}[last_link]"/> <link id="${row}[last_link]"/>
@ -161,13 +157,9 @@
</vbox> </vbox>
<vbox> <vbox>
<date-time id="${row}[created]" readonly="true" class="noWrap"/> <date-time id="${row}[created]" readonly="true" class="noWrap"/>
<menulist> <select-account id="${row}[creator]" readonly="true"/>
<menupopup type="select-account" id="${row}[creator]" readonly="true"/>
</menulist>
<date-time id="${row}[modified]" readonly="true" class="noBreak"/> <date-time id="${row}[modified]" readonly="true" class="noBreak"/>
<menulist> <select-account id="${row}[modifier]" readonly="true"/>
<menupopup type="select-account" id="${row}[modifier]" readonly="true"/>
</menulist>
</vbox> </vbox>
</row> </row>
</rows> </rows>
@ -177,15 +169,11 @@
<buttononly align="right" statustext="Add a new contact" id="add" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'850','440','_blank','addressbook',null,true); return false;"/> <buttononly align="right" statustext="Add a new contact" id="add" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'850','440','_blank','addressbook',null,true); return false;"/>
</template> </template>
<template id="addressbook.index.row" template="" lang="" group="0" version="1.3.001"> <template id="addressbook.index.row" template="" lang="" group="0" version="1.3.001">
<buttononly align="right" statustext="Advanced search" image="advanced-search" background_image="1" id="search" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.search'),'850','440','_blank','addressbook',null,true); return false;"/> <buttononly align="right" statustext="Advanced search" image="advanced-search" background_image="1" id="advanced-search" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.search'),'850','440','_blank','addressbook',null,true); return false;"/>
<menulist> <select statustext="Select a view" id="org_view" no_lang="1" rows="1" empty_label="All contacts"/>
<menupopup statustext="Select a view" id="org_view" no_lang="1" rows="1" empty_label="All contacts"/>
</menulist>
</template> </template>
<template id="addressbook.index.right" template="" lang="" group="0" version="1.7.001"> <template id="addressbook.index.right" template="" lang="" group="0" version="1.7.001">
<menulist> <select align="right" id="col_filter[tid]" empty_label="All types"/>
<menupopup align="right" id="col_filter[tid]" empty_label="All types"/>
</menulist>
</template> </template>
<template id="addressbook.index" template="" lang="" group="0" version="1.9.002"> <template id="addressbook.index" template="" lang="" group="0" version="1.9.002">
<nextmatch id="nm" template="addressbook.index.rows" span="all" header_left="addressbook.index.left" header_row="addressbook.index.row" header_right="addressbook.index.right"/> <nextmatch id="nm" template="addressbook.index.rows" span="all" header_left="addressbook.index.left" header_row="addressbook.index.row" header_right="addressbook.index.right"/>