Skip to content

Commit eb5f627

Browse files
Grandi0zGrandi0z
committed
update the test
1 parent 53732f1 commit eb5f627

File tree

15 files changed

+138
-139
lines changed

15 files changed

+138
-139
lines changed

‎modules/contacts/modules.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ protected function output() {
190190
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
191191
}
192192

193-
return '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label for="contact_auto_collect">' .
194-
$this->trans('Automatically add outgoing email addresses') . '</label></span><div><input class="form-check-input" type="checkbox" ' . $checked . ' id="contact_auto_collect" name="contact_auto_collect" data-default-value="true" value="1" />' . $reset . '</div></div></td></tr>';
193+
return '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="contact_auto_collect">' .
194+
$this->trans('Automatically add outgoing email addresses') . '</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><input class="form-check-input me-2" type="checkbox" ' . $checked . ' id="contact_auto_collect" name="contact_auto_collect" data-default-value="true" value="1" />' . $reset . '</div></td></tr>';
195195
}
196196
}
197197

@@ -317,9 +317,9 @@ protected function output() {
317317
$checked = '';
318318
$reset='';
319319
}
320-
return '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label class="form-check-label" for="enable_collect_address_on_send">'.
321-
$this->trans('Enable collect address on send').'</label></span><div><input class="form-check-input" type="checkbox" '.$checked.
322-
' value="1" id="enable_collect_address_on_send" name="enable_collect_address_on_send" data-default-value="'.(DEFAULT_ENABLE_COLLECT_ADDRESS_ON_SEND ? 'true' : 'false') . '"/>'.$reset.'</div></div></td></tr>';
320+
return '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="enable_collect_address_on_send">'.
321+
$this->trans('Enable collect address on send').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><input class="form-check-input me-2" type="checkbox" '.$checked.
322+
' value="1" id="enable_collect_address_on_send" name="enable_collect_address_on_send" data-default-value="'.(DEFAULT_ENABLE_COLLECT_ADDRESS_ON_SEND ? 'true' : 'false') . '"/>'.$reset.'</div></td></tr>';
323323
}
324324
}
325325

@@ -581,9 +581,9 @@ protected function output() {
581581
$checked = '';
582582
$reset='';
583583
}
584-
return '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label class="form-check-label" for="enable_warn_contacts_cc_not_exist_in_list_contact">'.
585-
$this->trans('Enable warn if contacts Cc not exist in list contact').'</label></span><div><input class="form-check-input" type="checkbox" '.$checked.
586-
' value="1" id="enable_warn_contacts_cc_not_exist_in_list_contact" name="enable_warn_contacts_cc_not_exist_in_list_contact" />'.$reset.'</div></div></td></tr>';
584+
return '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="enable_warn_contacts_cc_not_exist_in_list_contact">'.
585+
$this->trans('Enable warn if contacts Cc not exist in list contact').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><input class="form-check-input me-2" type="checkbox" '.$checked.
586+
' value="1" id="enable_warn_contacts_cc_not_exist_in_list_contact" name="enable_warn_contacts_cc_not_exist_in_list_contact" />'.$reset.'</div></td></tr>';
587587
}
588588
}
589589

‎modules/core/functions.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -759,18 +759,17 @@ function getSettingsSectionOutput($section, $sectionLabel, $sectionIcon, $settin
759759
['type' => $type, 'label' => $label, 'description' => $description] = $setting;
760760

761761
if ($type === 'checkbox') {
762-
$input = '<input type="checkbox" id="'.$key.'" name="'.$key.'" '.($value ? 'checked' : '').' class="form-check-input">';
762+
$input = '<input type="checkbox" id="'.$key.'" name="'.$key.'" '.($value ? 'checked' : '').' class="form-check-input me-2">';
763763
} else {
764764
$input = '<input type="'.$type.'" id="'.$key.'" name="'.$key.'" value="'.$value.'" class="form-control">';
765765
}
766766

767767
$res .= "<tr class='{$section}_setting'>" .
768-
"<td><div class='d-flex flex-column flex-md-row'><span class='fw-bold me-md-3'><label for='$key'>$label</label></span>
769-
<div>
770-
$input
771-
</div>
772-
<div class='setting_description'>$description</div>
773-
</div></td>" .
768+
"<td class='d-block d-md-table-cell'><label for='$key'>$label</label></td>" .
769+
"<td class='d-block d-md-table-cell'>" .
770+
"<div class='d-flex align-items-center'>$input</div>" .
771+
"<div class='setting_description'>$description</div>" .
772+
"</td>" .
774773
"</tr>";
775774
}
776775
return $res;

