mirror of
https://github.com/webmin/webmin.git
synced 2026-10-26 05:00:51 +00:00
cbe1f7f17e
This PR adds a "Page layout" setting to the Framed Theme, with a new single page layout that shows the menu on every page instead of in a frame. It's meant for people who can't or don't want to use frames, so the Legacy Theme is no longer the only option without frames. The menu code moved out of `left.cgi` into a shared menu-lib.pl, so both layouts build the same menu, frames look the same as before, and `left.cgi` shrinks from about 400 lines to about 60. The menu's module search box now follows the global "webminsearch" permission, which the old frame code never actually checked. One exception to be aware of. A server opened through Webmin Servers Index always uses frames, because that index only rewrites the links and redirects of framed pages.
80 lines
2.2 KiB
Perl
Executable File
80 lines
2.2 KiB
Perl
Executable File
#!/usr/local/bin/perl
|
|
# Update visible right-frame sections
|
|
|
|
require "gray-theme/gray-theme-lib.pl";
|
|
require "gray-theme/theme.pl";
|
|
|
|
&ReadParse();
|
|
&error_setup($text{'edright_err'});
|
|
&load_theme_library();
|
|
($hasvirt, $level, $hasvm2) = &get_virtualmin_user_level();
|
|
$sects = &get_right_frame_sections();
|
|
!$sects->{'global'} ||
|
|
$hasvirt && &virtual_server::master_admin() ||
|
|
$hasvm2 && !$server_manager::access{'owner'} ||
|
|
&error($text{'edright_ecannot'});
|
|
|
|
# Validate and store
|
|
foreach $s (&list_right_frame_sections()) {
|
|
$sect->{'no'.$s->{'name'}} = !$in{$s->{'name'}};
|
|
}
|
|
if ($in{'alt_def'}) {
|
|
delete($sect->{'alt'});
|
|
}
|
|
else {
|
|
$in{'alt'} =~ /^(http|https|\/)/ || &error($text{'edright_ealt'});
|
|
$sect->{'alt'} = $in{'alt'};
|
|
}
|
|
$sect->{'list'} = $in{'list'};
|
|
$sect->{'tab'} = $in{'tab'};
|
|
# Page layout, framed or a single page
|
|
$in{'layout'} =~ /^(single|)$/ || &error($text{'edright_elayout'});
|
|
$sect->{'layout'} = $in{'layout'};
|
|
if ($in{'fsize_def'}) {
|
|
delete($sect->{'fsize'});
|
|
}
|
|
else {
|
|
$in{'fsize'} =~ /^\d+$/ || &error($text{'edright_efsize'});
|
|
$sect->{'fsize'} = $in{'fsize'};
|
|
}
|
|
$sect->{'nosearch'} = !$in{'search'};
|
|
# Color scheme, forced or following the browser when empty
|
|
$in{'scheme'} =~ /^(light|dark|)$/ || &error($text{'edright_escheme'});
|
|
$sect->{'scheme'} = $in{'scheme'};
|
|
if ($hasvirt) {
|
|
$sect->{'dom'} = $in{'dom'};
|
|
$sect->{'qsort'} = $in{'qsort'};
|
|
$sect->{'qshow'} = $in{'qshow'};
|
|
if ($in{'max_def'}) {
|
|
delete($sect->{'max'});
|
|
}
|
|
else {
|
|
$in{'max'} =~ /^[1-9]\d*$/ || &error($text{'edright_emax'});
|
|
$sect->{'max'} = $in{'max'};
|
|
}
|
|
}
|
|
if ($hasvm2) {
|
|
$sect->{'server'} = $in{'server'};
|
|
}
|
|
if ($hasvirt && &virtual_server::master_admin() ||
|
|
$hasvm2 && &server_manager::can_action(undef, "global")) {
|
|
$sect->{'global'} = $in{'global'};
|
|
$sect->{'nowebmin'} = $in{'nowebmin'};
|
|
}
|
|
|
|
# Save config
|
|
&save_right_frame_sections($sect);
|
|
if ($sect->{'layout'} ne $sects->{'layout'}) {
|
|
# The layout changed, so reload the whole window to drop the frameset
|
|
# or bring it back
|
|
$main::gray_theme_settings = undef;
|
|
&popup_header();
|
|
print &js_redirect($sect->{'layout'} ? "/right.cgi" : "/", "top");
|
|
&popup_footer();
|
|
}
|
|
else {
|
|
# Back to the system information page
|
|
&redirect("right.cgi");
|
|
}
|
|
|