diff --git a/cron/cron-lib.pl b/cron/cron-lib.pl index 2f15c3204..f2c87db06 100755 --- a/cron/cron-lib.pl +++ b/cron/cron-lib.pl @@ -924,7 +924,7 @@ foreach my $arr ("mins", "hours", "days", "months", "weekdays") { $table .= &ui_columns_row(\@cols, [ "valign=top", "valign=top", "valign=top", "valign=top", "valign=top" ]); $table .= &ui_columns_end(); -$table .= $text{'edit_ctrl'}; +$table .= &ui_note($text{'edit_ctrl'}, 0); $rv .= &ui_table_row(undef, $table, $width, undef, ['data-schedule-tr']); return $rv; } @@ -1056,7 +1056,8 @@ foreach $arr ("mins", "hours", "days", "months", "weekdays") { } print "\n"; } -print " $text{'edit_ctrl'} \n"; +my $ctlnote = &ui_note($text{'edit_ctrl'}, 0); +print " $ctlnote \n"; } =head2 parse_times_input(&job, &in) diff --git a/cron/lang/en b/cron/lang/en index 6b9321265..56cf292e0 100644 --- a/cron/lang/en +++ b/cron/lang/en @@ -63,7 +63,7 @@ edit_run=Run Now edit_saverun=Save and Run Now edit_clone=Clone Job edit_return=cron job -edit_ctrl=Note: Ctrl-click (or command-click on the Mac) to select and de-select minutes, hours, days and months. +edit_ctrl=Tip: Use Ctrl-click (or ⌘-click on Mac) to select or deselect multiple items, or Shift-click to select a range edit_special1=Simple schedule edit_special0=Times and dates selected below .. edit_special_hourly=Hourly diff --git a/time/index.cgi b/time/index.cgi index acdfaf4bb..e8035850a 100755 --- a/time/index.cgi +++ b/time/index.cgi @@ -234,7 +234,7 @@ if ( ( !$access{ 'sysdate' } && &has_command( "date" ) || !$access{ 'hwdate' } & &webmincron::show_times_input($job), 2); # Show ctrl help - print &ui_table_row(undef, $text{'index_ctrl'}, 2); + print &ui_table_row(undef, &ui_note($text{'index_ctrl'}, 0), 2); print &ui_table_end(); print &ui_form_end([ [ "action", $text{'index_sync'} ] ]); diff --git a/time/lang/en b/time/lang/en index 9e1534764..215472891 100644 --- a/time/lang/en +++ b/time/lang/en @@ -19,7 +19,7 @@ index_tabsync2=Run system $1 service for synchronization index_desctime=This form is for changing the system's current time, which is used by all running processes. On operating systems that have a separate hardware clock, it can be used to set that too. index_desczone=This form allows you to set the system's default time zone, which is used to convert the system time to a human-readable format and offset. index_descsync=This form is for configuring the system to automatically synchronize the time with a remote server. Synchronization will be done using the Unix time protocol or NTP, depending on which commands are installed and what the remote system supports. -index_ctrl=Note: Ctrl-click (or command-click on the Mac) to select and de-select minutes, hours, days and months. +index_ctrl=Tip: Use Ctrl-click (or ⌘-click on Mac) to select or deselect multiple items, or Shift-click to select a range action_save=Save action_apply=Apply diff --git a/ui-lib.pl b/ui-lib.pl index 6548f0e51..ca181d2a8 100755 --- a/ui-lib.pl +++ b/ui-lib.pl @@ -3344,7 +3344,7 @@ if ($head) { } } -=head2 ui_note(text) +=head2 ui_note(text, [whitespace-count]) Returns a note as a small font size text @@ -3352,8 +3352,10 @@ Returns a note as a small font size text sub ui_note { return &theme_ui_note(@_) if (defined(&theme_ui_note)); -my ($text) = @_; -return "  ⓘ  ". +my ($text, $whitespace) = @_; +$whitespace //= 2; +my $whitespace_str = " " x $whitespace; +return "${whitespace_str}ⓘ  ". "$text"; }