‎modules/core/output_modules.php‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -702,8 +702,8 @@ protected function output() {
702702
else {
703703
$start_page = DEFAULT_START_PAGE;
704704
}
705-
$res = '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label for="start_page">'.
706-
$this->trans('First page after login').'</label></span><div><select class="form-select form-select-sm w-auto" id="start_page" name="start_page">';
705+
$res = '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="start_page">'.
706+
$this->trans('First page after login').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><select class="form-select form-select-sm w-auto" id="start_page" name="start_page">';
707707
foreach ($options as $label => $val) {
708708
$res .= '<option ';
709709
if ($start_page == $val) {
@@ -714,7 +714,7 @@ protected function output() {
714714
}
715715
$res .= 'value="'.$val.'">'.$this->trans($label).'</option>';
716716
}
717-
$res .= '</select>'.$reset.'</div></div></td></tr>';
717+
$res .= '</select>'.$reset.'</div></td></tr>';
718718
return $res;
719719
}
720720
}
@@ -738,8 +738,8 @@ protected function output() {
738738
else {
739739
$default_sort_order = null;
740740
}
741-
$res = '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label for="default_sort_order">'.
742-
$this->trans('Default message sort order').'</label></span><div><select class="form-select form-select-sm w-auto" id="default_sort_order" name="default_sort_order">';
741+
$res = '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="default_sort_order">'.
742+
$this->trans('Default message sort order').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><select class="form-select form-select-sm w-auto" id="default_sort_order" name="default_sort_order">';
743743
foreach ($options as $val => $label) {
744744
$res .= '<option ';
745745
if ($default_sort_order == $val) {
@@ -750,7 +750,7 @@ protected function output() {
750750
}
751751
$res .= 'value="'.$val.'">'.$this->trans($label).'</option>';
752752
}
753-
$res .= '</select>'.$reset.'</div></div></td></tr>';
753+
$res .= '</select>'.$reset.'</div></td></tr>';
754754
return $res;
755755
}
756756
}
@@ -774,8 +774,8 @@ protected function output() {
774774
else {
775775
$list_style = DEFAULT_LIST_STYLE;
776776
}
777-
$res = '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label for="list_style">'.
778-
$this->trans('Message list style').'</label></span><div><select class="form-select form-select-sm w-auto" id="list_style" name="list_style" data-default-value="'.DEFAULT_LIST_STYLE.'">';
777+
$res = '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="list_style">'.
778+
$this->trans('Message list style').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><select class="form-select form-select-sm w-auto" id="list_style" name="list_style" data-default-value="'.DEFAULT_LIST_STYLE.'">';
779779
foreach ($options as $val => $label) {
780780
$res .= '<option ';
781781
if ($list_style == $val) {
@@ -786,7 +786,7 @@ protected function output() {
786786
}
787787
$res .= 'value="'.$val.'">'.$this->trans($label).'</option>';
788788
}
789-
$res .= '</select>'.$reset.'</div></div></td></tr>';
789+
$res .= '</select>'.$reset.'</div></td></tr>';
790790
return $res;
791791
}
792792
}
@@ -805,7 +805,7 @@ protected function output() {
805805
$checked = '';
806806
$reset = '';
807807
}
808-
return '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label class="form-check-label" for="mailto_handler">'.$this->trans('Allow handling of mailto links').'</label></span><div><input class="form-check-input" type="checkbox" '.$checked.' value="1" id="mailto_handler" name="mailto_handler" data-default-value="false" />'.$reset.'</div></div></td></tr>';
808+
return '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="mailto_handler">'.$this->trans('Allow handling of mailto links').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><input class="form-check-input me-2" type="checkbox" '.$checked.' value="1" id="mailto_handler" name="mailto_handler" data-default-value="false" />'.$reset.'</div></td></tr>';
809809
}
810810
}
811811

