From d944372e141a7a91db685c7fbd71df64c8ddc78f Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Fri, 17 Sep 2021 10:05:11 -0600
Subject: [PATCH] Change some more menulists into selects

---
 addressbook/templates/default/edit.xet  | 28 ++++++++++++-------------
 addressbook/templates/pixelegg/app.css  |  1 -
 addressbook/templates/pixelegg/app.less |  1 -
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index ed760b8c47..7c17d3e99d 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -114,9 +114,9 @@
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_fax,&amp;hearts;"/>
 					<description for="adr_one_countryname" value="country"/>
 					<vbox width="100%" tabindex="16">
-						<menulist tabindex="16">
-							<menupopup type="select-country" tabindex="16" tags="true" width="100%" class="countrySelect et2_fullWidth" id="adr_one_countrycode" onchange="app.addressbook.show_custom_country(this);" options="Select one,0,1" autocomplete="country"/>
-						</menulist>
+						<select-country tabindex="16" tags="true" width="100%" class="countrySelect et2_fullWidth"
+                                        id="adr_one_countrycode" onchange="app.addressbook.show_custom_country(this);"
+                                        options="Select one,0,1" autocomplete="country"/>
 						<textbox id="adr_one_countryname" class="custom_country et2_fullWidth" tabindex="16" autocomplete="country-name"/>
 					</vbox>
 					<description/>
@@ -135,9 +135,7 @@
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_car,&amp;hearts;"/>
 					<description disabled="@no_tid" for="tid" value="Type"/>
 					<hbox width="102%">
-						<menulist disabled="@no_tid">
-							<menupopup id="tid" no_lang="1" class="et2_fullWidth" onchange="1"/>
-						</menulist>
+                        <select id="tid" no_lang="1" class="et2_fullWidth" onchange="1" disabled="@no_tid"/>
 					</hbox>
 					<description/>
 				</row>
@@ -245,9 +243,9 @@
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_pager,&amp;hearts;"/>
 					<description for="adr_two_countryname" value="country"/>
 					<vbox width="100%" class="city_state_postcode">
-						<menulist class="et2_fullWidth">
-							<menupopup type="select-country" tabindex="37" tags="true" width="100%" class="countrySelect et2_fullWidth" id="adr_two_countrycode" onchange="app.addressbook.show_custom_country(this);" options="Select one,0,1" autocomplete="section-two country" />
-						</menulist>
+                        <select-country tabindex="37" tags="true" width="100%" class="countrySelect et2_fullWidth"
+                                        id="adr_two_countrycode" onchange="app.addressbook.show_custom_country(this);"
+                                        options="Select one,0,1" autocomplete="section-two country"/>
 						<textbox id="adr_two_countryname" class="custom_country et2_fullWidth" autocomplete="section-two country-name" />
 					</vbox>
 					<description/>
@@ -278,9 +276,9 @@
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_pager,&amp;hearts;"/>
 					<description for="adr_two_countryname" value="country"/>
 					<vbox width="100%">
-						<menulist>
-							<menupopup type="select-country" class="countrySelect et2_fullWidth" tags="true" width="100%" id="adr_two_countrycode" onchange="app.addressbook.show_custom_country(this);" options="Select one,0,1" autocomplete="section-two country" />
-						</menulist>
+                        <select-country class="countrySelect et2_fullWidth" tags="true" width="100%"
+                                        id="adr_two_countrycode" onchange="app.addressbook.show_custom_country(this);"
+                                        options="Select one,0,1" autocomplete="section-two country"/>
 						<textbox id="adr_two_countryname" class="custom_country et2_fullWidth" autocomplete="section-two country-name" />
 					</vbox>
 					<description/>
@@ -414,9 +412,9 @@
 				</row>
 				<row class="dialogOperators">
 					<description value="Addressbook"/>
-					<menulist class="et2_fullWidth">
-						<menupopup class="owner" statustext="Addressbook the contact should be saved to" id="owner" no_lang="1" onchange="widget.getInstanceManager().submit(null,false,true); return false;" />
-					</menulist>
+                    <select class="owner et2_fullWidth" statustext="Addressbook the contact should be saved to"
+                            id="owner" no_lang="1"
+                            onchange="widget.getInstanceManager().submit(null,false,true); return false;"/>
 					<description/>
 					<description value="own sorting"/>
 					<menulist>
diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css
index 2777b5fa5c..a4071b0f36 100755
--- a/addressbook/templates/pixelegg/app.css
+++ b/addressbook/templates/pixelegg/app.css
@@ -232,7 +232,6 @@ select#addressbook-index_col_filter\[tid\] {
   #addressbook-edit {
     height: auto;
     min-height: 390px;
-    overflow: auto;
   }
   /*##################################################################*/
   /*Infolog*/
diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less
index cd647351ba..005c47a5e4 100755
--- a/addressbook/templates/pixelegg/app.less
+++ b/addressbook/templates/pixelegg/app.less
@@ -84,7 +84,6 @@
 	#addressbook-edit {
 		height: auto;
 		min-height: 390px;
-		overflow:    auto;
 	}
 
 	/*##################################################################*/