Fix wording
authorJamie Cameron <jcameron@webmin.com>
Thu, 5 Mar 2009 21:59:19 +0000 (21:59 +0000)
committerJamie Cameron <jcameron@webmin.com>
Thu, 5 Mar 2009 21:59:19 +0000 (21:59 +0000)
postfix/general.cgi
postfix/lang/en
postfix/postfix-lib.pl

index 8c205d6..1bb54a7 100755 (executable)
@@ -55,7 +55,7 @@ print &ui_table_start($text{'general_title_others'}, "width=100%", 4);
 &option_freefield("hash_queue_names", 15);
 
 &option_freefield("hopcount_limit", 15);
-&option_radios_freefield("delay_warning_time", 15, $text{'opts_delay_warning_time_default'});
+&option_radios_freefield("delay_warning_time", 15, $text{'opts_delay_warning_time_default2'});
 
 &option_radios_freefield("inet_interfaces", 40, $text{'opts_all_interfaces'});
 
index 0648273..d81a925 100644 (file)
@@ -261,7 +261,7 @@ opts_relocated_maps_default=Default (disabled)
 opts_sun_mailtool_compatibility=Disable kernel file lock on mailboxes
 opts_trigger_timeout=Max time to send a trigger to a daemon
 opts_delay_warning_time=Time in hours before sending a warning for no delivery
-opts_delay_warning_time_default=Disabled
+opts_delay_warning_time_default2=Postfix default
 opts_content_filter_default=None
 
 smtpd_title=SMTP Server Options
index 5db2fb4..ed32956 100644 (file)
@@ -397,13 +397,9 @@ sub option_select
     my $v = &get_current_value($name);
     my $key = 'opts_'.$name;
 
-    defined($_[2]) ?
-       print "<td>".&hlink("<b>$text{$key}</b>", "opt_".$name)."</td> <td nowrap>\n"
-    :
-       print "<td><b>$text{$key}</b></td> <td nowrap>\n";
-    
-    print &ui_select($name."_def", lc($v), $_[1]);
-    print "</td>\n";
+    print &ui_table_row(defined($_[2]) ? &hlink($text{$key}, "opt_".$name)
+                                      : $text{$key},
+                       &ui_select($name."_def", lc($v), $_[1]));
 }