@@ -823,7 +823,7 @@ protected function output() {
823823
$checked = '';
824824
$reset = '';
825825
}
826-
return '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label class="form-check-label" for="no_folder_icons">'.$this->trans('Hide folder list icons').'</label></span><div><input class="form-check-input" type="checkbox" '.$checked.' value="1" id="no_folder_icons" name="no_folder_icons" data-default-value="false" />'.$reset.'</div></div></td></tr>';
826+
return '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="no_folder_icons">'.$this->trans('Hide folder list icons').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><input class="form-check-input me-2" type="checkbox" '.$checked.' value="1" id="no_folder_icons" name="no_folder_icons" data-default-value="false" />'.$reset.'</div></td></tr>';
827827
}
828828
}
829829

@@ -843,7 +843,7 @@ protected function output() {
843843
if(isset($settings['no_password_save']) && $settings['no_password_save'] !== DEFAULT_NO_PASSWORD_SAVE) {
844844
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
845845
}
846-
return '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label class="form-check-label" for="no_password_save">'.$this->trans('Don\'t save account passwords between logins').'</label></span><div><input class="form-check-input" type="checkbox" '.$checked.' value="1" id="no_password_save" name="no_password_save" data-default-value="'.(DEFAULT_NO_PASSWORD_SAVE ? 'true' : 'false') . '" />'.$reset.'</div></div></td></tr>';
846+
return '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="no_password_save">'.$this->trans('Don\'t save account passwords between logins').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><input class="form-check-input me-2" type="checkbox" '.$checked.' value="1" id="no_password_save" name="no_password_save" data-default-value="'.(DEFAULT_NO_PASSWORD_SAVE ? 'true' : 'false') . '" />'.$reset.'</div></td></tr>';
847847
}
848848
}
849849

@@ -864,7 +864,7 @@ protected function output() {
864864
if(isset($settings['disable_delete_prompt']) && $settings['disable_delete_prompt'] !== DEFAULT_DISABLE_DELETE_PROMPT) {
865865
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
866866
}
867-
return '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label class="form-check-label" for="disable_delete_prompt">'.$this->trans('Disable prompts when deleting').'</label></span><div><input class="form-check-input" type="checkbox" '.$checked.' value="1" id="disable_delete_prompt" name="disable_delete_prompt" data-default-value="'.(DEFAULT_DISABLE_DELETE_PROMPT ? 'true' : 'false') . '" />'.$reset.'</div></div></td></tr>';
867+
return '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="disable_delete_prompt">'.$this->trans('Disable prompts when deleting').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><input class="form-check-input me-2" type="checkbox" '.$checked.' value="1" id="disable_delete_prompt" name="disable_delete_prompt" data-default-value="'.(DEFAULT_DISABLE_DELETE_PROMPT ? 'true' : 'false') . '" />'.$reset.'</div></td></tr>';
868868
}
869869
}
870870

@@ -882,7 +882,7 @@ protected function output() {
882882
else {
883883
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
884884
}
885-
return '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label class="form-check-label" for="allow_delete_attachment">'.$this->trans('Allow delete attachment').'</label></span><div><input class="form-check-input" type="checkbox" '.$checked.' value="1" id="allow_delete_attachment" name="allow_delete_attachment" data-default-value="false" />'.$reset.'</div></div></td></tr>';
885+
return '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="allow_delete_attachment">'.$this->trans('Allow delete attachment').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><input class="form-check-input me-2" type="checkbox" '.$checked.' value="1" id="allow_delete_attachment" name="allow_delete_attachment" data-default-value="false" />'.$reset.'</div></td></tr>';
886886
}
887887
}
888888

