michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-06-03 03:40:31 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2 from gnadelwartz/majordomo2

Browse Source 
fix: fix missing col, no morelinebraks because of <b> in cell
This commit is contained in:
Kay Marquardt
2017-05-24 09:51:40 +02:00
committed by GitHub
parent e7c4c3abd9 989c759036
commit 0b1fac9f51
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firewall/firewall-lib.pl
View File

@@ -222,7 +222,7 @@ foreach $d ('p', 's', 'd', 'i', 'o', 'f', 'dport',
@v = map { uc($_) } @v if ($d eq 'p');
@v = map { join(", ", split(/,/, $_)) } @v
if ($d eq 's' || $d eq 'd');
local $txt = &text("desc_$d$n", map { "<b>$_</b>" } @v);
local $txt = &text("desc_$d$n", map { "<strong>$_</strong>" } @v);
push(@c, $txt) if ($txt);
}
}

12
firewall/index.cgi
View File

@@ -213,10 +213,10 @@ else {
# Generate the header
local (@hcols, @tds);
push(@hcols, "", $text{'index_action'});
push(@tds, "width=5", "width=10% nowrap");
push(@tds, "width=5", "width=20% nowrap");
if ($config{'view_condition'}) {
push(@hcols, $text{'index_desc'});
push(@tds, "");
push(@tds, "nowrap");
}
if ($config{'view_comment'}) {
push(@hcols, $text{'index_comm'});
@@ -249,7 +249,8 @@ else {
push(@cols, &ui_link("edit_rule.cgi?table=".&urlize($in{'table'})."&idx=$r->{'index'}",$act));
}
else {
push(@cols, $act);
# add col for not visible checkmark
push(@cols, "", $act);
}
if ($config{'view_condition'}) {
push(@cols, &describe_rule($r));
@@ -304,10 +305,7 @@ else {
\@cols, \@tds, "d", $r->{'index'});
}
else {
local $r=&ui_columns_row(\@cols, \@tds);
# fix missing first colum, need be a better solution ...
$r=~ s/<td /<td ><\/td><td width="30%" /;
print $r;
print &ui_columns_row(\@cols, \@tds);
}
}
print &ui_columns_end();