From 43fbf7e56b1fb2c1aea033a38441e49fbb3b452f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Cort=C3=A9s=20Cano?= <38475681+TrapoSAMA@users.noreply.github.com> Date: Fri, 3 Jul 2026 13:33:55 -0400 Subject: [PATCH] UI improvements for virtual form labels and search spacing (#1052) small UI and translation fixes for virtual/admin forms. Changes: - Adds PALANG entry for the domain search placeholder. - Replaces the hardcoded domain search placeholder in edit forms. - Shows the Domain label when creating aliases and mailboxes. - Uses Bootstrap 5 form-select for generated select controls. - Adds minor spacing for the virtual search field. Thanks @trapoSAMA --- languages/en.lang | 1 + languages/es.lang | 1 + model/AliasHandler.php | 2 +- model/MailboxHandler.php | 2 +- public/css/bootstrap.css | 2 ++ templates/editform.tpl | 6 +++--- templates/list-virtual.tpl | 2 +- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/languages/en.lang b/languages/en.lang index 410d0a75..6e614bb4 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -110,6 +110,7 @@ $PALANG['no_domains_for_this_admin'] = 'You don\'t have permissions for any doma $PALANG['no_domains_exist'] = 'You have to create at least one domain before you can use virtual list.'; # "virtual list" should match $PALANG['pAdminMenu_list_virtual'] $PALANG['domain'] = 'Domain'; +$PALANG['search_domains'] = 'Search for domains...'; $PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; $PALANG['mailboxes'] = 'Mailboxes'; $PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)'; diff --git a/languages/es.lang b/languages/es.lang index ffb566a6..537e5257 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -102,6 +102,7 @@ $PALANG['no_domains_for_this_admin'] = 'No tienes permisos sobre ningún dominio $PALANG['no_domains_exist'] = 'Debes crear al menos un dominio antes de usar la lista virtual.'; $PALANG['domain'] = 'Dominio'; +$PALANG['search_domains'] = 'Buscar dominios...'; $PALANG['pOverview_get_alias_domains'] = 'Alias de Dominios'; $PALANG['mailboxes'] = 'Buzones'; $PALANG['pOverview_get_quota'] = 'Cuota de buzón (MB)'; diff --git a/model/AliasHandler.php b/model/AliasHandler.php index e9103104..25db6e10 100644 --- a/model/AliasHandler.php +++ b/model/AliasHandler.php @@ -32,7 +32,7 @@ class AliasHandler extends PFAHandler 'localpart' => self::pacol($this->new, 0, 0, 'text', 'alias' , 'pCreate_alias_catchall_text' , '', /*options*/ array(), /*not_in_db*/ 1), - 'domain' => self::pacol($this->new, 0, 1, 'enum', '' , '' , '', + 'domain' => self::pacol($this->new, 0, 1, 'enum', 'domain' , '' , '', /*options*/ $this->allowed_domains), 'description' => self::pacol(1, 1, 1, 'text', 'description' , ''), 'goto' => self::pacol(1, 1, 1, 'txtl', 'to' , 'pEdit_alias_help' , array()), diff --git a/model/MailboxHandler.php b/model/MailboxHandler.php index 9f2e2f2e..2beae6e1 100644 --- a/model/MailboxHandler.php +++ b/model/MailboxHandler.php @@ -34,7 +34,7 @@ class MailboxHandler extends PFAHandler 'local_part' => self::pacol($this->new, 0, 0, 'text', 'pEdit_mailbox_username', '', '', /*options*/ array('legal_chars' => Config::read('username_legal_chars'), 'legal_char_warning' => Config::lang('pLegal_char_warning')) ), - 'domain' => self::pacol($this->new, 0, 1, 'enum', '', '', '', + 'domain' => self::pacol($this->new, 0, 1, 'enum', 'domain', '', '', /*options*/ $this->allowed_domains), # TODO: maildir: display in list is needed to include maildir in SQL result (for post_edit hook) # TODO: (not a perfect solution, but works for now - maybe we need a separate "include in SELECT query" field?) diff --git a/public/css/bootstrap.css b/public/css/bootstrap.css index b9a201aa..8b5c23ec 100644 --- a/public/css/bootstrap.css +++ b/public/css/bootstrap.css @@ -156,3 +156,5 @@ div#login{ max-width: 35em; } .mailbox-list-scroll > #mailbox_table { min-width: 820px; margin-bottom: 0; } .virtual-list-scroll { display: block; width: 100%; overflow-x: auto; } .virtual-list-scroll > #admin_table { min-width: 720px; margin-bottom: 0; } +.virtual-search form { margin-bottom: .25rem; } +.virtual-search .form-control { margin-left: auto; max-width: 18rem; } diff --git a/templates/editform.tpl b/templates/editform.tpl index 223b160e..e2c3e900 100644 --- a/templates/editform.tpl +++ b/templates/editform.tpl @@ -31,17 +31,17 @@ name="value[{$key}]"{if {$value_{$key}} == 1} checked="checked"{/if}/> {elseif $field.type == 'enum'} - {html_options output=$struct.{$key}.options values=$struct.{$key}.options selected=$value_{$key}} {elseif $field.type == 'enma'} - {html_options options=$struct.{$key}.options selected=$value_{$key}} {elseif $field.type == 'list'} + placeholder="{$PALANG.search_domains}" title="{$PALANG.search_domains}">