@@ -1186,8 +1186,8 @@ protected function output() {
11861186
}
11871187
asort($translated);
11881188
$mylang = $this->get('language', '');
1189-
$res = '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label for="language">'.
1190-
$this->trans('Language').'</label></span><div><select id="language" class="form-select form-select-sm w-auto" name="language">';
1189+
$res = '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="language">'.
1190+
$this->trans('Language').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><select id="language" class="form-select form-select-sm w-auto" name="language">';
11911191
foreach ($translated as $id => $lang) {
11921192
$res .= '<option ';
11931193
if ($id == $mylang) {
@@ -1198,7 +1198,7 @@ protected function output() {
11981198
}
11991199
$res .= 'value="'.$id.'">'.$lang.'</option>';
12001200
}
1201-
$res .= '</select>'.$reset.'</div></div></td></tr>';
1201+
$res .= '</select>'.$reset.'</div></td></tr>';
12021202
return $res;
12031203
}
12041204
}
@@ -1221,8 +1221,8 @@ protected function output() {
12211221
else {
12221222
$myzone = $this->get('default_timezone','UTC');
12231223
}
1224-
$res = '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label for="timezone">'.
1225-
$this->trans('Timezone').'</label></span><div><select class="w-auto form-select form-select-sm" id="timezone" name="timezone">';
1224+
$res = '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="timezone">'.
1225+
$this->trans('Timezone').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><select class="w-auto form-select form-select-sm" id="timezone" name="timezone">';
12261226
foreach ($zones as $zone) {
12271227
$res .= '<option ';
12281228
if ($zone == $myzone) {
@@ -1233,7 +1233,7 @@ protected function output() {
12331233
}
12341234
$res .= 'value="'.$zone.'">'.$zone.'</option>';
12351235
}
1236-
$res .= '</select>'.$reset.'</div></div></td></tr>';
1236+
$res .= '</select>'.$reset.'</div></td></tr>';
12371237
return $res;
12381238
}
12391239
}
@@ -1251,8 +1251,8 @@ protected function output() {
12511251
$checked = ' checked="checked"';
12521252
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
12531253
}
1254-
return '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label class="form-check-label" for="show_list_icons">'.
1255-
$this->trans('Show icons in message lists').'</label></span><div><input class="form-check-input" type="checkbox" '.$checked.' id="show_list_icons" name="show_list_icons" data-default-value="false" value="1" />'.$reset.'</div></div></td></tr>';
1254+
return '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="show_list_icons">'.
1255+
$this->trans('Show icons in message lists').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><input class="form-check-input me-2" type="checkbox" '.$checked.' id="show_list_icons" name="show_list_icons" data-default-value="false" value="1" />'.$reset.'</div></td></tr>';
12561256
}
12571257
}
12581258

@@ -2278,8 +2278,8 @@ protected function output() {
22782278
$checked = ' checked="checked"';
22792279
$reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise refresh_list reset_default_value_checkbox"></i></span>';
22802280
}
2281-
return '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label class="form-check-label" for="warn_for_unsaved_changes">'.
2282-
$this->trans('Warn for unsaved changes').'</label></span><div><input type="checkbox" '.$checked.' id="warn_for_unsaved_changes" name="warn_for_unsaved_changes" class="form-check-input" value="1" data-default-value="false" />'.$reset.'</div></div></td></tr>';
2281+
return '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="warn_for_unsaved_changes">'.
2282+
$this->trans('Warn for unsaved changes').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><input class="form-check-input me-2" type="checkbox" '.$checked.' id="warn_for_unsaved_changes" name="warn_for_unsaved_changes" value="1" data-default-value="false" />'.$reset.'</div></td></tr>';
22832283
}
22842284
}
22852285

‎modules/core/site.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ td {
304304
width: 100%;
305305
}
306306
.user_settings table td {
307-
height: 34px;
307+
height: auto;
308308
vertical-align: middle;
309309
padding: 5px;
310310
padding-left: 37px;

‎modules/idle_timer/modules.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected function output() {
100100
else {
101101
$idle_time = 1;
102102
}
103-
$res = '<tr class="general_setting"><td><div class="d-flex flex-column flex-md-row"><span class="fw-bold me-md-3"><label for="idle_time">'.$this->trans('Allowed idle time until logout').'</label></span><select class="form-select form-select-sm w-auto" id="idle_time" name="idle_time">';
103+
$res = '<tr class="general_setting"><td class="d-block d-md-table-cell"><label for="idle_time">'.$this->trans('Allowed idle time until logout').'</label></td><td class="d-block d-md-table-cell"><div class="d-flex align-items-center"><select class="form-select form-select-sm w-auto" id="idle_time" name="idle_time">';
104104
foreach ($options as $val => $label) {
105105
$res .= '<option ';
106106
if ($idle_time == $val) {

0 commit comments

Comments
 (0)