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

Merge pull request #1453 from webmin/dev/no-list-blue-theme

Browse Source 
Change: Dev/no list blue theme
This commit is contained in:
Jamie Cameron
2021-03-06 12:08:18 -08:00
committed by GitHub
parent 34ccf16be0 38deb9c132
commit e2866aefa9
4 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acl/edit_user.cgi
View File

@@ -211,7 +211,7 @@ if ($access{'cats'}) {
[ 0, $text{'default'} ] ]));
}
my @all = &webmin::list_themes();
my @all = &webmin::list_visible_themes();
my @themes = grep { !$_->{'overlay'} } @all;
my @overlays = grep { $_->{'overlay'} } @all;

2
usermin/edit_themes.cgi
View File

@@ -7,7 +7,7 @@ $access{'themes'} || &error($text{'acl_ecannot'});
&ReadParse();
&ui_print_header(undef, $text{'themes_title'}, "");
@themes = &list_themes();
@themes = &list_visible_themes();
&get_usermin_config(\%uconfig);
$prog = "edit_themes.cgi?mode=";

1
usermin/usermin-lib.pl
View File

@@ -181,7 +181,6 @@ my %done;
foreach my $theme (&list_themes()) {
my $iscurr = $curr && $theme->{'dir'} eq $curr;
next if (-l $root_directory."/".$theme->{'dir'} &&
$theme->{'dir'} =~ /\d+$/ &&
!$iscurr);
next if ($done{$theme->{'desc'}}++ && !$iscurr);
push(@rv, $theme);

1
webmin/webmin-lib.pl
View File

@@ -2752,7 +2752,6 @@ my %done;
foreach my $theme (&list_themes()) {
my $iscurr = $curr && $theme->{'dir'} eq $curr;
next if (-l $root_directory."/".$theme->{'dir'} &&
$theme->{'dir'} =~ /\d+$/ &&
!$iscurr);
next if ($done{$theme->{'desc'}}++ && !$iscurr);
push(@rv, $theme);