sub show_range_input
{
local ($job) = @_;
-print &ui_oneradio("range_def", 1, $text{'range_all'}, !$job->{'start'}),
- "<br>\n";
-print &ui_oneradio("range_def", 0, "", $job->{'start'}),"\n";
-print &text('range_start', &ui_date_input(
+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",
+ "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(
+ "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",
+ "range_end_day", "range_end_month", "range_end_year"))."\n".
&date_chooser_button(
- "range_end_day", "range_end_month", "range_end_year"),"\n";
+ "range_end_day", "range_end_month", "range_end_year")."\n";
+print &ui_oneradio("range_def", 1, $text{'range_all'}, !$job->{'start'}),
+ "<br>\n";
+print &ui_oneradio("range_def", 0, $rng, $job->{'start'}),"\n";
}
# parse_range_input(&job, &in)
}
}
-print "<form action=save_cron.cgi>\n";
-print "<input type=hidden name=new value='$in{'new'}'>\n";
-print "<input type=hidden name=idx value='$in{'idx'}'>\n";
-print "<table border width=100%>\n";
-print "<tr $tb> <td><b>$text{'edit_details'}</b></td> </tr>\n";
-print "<tr $cb> <td><table>\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 "<tr> <td><b>$text{'edit_user'}</b></td>\n";
if ($access{'mode'} == 1) {
- print "<td><select name=user>\n";
- foreach $u (split(/\s+/, $access{'users'})) {
- printf "<option %s>$u\n",
- $job->{'user'} eq $u ? "selected" : "";
- }
- print "</select></td>\n";
+ $usel = &ui_select("user", $job->{'user'},
+ [ split(/\s+/, $access{'users'}) ]);
}
elsif ($access{'mode'} == 3) {
- print "<td><tt>$remote_user</tt></td>\n";
- print "<input type=hidden name=user value='$remote_user'>\n";
+ $usel = "<tt>$remote_user</tt>";
+ print &ui_hidden("user", $remote_user);
}
else {
- print "<td><input name=user size=8 value=\"$job->{'user'}\"> ",
- &user_chooser_button("user", 0),"</td>\n";
+ $usel = &ui_user_textbox("user", $job->{'user'});
}
- }
-else {
- # No such thing as users!
- print "<tr>\n";
+ print &ui_table_row($text{'edit_user'}, $usel);
}
-print "<td> <b>$text{'edit_active'}</b></td>\n";
-printf "<td><input type=radio name=active value=1 %s> $text{'yes'}\n",
- $job->{'active'} ? "checked" : "";
-printf "<input type=radio name=active value=0 %s> $text{'no'}</td> </tr>\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 "<tr> <td valign=top><b>$text{'edit_commands'}</b></td>\n";
- print "<td><tt>",join("<br>",&expand_run_parts($rpd)),
- "</tt></td> </tr>\n";
- print "<input type=hidden name=cmd value='$job->{'command'}'>\n";
+ print &ui_table_row($text{'edit_commands'},
+ "<tt>".join("<br>",&expand_run_parts($rpd))."</tt>");
+ print &ui_hidden("cmd", $job->{'command'});
}
elsif (!$access{'command'}) {
# Just show command, which cannot be edited
- print "<tr> <td><b>$text{'edit_command'}</b></td>\n";
- print "<td colspan=3><tt>$job->{'command'}</tt></td> </tr>\n";
+ print &ui_table_row($text{'edit_commands'},
+ "<tt>".&html_escape($job->{'command'})."</tt>");
}
else {
# Normal cron job.. can edit command
$rangeable = 1;
($command, $input) = &extract_input($job->{'command'});
@lines = split(/%/, $input);
- print "<tr> <td><b>$text{'edit_command'}</b></td>\n";
- print "<td colspan=3><input name=cmd size=60 ",
- "value='",&html_escape($command),"'></td> </tr>\n";
+ print &ui_table_row($text{'edit_command'},
+ &ui_textbox("cmd", $command, 60));
if ($config{'cron_input'}) {
- print "<tr> <td valign=top><b>$text{'edit_input'}</b></td>\n";
- print "<td colspan=3><textarea name=input rows=3 cols=50>",
- join("\n" , @lines),"</textarea></td> </tr>\n";
+ print &ui_table_row($text{'edit_input'},
+ &ui_textarea("input", join("\n" , @lines), 3, 50));
}
}
# Show comment
-print "<tr> <td><b>$text{'edit_comment'}</b></td>\n";
-print "<td colspan=3>",&ui_textbox("comment", $job->{'comment'}, 60),
- "</td> </tr>\n";
+print &ui_table_row($text{'edit_comment'},
+ &ui_textbox("comment", $job->{'comment'}, 60));
-print "</table></td></tr></table><p>\n";
+print &ui_table_end();
# Show times and days to run
-print "<table border width=100%>\n";
-print "<tr $tb> <td colspan=5><b>$text{'edit_when'}</b></td> </tr>\n";
-&show_times_input($job);
-print "</table>\n";
+print &ui_table_start($text{'edit_when'}, "width=100%", 2);
+print &ui_table_row(undef, "<table border width=100%>".
+ &capture_function_output(\&show_times_input, $job).
+ "</table>", 2);
+print &ui_table_end();
if ($rangeable) {
# Show date range to run
- print "<p><table border width=100%>\n";
- print "<tr $tb> <td><b>$text{'edit_range'}</b></td> </tr>\n";
- print "<tr $cb><td>";
- &show_range_input($job);
- print "</td></tr></table>\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 "<table width=100%>\n";
+ print "<table><tr>\n";
# Save button
- print "<tr> <td align=left width=25%><input type=submit value=\"$text{'save'}\"></td>\n";
+ print "<td>",&ui_submit($text{'save'}),"</td>\n";
+ print &ui_form_end();
# Run button
if (!$rpd) {
- print "</form><form action=\"exec_cron.cgi\">\n";
- print "<input type=hidden name=idx value=\"$in{'idx'}\">\n";
- print "<td align=center width=25%>",
- "<input type=submit value=\"$text{'edit_run'}\"></td>\n";
+ print &ui_form_start("exec_cron.cgi");
+ print &ui_hidden("idx", $in{'idx'});
+ print "<td>",&ui_submit($text{'edit_run'}),"</td>\n";
+ print &ui_form_end();
}
# Clone button
- print "</form><form action=\"edit_cron.cgi\">\n";
- print "<input type=hidden name=clone value=\"$in{'idx'}\">\n";
- print "<input type=hidden name=new value=\"1\">\n";
- print "<td align=right width=25%><input type=submit value=\"$text{'edit_clone'}\"></td>\n";
+ print &ui_form_start("edit_cron.cgi");
+ print &ui_hidden("clone", $in{'idx'});
+ print &ui_hidden("new", 1);
+ print "<td>",&ui_submit($text{'edit_clone'}),"</td>\n";
+ print &ui_form_end();
# Delete button
if ($access{'delete'}) {
- print "</form><form action=\"delete_cron.cgi\">\n";
- print "<input type=hidden name=idx value=\"$in{'idx'}\">\n";
- print "<td align=right width=25%><input type=submit value=\"$text{'delete'}\"></td> </tr>\n";
- }
- else {
- print "<td align=right width=25%></td>\n";
+ print &ui_form_start("delete_cron.cgi");
+ print &ui_hidden("idx", $in{'idx'});
+ print "<td>",&ui_submit($text{'delete'}),"</td>\n";
+ print &ui_form_end();
}
- print "</form></table><p>\n";
+ print "</tr></table>\n";
}
else {
- print "<input type=submit value=\"$text{'create'}\"></form><p>\n";
+ print &ui_form_end([ [ undef, $text{'create'} ] ]);
}
&ui_print_footer("", $text{'index_return'});