From d56bcff45d3e3aa09b1e6aa52a623dc2c69fb47b Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Sat, 29 Dec 2007 06:34:07 +0000 Subject: [PATCH] Completed ui-lib conversion --- cron/cron-lib.pl | 23 ++++----- cron/edit_cron.cgi | 121 +++++++++++++++++++-------------------------- 2 files changed, 64 insertions(+), 80 deletions(-) diff --git a/cron/cron-lib.pl b/cron/cron-lib.pl index 4091f4eae..d5f5de639 100644 --- a/cron/cron-lib.pl +++ b/cron/cron-lib.pl @@ -778,19 +778,20 @@ else { sub show_range_input { local ($job) = @_; +local $rng; +$rng = &text('range_start', &ui_date_input( + $job->{'start'}->[0], $job->{'start'}->[1], $job->{'start'}->[2], + "range_start_day", "range_start_month", "range_start_year"))."\n". + &date_chooser_button( + "range_start_day", "range_start_month", "range_start_year")."\n". + &text('range_end', &ui_date_input( + $job->{'end'}->[0], $job->{'end'}->[1], $job->{'end'}->[2], + "range_end_day", "range_end_month", "range_end_year"))."\n". + &date_chooser_button( + "range_end_day", "range_end_month", "range_end_year")."\n"; print &ui_oneradio("range_def", 1, $text{'range_all'}, !$job->{'start'}), "
\n"; -print &ui_oneradio("range_def", 0, "", $job->{'start'}),"\n"; -print &text('range_start', &ui_date_input( - $job->{'start'}->[0], $job->{'start'}->[1], $job->{'start'}->[2], - "range_start_day", "range_start_month", "range_start_year")),"\n", - &date_chooser_button( - "range_start_day", "range_start_month", "range_start_year"),"\n"; -print &text('range_end', &ui_date_input( - $job->{'end'}->[0], $job->{'end'}->[1], $job->{'end'}->[2], - "range_end_day", "range_end_month", "range_end_year")),"\n", - &date_chooser_button( - "range_end_day", "range_end_month", "range_end_year"),"\n"; +print &ui_oneradio("range_def", 0, $rng, $job->{'start'}),"\n"; } # parse_range_input(&job, &in) diff --git a/cron/edit_cron.cgi b/cron/edit_cron.cgi index 355c537e8..9ee9ebe29 100755 --- a/cron/edit_cron.cgi +++ b/cron/edit_cron.cgi @@ -35,57 +35,43 @@ else { } } -print "
\n"; -print "\n"; -print "\n"; -print "\n"; -print "\n"; -print "
$text{'edit_details'}
\n"; +print &ui_form_start("save_cron.cgi"); +print &ui_hidden("new", $in{'new'}); +print &ui_hidden("idx", $in{'idx'}); +print &ui_table_start($text{'edit_details'}, "width=100%", 2); if (&supports_users()) { # Allow selection of user - print "\n"; if ($access{'mode'} == 1) { - print "\n"; + $usel = &ui_select("user", $job->{'user'}, + [ split(/\s+/, $access{'users'}) ]); } elsif ($access{'mode'} == 3) { - print "\n"; - print "\n"; + $usel = "$remote_user"; + print &ui_hidden("user", $remote_user); } else { - print "\n"; + $usel = &ui_user_textbox("user", $job->{'user'}); } - } -else { - # No such thing as users! - print "\n"; + print &ui_table_row($text{'edit_user'}, $usel); } -print "\n"; -printf "\n", - $job->{'active'} ? "" : "checked"; +# Is job active? +print &ui_table_row($text{'edit_active'}, + &ui_yesno_radio("active", $job->{'active'} ? 1 : 0)); &convert_comment($job); $rpd = &is_run_parts($job->{'command'}); if ($rpd) { # run-parts command.. just show scripts that will be run - print "\n"; - print "\n"; - print "\n"; + print &ui_table_row($text{'edit_commands'}, + "".join("
",&expand_run_parts($rpd)).""); + print &ui_hidden("cmd", $job->{'command'}); } elsif (!$access{'command'}) { # Just show command, which cannot be edited - print "\n"; - print "\n"; + print &ui_table_row($text{'edit_commands'}, + "".&html_escape($job->{'command'}).""); } else { # Normal cron job.. can edit command @@ -93,72 +79,69 @@ else { $rangeable = 1; ($command, $input) = &extract_input($job->{'command'}); @lines = split(/%/, $input); - print "\n"; - print "\n"; + print &ui_table_row($text{'edit_command'}, + &ui_textbox("cmd", $command, 60)); if ($config{'cron_input'}) { - print "\n"; - print "\n"; + print &ui_table_row($text{'edit_input'}, + &ui_textarea("input", join("\n" , @lines), 3, 50)); } } # Show comment -print "\n"; -print "\n"; +print &ui_table_row($text{'edit_comment'}, + &ui_textbox("comment", $job->{'comment'}, 60)); -print "
$text{'edit_user'}$remote_user{'user'}\"> ", - &user_chooser_button("user", 0),"
$text{'edit_active'} $text{'yes'}\n", - $job->{'active'} ? "checked" : ""; -printf " $text{'no'}
$text{'edit_commands'}",join("
",&expand_run_parts($rpd)), - "
$text{'edit_command'}$job->{'command'}
$text{'edit_command'}
$text{'edit_input'}
$text{'edit_comment'}",&ui_textbox("comment", $job->{'comment'}, 60), - "

\n"; +print &ui_table_end(); # Show times and days to run -print "\n"; -print "\n"; -&show_times_input($job); -print "
$text{'edit_when'}
\n"; +print &ui_table_start($text{'edit_when'}, "width=100%", 2); +print &ui_table_row(undef, "". + &capture_function_output(\&show_times_input, $job). + "
", 2); +print &ui_table_end(); if ($rangeable) { # Show date range to run - print "

\n"; - print "\n"; - print "
$text{'edit_range'}
"; - &show_range_input($job); - print "
\n"; + print &ui_table_start($text{'edit_range'}, "width=100%", 2); + print &ui_table_row(undef, + &capture_function_output(\&show_range_input, $job), 2); + print &ui_table_end(); } if (!$in{'new'}) { - print "\n"; + print "
\n"; # Save button - print "\n"; + print "\n"; + print &ui_form_end(); # Run button if (!$rpd) { - print "\n"; - print "\n"; - print "\n"; + print &ui_form_start("exec_cron.cgi"); + print &ui_hidden("idx", $in{'idx'}); + print "\n"; + print &ui_form_end(); } # Clone button - print "\n"; - print "\n"; - print "\n"; - print "\n"; + print &ui_form_start("edit_cron.cgi"); + print &ui_hidden("clone", $in{'idx'}); + print &ui_hidden("new", 1); + print "\n"; + print &ui_form_end(); # Delete button if ($access{'delete'}) { - print "\n"; - print "\n"; - print "\n"; + print &ui_form_start("delete_cron.cgi"); + print &ui_hidden("idx", $in{'idx'}); + print "\n"; + print &ui_form_end(); } - else { - print "\n"; - } - print "
",&ui_submit($text{'save'}),"
", - "",&ui_submit($text{'edit_run'}),"
",&ui_submit($text{'edit_clone'}),"
",&ui_submit($text{'delete'}),"

\n"; + print "\n"; } else { - print "

\n"; + print &ui_form_end([ [ undef, $text{'create'} ] ]); } &ui_print_footer("", $text{'index_return'});