From 789d2c9748f6c8f7ca7567301339e1ab5a50e518 Mon Sep 17 00:00:00 2001
From: ralf <rb@egroupware.org>
Date: Wed, 20 Jul 2022 08:56:18 +0200
Subject: [PATCH] setting full_email for select-email widgets (aliases &
 forwards) and label-on-left for smtp&sieve port (does NOT yet work)

---
 admin/templates/default/mailaccount.xet | 10 +++++-----
 admin/templates/pixelegg/app.css        | 10 ----------
 admin/templates/pixelegg/app.less       |  3 +--
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/admin/templates/default/mailaccount.xet b/admin/templates/default/mailaccount.xet
index 57dcd93177..a117ae77f4 100644
--- a/admin/templates/default/mailaccount.xet
+++ b/admin/templates/default/mailaccount.xet
@@ -186,7 +186,7 @@
 					<description for="acc_sieve_ssl" value="Secure connection"/>
 					<hbox>
 						<select class="emailadmin_ssl" id="acc_sieve_ssl" onchange="app.admin.wizard_sieve_ssl_onchange"/>
-						<textbox type="integer" label="Port" id="acc_sieve_port" onchange="app.admin.wizard_sieve_onchange" class="emailadmin_port"/>
+						<textbox type="integer" label="Port" id="acc_sieve_port" onchange="app.admin.wizard_sieve_onchange" class="label-on-left"/>
 					</hbox>
 				</row>
 				<row height="150">
@@ -231,7 +231,7 @@
 					<description for="acc_smtp_ssl" value="Secure connection"/>
 					<hbox>
 						<select class="emailadmin_ssl" id="acc_smtp_ssl" needed="1" onchange="app.admin.wizard_smtp_ssl_onchange"/>
-						<textbox type="integer" label="Port" id="acc_smtp_port" needed="1" class="emailadmin_port"/>
+						<textbox type="integer" label="Port" id="acc_smtp_port" needed="1" class="label-on-left"/>
 					</hbox>
 				</row>
 				<row>
@@ -255,17 +255,17 @@
 			<rows>
 				<row>
 					<description for="mailLocalAddress" value="EMail address"/>
-					<url-email id="mailLocalAddress" options="32,128"/>
+					<url-email id="mailLocalAddress" size="32" maxlength="128"/>
 					<checkbox label="Email account active" id="accountStatus" selected_value="active"/>
 				</row>
 				<row>
 					<description for="mailAlternateAddress" value="Alternate email address"/>
-					<taglist-email id="mailAlternateAddress" autocomplete_url=""/>
+					<select-email id="mailAlternateAddress" autocomplete_url="" full_email="true"/>
 					<description/>
 				</row>
 				<row disabled="@no_forward_available">
 					<description for="mailForwardingAddress" value="Forward email's to"/>
-					<taglist-email id="mailForwardingAddress" autocomplete_url=""/>
+					<select-email id="mailForwardingAddress" autocomplete_url="" full_email="true"/>
 					<vbox>
 						<checkbox label="Forward only" id="deliveryMode" selected_value="forwardOnly" onchange="if (widget.getValue()) et2_dialog.alert('Forward only disables IMAP mailbox / storing of mails and just forwards them to given address.','Forward only');"/>
 						<checkbox label="Allow users to change forwards" id="acc_user_forward"/>
diff --git a/admin/templates/pixelegg/app.css b/admin/templates/pixelegg/app.css
index 64f178c53e..6cbb4841b5 100755
--- a/admin/templates/pixelegg/app.css
+++ b/admin/templates/pixelegg/app.css
@@ -9,7 +9,6 @@
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de>
  * @package addressbook
- * @version $Id$
  */
 /**
  * EGroupware - CSS Styles used by admin app
@@ -123,9 +122,6 @@ td.admin_userAgent span {
   display: none;
   padding-top: 5px;
 }
-.emailadmin_ssl {
-  margin-right: 10px;
-}
 .emailadmin_port {
   width: 5em;
 }
@@ -161,12 +157,6 @@ span#admin-mailaccount_acc_id {
   padding-left: 5px;
   align-self: center;
 }
-#admin-mailaccount_mailLocalAddress {
-  width: 98%;
-}
-select#admin-mailaccount_ident_id {
-  width: 95%;
-}
 /**
  * new et2 site configuration
  */
diff --git a/admin/templates/pixelegg/app.less b/admin/templates/pixelegg/app.less
index 3fc7ba9b18..9bbc8a69c6 100755
--- a/admin/templates/pixelegg/app.less
+++ b/admin/templates/pixelegg/app.less
@@ -9,7 +9,6 @@
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @author Stefan Reinhardt <stefan.reinhardt@pixelegg.de>
  * @package addressbook
- * @version $Id$
  */
 
 
@@ -63,4 +62,4 @@
 	#admin-account-delete .dialogFooterToolbar .et2_button_delete {
 		margin-left: 0;
 	}
-}
+}
\ No newline at end of file