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

Fix to display Legacy Theme if currently selected

Browse Source
This commit is contained in:
Ilia Rostovtsev
2021-03-06 22:44:39 +03:00
parent c614274043
commit 4882e980f6
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acl/edit_user.cgi
View File

@@ -218,6 +218,7 @@ my @overlays = grep { $_->{'overlay'} } @all;
if ($access{'theme'}) {
# Current theme
my @topts = ( );
push(@topts, !$user{'theme'} ? [ '', $text{'edit_themedef'} ] : ());
foreach my $t (@themes) {
push(@topts, [ $t->{'dir'}, $t->{'desc'} ]);
}

2
change-user/index.cgi
View File

@@ -75,7 +75,7 @@ if ($access{'theme'}) {
[ [ 1, &text('index_themeglobal', $tname)."<br>" ],
[ 0, $text{'index_themeset'} ] ])." ".
&ui_select("theme", $user->{'theme'},
[ [ '', $text{'index_themedef'} ],
[ !$user->{'theme'} ? [ '', $text{'index_themedef'} ] : (),
map { [ $_->{'dir'}, $_->{'desc'} ] }
@themes ]), undef, [ "valign=top","valign=top" ]);

3
usermin/edit_themes.cgi
View File

@@ -30,7 +30,8 @@ if (@themes) {
print &ui_form_start("change_theme.cgi");
print "<b>$text{'themes_sel'}</b>\n";
print &ui_select("theme", $uconfig{'theme'},
[ map { [ $_->{'dir'}, $_->{'desc'} ] } @themes ]),"<p>\n";
[ !$uconfig{'theme'} ? [ '', $text{'themes_default'} ] : (),
map { [ $_->{'dir'}, $_->{'desc'} ] } @themes ]),"<p>\n";
print &ui_form_end([ [ undef, $text{'themes_change'} ] ]);
print &ui_tabs_end_tab("mode", "change");
}

3
webmin/edit_themes.cgi
View File

@@ -37,7 +37,8 @@ if (@themes) {
print &ui_form_start("change_theme.cgi");
print "<b>$text{'themes_sel'}</b>\n";
print &ui_select("theme", $gtheme,
[ map { [ $_->{'dir'}, $_->{'desc'} ] } @themes ]),"<p>\n";
[ !$gtheme ? [ '', $text{'themes_default'} ] : (),
map { [ $_->{'dir'}, $_->{'desc'} ] } @themes ]),"<p>\n";
print &ui_form_end([ [ undef, $text{'themes_change'} ] ]);
print &ui_tabs_end_tab("mode", "change");
}