return $rv;
}
-=head2 ui_checked_columns_row(&columns, &tdtags, checkname, checkvalue, [checked?], [disabled])
+=head2 ui_checked_columns_row(&columns, &tdtags, checkname, checkvalue, [checked?], [disabled], [tags])
Returns HTML for a row in a multi-column table, in which the first column
contains a checkbox. The parameters are :
=item disabled - Set to 1 if the checkbox should be disabled and thus un-clickable.
+=item tags - Extra HTML tags to include in the radio button.
+
=cut
sub ui_checked_columns_row
{
return &theme_ui_checked_columns_row(@_) if (defined(&theme_ui_checked_columns_row));
-my ($cols, $tdtags, $checkname, $checkvalue, $checked, $disabled) = @_;
+my ($cols, $tdtags, $checkname, $checkvalue, $checked, $disabled, $tags) = @_;
my $rv;
$rv .= "<tr $cb class='ui_checked_columns'>\n";
$rv .= "<td class='ui_checked_checkbox' ".$tdtags->[0].">".
- &ui_checkbox($checkname, $checkvalue, undef, $checked, undef, $disabled).
+ &ui_checkbox($checkname, $checkvalue, undef, $checked, $tags, $disabled).
"</td>\n";
my $i;
for($i=0; $i<@$cols; $i++) {
return $rv;
}
-=head2 ui_radio_columns_row(&columns, &tdtags, checkname, checkvalue, [checked], [disabled])
+=head2 ui_radio_columns_row(&columns, &tdtags, checkname, checkvalue, [checked], [disabled], [tags])
Returns HTML for a row in a multi-column table, in which the first
column is a radio button. The parameters are :
=item disabled - Set to 1 if the radio button should be disabled and thus un-clickable.
+=item tags - Extra HTML tags to include in the radio button.
+
=cut
sub ui_radio_columns_row
{
return &theme_ui_radio_columns_row(@_) if (defined(&theme_ui_radio_columns_row));
-my ($cols, $tdtags, $checkname, $checkvalue, $checked, $dis) = @_;
+my ($cols, $tdtags, $checkname, $checkvalue, $checked, $dis, $tags) = @_;
my $rv;
$rv .= "<tr $cb class='ui_radio_columns'>\n";
$rv .= "<td class='ui_radio_radio' ".$tdtags->[0].">".
# Checkbox in non-first column
push(@cols, &ui_checkbox($c->{'name'}, $c->{'value'},
$c->{'label'}, $c->{'checked'},
- undef, $c->{'disabled'}));
+ $c->{'tags'},
+ $c->{'disabled'}));
}
elsif ($c->{'type'} eq 'radio') {
# Radio button in non-first column
push(@cols, &ui_oneradio($c->{'name'}, $c->{'value'},
$c->{'label'}, $c->{'checked'},
- undef, $c->{'disabled'}));
+ $c->{'tags'},
+ $c->{'disabled'}));
}
elsif ($c->{'type'} eq 'group') {
# Header row that spans whole table
elsif ($c0->{'type'} eq 'checkbox') {
$rv .= &ui_checked_columns_row(\@cols, \@rtds, $c0->{'name'},
$c0->{'value'}, $c0->{'checked'},
- $c0->{'disabled'});
+ $c0->{'disabled'},
+ $c0->{'tags'});
}
elsif ($c0->{'type'} eq 'radio') {
$rv .= &ui_radio_columns_row(\@cols, \@rtds, $c0->{'name'},
$c0->{'value'}, $c0->{'checked'},
- $c0->{'disabled'});
+ $c0->{'disabled'},
+ $c0->{'tags'});
}
}
return $rv;
}
-=head2 ui_form_columns_table(cgi, &buttons, select-all, &otherlinks, &hiddens, &headings, width-percent, &data, &types, no-sort, title, empty-msg)
+=head2 ui_form_columns_table(cgi, &buttons, select-all, &otherlinks, &hiddens, &headings, width-percent, &data, &types, no-sort, title, empty-msg, form-no)
Similar to ui_columns_table, but wrapped in a form. Parameters are :
return &theme_ui_form_columns_table(@_)
if (defined(&theme_ui_form_columns_table));
my ($cgi, $buttons, $selectall, $others, $hiddens,
- $heads, $width, $data, $types, $nosort, $title, $emptymsg) = @_;
+ $heads, $width, $data, $types, $nosort, $title, $emptymsg, $formno) = @_;
my $rv;
# Build links
}
}
if ($cbname) {
- unshift(@leftlinks, &select_all_link($cbname),
- &select_invert_link($cbname));
+ unshift(@leftlinks, &select_all_link($cbname, $formno),
+ &select_invert_link($cbname, $formno));
}
}
}
=item disabled - Set to 1 if this text box should be disabled by default.
+=item tags - Additional HTML attributes for the <input> tag.
+
+=item defaultunits - Units mode selected by default
+
=cut
sub ui_bytesbox
{
-my ($name, $bytes, $size, $dis) = @_;
+my ($name, $bytes, $size, $dis, $tags, $defaultunits) = @_;
my $units = 1;
-if ($bytes >= 10*1024*1024*1024*1024) {
+if ($bytes eq '' && $defaultunits) {
+ $units = $defaultunits;
+ }
+elsif ($bytes >= 10*1024*1024*1024*1024) {
$units = 1024*1024*1024*1024;
}
elsif ($bytes >= 10*1024*1024*1024) {
$bytes =~ s/\.00$//;
}
$size = &ui_max_text_width($size || 8);
-return &ui_textbox($name, $bytes, $size, $dis)." ".
+return &ui_textbox($name, $bytes, $size, $dis, undef, $tags)." ".
&ui_select($name."_units", $units,
[ [ 1, "bytes" ],
[ 1024, "kB" ],
}
$rv .= "<tr class='ui_multi_select_row'>";
$rv .= "<td>".&ui_select($name."_opts", [ ], $leftover,
- $size, 0, 0, $dis, $wstyle)."</td>\n";
-$rv .= "<td>".&ui_button("->", undef, $dis,
+ $size, 1, 0, $dis, $wstyle)."</td>\n";
+$rv .= "<td>".&ui_button("->", $name."_add", $dis,
"onClick='multi_select_move(\"$name\", form, 1)'")."<br>".
- &ui_button("<-", undef, $dis,
+ &ui_button("<-", $name."_remove", $dis,
"onClick='multi_select_move(\"$name\", form, 0)'")."</td>\n";
$rv .= "<td>".&ui_select($name."_vals", [ ], $values,
- $size, 0, 0, $dis, $wstyle)."</td>\n";
+ $size, 1, 0, $dis, $wstyle)."</td>\n";
$rv .= "</tr></table>\n";
$rv .= &ui_hidden($name, join("\n", map { $_->[0] } @$values));
return $rv;
var vals_idx = vals.selectedIndex;
if (dir == 1 && opts_idx >= 0) {
// Moving from options to selected list
- var o = opts.options[opts_idx];
- vals.options[vals.options.length] = new Option(o.text, o.value);
- opts.remove(opts_idx);
+ for(var i=0; i<opts.options.length; i++) {
+ var o = opts.options[i];
+ if (o.selected) {
+ vals.options[vals.options.length] =
+ new Option(o.text, o.value);
+ opts.remove(i);
+ i--;
+ }
+ }
}
else if (dir == 0 && vals_idx >= 0) {
// Moving the other way
- var o = vals.options[vals_idx];
- opts.options[opts.options.length] = new Option(o.text, o.value);
- vals.remove(vals_idx);
+ for(var i=0; i<vals.options.length; i++) {
+ var o = vals.options[i];
+ if (o.selected) {
+ opts.options[opts.options.length] =
+ new Option(o.text, o.value);
+ vals.remove(i);
+ i--;
+ }
+ }
}
// Fill in hidden field
var hid = f.elements[name];
return $rv;
}
-=head2 ui_print_header(subtext, args...)
+=head2 ui_print_header(subtext, image, [help], [config], [nomodule], [nowebmin], [rightside], [head-stuff], [body-stuff], [below])
Print HTML for a header with the post-header line. The args are the same
-as those passed to header(), defined in web-lib-funcs.pl. The exception is
-the additional subtext parameter, which is for optional HTML to display
-just below the header.
+as those passed to header(), defined in web-lib-funcs.pl, with the addition
+of the subtext parameter :
+
+=item subtext - Text to display below the title
+
+=item title - The text to show at the top of the page
+
+=item image - An image to show instead of the title text. This is typically left blank.
+
+=item help - If set, this is the name of a help page that will be linked to in the title.
+
+=item config - If set to 1, the title will contain a link to the module's config page.
+
+=item nomodule - If set to 1, there will be no link in the title section to the module's index.
+
+=item nowebmin - If set to 1, there will be no link in the title section to the Webmin index.
+
+=item rightside - HTML to be shown on the right-hand side of the title. Can contain multiple lines, separated by <br>. Typically this is used for links to stop, start or restart servers.
+
+=item head-stuff - HTML to be included in the <head> section of the page.
+
+=item body-stuff - HTML attributes to be include in the <body> tag.
+
+=item below - HTML to be displayed below the title. Typically this is used for application or server version information.
+
+
=cut
sub ui_print_header
}
# Build list of tab titles and names
-my $tabnames = "[".join(",", map { "\"".&html_escape($_->[0])."\"" } @$tabs)."]";
-my $tabtitles = "[".join(",", map { "\"".&html_escape($_->[1])."\"" } @$tabs)."]";
+my $tabnames = "[".join(",", map { "\""."e_escape($_->[0])."\"" } @$tabs)."]";
+my $tabtitles = "[".join(",", map { "\""."e_escape($_->[1])."\"" } @$tabs)."]";
$rv .= "<script>\n";
$rv .= "document.${name}_tabnames = $tabnames;\n";
$rv .= "document.${name}_tabtitles = $tabtitles;\n";
$rv .= "<tr>\n";
$rv .= "<td valign=top".(defined($r->[2]) ? "" : " colspan=2").">".
($nobold ? "" : "<b>").
- &ui_oneradio($name, $r->[0], $r->[1], $r->[0] eq $sel).
+ &ui_oneradio($name, $r->[0], $r->[1], $r->[0] eq $sel, $r->[3]).
($nobold ? "" : "</b>").
"</td>\n";
if (defined($r->[2])) {
# Far left link, if needed
if (@_ > 5) {
if ($farleft) {
- $rv .= "<a href='$farleft'><img src=/images/first.gif ".
+ $rv .= "<a href='$farleft'>".
+ "<img src=$gconfig{'webprefix'}/images/first.gif ".
"border=0 align=middle></a>\n";
}
else {
- $rv .= "<img src=/images/first-grey.gif ".
+ $rv .= "<img src=$gconfig{'webprefix'}/images/first-grey.gif ".
"border=0 align=middle></a>\n";
}
}
# Left link
if ($left) {
- $rv .= "<a href='$left'><img src=/images/left.gif ".
+ $rv .= "<a href='$left'>".
+ "<img src=$gconfig{'webprefix'}/images/left.gif ".
"border=0 align=middle></a>\n";
}
else {
- $rv .= "<img src=/images/left-grey.gif ".
+ $rv .= "<img src=$gconfig{'webprefix'}/images/left-grey.gif ".
"border=0 align=middle></a>\n";
}
# Right link
if ($right) {
- $rv .= "<a href='$right'><img src=/images/right.gif ".
+ $rv .= "<a href='$right'>".
+ "<img src=$gconfig{'webprefix'}/images/right.gif ".
"border=0 align=middle></a>\n";
}
else {
- $rv .= "<img src=/images/right-grey.gif ".
+ $rv .= "<img src=$gconfig{'webprefix'}/images/right-grey.gif ".
"border=0 align=middle></a>\n";
}
# Far right link, if needed
if (@_ > 5) {
if ($farright) {
- $rv .= "<a href='$farright'><img src=/images/last.gif ".
+ $rv .= "<a href='$farright'>".
+ "<img src=$gconfig{'webprefix'}/images/last.gif ".
"border=0 align=middle></a>\n";
}
else {
- $rv .= "<img src=/images/last-grey.gif ".
+ $rv .= "<img src=$gconfig{'webprefix'}/images/last-grey.gif ".
"border=0 align=middle></a>\n";
}
}
return &theme_js_redirect(@_);
}
$window ||= "window";
+if ($url =~ /^\//) {
+ # If the URL is like /foo , add webprefix
+ $url = $gconfig{'webprefix'}.$url;
+ }
return "<script>${window}.location = '"."e_escape($url)."';</script>\n";
}