VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-19 01:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show view name in header on all pages https://github.com/webmin/webmin/issues/1227

Browse Source
This commit is contained in:
Jamie Cameron
2020-04-04 18:42:44 -07:00
parent ab1af2238e
commit 4a0c7b4297
16 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bind8/bind8-lib.pl
View File

@ -4260,5 +4260,15 @@ if (&foreign_check("virtual-server")) {
return wantarray ? @rv : $rv[0];
}
# zone_subhead(&zone)
# Returns a ui_header subtitle for a zone
sub zone_subhead
{
my ($zone) = @_;
my $desc = &ip6int_to_net(&arpa_to_ip($zone->{'name'}));
my $view = $zone->{'view'};
return $view ? &text('master_inview', $desc, $view) : $desc;
}
1;

3
bind8/edit_delegation.cgi
View File

@ -16,8 +16,7 @@ my $dom = $zone->{'name'};
&can_edit_zone($zone) ||
&error($text{'master_ecannot'});
my $desc = &ip6int_to_net(&arpa_to_ip($dom));
&ui_print_header($desc, $text{'delegation_title'}, "",
&ui_print_header(&zone_subhead($zone), $text{'delegation_title'}, "",
undef, undef, undef, undef, &restart_links());
print "<b>$text{'delegation_noopts'}</b><p>\n";

3
bind8/edit_forward.cgi
View File

@ -19,8 +19,7 @@ my $dom = $zone->{'name'};
$dom = $zone->{'name'};
&can_edit_zone($zone) ||
&error($text{'fwd_ecannot'});
my $desc = &ip6int_to_net(&arpa_to_ip($dom));
&ui_print_header($desc, $text{'fwd_title'}, "",
&ui_print_header(&zone_subhead($zone), $text{'fwd_title'}, "",
undef, undef, undef, undef, &restart_links());
# Start of the form

3
bind8/edit_master.cgi
View File

@ -12,8 +12,7 @@ $in{'view'} = 'any' if (!$in{'view'} || $in{'view'} eq '');
my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});
my $dom = $zone->{'name'};
&can_edit_zone($zone) || &error($text{'master_ecannot'});
my $desc = &ip6int_to_net(&arpa_to_ip($dom));
&ui_print_header($desc, $text{'master_title'}, "",
&ui_print_header(&zone_subhead($zone), $text{'master_title'}, "",
undef, undef, undef, undef, &restart_links($zone));
# Find the record types

3
bind8/edit_options.cgi
View File

@ -16,8 +16,7 @@ my $dom = $zone->{'name'};
&error($text{'master_ecannot'});
$access{'opts'} || &error($text{'master_eoptscannot'});
my $desc = &ip6int_to_net(&arpa_to_ip($dom));
&ui_print_header($desc, $text{'master_opts'}, "",
&ui_print_header(&zone_subhead($zone), $text{'master_opts'}, "",
undef, undef, undef, undef, &restart_links($zone));
# Start of form for editing zone options

2
bind8/edit_record.cgi
View File

@ -19,7 +19,7 @@ $rec || &error($text{'edit_egone'});
&can_edit_type($rec->{'type'}, \%access) ||
&error($text{'recs_ecannottype'});
my $desc = &text('edit_header', &ip6int_to_net(&arpa_to_ip($dom)));
my $desc = &text('edit_header', &zone_subhead($zone));
&ui_print_header($desc, &text('edit_title', $text{"edit_".$rec->{'type'}} || $rec->{'type'}), "",
undef, undef, undef, undef, &restart_links($zone));

2
bind8/edit_recs.cgi
View File

@ -13,7 +13,7 @@ my $dom = $zone->{'name'};
&error($text{'recs_ecannot'});
&can_edit_type($in{'type'}, \%access) ||
&error($text{'recs_ecannottype'});
my $desc = &text('recs_header', &ip6int_to_net(&arpa_to_ip($dom)));
my $desc = &text('recs_header', &zone_subhead($zone));
my $typedesc = $text{"recs_$in{'type'}"} || $in{'type'};
&ui_print_header($desc, &text('recs_title', $typedesc), "",
undef, undef, undef, undef, &restart_links($zone));

5
bind8/edit_slave.cgi
View File

@ -14,7 +14,6 @@ my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});
my $dom = $zone->{'name'};
&can_edit_zone($zone) || &error($text{'master_ecannot'});
my $desc = &ip6int_to_net(&arpa_to_ip($dom));
my @st;
my $lasttrans;
if ($zone->{'file'}) {
@ -22,8 +21,8 @@ if ($zone->{'file'}) {
$lasttrans = &text('slave_last', @st && $st[7] ? &make_date($st[9])
: $text{'slave_never'});
}
&ui_print_header($desc, $0 =~ /edit_slave/ ? $text{'slave_title'}
: $text{'stub_title'},
&ui_print_header(&zone_subhead($zone),
$0 =~ /edit_slave/ ? $text{'slave_title'} : $text{'stub_title'},
"", undef, 0, 0, 0, &restart_links($zone),
undef, undef, $lasttrans);

3
bind8/edit_soa.cgi
View File

@ -12,8 +12,7 @@ my $dom = $zone->{'name'};
&can_edit_zone($zone) ||
&error($text{'master_ecannot'});
$access{'params'} || &error($text{'master_esoacannot'});
my $desc = &ip6int_to_net(&arpa_to_ip($dom));
&ui_print_header($desc, $text{'master_params'}, "",
&ui_print_header(&zone_subhead($zone), $text{'master_params'}, "",
undef, undef, undef, undef, &restart_links($zone));
my @recs = &read_zone_file($zone->{'file'}, $dom);

3
bind8/edit_soptions.cgi
View File

@ -17,8 +17,7 @@ my $dom = $zone->{'name'};
&error($text{'master_ecannot'});
$access{'opts'} || &error($text{'slave_ecannot'});
my $desc = &ip6int_to_net(&arpa_to_ip($dom));
&ui_print_header($desc, $text{'master_opts'}, "",
&ui_print_header(&zone_subhead($zone), $text{'master_opts'}, "",
undef, undef, undef, undef, &restart_links($zone));
# Start of the form

3
bind8/edit_zonedt.cgi
View File

@ -12,9 +12,8 @@ my $dom = $zone->{'name'};
&can_edit_zone($zone) ||
&error($text{'master_ecannot'});
$access{'dnssec'} || &error($text{'dnssec_ecannot'});
my $desc = &ip6int_to_net(&arpa_to_ip($dom));
&ui_print_header($desc, $text{'dt_zone_title'}, "",
&ui_print_header(&zone_subhead($zone), $text{'dt_zone_title'}, "",
undef, undef, undef, undef, &restart_links($zone));
my $rrr;

3
bind8/edit_zonekey.cgi
View File

@ -11,9 +11,8 @@ my $dom = $zone->{'name'};
&can_edit_zone($zone) ||
&error($text{'master_ecannot'});
$access{'dnssec'} || &error($text{'dnssec_ecannot'});
my $desc = &ip6int_to_net(&arpa_to_ip($dom));
&ui_print_header($desc, $text{'zonekey_title'}, "",
&ui_print_header(&zone_subhead($zone), $text{'zonekey_title'}, "",
undef, undef, undef, undef, &restart_links($zone));
# Check if the zone already has a key, from a DNSKEY record

2
bind8/find_free.cgi
View File

@ -15,7 +15,7 @@ my $file = $zone->{'file'};
my $type = $zone->{'type'};
if (!$access{'findfree'}) {&error($text{'findfree_nofind'})};
my $desc = &text('findfree_header', &arpa_to_ip($dom));
my $desc = &text('findfree_header', &zone_subhead($zone));
&ui_print_header($desc, &text('findfree_title'), "",
undef, undef, undef, undef, &restart_links($zone));

1
bind8/lang/en
View File

@ -67,6 +67,7 @@ index_eexpired_conf=Automatic signing should be re-enabled on the $1 page.
index_eexpired_mod=Use the $1 module to either disable DNSSEC for these domains, or check why signing is failing.
master_title=Edit Master Zone
master_inview=$1 in view $2
master_ecannot=You are not allowed to edit this zone
master_egone=Zone $1 does not exist in any view
master_egone2=Zone $1 does not exist!

2
bind8/list_gen.cgi
View File

@ -14,7 +14,7 @@ my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});
my $dom = $zone->{'name'};
&can_edit_zone($zone) || &error($text{'master_ecannot'});
my $desc = &text('recs_header', &ip6int_to_net(&arpa_to_ip($dom)));
my $desc = &text('recs_header', &zone_subhead($zone));
&ui_print_header($desc, $text{'gen_title'}, "",
undef, undef, undef, undef, &restart_links($zone));

3
bind8/whois.cgi
View File

@ -15,8 +15,7 @@ my $dom = $zone->{'name'};
my $tv = $zone->{'type'};
$dom =~ s/\.$//;
my $desc = &ip6int_to_net(&arpa_to_ip($dom));
&ui_print_header($desc, $text{'whois_title'}, "",
&ui_print_header(&zone_subhead($zone), $text{'whois_title'}, "",
undef, undef, undef, undef, &restart_links($zone));
my $qdom = quotemeta($dom);