Merge remote-tracking branch 'ms/fifteen-theme' into fifteen

This commit is contained in:
Michael Tremer
2014-01-05 21:16:17 +01:00
33 changed files with 1107 additions and 391 deletions

View File

@@ -36,7 +36,6 @@ my %checked=();
my $errormessage='';
$cgiparams{'FX'} = 'off';
$cgiparams{'SPEED'} = 'off';
$cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
$cgiparams{'REBOOTQUESTION'} = 'off';
@@ -90,7 +89,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
$mainsettings{'WINDOWWITHHOSTNAME'} = $cgiparams{'WINDOWWITHHOSTNAME'};
$mainsettings{'REBOOTQUESTION'} = $cgiparams{'REBOOTQUESTION'};
$mainsettings{'PPPUPDOWNBEEP'} = $cgiparams{'PPPUPDOWNBEEP'};
$mainsettings{'FX'} = $cgiparams{'FX'};
$mainsettings{'SPEED'} = $cgiparams{'SPEED'};
$mainsettings{'THEME'} = $cgiparams{'theme'};
$mainsettings{'REFRESHINDEX'} = $cgiparams{'REFRESHINDEX'};
@@ -101,7 +99,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
if ($mainsettings{'WINDOWWITHHOSTNAME'}) {
$cgiparams{'WINDOWWITHHOSTNAME'} = $mainsettings{'WINDOWWITHHOSTNAME'};
} else {
$cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
$cgiparams{'WINDOWWITHHOSTNAME'} = 'on';
}
if ($mainsettings{'REBOOTQUESTION'}) {
@@ -116,12 +114,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
$cgiparams{'PPPUPDOWNBEEP'} = 'on';
}
if ($mainsettings{'FX'}) {
$cgiparams{'FX'} = $mainsettings{'FX'};
} else {
$cgiparams{'FX'} = 'on';
}
if ($mainsettings{'THEME'}) {
$cgiparams{'THEME'} = $mainsettings{'THEME'};
} else {
@@ -146,11 +138,10 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
# Default settings
if ($cgiparams{'ACTION'} eq "$Lang::tr{'restore defaults'}")
{
$cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
$cgiparams{'WINDOWWITHHOSTNAME'} = 'on';
$cgiparams{'REBOOTQUESTION'} = 'on';
$cgiparams{'PPPUPDOWNBEEP'} = 'on';
$cgiparams{'REFRESHINDEX'} = 'off';
$cgiparams{'FX'} = 'on';
$cgiparams{'SPEED'} = 'on';
$cgiparams{'THEME'} = 'ipfire';
}
@@ -171,10 +162,6 @@ $checked{'REFRESHINDEX'}{'off'} = '';
$checked{'REFRESHINDEX'}{'on'} = '';
$checked{'REFRESHINDEX'}{$cgiparams{'REFRESHINDEX'}} = "checked='checked'";
$checked{'FX'}{'off'} = '';
$checked{'FX'}{'on'} = '';
$checked{'FX'}{$cgiparams{'FX'}} = "checked='checked'";
$checked{'SPEED'}{'off'} = '';
$checked{'SPEED'}{'on'} = '';
$checked{'SPEED'}{$cgiparams{'SPEED'}} = "checked='checked'";
@@ -196,10 +183,6 @@ print <<END
<tr>
<td colspan='2'><p><b>$Lang::tr{'display'}</b></td>
</tr>
<tr>
<td><input type='checkbox' name='FX' $checked{'FX'}{'on'} /></td>
<td>$Lang::tr{'display webinterface effects'}</td>
</tr>
<tr>
<td><input type='checkbox' name='WINDOWWITHHOSTNAME' $checked{'WINDOWWITHHOSTNAME'}{'on'} /></td>
<td>$Lang::tr{'display hostname in window title'}</td>