From d9695255227ab5c107e5a4c01eddd4428ad1993d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 22 Mar 2016 11:16:11 +0000
Subject: [PATCH] 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"

---
 addressbook/templates/default/index.xet | 26 +++++++------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/addressbook/templates/default/index.xet b/addressbook/templates/default/index.xet
index 4509519555..395b96cb7f 100644
--- a/addressbook/templates/default/index.xet
+++ b/addressbook/templates/default/index.xet
@@ -118,9 +118,7 @@
 							<description id="${row}[adr_one_region]" no_lang="1" class="leftPad5"/>
 						</hbox>
 						<description id="${row}[adr_one_countryname]" no_lang="1"/>
-						<menulist>
-							<menupopup type="select-country" id="${row}[adr_one_countrycode]" readonly="true"/>
-						</menulist>
+						<select-country id="${row}[adr_one_countrycode]" readonly="true"/>
 					</vbox>
 					<vbox>
 						<description id="${row}[adr_two_street]" no_lang="1"/>
@@ -151,9 +149,7 @@
 					<customfields-list id="$row" class="customfields"/>
 					<textbox multiline="true" id="${row}[note]" no_lang="1" readonly="true"/>
 					<description id="${row}[distrib_lists]"/>
-					<menulist>
-						<menupopup id="${row}[owner]" readonly="true"/>
-					</menulist>
+					<select id="${row}[owner]" readonly="true"/>
 					<description id="${row}[id]" class="contactid"/>
 					<vbox>
 						<link id="${row}[last_link]"/>
@@ -161,13 +157,9 @@
 					</vbox>
 					<vbox>
 						<date-time id="${row}[created]" readonly="true" class="noWrap"/>
-						<menulist>
-							<menupopup type="select-account" id="${row}[creator]" readonly="true"/>
-						</menulist>
+						<select-account id="${row}[creator]" readonly="true"/>
 						<date-time id="${row}[modified]" readonly="true" class="noBreak"/>
-						<menulist>
-							<menupopup type="select-account" id="${row}[modifier]" readonly="true"/>
-						</menulist>
+						<select-account id="${row}[modifier]" readonly="true"/>
 					</vbox>
 				</row>
 			</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;"/>
 	</template>
 	<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;"/>
-		<menulist>
-			<menupopup statustext="Select a view" id="org_view" no_lang="1" rows="1" empty_label="All contacts"/>
-		</menulist>
+		<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;"/>
+		<select statustext="Select a view" id="org_view" no_lang="1" rows="1" empty_label="All contacts"/>
 	</template>
 	<template id="addressbook.index.right" template="" lang="" group="0" version="1.7.001">
-		<menulist>
-			<menupopup align="right" id="col_filter[tid]" empty_label="All types"/>
-		</menulist>
+		<select align="right" id="col_filter[tid]" empty_label="All types"/>
 	</template>
 	<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"/>