maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

make the panel more customizable by letting the admin use a google-webfont for it

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <mkaufmann@nutime.de>
This commit is contained in:
Michael Kaufmann (d00p)
2013-02-25 20:54:24 +01:00
parent cebd5ccf56
commit d9ac3b535e
7 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
actions/admin/settings/100.panel.php
View File

@@ -77,6 +77,23 @@ return array(
'option_options' => array('Manual' => $lng['serversettings']['manual'], 'Dropdown' => $lng['serversettings']['dropdown']),
'save_method' => 'storeSettingField',
),
'use_webfonts' => array(
'label' => 'Use a google-webfont for the panel',
'settinggroup' => 'panel',
'varname' => 'use_webfonts',
'type' => 'bool',
'default' => true,
'save_method' => 'storeSettingField',
),
'webfont' => array(
'label' => 'Use a google-webfont for the panel',
'settinggroup' => 'panel',
'varname' => 'webfont',
'type' => 'string',
'default' => 'Numans',
'string_emptyallowed' => false,
'save_method' => 'storeSettingField',
),
'panel_adminmail' => array(
'label' => $lng['serversettings']['adminmail'],
'settinggroup' => 'panel',

2
install/froxlor.sql
View File

@@ -532,6 +532,8 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('panel', 'allow_preset', '1'),
('panel', 'allow_preset_admin', '0'),
('panel', 'password_regex', ''),
('panel', 'use_webfonts', '1'),
('panel', 'webfont', 'Numans'),
('panel', 'version', '0.9.28-svn6');

4
install/install.php
View File

@@ -102,6 +102,7 @@ function page_header() {
<head>
<meta charset="utf-8" />
<meta http-equiv="Default-Style" content="text/css" />
<link href="//fonts.googleapis.com/css?family=Numans" rel="stylesheet">
<link rel="stylesheet" href="../templates/Froxlor/assets/css/main.css" />
<!--[if IE]><link rel="stylesheet" href="../templates/Froxlor/assets/css/main_ie.css" /><![endif]-->
<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
@@ -110,6 +111,9 @@ function page_header() {
<link href="../templates/Froxlor/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
<title>Froxlor Server Management Panel - Installation</title>
<style>
body {
font-family: Numans, Verdana, Geneva, sans-serif;
}
input {
background: #dae7ee url('../templates/Froxlor/assets/img/icons/text_align_left.png') no-repeat 5px 4px;
}

5
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -2003,5 +2003,10 @@ if(isFroxlorVersion('0.9.28-svn5')) {
$db->query("UPDATE `panel_admins` SET `tickets_see_all` = '1' WHERE `adminid` = '".$userinfo['adminid']."';");
lastStepStatus(0);
showUpdateSet("Inserting new webfont-settings", true);
$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'use_webfonts', '1');");
$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'webfont', 'Numans');");
lastStepStatus(0);
updateToVersion('0.9.28-svn6');
}

1
lib/init.php
View File

@@ -455,6 +455,7 @@ if(AREA == 'admin' || AREA == 'customer')
unset($navigation_data);
}
$webfont = str_replace('+', ' ', $settings['panel']['webfont']);
eval("\$header = \"" . getTemplate('header', '1') . "\";");
$current_year = date('Y', time());

4
templates/Froxlor/assets/css/main.css
View File

@@ -1,9 +1,5 @@
@charset "UTF-8";
* {
font-family: Verdana, Verdana, Geneva, sans-serif;
}
html,body {
font-size: 12px;
}

8
templates/Froxlor/header.tpl
View File

@@ -19,12 +19,20 @@
<link rel="stylesheet" type="text/css" href="css/jquery.jqplot.css" />
<script language="javascript" type="text/javascript" src="templates/{$theme}/assets/js/traffic.js"></script>
</if>
<if $settings['panel']['use_webfonts'] == '1'>
<link href="//fonts.googleapis.com/css?family={$settings['panel']['webfont']}" rel="stylesheet">
</if>
<link href="templates/{$theme}/assets/css/main.css" rel="stylesheet" type="text/css" />
<!--[if IE]><link rel="stylesheet" href="templates/{$theme}/css/main_ie.css" type="text/css" /><![endif]-->
<link href="css/jquery.jquery-ui.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="templates/{$theme}/assets/js/main.js"></script>
<link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
<title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor Server Management Panel</title>
<style type="text/css">
body {
font-family: <if $settings['panel']['use_webfonts'] == '1'>{$webfont},</if> Verdana, Geneva, sans-serif;
}
</style>
</head>
<body>