firewall.cgi: Merge the ID and policy columns

This saves us a little bit of space and looks tidier to me.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2024-08-07 16:29:23 +02:00
parent 75732eb180
commit 005efd4e29

View File

@@ -2498,23 +2498,22 @@ sub viewtablenew
print <<END; print <<END;
<tr> <tr>
<th align='right' width='3%'> <th width='3%'>
# #
</th> </th>
<th width='2%'></th> <th>
<th align='center'>
<b>$Lang::tr{'protocol'}</b> <b>$Lang::tr{'protocol'}</b>
</th> </th>
<th align='center' width='30%'> <th width='30%'>
<b>$Lang::tr{'fwdfw source'}</b> <b>$Lang::tr{'fwdfw source'}</b>
</th> </th>
<th align='center'> <th>
<b>$Lang::tr{'fwdfw log'}</b> <b>$Lang::tr{'fwdfw log'}</b>
</th> </th>
<th align='center' width='30%'> <th width='30%'>
<b>$Lang::tr{'fwdfw target'}</b> <b>$Lang::tr{'fwdfw target'}</b>
</th> </th>
<th align='center' colspan='6' width='18%'> <th colspan='6' width='18%'>
<b>$Lang::tr{'fwdfw action'}</b> <b>$Lang::tr{'fwdfw action'}</b>
</th> </th>
</tr> </tr>
@@ -2595,9 +2594,6 @@ END
} }
print<<END; print<<END;
<tr bgcolor='$color'> <tr bgcolor='$color'>
<td align='right' width='3%'>
<b>$key&nbsp;</b>
</td>
END END
#RULETYPE (A,R,D) #RULETYPE (A,R,D)
@@ -2616,8 +2612,8 @@ END
} }
print <<END; print <<END;
<td class='$rulecolor' width='2%'> <td class='$rulecolor'>
<span title='$tooltip'>&nbsp;&nbsp;</span> <span title='$tooltip'>$key</span>
</td> </td>
END END